self-hosted/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr.git synced 2024-12-12 11:15:43 +02:00
Code Issues Releases Activity

New: Report health error if Recycling Bin folder is not writable

Browse Source 
Closes #4692
This commit is contained in:
Mark McDowall 2023-04-24 20:23:20 -07:00
parent 99c4f5b746
commit 8c50cd061e
5 changed files with 78 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/NzbDrone.Core/HealthCheck/Checks/RecyclingBinCheck.cs Normal file
View File

@ -0,0 +1,38 @@
using NzbDrone.Common.Disk;
using NzbDrone.Common.Extensions;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.MediaFiles.Events;
namespace NzbDrone.Core.HealthCheck.Checks
{
[CheckOn(typeof(EpisodeImportedEvent), CheckOnCondition.FailedOnly)]
[CheckOn(typeof(EpisodeImportFailedEvent), CheckOnCondition.SuccessfulOnly)]
public class RecyclingBinCheck : HealthCheckBase
{
private readonly IConfigService _configService;
private readonly IDiskProvider _diskProvider;
public RecyclingBinCheck(IConfigService configService, IDiskProvider diskProvider)
{
_configService = configService;
_diskProvider = diskProvider;
}
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, $"Unable to write to configured recycling bin folder: {recycleBin}. Ensure this path exists and is writable by the user running Sonarr");
}
return new HealthCheck(GetType());
}
}
}

2
src/NzbDrone.Core/HealthCheck/HealthCheckService.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using NLog;

7
src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportApprovedEpisodes.cs
View File

@ -151,6 +151,13 @@ public List<ImportResult> Import(List<ImportDecision> decisions, bool newDownloa
_commandQueueManager.Push(new RescanSeriesCommand(localEpisode.Series.Id));
}
catch (RecycleBinException e)
{
_logger.Warn(e, "Couldn't import episode " + localEpisode);
_eventAggregator.PublishEvent(new EpisodeImportFailedEvent(e, localEpisode, newDownload, downloadClientItem));
importResults.Add(new ImportResult(importDecision, "Failed to import episode, unable to move existing file to the Recycle Bin."));
}
catch (Exception e)
{
_logger.Warn(e, "Couldn't import episode " + localEpisode);

28
src/NzbDrone.Core/MediaFiles/EpisodeImport/RecycleBinException.cs Normal file
View File

@ -0,0 +1,28 @@
using System;
using System.IO;
using System.Runtime.Serialization;
namespace NzbDrone.Core.MediaFiles.EpisodeImport
{
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)
{
}
}
}

7
src/NzbDrone.Core/MediaFiles/RecycleBinProvider.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using System.IO;
using NLog;
using NzbDrone.Common.Disk;
@ -6,6 +6,7 @@
using NzbDrone.Common.Extensions;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.MediaFiles.Commands;
using NzbDrone.Core.MediaFiles.EpisodeImport;
using NzbDrone.Core.Messaging.Commands;
using NzbDrone.Core.Messaging.Events;
using NzbDrone.Core.Tv.Events;
@ -98,7 +99,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;
@ -123,7 +124,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);