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

Check against the .cue file directory when importing the media files to only import the files in the same directory.

Browse source 
(cherry picked from commit 07c9213415f485ed9edf96f3cf3b5d84e095268f)
This commit is contained in:
zhangdoa 2024-01-07 16:11:14 +01:00
commit cd248eda71
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/NzbDrone.Core/MediaFiles/CueSheetService.cs
View file

@ -20,7 +20,7 @@ namespace NzbDrone.Core.MediaFiles
public List<IFileInfo> MusicFiles { get; set; } = new List<IFileInfo>(); public List<IFileInfo> MusicFiles { get; set; } = new List<IFileInfo>();
public IdentificationOverrides IdOverrides { get; set; } public IdentificationOverrides IdOverrides { get; set; }
public CueSheet CueSheet { get; set; } public CueSheet CueSheet { get; set; }
public bool IsForMediaFile(string path) => CueSheet != null && CueSheet.Files.Count > 0 && CueSheet.Files.Any(x => Path.GetFileName(path) == x.Name); public bool IsForMediaFile(string path) => CueSheet != null && CueSheet.Files.Count > 0 && (Path.GetDirectoryName(path) == Path.GetDirectoryName(CueSheet.Path)) && CueSheet.Files.Any(x => Path.GetFileName(path) == x.Name);
public CueSheet.FileEntry TryToGetFileEntryForMediaFile(string path) public CueSheet.FileEntry TryToGetFileEntryForMediaFile(string path)
{ {
if (CueSheet != null && CueSheet.Files.Count > 0) if (CueSheet != null && CueSheet.Files.Count > 0)
@ -442,7 +442,8 @@ namespace NzbDrone.Core.MediaFiles
} }
cueSheetInfo.CueSheet = cueSheet; cueSheetInfo.CueSheet = cueSheet;
cueSheetInfo.MusicFiles = musicFiles.Where(musicFile => cueSheet.Files.Any(musicFileFromCue => musicFileFromCue.Name == musicFile.Name)).ToList(); var musicFilesInTheSameDir = musicFiles.Where(musicFile => musicFile.DirectoryName == Path.GetDirectoryName(cueSheetInfo.CueSheet.Path)).ToList();
cueSheetInfo.MusicFiles = musicFilesInTheSameDir.Where(musicFile => cueSheet.Files.Any(musicFileFromCue => musicFileFromCue.Name == musicFile.Name)).ToList();
cueSheetInfo.IdOverrides = new IdentificationOverrides(); cueSheetInfo.IdOverrides = new IdentificationOverrides();