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

Added additional codecs and more complete error message.

This commit is contained in:
Taloth Saldono 2017-07-29 12:33:21 +02:00
parent c7d30ae703
commit 1cb25525ab
4 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/NzbDrone.Core.Test/MediaFiles/MediaInfo/MediaInfoFormatterTests/FormatAudioCodecFixture.cs
View File

@ -8,6 +8,8 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo.MediaInfoFormatterTests
[TestFixture] [TestFixture]
public class FormatAudioCodecFixture : TestBase public class FormatAudioCodecFixture : TestBase
{ {
private static string sceneName = "My.Series.S01E01-Sonarr";
[TestCase("AC-3", "AC3")] [TestCase("AC-3", "AC3")]
[TestCase("E-AC-3", "EAC3")] [TestCase("E-AC-3", "EAC3")]
[TestCase("MPEG Audio", "MPEG Audio")] [TestCase("MPEG Audio", "MPEG Audio")]
@ -19,7 +21,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo.MediaInfoFormatterTests
AudioFormat = audioFormat AudioFormat = audioFormat
}; };
MediaInfoFormatter.FormatAudioCodec(mediaInfoModel).Should().Be(expectedFormat); MediaInfoFormatter.FormatAudioCodec(mediaInfoModel, sceneName).Should().Be(expectedFormat);
} }
[Test] [Test]
@ -31,7 +33,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo.MediaInfoFormatterTests
AudioProfile = "Layer 3" AudioProfile = "Layer 3"
}; };
MediaInfoFormatter.FormatAudioCodec(mediaInfoModel).Should().Be("MP3"); MediaInfoFormatter.FormatAudioCodec(mediaInfoModel, sceneName).Should().Be("MP3");
} }
[Test] [Test]
@ -42,7 +44,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo.MediaInfoFormatterTests
AudioFormat = "Other Audio Format" AudioFormat = "Other Audio Format"
}; };
MediaInfoFormatter.FormatAudioCodec(mediaInfoModel).Should().Be(mediaInfoModel.AudioFormat); MediaInfoFormatter.FormatAudioCodec(mediaInfoModel, sceneName).Should().Be(mediaInfoModel.AudioFormat);
ExceptionVerification.ExpectedErrors(1); ExceptionVerification.ExpectedErrors(1);
} }
} }

2
src/NzbDrone.Core/Extras/Metadata/Consumers/Xbmc/XbmcMetadata.cs
View File

@ -265,7 +265,7 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Xbmc
var audio = new XElement("audio"); var audio = new XElement("audio");
audio.Add(new XElement("bitrate", episodeFile.MediaInfo.AudioBitrate)); audio.Add(new XElement("bitrate", episodeFile.MediaInfo.AudioBitrate));
audio.Add(new XElement("channels", episodeFile.MediaInfo.AudioChannels)); audio.Add(new XElement("channels", episodeFile.MediaInfo.AudioChannels));
audio.Add(new XElement("codec", MediaInfoFormatter.FormatAudioCodec(episodeFile.MediaInfo))); audio.Add(new XElement("codec", MediaInfoFormatter.FormatAudioCodec(episodeFile.MediaInfo, episodeFile.SceneName)));
audio.Add(new XElement("language", episodeFile.MediaInfo.AudioLanguages)); audio.Add(new XElement("language", episodeFile.MediaInfo.AudioLanguages));
streamDetails.Add(audio); streamDetails.Add(audio);

23
src/NzbDrone.Core/MediaFiles/MediaInfo/MediaInfoFormatter.cs
View File

@ -40,7 +40,7 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo
.Sum(s => decimal.Parse(s, CultureInfo.InvariantCulture)); .Sum(s => decimal.Parse(s, CultureInfo.InvariantCulture));
} }
public static string FormatAudioCodec(MediaInfoModel mediaInfo) public static string FormatAudioCodec(MediaInfoModel mediaInfo, string sceneName)
{ {
var audioFormat = mediaInfo.AudioFormat; var audioFormat = mediaInfo.AudioFormat;
@ -79,7 +79,12 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo
return "FLAC"; return "FLAC";
} }
Logger.Error("Unknown audio format: {0}", audioFormat); if (audioFormat.Equals("Vorbis", StringComparison.OrdinalIgnoreCase))
{
return "Vorbis";
}
Logger.Error(new Exception(), "Unknown audio format: {0} in {1}. Please notify Sonarr developers.", audioFormat, sceneName);
return audioFormat; return audioFormat;
} }
@ -111,12 +116,22 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo
return "MPEG2"; return "MPEG2";
} }
if (videoCodec.Equals("XviD", StringComparison.OrdinalIgnoreCase)) if (videoCodec.StartsWith("XviD", StringComparison.OrdinalIgnoreCase))
{ {
return "XviD"; return "XviD";
} }
Logger.Error("Unknown video codec: {0}", videoCodec); if (videoCodec.StartsWith("DivX", StringComparison.OrdinalIgnoreCase))
{
return "DivX";
}
if (videoCodec.Equals("VC-1", StringComparison.OrdinalIgnoreCase))
{
return "VC1";
}
Logger.Error(new Exception(), "Unknown video codec: {0} in {1}. Please notify Sonarr developers.", videoCodec, sceneName);
return videoCodec; return videoCodec;
} }
} }

4
src/NzbDrone.Core/Organizer/FileNameBuilder.cs
View File

@ -131,7 +131,7 @@ namespace NzbDrone.Core.Organizer
AddEpisodeFileTokens(tokenHandlers, episodeFile); AddEpisodeFileTokens(tokenHandlers, episodeFile);
AddQualityTokens(tokenHandlers, series, episodeFile); AddQualityTokens(tokenHandlers, series, episodeFile);
AddMediaInfoTokens(tokenHandlers, episodeFile); AddMediaInfoTokens(tokenHandlers, episodeFile);
var fileName = ReplaceTokens(pattern, tokenHandlers, namingConfig).Trim(); var fileName = ReplaceTokens(pattern, tokenHandlers, namingConfig).Trim();
fileName = FileNameCleanupRegex.Replace(fileName, match => match.Captures[0].Value[0].ToString()); fileName = FileNameCleanupRegex.Replace(fileName, match => match.Captures[0].Value[0].ToString());
fileName = TrimSeparatorsRegex.Replace(fileName, string.Empty); fileName = TrimSeparatorsRegex.Replace(fileName, string.Empty);
@ -455,7 +455,7 @@ namespace NzbDrone.Core.Organizer
if (episodeFile.MediaInfo == null) return; if (episodeFile.MediaInfo == null) return;
var videoCodec = MediaInfoFormatter.FormatVideoCodec(episodeFile.MediaInfo, episodeFile.SceneName); var videoCodec = MediaInfoFormatter.FormatVideoCodec(episodeFile.MediaInfo, episodeFile.SceneName);
var audioCodec = MediaInfoFormatter.FormatAudioCodec(episodeFile.MediaInfo); var audioCodec = MediaInfoFormatter.FormatAudioCodec(episodeFile.MediaInfo, episodeFile.SceneName);
var audioChannels = MediaInfoFormatter.FormatAudioChannels(episodeFile.MediaInfo); var audioChannels = MediaInfoFormatter.FormatAudioChannels(episodeFile.MediaInfo);
var mediaInfoAudioLanguages = GetLanguagesToken(episodeFile.MediaInfo.AudioLanguages); var mediaInfoAudioLanguages = GetLanguagesToken(episodeFile.MediaInfo.AudioLanguages);