Bump version to 4.0.15

Closes #7874

.github/workflows/build.yml

@@ -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.15
 
 jobs:
   backend:

src/NzbDrone.Core/Download/RejectedImportService.cs

@@ -1,5 +1,5 @@
-using System.Collections.Generic;
 using System.Linq;
+using NLog;
 using NzbDrone.Core.Download.TrackedDownloads;
 using NzbDrone.Core.Indexers;
 using NzbDrone.Core.MediaFiles.EpisodeImport;
@@ -14,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)
+        if (importResult.Result != ImportResultType.Rejected || trackedDownload.RemoteEpisode?.Release == null)
         {
             return false;
         }
@@ -30,19 +32,27 @@ public class RejectedImportService : IRejectedImportService
         var indexerSettings = _cachedIndexerSettingsProvider.GetSettings(trackedDownload.RemoteEpisode.Release.IndexerId);
         var rejectionReason = importResult.ImportDecision.Rejections.FirstOrDefault()?.Reason;
 
+        if (indexerSettings == null)
+        {
+            trackedDownload.Warn(new TrackedDownloadStatusMessage(trackedDownload.DownloadItem.Title, importResult.Errors));
+            return true;
+        }
+
         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
         {
-            trackedDownload.Warn(new TrackedDownloadStatusMessage(importResult.Errors.First(), new List<string>()));
+            trackedDownload.Warn(new TrackedDownloadStatusMessage(trackedDownload.DownloadItem.Title, importResult.Errors));
         }
 
         return true;

src/NzbDrone.Core/Download/TrackedDownloads/TrackedDownload.cs

@@ -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;
         }
     }
 

src/NzbDrone.Core/ImportLists/ImportListSyncService.cs

@@ -305,7 +305,7 @@ namespace NzbDrone.Core.ImportLists
             {
                 var seriesExists = allListItems.Where(l =>
                     l.TvdbId == series.TvdbId ||
-                    l.ImdbId == series.ImdbId ||
+                    (l.ImdbId.IsNotNullOrWhiteSpace() && series.ImdbId.IsNotNullOrWhiteSpace() && l.ImdbId == series.ImdbId) ||
                     l.TmdbId == series.TmdbId ||
                     series.MalIds.Contains(l.MalId) ||
                     series.AniListIds.Contains(l.AniListId)).ToList();

src/NzbDrone.Core/ImportLists/Trakt/TraktAPI.cs

@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Text.Json.Serialization;
+using Newtonsoft.Json;
 
 namespace NzbDrone.Core.ImportLists.Trakt
 {
@@ -17,7 +17,7 @@ namespace NzbDrone.Core.ImportLists.Trakt
         public string Title { get; set; }
         public int? Year { get; set; }
         public TraktSeriesIdsResource Ids { get; set; }
-        [JsonPropertyName("aired_episodes")]
+        [JsonProperty("aired_episodes")]
         public int AiredEpisodes { get; set; }
     }
 
@@ -44,11 +44,11 @@ namespace NzbDrone.Core.ImportLists.Trakt
 
     public class RefreshRequestResponse
     {
-        [JsonPropertyName("access_token")]
+        [JsonProperty("access_token")]
         public string AccessToken { get; set; }
-        [JsonPropertyName("expires_in")]
+        [JsonProperty("expires_in")]
         public int ExpiresIn { get; set; }
-        [JsonPropertyName("refresh_token")]
+        [JsonProperty("refresh_token")]
         public string RefreshToken { get; set; }
     }
 

src/NzbDrone.Core/MediaFiles/FileExtensions.cs

@@ -23,7 +23,9 @@ namespace NzbDrone.Core.MediaFiles
 
         private static List<string> _dangerousExtensions = new List<string>
         {
+            ".arj",
             ".lnk",
+            ".lzh",
             ".ps1",
             ".scr",
             ".vbs",

src/NzbDrone.Core/Sonarr.Core.csproj

@@ -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" />