mirror of
https://github.com/lidarr/lidarr.git
synced 2025-08-21 14:03:29 -07:00
Refactored the shit out of PostDownloadProvider
This commit is contained in:
kay.one
parent
35e44284c0
commit
ec08436587
12 changed files with 323 additions and 576 deletions
|
|
@ -13,53 +13,27 @@ namespace NzbDrone.Core.Providers
|
|||
{
|
||||
public class PostDownloadProvider
|
||||
{
|
||||
//Used to perform Post Download Processing (Started by PostDownloadScanJob)
|
||||
|
||||
private readonly ConfigProvider _configProvider;
|
||||
private readonly DiskProvider _diskProvider;
|
||||
private readonly EpisodeProvider _episodeProvider;
|
||||
private readonly DiskScanProvider _diskScanProvider;
|
||||
private readonly SeriesProvider _seriesProvider;
|
||||
private readonly EpisodeProvider _episodeProvider;
|
||||
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
|
||||
|
||||
private static readonly Regex StatusRegex = new Regex(@"^_[\w_]*_", RegexOptions.Compiled);
|
||||
|
||||
private static readonly List<PostDownloadInfoModel> InfoList = new List<PostDownloadInfoModel>();
|
||||
|
||||
[Inject]
|
||||
public PostDownloadProvider(ConfigProvider configProvider, DiskProvider diskProvider,
|
||||
DiskScanProvider diskScanProvider, SeriesProvider seriesProvider,
|
||||
EpisodeProvider episodeProvider)
|
||||
public PostDownloadProvider(DiskProvider diskProvider, EpisodeProvider episodeProvider,
|
||||
DiskScanProvider diskScanProvider, SeriesProvider seriesProvider)
|
||||
{
|
||||
_configProvider = configProvider;
|
||||
_diskProvider = diskProvider;
|
||||
_episodeProvider = episodeProvider;
|
||||
_diskScanProvider = diskScanProvider;
|
||||
_seriesProvider = seriesProvider;
|
||||
_episodeProvider = episodeProvider;
|
||||
}
|
||||
|
||||
public PostDownloadProvider()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public virtual void ScanDropFolder(ProgressNotification notification)
|
||||
{
|
||||
var dropFolder = _configProvider.SabDropDirectory;
|
||||
|
||||
if (String.IsNullOrWhiteSpace(dropFolder))
|
||||
{
|
||||
Logger.Debug("No drop folder is defined. Skipping.");
|
||||
return;
|
||||
}
|
||||
|
||||
if (!_diskProvider.FolderExists(dropFolder))
|
||||
{
|
||||
Logger.Warn("Unable to Scan for New Downloads - folder Doesn't exist: [{0}]", dropFolder);
|
||||
return;
|
||||
}
|
||||
|
||||
ProcessDropFolder(dropFolder);
|
||||
}
|
||||
|
||||
public virtual void ProcessDropFolder(string dropFolder)
|
||||
|
|
@ -68,57 +42,33 @@ namespace NzbDrone.Core.Providers
|
|||
{
|
||||
try
|
||||
{
|
||||
var subfolderInfo = new DirectoryInfo(subfolder);
|
||||
|
||||
var folderStatus = GetPostDownloadStatusForFolder(subfolderInfo.Name);
|
||||
|
||||
|
||||
|
||||
if (folderStatus == PostDownloadStatusType.Unpacking)
|
||||
{
|
||||
ProcessFailedOrUnpackingDownload(subfolderInfo, PostDownloadStatusType.Unpacking);
|
||||
Logger.Debug("Folder [{0}] is still being unpacked. skipping.", subfolder);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (folderStatus == PostDownloadStatusType.Failed)
|
||||
{
|
||||
ProcessFailedOrUnpackingDownload(subfolderInfo, PostDownloadStatusType.Failed);
|
||||
Logger.Debug("Folder [{0}] is marked as failed. skipping.", subfolder);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (folderStatus != PostDownloadStatusType.NoError)
|
||||
{
|
||||
//Retry processing on the download
|
||||
ReProcessDownload(new PostDownloadInfoModel { Name = subfolderInfo.FullName, Status = folderStatus });
|
||||
continue;
|
||||
}
|
||||
|
||||
//Process a successful download
|
||||
ProcessDownload(subfolderInfo);
|
||||
ProcessDownload(new DirectoryInfo(subfolder));
|
||||
}
|
||||
|
||||
catch (Exception e)
|
||||
{
|
||||
Logger.ErrorException("An error has occurred while importing " + subfolder, e);
|
||||
Logger.ErrorException("An error has occurred while importing folder" + subfolder, e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public virtual void ProcessDownload(DirectoryInfo subfolderInfo)
|
||||
{
|
||||
//Parse the Folder name
|
||||
var seriesName = Parser.ParseSeriesName(subfolderInfo.Name);
|
||||
|
||||
if (subfolderInfo.Name.StartsWith("_") && subfolderInfo.LastWriteTimeUtc.AddMinutes(1) > DateTime.UtcNow)
|
||||
{
|
||||
Logger.Trace("[{0}] is too fresh. skipping", subfolderInfo.Name);
|
||||
return;
|
||||
}
|
||||
|
||||
var seriesName = Parser.ParseSeriesName(RemoveStatusFromFolderName(subfolderInfo.Name));
|
||||
var series = _seriesProvider.FindSeries(seriesName);
|
||||
|
||||
if (series == null)
|
||||
{
|
||||
Logger.Warn("Unable to Import new download [{0}], series doesn't exist in database.", subfolderInfo.FullName);
|
||||
Logger.Warn("Unable to Import new download [{0}], Can't find matching series in database.", subfolderInfo.Name);
|
||||
|
||||
//Rename the Directory so it's not processed again.
|
||||
_diskProvider.MoveDirectory(subfolderInfo.FullName,
|
||||
GetNewFolderNameWithPostDownloadStatus(subfolderInfo, PostDownloadStatusType.InvalidSeries));
|
||||
TagFolder(subfolderInfo, PostDownloadStatusType.UnknownSeries);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -127,157 +77,41 @@ namespace NzbDrone.Core.Providers
|
|||
|
||||
//Delete the folder only if folder is small enough
|
||||
if (_diskProvider.GetDirectorySize(subfolderInfo.FullName) < 10.Megabytes())
|
||||
{
|
||||
_diskProvider.DeleteFolder(subfolderInfo.FullName, true);
|
||||
|
||||
//Otherwise rename the folder to say it was already processed once by NzbDrone
|
||||
}
|
||||
else
|
||||
{
|
||||
//Otherwise rename the folder to say it was already processed once by NzbDrone
|
||||
if (importedFiles.Count == 0)
|
||||
{
|
||||
Logger.Warn("Unable to Import new download [{0}], unable to parse episode file(s).", subfolderInfo.FullName);
|
||||
_diskProvider.MoveDirectory(subfolderInfo.FullName,
|
||||
GetNewFolderNameWithPostDownloadStatus(subfolderInfo, PostDownloadStatusType.ParseError));
|
||||
Logger.Warn("Unable to Import new download [{0}], no importable files were found..", subfolderInfo.Name);
|
||||
TagFolder(subfolderInfo, PostDownloadStatusType.ParseError);
|
||||
}
|
||||
|
||||
//Unknown Error Importing (Possibly a lesser quality than episode currently on disk)
|
||||
//Unknown Error Importing (Possibly a lesser quality than episode currently on disk)
|
||||
else
|
||||
{
|
||||
Logger.Warn("Unable to Import new download [{0}].", subfolderInfo.FullName);
|
||||
|
||||
_diskProvider.MoveDirectory(subfolderInfo.FullName, GetNewFolderNameWithPostDownloadStatus(subfolderInfo, PostDownloadStatusType.Unknown));
|
||||
Logger.Warn("Unable to Import new download [{0}].", subfolderInfo.Name);
|
||||
TagFolder(subfolderInfo, PostDownloadStatusType.Unknown);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public virtual void ProcessFailedOrUnpackingDownload(DirectoryInfo directoryInfo, PostDownloadStatusType postDownloadStatus)
|
||||
public void TagFolder(DirectoryInfo directory, PostDownloadStatusType status)
|
||||
{
|
||||
//Check to see if its already in InfoList, if it is, check if enough time has passed to process
|
||||
var model = CheckForExisting(directoryInfo.FullName);
|
||||
|
||||
if (model != null)
|
||||
{
|
||||
//Process if 30 minutes has passed
|
||||
if (model.Added > DateTime.Now.AddMinutes(30))
|
||||
{
|
||||
ReProcessDownload(model);
|
||||
|
||||
//If everything processed successfully up until now, remove it from InfoList
|
||||
Remove(model);
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
//Remove the error prefix before processing
|
||||
var parseResult = Parser.ParseTitle(RemoveStatusFromFolderName(directoryInfo.Name));
|
||||
|
||||
parseResult.Series = _seriesProvider.FindSeries(parseResult.CleanTitle);
|
||||
|
||||
List<int> episodeIds;
|
||||
|
||||
if (parseResult.EpisodeNumbers.Count == 0 && parseResult.FullSeason)
|
||||
{
|
||||
episodeIds =
|
||||
_episodeProvider.GetEpisodesBySeason(parseResult.Series.SeriesId, parseResult.SeasonNumber)
|
||||
.Select(e => e.EpisodeId).ToList();
|
||||
}
|
||||
else
|
||||
episodeIds = _episodeProvider.GetEpisodesByParseResult(parseResult).Select(e => e.EpisodeId).ToList();
|
||||
|
||||
if (episodeIds.Count == 0)
|
||||
{
|
||||
//Mark as InvalidEpisode
|
||||
Logger.Warn("Unable to Import new download [{0}], no episode(s) found in database.", directoryInfo.FullName);
|
||||
|
||||
var newPath = GetNewFolderNameWithPostDownloadStatus(directoryInfo, PostDownloadStatusType.InvalidEpisode);
|
||||
_diskProvider.MoveDirectory(directoryInfo.FullName, newPath);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
//Set the PostDownloadStatus for all found episodes
|
||||
_episodeProvider.SetPostDownloadStatus(episodeIds, postDownloadStatus);
|
||||
|
||||
//Add to InfoList for possible later processing
|
||||
Add(new PostDownloadInfoModel
|
||||
{
|
||||
Name = directoryInfo.FullName,
|
||||
Added = DateTime.Now,
|
||||
Status = postDownloadStatus
|
||||
});
|
||||
_diskProvider.MoveDirectory(directory.FullName, GetFolderNameWithStatus(directory, status));
|
||||
}
|
||||
|
||||
public virtual void ReProcessDownload(PostDownloadInfoModel model)
|
||||
public static string GetFolderNameWithStatus(DirectoryInfo directoryInfo, PostDownloadStatusType status)
|
||||
{
|
||||
var directoryInfo = new DirectoryInfo(model.Name);
|
||||
var newName = GetNewFolderNameWithPostDownloadStatus(directoryInfo, PostDownloadStatusType.NoError);
|
||||
if (status == PostDownloadStatusType.NoError)
|
||||
throw new InvalidOperationException("Can't tag a folder with a None-error status. " + status);
|
||||
|
||||
_diskProvider.MoveDirectory(directoryInfo.FullName, newName);
|
||||
var cleanName = RemoveStatusFromFolderName(directoryInfo.Name);
|
||||
|
||||
directoryInfo = new DirectoryInfo(newName);
|
||||
var newName = string.Format("_{0}_{1}", status, cleanName);
|
||||
|
||||
ProcessDownload(directoryInfo);
|
||||
}
|
||||
|
||||
public void Add(PostDownloadInfoModel model)
|
||||
{
|
||||
InfoList.Add(model);
|
||||
}
|
||||
|
||||
public void Remove(PostDownloadInfoModel model)
|
||||
{
|
||||
InfoList.Remove(model);
|
||||
}
|
||||
|
||||
public PostDownloadInfoModel CheckForExisting(string path)
|
||||
{
|
||||
return InfoList.SingleOrDefault(i => i.Name == path);
|
||||
}
|
||||
|
||||
public PostDownloadStatusType GetPostDownloadStatusForFolder(string folderName)
|
||||
{
|
||||
if (folderName.StartsWith("_UNPACK_"))
|
||||
return PostDownloadStatusType.Unpacking;
|
||||
|
||||
if (folderName.StartsWith("_FAILED_"))
|
||||
return PostDownloadStatusType.Failed;
|
||||
|
||||
foreach (PostDownloadStatusType postDownloadStatusType in Enum.GetValues(typeof(PostDownloadStatusType)))
|
||||
{
|
||||
var startsWith = String.Format("_NzbDrone_{0}_", postDownloadStatusType.ToString());
|
||||
|
||||
if (folderName.StartsWith(startsWith))
|
||||
return postDownloadStatusType;
|
||||
}
|
||||
|
||||
if (folderName.StartsWith("_NzbDrone_"))
|
||||
return PostDownloadStatusType.Unknown;
|
||||
|
||||
return PostDownloadStatusType.NoError;
|
||||
}
|
||||
|
||||
public string GetNewFolderNameWithPostDownloadStatus(DirectoryInfo directoryInfo, PostDownloadStatusType postDownloadStatus)
|
||||
{
|
||||
var existingError = GetPostDownloadStatusForFolder(directoryInfo.Name);
|
||||
var newFolderName = directoryInfo.Name;
|
||||
var error = String.Format("_NzbDrone_{0}_", postDownloadStatus.ToString());
|
||||
|
||||
if (existingError != PostDownloadStatusType.NoError)
|
||||
newFolderName = RemoveStatusFromFolderName(directoryInfo.Name);
|
||||
|
||||
if (postDownloadStatus == PostDownloadStatusType.Unknown)
|
||||
error = "_NzbDrone_";
|
||||
|
||||
if (postDownloadStatus == PostDownloadStatusType.NoError)
|
||||
error = String.Empty;
|
||||
|
||||
if (postDownloadStatus == PostDownloadStatusType.Processed)
|
||||
error = String.Empty;
|
||||
|
||||
var parent = directoryInfo.Parent.FullName;
|
||||
var newName = error + newFolderName;
|
||||
|
||||
return Path.Combine(parent, newName);
|
||||
return Path.Combine(directoryInfo.Parent.FullName, newName);
|
||||
}
|
||||
|
||||
public static string RemoveStatusFromFolderName(string folderName)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue