Backup_Repos/Readarr
1
0
Fork 0
mirror of https://github.com/Readarr/Readarr synced 2026-05-09 05:21:41 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
(cherry picked from commit a6a68b4cae7688506c45ff6cf10989fe6596c274)

Closes #1650
This commit is contained in:
Mark McDowall 2022-04-12 17:46:10 -07:00 committed by Bogdan
parent 02fd733223
commit 44009e980b
3 changed files with 8 additions and 8 deletions
Show stats 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 @@ public interface IExtraFileRepository<TExtraFile> : IBasicRepository<TExtraFile>
List<TExtraFile> GetFilesByAuthor(int authorId); List<TExtraFile> GetFilesByAuthor(int authorId);
List<TExtraFile> GetFilesByBook(int authorId, int bookId); List<TExtraFile> GetFilesByBook(int authorId, int bookId);
List<TExtraFile> GetFilesByBookFile(int bookFileId); List<TExtraFile> GetFilesByBookFile(int bookFileId);
TExtraFile FindByPath(string path); TExtraFile FindByPath(int authorId, string path);
} }
public class ExtraFileRepository<TExtraFile> : BasicRepository<TExtraFile>, IExtraFileRepository<TExtraFile> public class ExtraFileRepository<TExtraFile> : BasicRepository<TExtraFile>, IExtraFileRepository<TExtraFile>
@ -55,9 +55,9 @@ public List<TExtraFile> GetFilesByBookFile(int bookFileId)
return Query(c => c.BookFileId == bookFileId); return Query(c => c.BookFileId == bookFileId);
} }
public TExtraFile FindByPath(string path) public TExtraFile FindByPath(int authorId, string path)
{ {
return Query(c => c.RelativePath == path).SingleOrDefault(); return Query(c => c.AuthorId == authorId && c.RelativePath == path).SingleOrDefault();
} }
} }
} }

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

@ -18,7 +18,7 @@ public interface IExtraFileService<TExtraFile>
{ {
List<TExtraFile> GetFilesByAuthor(int authorId); List<TExtraFile> GetFilesByAuthor(int authorId);
List<TExtraFile> GetFilesByBookFile(int bookFileId); List<TExtraFile> GetFilesByBookFile(int bookFileId);
TExtraFile FindByPath(string path); TExtraFile FindByPath(int authorId, 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 @@ public List<TExtraFile> GetFilesByBookFile(int bookFileId)
return _repository.GetFilesByBookFile(bookFileId); return _repository.GetFilesByBookFile(bookFileId);
} }
public TExtraFile FindByPath(string path) public TExtraFile FindByPath(int authorId, string path)
{ {
return _repository.FindByPath(path); return _repository.FindByPath(authorId, 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 @@ public void RenameOtherExtraFile(Author author, string path)
} }
var relativePath = author.Path.GetRelativePath(path); var relativePath = author.Path.GetRelativePath(path);
var otherExtraFile = _otherExtraFileService.FindByPath(author.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 @@ private void RemoveOtherExtraFile(Author author, string path)
} }
var relativePath = author.Path.GetRelativePath(path); var relativePath = author.Path.GetRelativePath(path);
var otherExtraFile = _otherExtraFileService.FindByPath(author.Id, relativePath);
var otherExtraFile = _otherExtraFileService.FindByPath(relativePath);
if (otherExtraFile != null) if (otherExtraFile != null)
{ {
var subfolder = Path.GetDirectoryName(relativePath); var subfolder = Path.GetDirectoryName(relativePath);