Minor improvments to rename

ScottRFrost · Sep 26, 2016 · bd48f20 · bd48f20
1 parent 5870e1a
commit bd48f20
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/src/SimpleSFTPSyncCore/Rename.cs b/src/SimpleSFTPSyncCore/Rename.cs
@@ -62,7 +62,6 @@ static string Clean(this string filename)
             // Strip things we know we don't want
             return (
                 filename
-                .ToLowerInvariant()
                 .Replace("1080p", string.Empty).Replace("720p", string.Empty).Replace("x264", string.Empty).Replace("h264", string.Empty).Replace("ac3", string.Empty).Replace("dts", string.Empty)
                 .Replace("blurayrip", string.Empty).Replace("bluray", string.Empty).Replace("dvdrip", string.Empty).Replace("HDTV", string.Empty).Replace("Webrip", string.Empty)
                 .Replace(".", " ").Replace("  ", " ").Replace("  ", " ")
@@ -132,7 +131,8 @@ public static string Movie(string filename)
                 }
 
                 // Attempt OMDBAPI Check
-                var title = filename.Substring(0, idx - 1).Trim();
+                var title = filename.Substring(0, idx - 1).Trim(); // Strip garbage after year
+                title = title.Substring(title.LastIndexOf("\\", StringComparison.Ordinal) + 1); // Strip Folder
                 var httpClient = new ProHttpClient();
                 dynamic omdbapi = JObject.Parse(httpClient.DownloadString("http://www.omdbapi.com/?type=movie&t=" + title + "&y=" + year.ToString(CultureInfo.InvariantCulture)).Result);
                 if (omdbapi.Response == "False")
@@ -157,7 +157,7 @@ public static string Movie(string filename)
                 else if (genres.Contains("Adventure")) { genre = "Adventure"; }
                 return (genre +"\\" + (string)omdbapi.Title + " (" + year.ToString(CultureInfo.InvariantCulture) + ").mkv").CleanFilePath();
             }
-            return filename.CleanFilePath();
+            return filename.Substring(filename.LastIndexOf("\\", StringComparison.Ordinal) + 1).CleanFilePath();
         }
 
         /// <summary>
@@ -180,21 +180,22 @@ public static string TV(string filename)
                     if (idx > 0)
                     {
                         // Attempt OMDBAPI Check
-                        var title = filename.Substring(0, idx - 1).Trim();
+                        var title = filename.Substring(0, idx - 1).Trim(); // Strip S01E01 and trailing garbage
+                        title = title.Substring(title.LastIndexOf("\\", StringComparison.Ordinal) + 1); // Strip Folder
                         var httpClient = new ProHttpClient();
                         dynamic omdbapi = JObject.Parse(httpClient.DownloadString("http://www.omdbapi.com/?type=series&t=" + title).Result);
                         if (omdbapi.Response == "False")
                         {
                             // Didn't find it, return a best guess
-                            return (title + "\\Season " + season.ToString(CultureInfo.InvariantCulture) + "\\" + title + " - " + episodeNumber.ToUpperInvariant() + ".mkv").CleanFilePath();
+                            return (title.CleanFilePath() + "\\Season " + season.ToString(CultureInfo.InvariantCulture) + "\\" + title.CleanFilePath() + " - " + episodeNumber.ToUpperInvariant() + ".mkv");
                         }
                         // Found it, use the corrected title
                         title = (string)omdbapi.Title;
-                        return (title + "\\Season " + season.ToString(CultureInfo.InvariantCulture) + "\\" + title + " - " + episodeNumber.ToUpperInvariant() + ".mkv").CleanFilePath();
+                        return (title.CleanFilePath() + "\\Season " + season.ToString(CultureInfo.InvariantCulture) + "\\" + title.CleanFilePath() + " - " + episodeNumber.ToUpperInvariant() + ".mkv").CleanFilePath();
                     }
                 }
             }
-            return filename.CleanFilePath();
+            return filename.Substring(filename.LastIndexOf("\\", StringComparison.Ordinal) + 1).CleanFilePath();
         }
     }
 }
diff --git a/src/SimpleSFTPSyncCore/SimpleSFTPSync.cs b/src/SimpleSFTPSyncCore/SimpleSFTPSync.cs
@@ -238,7 +238,7 @@ public void MoveFiles(List<string> mkvs)
                     if (Rename.IsTV(mkv))
                     {
                         var filename = Rename.TV(mkv);
-                        Log("Moving TV " + mkv + " --> " + tvDir + '\\' + filename);
+                        Log("Moving TV " + mkv + " -->\r\n     " + tvDir + '\\' + filename);
                         Directory.CreateDirectory(tvDir + '\\' + filename.Substring(0, filename.LastIndexOf("\\", StringComparison.Ordinal)));
                         var shouldMove = true;
                         if (File.Exists(tvDir + '\\' + filename))
@@ -266,7 +266,7 @@ public void MoveFiles(List<string> mkvs)
                     else
                     {
                         var filename = Rename.Movie(mkv);
-                        Log("Moving Movie " + mkv + " --> " + movieDir + '\\' + filename);
+                        Log("Moving Movie " + mkv + " -->\r\n     " + movieDir + '\\' + filename);
                         Directory.CreateDirectory(movieDir + '\\' + filename.Substring(0, filename.LastIndexOf("\\", StringComparison.Ordinal)));
                         var shouldMove = true;
                         if (File.Exists(movieDir + '\\' + filename))
@@ -297,6 +297,7 @@ public void MoveFiles(List<string> mkvs)
                     Log("!!ERROR!! during move of " + mkv + " - " + ex);
                 }
             }
+            log.Flush();
         }
 
         /// <summary>