mirror of
https://github.com/lidarr/Lidarr
synced 2025-02-25 07:12:40 +00:00
New: Report health error if Recycling Bin folder is not writable
(cherry picked from commit 8c50cd061e691914d9fcce119b9f838f1276950c)
This commit is contained in:
parent
d317c3dd60
commit
ba4e3b404e
5 changed files with 81 additions and 3 deletions
41
src/NzbDrone.Core/HealthCheck/Checks/RecyclingBinCheck.cs
Normal file
41
src/NzbDrone.Core/HealthCheck/Checks/RecyclingBinCheck.cs
Normal file
|
@ -0,0 +1,41 @@
|
|||
using NzbDrone.Common.Disk;
|
||||
using NzbDrone.Common.Extensions;
|
||||
using NzbDrone.Core.Configuration;
|
||||
using NzbDrone.Core.Localization;
|
||||
using NzbDrone.Core.MediaFiles.Events;
|
||||
|
||||
namespace NzbDrone.Core.HealthCheck.Checks
|
||||
{
|
||||
[CheckOn(typeof(TrackImportedEvent), CheckOnCondition.FailedOnly)]
|
||||
[CheckOn(typeof(TrackImportFailedEvent), CheckOnCondition.SuccessfulOnly)]
|
||||
public class RecyclingBinCheck : HealthCheckBase
|
||||
{
|
||||
private readonly IConfigService _configService;
|
||||
private readonly IDiskProvider _diskProvider;
|
||||
private readonly ILocalizationService _localizationService;
|
||||
|
||||
public RecyclingBinCheck(IConfigService configService, IDiskProvider diskProvider, ILocalizationService localizationService)
|
||||
{
|
||||
_configService = configService;
|
||||
_diskProvider = diskProvider;
|
||||
_localizationService = localizationService;
|
||||
}
|
||||
|
||||
public override HealthCheck Check()
|
||||
{
|
||||
var recycleBin = _configService.RecycleBin;
|
||||
|
||||
if (recycleBin.IsNullOrWhiteSpace())
|
||||
{
|
||||
return new HealthCheck(GetType());
|
||||
}
|
||||
|
||||
if (!_diskProvider.FolderWritable(recycleBin))
|
||||
{
|
||||
return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("RecycleBinUnableToWriteHealthCheck"), recycleBin), "#cannot-write-recycle-bin");
|
||||
}
|
||||
|
||||
return new HealthCheck(GetType());
|
||||
}
|
||||
}
|
||||
}
|
|
@ -623,6 +623,7 @@
|
|||
"RecycleBinCleanupDaysHelpText": "Set to 0 to disable automatic cleanup",
|
||||
"RecycleBinCleanupDaysHelpTextWarning": "Files in the recycle bin older than the selected number of days will be cleaned up automatically",
|
||||
"RecycleBinHelpText": "Track files will go here when deleted instead of being permanently deleted",
|
||||
"RecycleBinUnableToWriteHealthCheck": "Unable to write to configured recycling bin folder: {0}. Ensure this path exists and is writable by the user running Lidarr",
|
||||
"RecyclingBin": "Recycling Bin",
|
||||
"RecyclingBinCleanup": "Recycling Bin Cleanup",
|
||||
"Redownload": "Redownload",
|
||||
|
@ -926,4 +927,4 @@
|
|||
"WriteMetadataToAudioFiles": "Write Metadata to Audio Files",
|
||||
"Year": "Year",
|
||||
"YesCancel": "Yes, Cancel"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
using NzbDrone.Common.Extensions;
|
||||
using NzbDrone.Core.Configuration;
|
||||
using NzbDrone.Core.MediaFiles.Commands;
|
||||
using NzbDrone.Core.MediaFiles.TrackImport;
|
||||
using NzbDrone.Core.Messaging.Commands;
|
||||
|
||||
namespace NzbDrone.Core.MediaFiles
|
||||
|
@ -96,7 +97,7 @@ public void DeleteFile(string path, string subfolder = "")
|
|||
catch (IOException e)
|
||||
{
|
||||
_logger.Error(e, "Unable to create the folder '{0}' in the recycling bin for the file '{1}'", destinationFolder, fileInfo.Name);
|
||||
throw;
|
||||
throw new RecycleBinException($"Unable to create the folder '{destinationFolder}' in the recycling bin for the file '{fileInfo.Name}'", e);
|
||||
}
|
||||
|
||||
var index = 1;
|
||||
|
@ -121,7 +122,7 @@ public void DeleteFile(string path, string subfolder = "")
|
|||
catch (IOException e)
|
||||
{
|
||||
_logger.Error(e, "Unable to move '{0}' to the recycling bin: '{1}'", path, destination);
|
||||
throw;
|
||||
throw new RecycleBinException($"Unable to move '{path}' to the recycling bin: '{destination}'", e);
|
||||
}
|
||||
|
||||
SetLastWriteTime(destination, DateTime.UtcNow);
|
||||
|
|
|
@ -266,6 +266,13 @@ public List<ImportResult> Import(List<ImportDecision<LocalTrack>> decisions, boo
|
|||
|
||||
importResults.Add(new ImportResult(importDecision, "Failed to import track, Permissions error"));
|
||||
}
|
||||
catch (RecycleBinException e)
|
||||
{
|
||||
_logger.Warn(e, "Couldn't import track " + localTrack);
|
||||
_eventAggregator.PublishEvent(new TrackImportFailedEvent(e, localTrack, !localTrack.ExistingFile, downloadClientItem));
|
||||
|
||||
importResults.Add(new ImportResult(importDecision, "Failed to import track, unable to move existing file to the Recycle Bin."));
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
_logger.Warn(e, "Couldn't import track " + localTrack);
|
||||
|
|
|
@ -0,0 +1,28 @@
|
|||
using System;
|
||||
using System.IO;
|
||||
using System.Runtime.Serialization;
|
||||
|
||||
namespace NzbDrone.Core.MediaFiles.TrackImport
|
||||
{
|
||||
public class RecycleBinException : DirectoryNotFoundException
|
||||
{
|
||||
public RecycleBinException()
|
||||
{
|
||||
}
|
||||
|
||||
public RecycleBinException(string message)
|
||||
: base(message)
|
||||
{
|
||||
}
|
||||
|
||||
public RecycleBinException(string message, Exception innerException)
|
||||
: base(message, innerException)
|
||||
{
|
||||
}
|
||||
|
||||
protected RecycleBinException(SerializationInfo info, StreamingContext context)
|
||||
: base(info, context)
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in a new issue