Fix gettagmap assert error

ptr727 · May 7, 2023 · a1e0fa2 · a1e0fa2
1 parent d07b67d
commit a1e0fa2
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 23 deletions.
diff --git a/PlexCleaner.sln b/PlexCleaner.sln
@@ -41,7 +41,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sandbox", "Sandbox\Sandbox.
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Issues", "Issues", "{03A7B3AB-49DA-481B-AF3D-CF3D16BBFD0E}"
 	ProjectSection(SolutionItems) = preProject
-		.github\ISSUE_TEMPLATE\bug_report.md = .github\ISSUE_TEMPLATE\bug_report.md
+		.github\ISSUE_TEMPLATE\bug_report.yml = .github\ISSUE_TEMPLATE\bug_report.yml
 		.github\ISSUE_TEMPLATE\config.yml = .github\ISSUE_TEMPLATE\config.yml
 	EndProjectSection
 EndProject

diff --git a/PlexCleaner/SidecarFile.cs b/PlexCleaner/SidecarFile.cs
@@ -553,8 +553,10 @@ public void WriteLine()
         Log.Logger.Information("MediaInfoXml: {MediaInfoXml}", MediaInfoXml);
         Log.Logger.Information("MkvMergeInfoJson: {MkvMergeInfoJson}", MkvMergeInfoJson);
         Log.Logger.Information("FfProbeInfoJson: {FfProbeInfoJson}", FfProbeInfoJson);
+        Log.Logger.Information("SchemaVersion: {SchemaVersion}", SidecarJson.SchemaVersion);
         Log.Logger.Information("MediaLastWriteTimeUtc: {MediaLastWriteTimeUtc}", SidecarJson.MediaLastWriteTimeUtc);
         Log.Logger.Information("MediaLength: {MediaLength}", SidecarJson.MediaLength);
+        Log.Logger.Information("MediaHash: {MediaHash}", SidecarJson.MediaHash);
         Log.Logger.Information("MediaInfoToolVersion: {MediaInfoToolVersion}", SidecarJson.MediaInfoToolVersion);
         Log.Logger.Information("MkvMergeToolVersion: {MkvMergeToolVersion}", SidecarJson.MkvMergeToolVersion);
         Log.Logger.Information("FfProbeToolVersion: {FfProbeToolVersion}", SidecarJson.FfProbeToolVersion);

diff --git a/PlexCleaner/TagMapDictionary.cs b/PlexCleaner/TagMapDictionary.cs
@@ -83,28 +83,7 @@ private static bool DoTracksMatch(MediaInfo mediaInfo, MediaInfo mkvMerge, Media
             return false;
         }
 
-        // Verify the track languages match
-        // FfProbe has bugs with language vs. tag_language, try removing the tags
-        if (ffProbe.Video.Where((t, i) =>
-                !t.Language.Equals(mediaInfo.Video[i].Language, StringComparison.OrdinalIgnoreCase) ||
-                !t.Language.Equals(mkvMerge.Video[i].Language, StringComparison.OrdinalIgnoreCase)).Any())
-        {
-            return false;
-        }
-
-        if (ffProbe.Audio.Where((t, i) =>
-                !t.Language.Equals(mediaInfo.Audio[i].Language, StringComparison.OrdinalIgnoreCase) ||
-                !t.Language.Equals(mkvMerge.Audio[i].Language, StringComparison.OrdinalIgnoreCase)).Any())
-        {
-            return false;
-        }
-
-        if (ffProbe.Subtitle.Where((t, i) =>
-                !t.Language.Equals(mediaInfo.Subtitle[i].Language, StringComparison.OrdinalIgnoreCase) ||
-                !t.Language.Equals(mkvMerge.Subtitle[i].Language, StringComparison.OrdinalIgnoreCase)).Any())
-        {
-            return false;
-        }
+        // TODO: Verify the track languages match
 
         return true;
     }

diff --git a/PlexCleanerTests/PlexCleanerTests.cs b/PlexCleanerTests/PlexCleanerTests.cs
@@ -4,6 +4,28 @@
 using System.Reflection;
 using PlexCleaner;
 
+// TODO: Create test script
+/*
+./PlexCleaner --version
+./PlexCleaner --help
+./PlexCleaner defaultsettings --settingsfile PlexCleaner.default.json
+./PlexCleaner getversioninfo --settingsfile PlexCleaner.json
+./PlexCleaner checkfornewtools  --settingsfile=PlexCleaner.json
+./PlexCleaner process --settingsfile PlexCleaner.json --mediafiles D:/Test --testsnippets
+./PlexCleaner monitor --settingsfile PlexCleaner.json --mediafiles D:/Test
+./PlexCleaner remux --settingsfile PlexCleaner.json --mediafiles D:/Test
+./PlexCleaner reencode --settingsfile PlexCleaner.json --mediafiles D:/Test
+./PlexCleaner deinterlace --settingsfile PlexCleaner.json --mediafiles D:/Test
+./PlexCleaner removesubtitles --settingsfile PlexCleaner.json --mediafiles D:/Test
+./PlexCleaner createsidecar --settingsfile PlexCleaner.json --mediafiles D:/Test
+./PlexCleaner updatesidecar --settingsfile PlexCleaner.json --mediafiles D:/Test
+./PlexCleaner getsidecarinfo --settingsfile PlexCleaner.json --mediafiles D:/Test
+./PlexCleaner gettagmap --settingsfile PlexCleaner.json --mediafiles D:/Test
+./PlexCleaner getmediainfo --settingsfile PlexCleaner.json --mediafiles D:/Test
+./PlexCleaner gettoolinfo --settingsfile PlexCleaner.json --mediafiles D:/Test
+./PlexCleaner createschema --schemafile PlexCleaner.schema.json
+*/
+
 namespace PlexCleanerTests;
 
 public class PlexCleanerTests : IDisposable