tedkulp/Readarr
1
0
Fork 0
mirror of https://github.com/Readarr/Readarr.git synced 2026-04-26 22:46:37 -04:00
Code Issues Projects Releases Wiki Activity

Cleanup Conflicts in Sonarr/Lidarr Pulls

Browse Source 
Co-Authored-By: Robin Dadswell <19610103+RobinDadswell@users.noreply.github.com>
This commit is contained in:
Qstick
2021-01-24 02:22:50 -05:00
parent ffc12656ee
commit 93ba5ade9e
298 changed files with 4460 additions and 4508 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NzbDrone.Core/MediaFiles/DiskScanService.cs
+7 -7
View File
@@ -13,8 +13,8 @@ using NzbDrone.Common.Instrumentation.Extensions;
using NzbDrone.Common.Serializer;
using NzbDrone.Core.Books;
using NzbDrone.Core.Books.Calibre;
using NzbDrone.Core.MediaFiles.BookImport;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.MediaFiles.BookImport;
using NzbDrone.Core.MediaFiles.Commands;
using NzbDrone.Core.MediaFiles.Events;
using NzbDrone.Core.Messaging.Commands;
@@ -26,7 +26,7 @@ namespace NzbDrone.Core.MediaFiles
{
public interface IDiskScanService
{
void Scan(List<string> folders = null, FilterFilesType filter = FilterFilesType.Known, bool addNewArtists = false, List<int> authorIds = null);
void Scan(List<string> folders = null, FilterFilesType filter = FilterFilesType.Known, bool addNewAuthors = false, List<int> authorIds = null);
IFileInfo[] GetBookFiles(string path, bool allDirectories = true);
string[] GetNonBookFiles(string path, bool allDirectories = true);
List<IFileInfo> FilterFiles(string basePath, IEnumerable<IFileInfo> files);
@@ -78,7 +78,7 @@ namespace NzbDrone.Core.MediaFiles
_logger = logger;
}
public void Scan(List<string> folders = null, FilterFilesType filter = FilterFilesType.Known, bool addNewArtists = false, List<int> authorIds = null)
public void Scan(List<string> folders = null, FilterFilesType filter = FilterFilesType.Known, bool addNewAuthors = false, List<int> authorIds = null)
{
if (folders == null)
{
@@ -158,7 +158,7 @@ namespace NzbDrone.Core.MediaFiles
{
Filter = filter,
IncludeExisting = true,
AddNewAuthors = addNewArtists
AddNewAuthors = addNewAuthors
};
var decisions = _importDecisionMaker.GetImportDecisions(mediaFileList, null, null, config);
@@ -219,8 +219,8 @@ namespace NzbDrone.Core.MediaFiles
_logger.Debug($"Updated info for {updatedFiles.Count} known files");
var artists = _authorService.GetAuthors(authorIds);
foreach (var author in artists)
var authors = _authorService.GetAuthors(authorIds);
foreach (var author in authors)
{
CompletedScanning(author);
}
@@ -307,7 +307,7 @@ namespace NzbDrone.Core.MediaFiles
public void Execute(RescanFoldersCommand message)
{
Scan(message.Folders, message.Filter, message.AddNewArtists, message.AuthorIds);
Scan(message.Folders, message.Filter, message.AddNewAuthors, message.AuthorIds);
}
}
}