Cleanup

ptr727 · Mar 25, 2023 · ca953ac · ca953ac
1 parent 7274055
commit ca953ac
Show file tree

Hide file tree

Showing 12 changed files with 35 additions and 33 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,5 +1,6 @@
 {
     "cSpell.words": [
+        "archlinux",
         "checkfornewtools",
         "commandline",
         "defaultsettings",
@@ -8,9 +9,12 @@
         "Jellyfin",
         "Matroska",
         "mediafiles",
+        "Nerdbank",
+        "Newtonsoft",
         "Plex",
         "plexcleaner",
         "printmediainfo",
+        "Serilog",
         "settingsfile",
         "threadcount",
         "Vorbis"

diff --git a/PlexCleaner/Bitrate.cs b/PlexCleaner/Bitrate.cs
@@ -73,9 +73,9 @@ public void WriteLine(string prefix)
             TimeSpan.FromSeconds(Duration));
     }
 
-    public static string ToBitsPerSecond(long byterate)
+    public static string ToBitsPerSecond(long byteRate)
     {
-        return Format.BytesToKilo(byterate * 8, "bps");
+        return Format.BytesToKilo(byteRate * 8, "bps");
     }
 
     // Array of bytes per second

diff --git a/PlexCleaner/ConfigFileJsonSchema.cs b/PlexCleaner/ConfigFileJsonSchema.cs
@@ -11,8 +11,6 @@ namespace PlexCleaner;
 // Base
 public record ConfigFileJsonSchemaBase
 {
-    public ConfigFileJsonSchemaBase() { }
-
     // TODO: How to set the $schema through e.g. attributes on the class?
     // https://stackoverflow.com/questions/71625019/how-to-inject-the-json-schema-value-during-newtonsoft-jsonconvert-serializeobje
     // Schema reference
@@ -32,8 +30,6 @@ public ConfigFileJsonSchemaBase() { }
 [Obsolete]
 public record ConfigFileJsonSchema1 : ConfigFileJsonSchemaBase
 {
-    public ConfigFileJsonSchema1() { }
-
     // Deprecated
     [Obsolete]
     internal ConvertOptions1 ConvertOptions { get; set; } = new();

diff --git a/PlexCleaner/FfMpegTool.cs b/PlexCleaner/FfMpegTool.cs
@@ -305,17 +305,17 @@ private static void CreateTrackArgs(SelectMediaInfo selectMediaInfo, out string
             // Copy or encode
             switch (trackInfo)
             {
-                case VideoInfo info:
-                    sb.Append(info.State == TrackInfo.StateType.Keep
+                case VideoInfo videoInfo:
+                    sb.Append(videoInfo.State == TrackInfo.StateType.Keep
                         ? $"-c:v:{videoIndex++} copy "
                         : $"-c:v:{videoIndex++} {Program.Config.ConvertOptions.FfMpegOptions.Video} ");
                     break;
-                case AudioInfo info:
-                    sb.Append(info.State == TrackInfo.StateType.Keep
+                case AudioInfo audioInfo:
+                    sb.Append(audioInfo.State == TrackInfo.StateType.Keep
                         ? $"-c:a:{audioIndex++} copy "
                         : $"-c:a:{audioIndex++} {Program.Config.ConvertOptions.FfMpegOptions.Audio} ");
                     break;
-                case SubtitleInfo info:
+                case SubtitleInfo:
                     // No re-encoding of subtitles, just copy
                     sb.Append($"-c:s:{subtitleIndex++} copy ");
                     break;

diff --git a/PlexCleaner/MediaInfoToolXmlSchema.cs b/PlexCleaner/MediaInfoToolXmlSchema.cs
@@ -91,10 +91,10 @@ public class MediaInfo
 
     public static MediaInfo FromXml(string xml)
     {
-        XmlSerializer xmlserializer = new(typeof(MediaInfo));
-        using TextReader textreader = new StringReader(xml);
-        using var xmlReader = XmlReader.Create(textreader);
-        return xmlserializer.Deserialize(xmlReader) as MediaInfo;
+        XmlSerializer xmlSerializer = new(typeof(MediaInfo));
+        using TextReader textReader = new StringReader(xml);
+        using var xmlReader = XmlReader.Create(textReader);
+        return xmlSerializer.Deserialize(xmlReader) as MediaInfo;
     }
 
     public static bool StringToBool(string value)

diff --git a/PlexCleaner/Monitor.cs b/PlexCleaner/Monitor.cs
@@ -105,8 +105,7 @@ void ErrorHandler(object s, ErrorEventArgs e)
                 Log.Logger.Information("Monitored changes in : {Folder}", folder);
             }
 
-            Process process = new();
-            process.ProcessFolders(watchlist);
+            Process.ProcessFolders(watchlist);
             Process.DeleteEmptyFolders(watchlist);
         }
 

diff --git a/PlexCleaner/Process.cs b/PlexCleaner/Process.cs
@@ -68,7 +68,7 @@ public Process()
         Program.Config.ProcessOptions.KeepLanguages.Add(Program.Config.ProcessOptions.DefaultLanguage);
     }
 
-    public bool ProcessFolders(List<string> folderList)
+    public static bool ProcessFolders(List<string> folderList)
     {
         // Create the file and directory list
         if (!FileEx.EnumerateDirectories(folderList, out List<FileInfo> fileInfoList, out _))

diff --git a/PlexCleaner/ProcessFile.cs b/PlexCleaner/ProcessFile.cs
@@ -269,7 +269,7 @@ public bool RepairMediaInfoErrors(ref bool modified)
         // Conditional
         if (!Program.Config.VerifyOptions.AutoRepair)
         {
-            // If repair is not enabled jsut clear error state
+            // If repair is not enabled just clear error state
             ClearMediaInfoErrors();
             return true;
         }
@@ -1727,7 +1727,7 @@ public SelectMediaInfo FindUnwantedLanguageTracks()
             // Use the first track
             var videoInfo = MkvMergeInfo.Video.First();
             selectMediaInfo.Move(videoInfo, true);
-            Log.Logger.Warning("No video track matching requested language : {Available} != {Languages}, Using: {Selected}", Language.GetLanguageList(MkvMergeInfo.Video), Program.Config.ProcessOptions.KeepLanguages, videoInfo.LanguageIetf);
+            Log.Logger.Warning("No video track matching requested language : {Available} not in {Languages}, Selecting {Selected}", Language.GetLanguageList(MkvMergeInfo.Video), Program.Config.ProcessOptions.KeepLanguages, videoInfo.LanguageIetf);
         }
 
         // Keep at least one audio track if any
@@ -1736,13 +1736,13 @@ public SelectMediaInfo FindUnwantedLanguageTracks()
             // Use the preferred audio codec track from the unselected tracks
             var audioInfo = FindPreferredAudio(selectMediaInfo.NotSelected.Audio);
             selectMediaInfo.Move(audioInfo, true);
-            Log.Logger.Warning("No audio track matching requested language : {Available} != {Languages}, Using: {Selected}", Language.GetLanguageList(MkvMergeInfo.Audio), Program.Config.ProcessOptions.KeepLanguages, audioInfo.LanguageIetf);
+            Log.Logger.Warning("No audio track matching requested language : {Available} not in {Languages}, Selecting {Selected}", Language.GetLanguageList(MkvMergeInfo.Audio), Program.Config.ProcessOptions.KeepLanguages, audioInfo.LanguageIetf);
         }
 
         // No language matching subtitle tracks
         if (selectMediaInfo.Selected.Subtitle.Count == 0 && MkvMergeInfo.Subtitle.Count > 0)
         {
-            Log.Logger.Warning("No subtitle track matching requested language : {Available} != {Languages}", Language.GetLanguageList(MkvMergeInfo.Subtitle), Program.Config.ProcessOptions.KeepLanguages);
+            Log.Logger.Warning("No subtitle track matching requested language : {Available} not in {Languages}", Language.GetLanguageList(MkvMergeInfo.Subtitle), Program.Config.ProcessOptions.KeepLanguages);
         }
 
         // Selected is Keep
@@ -1753,6 +1753,14 @@ public SelectMediaInfo FindUnwantedLanguageTracks()
 
     static AudioInfo FindPreferredAudio(IEnumerable<TrackInfo> trackInfoList)
     {
+        // No preferred tracks, or only 1 track, use first track
+        Debug.Assert(trackInfoList.Count() > 0);
+        if (Program.Config.ProcessOptions.PreferredAudioFormats.Count == 0 ||
+            trackInfoList.Count() == 1)
+        {
+            return (AudioInfo)trackInfoList.First();
+        }
+
         // Iterate through the preferred codecs in order
         var audioInfoList = trackInfoList.OfType<AudioInfo>().ToList();
         foreach (var codec in Program.Config.ProcessOptions.PreferredAudioFormats)
@@ -1761,12 +1769,13 @@ static AudioInfo FindPreferredAudio(IEnumerable<TrackInfo> trackInfoList)
             var audioInfo = audioInfoList.Find(item => item.Format.Equals(codec, StringComparison.OrdinalIgnoreCase));
             if (audioInfo != null)
             {
-                // Done
+                Log.Logger.Information("Preferred audio codec selected : {Preferred} in {Codecs}", audioInfo.Format, audioInfoList.Select(item => item.Format));
                 return audioInfo;
             }
         }
 
         // Return first item
+        Log.Logger.Information("No audio codec matching preferred codecs : {Preferred} not in {Codecs}, Selecting {Selected}", Program.Config.ProcessOptions.PreferredAudioFormats, audioInfoList.Select(item => item.Format), audioInfoList.First().Codec);
         return audioInfoList.First();
     }
 

diff --git a/PlexCleaner/SevenZipTool.cs b/PlexCleaner/SevenZipTool.cs
@@ -182,7 +182,7 @@ public bool BootstrapDownload()
             return false;
         }
 
