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

Fixed: A potential issue when extra files for multiple artists have the same relative path

Browse source 
(cherry picked from commit a6a68b4cae7688506c45ff6cf10989fe6596c274)

Closes #2760
This commit is contained in:
Mark McDowall 2022-04-12 17:46:10 -07:00 • committed by Bogdan
commit 0bdd5f3278
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/NzbDrone.Core/Extras/Files/ExtraFileRepository.cs
View file

@ -14,7 +14,7 @@ namespace NzbDrone.Core.Extras.Files
List<TExtraFile> GetFilesByArtist(int artistId); List<TExtraFile> GetFilesByArtist(int artistId);
List<TExtraFile> GetFilesByAlbum(int artistId, int albumId); List<TExtraFile> GetFilesByAlbum(int artistId, int albumId);
List<TExtraFile> GetFilesByTrackFile(int trackFileId); List<TExtraFile> GetFilesByTrackFile(int trackFileId);
TExtraFile FindByPath(string path); TExtraFile FindByPath(int artistId, string path);
} }
public class ExtraFileRepository<TExtraFile> : BasicRepository<TExtraFile>, IExtraFileRepository<TExtraFile> public class ExtraFileRepository<TExtraFile> : BasicRepository<TExtraFile>, IExtraFileRepository<TExtraFile>
@ -55,9 +55,9 @@ namespace NzbDrone.Core.Extras.Files
return Query(c => c.TrackFileId == trackFileId); return Query(c => c.TrackFileId == trackFileId);
} }
public TExtraFile FindByPath(string path) public TExtraFile FindByPath(int artistId, string path)
{ {
return Query(c => c.RelativePath == path).SingleOrDefault(); return Query(c => c.ArtistId == artistId && c.RelativePath == path).SingleOrDefault();
} }
} }
} }

6
src/NzbDrone.Core/Extras/Files/ExtraFileService.cs
View file

@ -18,7 +18,7 @@ namespace NzbDrone.Core.Extras.Files
{ {
List<TExtraFile> GetFilesByArtist(int artistId); List<TExtraFile> GetFilesByArtist(int artistId);
List<TExtraFile> GetFilesByTrackFile(int trackFileId); List<TExtraFile> GetFilesByTrackFile(int trackFileId);
TExtraFile FindByPath(string path); TExtraFile FindByPath(int artistId, string path);
void Upsert(TExtraFile extraFile); void Upsert(TExtraFile extraFile);
void Upsert(List<TExtraFile> extraFiles); void Upsert(List<TExtraFile> extraFiles);
void Delete(int id); void Delete(int id);
@ -59,9 +59,9 @@ namespace NzbDrone.Core.Extras.Files
return _repository.GetFilesByTrackFile(trackFileId); return _repository.GetFilesByTrackFile(trackFileId);
} }
public TExtraFile FindByPath(string path) public TExtraFile FindByPath(int artistId, string path)
{ {
return _repository.FindByPath(path); return _repository.FindByPath(artistId, path);
} }
public void Upsert(TExtraFile extraFile) public void Upsert(TExtraFile extraFile)

4
src/NzbDrone.Core/Extras/Others/OtherExtraFileRenamer.cs
View file

@ -41,8 +41,8 @@ namespace NzbDrone.Core.Extras.Others
} }
var relativePath = artist.Path.GetRelativePath(path); var relativePath = artist.Path.GetRelativePath(path);
var otherExtraFile = _otherExtraFileService.FindByPath(artist.Id, relativePath);
var otherExtraFile = _otherExtraFileService.FindByPath(relativePath);
if (otherExtraFile != null) if (otherExtraFile != null)
{ {
var newPath = path + "-orig"; var newPath = path + "-orig";
@ -66,8 +66,8 @@ namespace NzbDrone.Core.Extras.Others
} }
var relativePath = artist.Path.GetRelativePath(path); var relativePath = artist.Path.GetRelativePath(path);
var otherExtraFile = _otherExtraFileService.FindByPath(artist.Id, relativePath);
var otherExtraFile = _otherExtraFileService.FindByPath(relativePath);
if (otherExtraFile != null) if (otherExtraFile != null)
{ {
var subfolder = Path.GetDirectoryName(relativePath); var subfolder = Path.GetDirectoryName(relativePath);