github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-23 14:55:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix error with weirdly formatted audioChannelPositions on MediaInfo.

Browse source
This commit is contained in:
Leonardo Galli 2017-03-07 10:33:59 +01:00
commit 0668f12e62
2 changed files with 42 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/NzbDrone.Core.Test/MediaFiles/MediaInfo/VideoFileInfoReaderFixture.cs
View file

@ -100,5 +100,23 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo
stream.Close(); stream.Close();
} }
[Test]
[TestCase("/ Front: L R", 2.0)]
public void should_correctly_read_audio_channels(string ChannelPositions, decimal formattedChannels)
{
var info = new MediaInfoModel()
{
VideoCodec = "AVC",
AudioFormat = "DTS",
AudioLanguages = "English",
Subtitles = "English",
AudioChannels = 2,
AudioChannelPositions = ChannelPositions,
SchemaRevision = 3,
};
info.FormattedAudioChannels.Should().Be(formattedChannels);
}
} }
} }

42
src/NzbDrone.Core/MediaFiles/MediaInfo/MediaInfoModel.cs
View file

@ -34,27 +34,33 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo
{ {
get get
{ {
if (AudioChannelPositions.IsNullOrWhiteSpace()) try
{ {
if (AudioChannelPositionsText.IsNullOrWhiteSpace()) return
{ AudioChannelPositions.Replace("Object Based /", "").Replace(" / ", "$")
if (SchemaRevision >= 3) .Split('$')
{ .First()
return AudioChannels; .Split('/')
} .Sum(s => decimal.Parse(s, CultureInfo.InvariantCulture));
}
catch
{
return 0; if (AudioChannelPositionsText.IsNullOrWhiteSpace())
} {
if (SchemaRevision >= 3)
{
return AudioChannels;
}
return AudioChannelPositionsText.ContainsIgnoreCase("LFE") ? AudioChannels - 1 + 0.1m : AudioChannels; return 0;
} }
return AudioChannelPositionsText.ContainsIgnoreCase("LFE") ? AudioChannels - 1 + 0.1m : AudioChannels;
}
return
AudioChannelPositions.Replace("Object Based /", "").Replace(" / ", "$")
.Split('$')
.First()
.Split('/')
.Sum(s => decimal.Parse(s, CultureInfo.InvariantCulture));
} }
} }
} }