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

Download Handling, Clean Up Drone Folder Leftovers

Browse Source
This commit is contained in:
Qstick
2017-09-17 23:00:37 -04:00
parent 9f689c0233
commit 405e7f981d
24 changed files with 467 additions and 754 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NzbDrone.Core/Download/CompletedDownloadService.cs
+14 -22
View File
@@ -11,7 +11,7 @@ using NzbDrone.Core.History;
using NzbDrone.Core.MediaFiles;
using NzbDrone.Core.Messaging.Events;
using NzbDrone.Core.Parser;
using NzbDrone.Core.Tv;
using NzbDrone.Core.Music;
using NzbDrone.Core.MediaFiles.TrackImport;
namespace NzbDrone.Core.Download
@@ -26,26 +26,26 @@ namespace NzbDrone.Core.Download
private readonly IConfigService _configService;
private readonly IEventAggregator _eventAggregator;
private readonly IHistoryService _historyService;
private readonly IDownloadedEpisodesImportService _downloadedEpisodesImportService;
private readonly IDownloadedTracksImportService _downloadedTracksImportService;
private readonly IParsingService _parsingService;
private readonly Logger _logger;
private readonly ISeriesService _seriesService;
private readonly IArtistService _artistService;
public CompletedDownloadService(IConfigService configService,
IEventAggregator eventAggregator,
IHistoryService historyService,
IDownloadedEpisodesImportService downloadedEpisodesImportService,
IDownloadedTracksImportService downloadedTracksImportService,
IParsingService parsingService,
ISeriesService seriesService,
IArtistService artistService,
Logger logger)
{
_configService = configService;
_eventAggregator = eventAggregator;
_historyService = historyService;
_downloadedEpisodesImportService = downloadedEpisodesImportService;
_downloadedTracksImportService = downloadedTracksImportService;
_parsingService = parsingService;
_logger = logger;
_seriesService = seriesService;
_artistService = artistService;
}
public void Process(TrackedDownload trackedDownload, bool ignoreWarnings = false)
@@ -80,26 +80,18 @@ namespace NzbDrone.Core.Download
return;
}
var downloadedEpisodesFolder = new OsPath(_configService.DownloadedAlbumsFolder);
var artist = trackedDownload.RemoteAlbum.Artist;
if (downloadedEpisodesFolder.Contains(downloadItemOutputPath))
{
trackedDownload.Warn("Intermediate Download path inside drone factory, Skipping.");
return;
}
var series = _parsingService.GetSeries(trackedDownload.DownloadItem.Title);
if (series == null)
if (artist == null)
{
if (historyItem != null)
{
series = _seriesService.GetSeries(historyItem.ArtistId);
artist = _artistService.GetArtist(historyItem.ArtistId);
}
if (series == null)
if (artist == null)
{
trackedDownload.Warn("Series title mismatch, automatic import is not possible.");
trackedDownload.Warn("Artist name mismatch, automatic import is not possible.");
return;
}
}
@@ -111,7 +103,7 @@ namespace NzbDrone.Core.Download
private void Import(TrackedDownload trackedDownload)
{
var outputPath = trackedDownload.DownloadItem.OutputPath.FullPath;
var importResults = _downloadedEpisodesImportService.ProcessPath(outputPath, ImportMode.Auto, trackedDownload.RemoteEpisode.Series, trackedDownload.DownloadItem);
var importResults = _downloadedTracksImportService.ProcessPath(outputPath, ImportMode.Auto, trackedDownload.RemoteAlbum.Artist, trackedDownload.DownloadItem);
if (importResults.Empty())
{
@@ -119,7 +111,7 @@ namespace NzbDrone.Core.Download
return;
}
if (importResults.Count(c => c.Result == ImportResultType.Imported) >= Math.Max(1, trackedDownload.RemoteEpisode.Episodes.Count))
if (importResults.Count(c => c.Result == ImportResultType.Imported) >= Math.Max(1, trackedDownload.RemoteAlbum.Albums.Count))
{
trackedDownload.State = TrackedDownloadStage.Imported;
_eventAggregator.PublishEvent(new DownloadCompletedEvent(trackedDownload));