mirror
/
Lidarr
mirror of https://github.com/lidarr/Lidarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed: Re-processing imported download causing task to fail

This commit is contained in:
ta264 2020-08-18 16:56:58 +01:00 committed by Qstick
parent 79cae0add4
commit 48762a3013
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/NzbDrone.Core/MediaFiles/DownloadedTracksImportService.cs
View File

@ -110,30 +110,38 @@ namespace NzbDrone.Core.MediaFiles
public bool ShouldDeleteFolder(IDirectoryInfo directoryInfo, Artist artist)
{
var audioFiles = _diskScanService.GetAudioFiles(directoryInfo.FullName);
var rarFiles = _diskProvider.GetFiles(directoryInfo.FullName, SearchOption.AllDirectories).Where(f => Path.GetExtension(f).Equals(".rar", StringComparison.OrdinalIgnoreCase));
foreach (var audioFile in audioFiles)
try
{
var albumParseResult = Parser.Parser.ParseMusicTitle(audioFile.Name);
var audioFiles = _diskScanService.GetAudioFiles(directoryInfo.FullName);
var rarFiles = _diskProvider.GetFiles(directoryInfo.FullName, SearchOption.AllDirectories).Where(f => Path.GetExtension(f).Equals(".rar", StringComparison.OrdinalIgnoreCase));
if (albumParseResult == null)
foreach (var audioFile in audioFiles)
{
_logger.Warn("Unable to parse file on import: [{0}]", audioFile);
var albumParseResult = Parser.Parser.ParseMusicTitle(audioFile.Name);
if (albumParseResult == null)
{
_logger.Warn("Unable to parse file on import: [{0}]", audioFile);
return false;
}
_logger.Warn("Audio file detected: [{0}]", audioFile);
return false;
}
_logger.Warn("Audio file detected: [{0}]", audioFile);
return false;
}
if (rarFiles.Any(f => _diskProvider.GetFileSize(f) > 10.Megabytes()))
{
_logger.Warn("RAR file detected, will require manual cleanup");
return false;
}
if (rarFiles.Any(f => _diskProvider.GetFileSize(f) > 10.Megabytes()))
return true;
}
catch (DirectoryNotFoundException e)
{
_logger.Warn("RAR file detected, will require manual cleanup");
_logger.Debug(e, "Folder {0} has already been removed", directoryInfo.FullName);
return false;
}
return true;
}
private List<ImportResult> ProcessFolder(IDirectoryInfo directoryInfo, ImportMode importMode, DownloadClientItem downloadClientItem)