-        // Download the lastest version in the tools root folder
+        // Download the latest version in the tools root folder
         Log.Logger.Information("Downloading \"{FileName}\" ...", mediaToolInfo.FileName);
         var updateFile = Tools.CombineToolPath(mediaToolInfo.FileName);
         if (!Download.DownloadFile(new Uri(mediaToolInfo.Url), updateFile))
@@ -215,8 +215,8 @@ public bool BootstrapDownload()
         return FileEx.RenameFolder(extractPath, toolPath);
     }
 
-    private const string InstalledVeersionPattern = @"7-Zip\ ([^\s]+)\ (?<version>.*?)\ ";
-    [GeneratedRegex(InstalledVeersionPattern, RegexOptions.IgnoreCase | RegexOptions.Multiline)]
+    private const string InstalledVersionPattern = @"7-Zip\ ([^\s]+)\ (?<version>.*?)\ ";
+    [GeneratedRegex(InstalledVersionPattern, RegexOptions.IgnoreCase | RegexOptions.Multiline)]
     private static partial Regex InstalledVersionRegex();
 
     private const string LatestVersionPattern = @"Download\ 7-Zip\ (?<major>.*?)\.(?<minor>.*?)\ \((?<date>.*?)\)\ for\ Windows";

diff --git a/PlexCleaner/SidecarFileJsonSchema.cs b/PlexCleaner/SidecarFileJsonSchema.cs
@@ -8,8 +8,6 @@ namespace PlexCleaner;
 
 public record SidecarFileJsonSchemaBase
 {
-    public SidecarFileJsonSchemaBase() { }
-
     // TODO: Add a schema
     // Schema reference
     // [JsonProperty(PropertyName = "$schema", Order = -3)]
@@ -24,8 +22,6 @@ public SidecarFileJsonSchemaBase() { }
 [Obsolete]
 public record SidecarFileJsonSchema1 : SidecarFileJsonSchemaBase
 {
-    public SidecarFileJsonSchema1() { }
-
     [Obsolete]
     internal string FfMpegToolVersion { get; set; }
     [Obsolete]

diff --git a/PlexCleaner/TrackInfo.cs b/PlexCleaner/TrackInfo.cs
@@ -94,7 +94,7 @@ internal TrackInfo(MkvToolJsonSchema.Track trackJson)
             }
             else 
             {
-                Log.Logger.Warning("MkvToolJsonSchema : IETF language not set, converting ISO639-3 to IETF : {Language} -> {IETFLanguage}", Language, lookupLanguage);
+                Log.Logger.Warning("MkvToolJsonSchema : IETF language not set, converting ISO639-3 to IETF : {Language} -> {IetfLanguage}", Language, lookupLanguage);
                 LanguageIetf = lookupLanguage;
 
                 // Set track error and recommend remux

diff --git a/PlexCleaner/VideoInfo.cs b/PlexCleaner/VideoInfo.cs
@@ -14,8 +14,6 @@ namespace PlexCleaner;
 
 public class VideoInfo : TrackInfo
 {
-    public VideoInfo() { }
-
     internal VideoInfo(MkvToolJsonSchema.Track track) : base(track)
     {
         // Missing: Profile