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

Fixed: Quality hierarchy not being honored during track import

Browse source
This commit is contained in:
Qstick 2017-12-23 23:18:29 -05:00
commit c4c3c4f620
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/NzbDrone.Core.Test/MediaFiles/TrackImport/Specifications/UpgradeSpecificationFixture.cs
View file

@ -131,7 +131,7 @@ namespace NzbDrone.Core.Test.MediaFiles.TrackImport.Specifications
.With(e => e.TrackFile = new LazyLoaded<TrackFile>( .With(e => e.TrackFile = new LazyLoaded<TrackFile>(
new TrackFile new TrackFile
{ {
Quality = new QualityModel(Quality.MP3_320, new Revision(version: 1)), Quality = new QualityModel(Quality.MP3_256, new Revision(version: 1)),
Language = Language.English Language = Language.English
})) }))
.Build() .Build()

8
src/NzbDrone.Core/MediaFiles/TrackImport/Specifications/UpgradeSpecification.cs
View file

@ -22,11 +22,17 @@ namespace NzbDrone.Core.MediaFiles.TrackImport.Specifications
var qualityComparer = new QualityModelComparer(localTrack.Artist.Profile); var qualityComparer = new QualityModelComparer(localTrack.Artist.Profile);
var languageComparer = new LanguageComparer(localTrack.Artist.LanguageProfile); var languageComparer = new LanguageComparer(localTrack.Artist.LanguageProfile);
if (localTrack.Tracks.Any(e => e.TrackFileId != 0 && qualityComparer.Compare(e.TrackFile.Value.Quality, localTrack.Quality) > 0))
{
_logger.Debug("This file isn't a quality upgrade for all tracks. Skipping {0}", localTrack.Path);
return Decision.Reject("Not an upgrade for existing track file(s)");
}
if (localTrack.Tracks.Any(e => e.TrackFileId != 0 && if (localTrack.Tracks.Any(e => e.TrackFileId != 0 &&
languageComparer.Compare(e.TrackFile.Value.Language, localTrack.Language) > 0 && languageComparer.Compare(e.TrackFile.Value.Language, localTrack.Language) > 0 &&
qualityComparer.Compare(e.TrackFile.Value.Quality, localTrack.Quality) == 0)) qualityComparer.Compare(e.TrackFile.Value.Quality, localTrack.Quality) == 0))
{ {
_logger.Debug("This file isn't an upgrade for all tracks. Skipping {0}", localTrack.Path); _logger.Debug("This file isn't a language upgrade for all tracks. Skipping {0}", localTrack.Path);
return Decision.Reject("Not an upgrade for existing track file(s)"); return Decision.Reject("Not an upgrade for existing track file(s)");
} }