From a1e0fa2da5e9d53258465c1a9a172ed4419979f6 Mon Sep 17 00:00:00 2001 From: Pieter Viljoen Date: Sat, 6 May 2023 20:30:22 -0700 Subject: [PATCH] Fix gettagmap assert error --- PlexCleaner.sln | 2 +- PlexCleaner/SidecarFile.cs | 2 ++ PlexCleaner/TagMapDictionary.cs | 23 +---------------------- PlexCleanerTests/PlexCleanerTests.cs | 22 ++++++++++++++++++++++ 4 files changed, 26 insertions(+), 23 deletions(-) diff --git a/PlexCleaner.sln b/PlexCleaner.sln index 0ac32667..1e3d6abc 100644 --- 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 index ec7562e8..a89dee6a 100644 --- 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 index 714ef0aa..48cf1ced 100644 --- 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 index a7230b2e..774e49d4 100644 --- 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