mirror
/
Lidarr
mirror of https://github.com/lidarr/Lidarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix: Don't use scene name for tracks when track naming disabled (#646)

This commit is contained in:
ta264 2019-03-01 14:33:54 +00:00 committed by Daniel Underwood
parent c8ef68283b
commit b9cc94aa46
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/FileNameBuilderFixture.cs
View File

@ -303,6 +303,17 @@ namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
Subject.BuildTrackFileName(new List<Track> { _track1 }, _artist, _album, _trackFile)
.Should().Be(Path.GetFileNameWithoutExtension(_trackFile.RelativePath));
}
[Test]
public void use_file_name_when_sceneName_is_not_null()
{
_namingConfig.RenameTracks = false;
_trackFile.RelativePath = "Linkin Park - 06 - Test";
_trackFile.SceneName = "SceneName";
Subject.BuildTrackFileName(new List<Track> { _track1 }, _artist, _album, _trackFile)
.Should().Be(Path.GetFileNameWithoutExtension(_trackFile.RelativePath));
}
[Test]
public void use_path_when_sceneName_and_relative_path_are_null()
@ -315,7 +326,6 @@ namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
.Should().Be(Path.GetFileNameWithoutExtension(_trackFile.Path));
}
[Test]
public void should_not_clean_track_title_if_there_is_only_one()
{

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

@ -93,7 +93,7 @@ namespace NzbDrone.Core.Organizer
if (!namingConfig.RenameTracks)
{
return GetOriginalTitle(trackFile);
return GetOriginalFileName(trackFile);
}
if (namingConfig.StandardTrackFormat.IsNullOrWhiteSpace())