Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added more logging to MediaInfo encoding check for linux.

This commit is contained in:
Taloth Saldono 2019-05-22 19:54:16 +02:00
parent 7ce8bac3ea
commit a80b1bbcb3
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/NzbDrone.Core/MediaFiles/MediaInfo/MediaInfoLib.cs
View File

@ -1,9 +1,11 @@
using System; using System;
using System.Collections.Generic;
using System.IO; using System.IO;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Text; using System.Text;
using NzbDrone.Common.Instrumentation;
using NLog; using NLog;
using NzbDrone.Common.Extensions;
using NzbDrone.Common.Instrumentation;
namespace NzbDrone.Core.MediaFiles.MediaInfo namespace NzbDrone.Core.MediaFiles.MediaInfo
{ {
@ -98,18 +100,24 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo
} }
else else
{ {
var responses = new List<string>();
// Linux normally UCS-4. As fallback we try UCS-2 and plain Ansi. // Linux normally UCS-4. As fallback we try UCS-2 and plain Ansi.
MustUseAnsi = false; MustUseAnsi = false;
Encoding = Encoding.UTF32; Encoding = Encoding.UTF32;
if (Option("Info_Version", "").StartsWith("MediaInfoLib")) var version = Option("Info_Version", "");
responses.Add(version);
if (version.StartsWith("MediaInfoLib"))
{ {
return; return;
} }
Encoding = Encoding.Unicode; Encoding = Encoding.Unicode;
if (Option("Info_Version", "").StartsWith("MediaInfoLib")) version = Option("Info_Version", "");
responses.Add(version);
if (version.StartsWith("MediaInfoLib"))
{ {
return; return;
} }
@ -117,12 +125,14 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo
MustUseAnsi = true; MustUseAnsi = true;
Encoding = Encoding.Default; Encoding = Encoding.Default;
if (Option("Info_Version", "").StartsWith("MediaInfoLib")) version = Option("Info_Version", "");
responses.Add(version);
if (version.StartsWith("MediaInfoLib"))
{ {
return; return;
} }
throw new NotSupportedException("Unsupported MediaInfoLib encoding"); throw new NotSupportedException("Unsupported MediaInfoLib encoding, version check responses (may be gibberish, show it to the Sonarr devs): " + responses.Join(", ") );
} }
} }