mirror of
https://github.com/Sonarr/Sonarr.git
synced 2025-04-20 20:37:08 -04:00
Compare commits
5 commits
v4.0.13.29
...
develop
Author | SHA1 | Date | |
---|---|---|---|
|
640e3e5d44 | ||
|
1260d3c800 | ||
|
feeed9a7cf | ||
|
c8cb74a976 | ||
|
7193acb5ee |
5 changed files with 14 additions and 4 deletions
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
|
@ -22,7 +22,7 @@ env:
|
|||
FRAMEWORK: net6.0
|
||||
RAW_BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
|
||||
SONARR_MAJOR_VERSION: 4
|
||||
VERSION: 4.0.13
|
||||
VERSION: 4.0.14
|
||||
|
||||
jobs:
|
||||
backend:
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
using System.Linq;
|
||||
using NLog;
|
||||
using NzbDrone.Core.Download.TrackedDownloads;
|
||||
using NzbDrone.Core.Indexers;
|
||||
using NzbDrone.Core.MediaFiles.EpisodeImport;
|
||||
|
@ -13,15 +14,17 @@ public interface IRejectedImportService
|
|||
public class RejectedImportService : IRejectedImportService
|
||||
{
|
||||
private readonly ICachedIndexerSettingsProvider _cachedIndexerSettingsProvider;
|
||||
private readonly Logger _logger;
|
||||
|
||||
public RejectedImportService(ICachedIndexerSettingsProvider cachedIndexerSettingsProvider)
|
||||
public RejectedImportService(ICachedIndexerSettingsProvider cachedIndexerSettingsProvider, Logger logger)
|
||||
{
|
||||
_cachedIndexerSettingsProvider = cachedIndexerSettingsProvider;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
public bool Process(TrackedDownload trackedDownload, ImportResult importResult)
|
||||
{
|
||||
if (importResult.Result != ImportResultType.Rejected || importResult.ImportDecision.LocalEpisode == null || trackedDownload.RemoteEpisode?.Release == null)
|
||||
if (importResult.Result != ImportResultType.Rejected || trackedDownload.RemoteEpisode?.Release == null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
@ -38,11 +41,13 @@ public class RejectedImportService : IRejectedImportService
|
|||
if (rejectionReason == ImportRejectionReason.DangerousFile &&
|
||||
indexerSettings.FailDownloads.Contains(FailDownloads.PotentiallyDangerous))
|
||||
{
|
||||
_logger.Trace("Download '{0}' contains potentially dangerous file, marking as failed", trackedDownload.DownloadItem.Title);
|
||||
trackedDownload.Fail();
|
||||
}
|
||||
else if (rejectionReason == ImportRejectionReason.ExecutableFile &&
|
||||
indexerSettings.FailDownloads.Contains(FailDownloads.Executables))
|
||||
{
|
||||
_logger.Trace("Download '{0}' contains executable file, marking as failed", trackedDownload.DownloadItem.Title);
|
||||
trackedDownload.Fail();
|
||||
}
|
||||
else
|
||||
|
|
|
@ -40,6 +40,9 @@ namespace NzbDrone.Core.Download.TrackedDownloads
|
|||
{
|
||||
Status = TrackedDownloadStatus.Error;
|
||||
State = TrackedDownloadState.FailedPending;
|
||||
|
||||
// Set CanBeRemoved to allow the failed item to be removed from the client
|
||||
DownloadItem.CanBeRemoved = true;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -23,7 +23,9 @@ namespace NzbDrone.Core.MediaFiles
|
|||
|
||||
private static List<string> _dangerousExtensions = new List<string>
|
||||
{
|
||||
".arj",
|
||||
".lnk",
|
||||
".lzh",
|
||||
".ps1",
|
||||
".scr",
|
||||
".vbs",
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
<PackageReference Include="Servarr.FluentMigrator.Runner.SQLite" Version="3.3.2.9" />
|
||||
<PackageReference Include="Servarr.FluentMigrator.Runner.Postgres" Version="3.3.2.9" />
|
||||
<PackageReference Include="FluentValidation" Version="9.5.4" />
|
||||
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.6" />
|
||||
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.7" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
||||
<PackageReference Include="NLog" Version="5.3.4" />
|
||||
<PackageReference Include="MonoTorrent" Version="2.0.7" />
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue