Merge pull request 'Radarr-Sonarr-Integration' (#15) from Radarr-Sonarr-Integration into main

Reviewed-on: #15

Jellyfin.Plugin.MediaCleaner/Configuration.cs

@@ -30,6 +30,16 @@ public class Configuration : BasePluginConfiguration
     /// </summary>
     public string SonarrAPIKey { get; set; } = string.Empty;
 
+    /// <summary>
+    /// Gets or sets the http and port address for your Sonarr instance.
+    /// </summary>
+    public string SonarrAnimeAddress { get; set; } = string.Empty;
+
+    /// <summary>
+    /// Gets or sets the api for your Sonarr instance.
+    /// </summary>
+    public string SonarrAnimeAPIKey { get; set; } = string.Empty;
+
     /// <summary>
     /// Gets or sets the cut off days before deleting unwatched files.
     /// </summary>

Jellyfin.Plugin.MediaCleaner/Controllers/RadarrController.cs

@@ -4,45 +4,22 @@ using Microsoft.AspNetCore.Mvc;
 using System;
 using System.Collections.Generic;
 using System.Net.Http;
-using System.Net.Http.Headers;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
-using System.Web;
+using Jellyfin.Plugin.MediaCleaner.Enums;
 using Microsoft.AspNetCore.Http;
 using System.Linq;
 
 namespace Jellyfin.Plugin.MediaCleaner.Controllers;
 
-public record ConnectionTestRequest(string Address, string ApiKey);
-
-public record RadarrMovie(
-    [property: JsonPropertyName("id")] int? Id,
-    [property: JsonPropertyName("title")] string? Title
-);
-
 [Route("radarr")]
 public class RadarrController : Controller
 {
-    private static Configuration Configuration =>
-            Plugin.Instance!.Configuration;
-
-    private readonly HttpClient _httpClient;
-
-    public RadarrController(HttpClient httpClient)
-    {
-        _httpClient = httpClient;
-
-        // Set the default request headers
-        _httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
-        _httpClient.DefaultRequestHeaders.Add("X-Api-Key", Configuration.RadarrAPIKey);
-    }
-
     private async Task<ObjectResult> GetRadarrMovieInfo(MovieInfo movieInfo)
     {
-        var responseBody = await HttpHelper.SendHttpRequestAsync(
-            _httpClient,
-            Configuration.RadarrAddress,
+        HttpHelper httpHelper = new(ServerType.Radarr);
+        var responseBody = await httpHelper.SendHttpRequestAsync(
             HttpMethod.Get,
             $"/api/v3/movie?tmdbId={Uri.EscapeDataString(movieInfo.TmdbId ?? string.Empty)}&excludeLocalCovers=false"
         ).ConfigureAwait(false);
@@ -76,9 +53,8 @@ public class RadarrController : Controller
 
             RadarrMovie movie = (RadarrMovie)radarrMovieInfoResult.Value;
 
-            var responseBody = await HttpHelper.SendHttpRequestAsync(
-                _httpClient,
-                Configuration.RadarrAddress,
+            HttpHelper httpHelper = new(ServerType.Radarr);
+            var responseBody = await httpHelper.SendHttpRequestAsync(
                 HttpMethod.Delete,
                 $"/api/v3/movie/{movie.Id}?deleteFiles=true&addImportExclusion=true"
             ).ConfigureAwait(false);
@@ -109,10 +85,11 @@ public class RadarrController : Controller
 
         try
         {
+            using var testHttpClient = new HttpClient();
             using var httpRequest = new HttpRequestMessage(HttpMethod.Get, address);
             httpRequest.Headers.Add("X-Api-Key", request.ApiKey);
 
-            var response = await _httpClient.SendAsync(httpRequest).ConfigureAwait(false);
+            var response = await testHttpClient.SendAsync(httpRequest).ConfigureAwait(false);
             return Ok(new { success = response.IsSuccessStatusCode });
         }
         catch (HttpRequestException e)

Jellyfin.Plugin.MediaCleaner/Controllers/SonarrController.cs

@@ -5,41 +5,18 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using System.Net.Http.Headers;
 using System;
-using System.Web;
 using System.Text.Json;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text.Json.Serialization;
 using System.Globalization;
-using System.Security.Cryptography.X509Certificates;
+using Jellyfin.Plugin.MediaCleaner.Enums;
 using Jellyfin.Plugin.MediaCleaner.Helpers;
 
 namespace Jellyfin.Plugin.MediaCleaner.Controllers;
 
-public record SonarrSeries(
-    [property: JsonPropertyName("id")] int? Id,
-    [property: JsonPropertyName("title")] string? Title,
-    [property: JsonPropertyName("seasons")] IReadOnlyList<Season> Seasons
-);
-
-public record EpisodeDeletionDetails(
-    [property: JsonPropertyName("id")] int? EpisodeId,
-    [property: JsonPropertyName("episodeFileId")] int? EpisodeFileId,
-    [property: JsonPropertyName("seasonNumber")] int? SeasonNumber
-);
-
-public record EpisodeIdLists(IReadOnlyList<int> EpisodeIds, IReadOnlyList<int> EpisodeFileIds);
-
-public record Season(
-    [property: JsonPropertyName("seasonNumber")] int? SeasonNumber
-);
-
 [Route("sonarr")]
 public class SonarrController : Controller
 {
-    private static Configuration Configuration =>
-            Plugin.Instance!.Configuration;
-
     private readonly HttpClient _httpClient;
 
     public SonarrController(HttpClient httpClient)
@@ -48,13 +25,11 @@ public class SonarrController : Controller
 
         // Set the default request headers
         _httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
-        _httpClient.DefaultRequestHeaders.Add("X-Api-Key", Configuration.SonarrAPIKey);
     }
 
-    private async Task<ObjectResult> GetSonarrSeriesInfo(SeriesInfo seriesInfo){
-        var responseBody = await HttpHelper.SendHttpRequestAsync(
-            _httpClient,
-            Configuration.SonarrAddress,
+    private async Task<ObjectResult> GetSeriesInfo(SeriesInfo seriesInfo, ServerType serverType){
+        HttpHelper httpHelper = new(serverType);
+        var responseBody = await httpHelper.SendHttpRequestAsync(
             HttpMethod.Get,
             $"/api/v3/series?tvdbId={Uri.EscapeDataString(seriesInfo.TvdbId ?? string.Empty)}"
         ).ConfigureAwait(false);
@@ -70,12 +45,11 @@ public class SonarrController : Controller
         return Ok(series);
     }
 
-    private async Task<ObjectResult> GetSonarrEpisodeInfo(SonarrSeries sonarrSeries){
-        var responseBody = await HttpHelper.SendHttpRequestAsync(
-            _httpClient,
-            Configuration.SonarrAddress,
+    private async Task<ObjectResult> GetEpisodeInfo(SonarrSeries sonarrSeries, ServerType serverType){
+        HttpHelper httpHelper = new(serverType);
+        var responseBody = await httpHelper.SendHttpRequestAsync(
             HttpMethod.Get,
-            $"/api/v3/episode?seriesId={sonarrSeries.Id?.ToString(CultureInfo.InvariantCulture)}"
+            $"/api/v3/episode?seriesId={sonarrSeries.Id.ToString(CultureInfo.InvariantCulture)}"
         ).ConfigureAwait(false);
 
         var episodesResponseObj = JsonSerializer.Deserialize<List<EpisodeDeletionDetails>>(responseBody.GetRawText());
@@ -85,31 +59,27 @@ public class SonarrController : Controller
         }
 
         var seasonNumbers = new HashSet<int>(sonarrSeries.Seasons
-            .Where(s => s.SeasonNumber.HasValue)
-            .Select(s => s.SeasonNumber!.Value));
+            .Select(s => s.SeasonNumber));
 
         var staleEpisodesResponseObj = episodesResponseObj
-            .Where(episodeDeletionDetail => episodeDeletionDetail.SeasonNumber != null &&
-                        seasonNumbers.Contains(episodeDeletionDetail.SeasonNumber.Value))
+            .Where(episodeDeletionDetail => seasonNumbers.Contains(episodeDeletionDetail.SeasonNumber))
             .ToList();
 
         var episodeIds = staleEpisodesResponseObj
+            .Where(episodeDeletionDetail => episodeDeletionDetail.HasFile)
             .Select(episodeDeletionDetail => episodeDeletionDetail.EpisodeId)
-            .Where(id => id.HasValue)
-            .Select(id => id!.Value)
             .ToList();
 
         var episodeFileIds = staleEpisodesResponseObj
+            .Where(episodeDeletionDetail => episodeDeletionDetail.HasFile)
             .Select(episodeDeletionDetail => episodeDeletionDetail.EpisodeFileId)
-            .Where(id => id.HasValue)
-            .Select(id => id!.Value)
             .ToList();
 
         return Ok(new EpisodeIdLists(episodeIds, episodeFileIds));
     }
 
-    [HttpPost("deleteSeriesFromSonarr")]
-    public async Task<IActionResult> DeleteSeriesFromRadarr([FromBody] SeriesInfo seriesInfo){
+    [HttpPost("deleteSeriesFromAnimeSonarr")]
+    public async Task<IActionResult> DeleteSeriesFromAnimeSonarr([FromBody] SeriesInfo seriesInfo){
 
         if (seriesInfo == null || string.IsNullOrEmpty(seriesInfo.TvdbId))
         {
@@ -118,7 +88,7 @@ public class SonarrController : Controller
 
         try
         {
-            var sonarrSeriesInfoResult = await GetSonarrSeriesInfo(seriesInfo).ConfigureAwait(false);
+            var sonarrSeriesInfoResult = await GetSeriesInfo(seriesInfo, ServerType.SonarrAnime).ConfigureAwait(false);
 
             if(sonarrSeriesInfoResult.StatusCode != StatusCodes.Status200OK || sonarrSeriesInfoResult.Value is not SonarrSeries){
                 return sonarrSeriesInfoResult;
@@ -128,10 +98,12 @@ public class SonarrController : Controller
             SonarrSeries staleSeries = new(
                 Id: retrievedSeries.Id,
                 Title: retrievedSeries.Title,
-                Seasons: [.. seriesInfo.Seasons.Select(season => new Season(SeasonNumber: int.Parse(season, CultureInfo.InvariantCulture)))]
+                Seasons: [.. seriesInfo.Seasons.Select(season => new Season(SeasonNumber: int.Parse(season, CultureInfo.InvariantCulture)))],
+                Ended: retrievedSeries.Ended,
+                TvdbId: retrievedSeries.TvdbId
             );
 
-            var episodesToPurgeResult = await GetSonarrEpisodeInfo(staleSeries).ConfigureAwait(false);
+            var episodesToPurgeResult = await GetEpisodeInfo(staleSeries, ServerType.SonarrAnime).ConfigureAwait(false);
             if (episodesToPurgeResult.StatusCode != StatusCodes.Status200OK || episodesToPurgeResult.Value is not EpisodeIdLists)
             {
                 return sonarrSeriesInfoResult;
@@ -139,9 +111,9 @@ public class SonarrController : Controller
 
             EpisodeIdLists episodesToPurge = (EpisodeIdLists)episodesToPurgeResult.Value;
 
-            await UnmonitorSeasons(staleSeries).ConfigureAwait(false);
-            await UnmonitorEpisodeIds(episodesToPurge.EpisodeIds).ConfigureAwait(false);
-            await DeleteEpisodeFiles(episodesToPurge.EpisodeFileIds).ConfigureAwait(false);
+            await UnmonitorSeasons(staleSeries, ServerType.SonarrAnime).ConfigureAwait(false);
+            await UnmonitorEpisodeIds(episodesToPurge.EpisodeIds, ServerType.SonarrAnime).ConfigureAwait(false);
+            await DeleteEpisodeFiles(episodesToPurge.EpisodeFileIds, ServerType.SonarrAnime).ConfigureAwait(false);
 
             return Ok();
         }
@@ -151,15 +123,59 @@ public class SonarrController : Controller
         }
     }
 
-    private async Task<ObjectResult> UnmonitorSeasons(SonarrSeries staleSeries){
+    [HttpPost("deleteSeriesFromSonarr")]
+    public async Task<IActionResult> DeleteSeriesFromSonarr([FromBody] SeriesInfo seriesInfo){
+
+        if (seriesInfo == null || string.IsNullOrEmpty(seriesInfo.TvdbId))
+        {
+            return BadRequest("Invalid series information provided.");
+        }
+
+        try
+        {
+            var sonarrSeriesInfoResult = await GetSeriesInfo(seriesInfo, ServerType.Sonarr).ConfigureAwait(false);
+
+            if(sonarrSeriesInfoResult.StatusCode != StatusCodes.Status200OK || sonarrSeriesInfoResult.Value is not SonarrSeries){
+                return sonarrSeriesInfoResult;
+            }
+
+            SonarrSeries retrievedSeries = (SonarrSeries)sonarrSeriesInfoResult.Value;
+            SonarrSeries staleSeries = new(
+                Id: retrievedSeries.Id,
+                Title: retrievedSeries.Title,
+                Seasons: [.. seriesInfo.Seasons.Select(season => new Season(SeasonNumber: int.Parse(season, CultureInfo.InvariantCulture)))],
+                Ended: retrievedSeries.Ended,
+                TvdbId: retrievedSeries.TvdbId
+            );
+
+            var episodesToPurgeResult = await GetEpisodeInfo(staleSeries, ServerType.Sonarr).ConfigureAwait(false);
+            if (episodesToPurgeResult.StatusCode != StatusCodes.Status200OK || episodesToPurgeResult.Value is not EpisodeIdLists)
+            {
+                return sonarrSeriesInfoResult;
+            }
+
+            EpisodeIdLists episodesToPurge = (EpisodeIdLists)episodesToPurgeResult.Value;
+
+            await UnmonitorSeasons(staleSeries, ServerType.Sonarr).ConfigureAwait(false);
+            await UnmonitorEpisodeIds(episodesToPurge.EpisodeIds, ServerType.Sonarr).ConfigureAwait(false);
+            await DeleteEpisodeFiles(episodesToPurge.EpisodeFileIds, ServerType.Sonarr).ConfigureAwait(false);
+
+            return Ok();
+        }
+        catch (HttpRequestException e)
+        {
+            return StatusCode(StatusCodes.Status500InternalServerError, $"An unexpected error occurred. {e.Message}");
+        }
+    }
+
+    private async Task<ObjectResult> UnmonitorSeasons(SonarrSeries staleSeries, ServerType serverType){
         if (staleSeries == null)
         {
             return BadRequest("No stale series provided.");
         }
 
-        var series = await HttpHelper.SendHttpRequestAsync(
-            _httpClient,
-            Configuration.SonarrAddress,
+        HttpHelper httpHelper = new(serverType);
+        var series = await httpHelper.SendHttpRequestAsync(
             HttpMethod.Get,
             $"/api/v3/series/{staleSeries.Id}"
         ).ConfigureAwait(false);
@@ -195,9 +211,7 @@ public class SonarrController : Controller
 
         seriesDict["seasons"] = updatedSeasons;
 
-        var responseBody = await HttpHelper.SendHttpRequestAsync(
-            _httpClient,
-            Configuration.SonarrAddress,
+        var responseBody = await httpHelper.SendHttpRequestAsync(
             HttpMethod.Put,
             $"/api/v3/series/{staleSeries.Id}",
             seriesDict
@@ -206,16 +220,15 @@ public class SonarrController : Controller
         return Ok(responseBody);
     }
 
-    private async Task<ObjectResult> DeleteEpisodeFiles(IReadOnlyList<int> episodeFileIds)
+    private async Task<ObjectResult> DeleteEpisodeFiles(IReadOnlyList<int> episodeFileIds, ServerType serverType)
     {
         if (episodeFileIds == null || episodeFileIds.Count == 0)
         {
             return BadRequest("No episode file IDs provided.");
         }
 
-        var responseBody = await HttpHelper.SendHttpRequestAsync(
-            _httpClient,
-            Configuration.SonarrAddress,
+        HttpHelper httpHelper = new(serverType);
+        var responseBody = await httpHelper.SendHttpRequestAsync(
             HttpMethod.Delete,
             "/api/v3/episodefile/bulk",
             new { episodeFileIds }
@@ -224,16 +237,16 @@ public class SonarrController : Controller
         return Ok(responseBody);
     }
 
-    private async Task<ObjectResult> UnmonitorEpisodeIds(IReadOnlyList<int> episodeIds)
+    private async Task<ObjectResult> UnmonitorEpisodeIds(IReadOnlyList<int> episodeIds, ServerType serverType)
     {
         if (episodeIds == null || episodeIds.Count == 0)
         {
             return BadRequest("No episode IDs provided.");
         }
 
-        var responseBody = await HttpHelper.SendHttpRequestAsync(
-            _httpClient,
-            Configuration.SonarrAddress,
+
+        HttpHelper httpHelper = new(serverType);
+        var responseBody = await httpHelper.SendHttpRequestAsync(
             HttpMethod.Put,
             "/api/v3/episode/monitor",
             new { episodeIds, monitored = false }

Jellyfin.Plugin.MediaCleaner/Controllers/StateController.cs

@@ -2,6 +2,8 @@ using Jellyfin.Plugin.MediaCleaner.Data;
 using Jellyfin.Plugin.MediaCleaner;
 using Jellyfin.Plugin.MediaCleaner.Models;
 using Microsoft.AspNetCore.Mvc;
+using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace Jellyfin.Plugin.MediaCleaner.Controllers;
 
@@ -12,8 +14,19 @@ public class StateController(MediaCleanerState state) : Controller
     private static Configuration Configuration =>
             Plugin.Instance!.Configuration;
 
-    [HttpGet("getSeriesInfo")]
-    public IActionResult GetSeriesInfo() => Ok(_state.GetSeriesInfo());
+    [HttpGet("getTvSeriesInfo")]
+    public async Task<IActionResult> GetTvSeriesInfo()
+    {
+        var tvSeriesInfo = await _state.GetTvSeriesInfo().ConfigureAwait(false);
+        return Ok(tvSeriesInfo);
+    }
+
+    [HttpGet("getAnimeSeriesInfo")]
+    public async Task<IActionResult> GetAnimeSeriesInfo()
+    {
+        var animeSeriesInfo = await _state.GetAnimeSeriesInfo().ConfigureAwait(false);
+        return Ok(animeSeriesInfo);
+    }
 
     [HttpGet("getMovieInfo")]
     public IActionResult GetMovieInfo() => Ok(_state.GetMovieInfo());
@@ -25,7 +38,11 @@ public class StateController(MediaCleanerState state) : Controller
     public IActionResult GetMoviesTitle() =>
         Ok($"Stale Movies (Unwatched for and created over {Configuration.StaleMediaCutoff} Days ago.)");
 
-     [HttpGet("getSeriesTitle")]
+    [HttpGet("getSeriesTitle")]
     public IActionResult GetSeriesTitle() =>
-        Ok($"Stale Series (Unwatched for and created over {Configuration.StaleMediaCutoff} Days ago.)");
+        Ok($"Stale TV Series (Unwatched for and created over {Configuration.StaleMediaCutoff} Days ago.)");
+
+    [HttpGet("getAnimeSeriesTitle")]
+    public IActionResult GetAnimeSeriesTitle() =>
+        Ok($"Stale Anime Series (Unwatched for and created over {Configuration.StaleMediaCutoff} Days ago.)");
 }

Jellyfin.Plugin.MediaCleaner/Data/MediaCleanerState.cs

@@ -1,15 +1,16 @@
-using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Jellyfin.Database.Implementations.ModelConfiguration;
-using Jellyfin.Plugin.MediaCleaner;
+using Jellyfin.Plugin.MediaCleaner.Helpers;
 using Jellyfin.Plugin.MediaCleaner.Models;
-using Jellyfin.Plugin.MediaCleaner.ScheduledTasks;
 using MediaBrowser.Controller.Library;
 using Microsoft.Extensions.Logging;
+using Jellyfin.Plugin.MediaCleaner.Enums;
+using System.Net.Http;
+using System;
+using System.Text.Json;
+using System.Globalization;
 
 namespace Jellyfin.Plugin.MediaCleaner.Data;
 
@@ -24,15 +25,54 @@ public class MediaCleanerState(ILogger<StaleMediaScanner> logger, ILibraryManage
         _mediaInfo = await _staleMediaScanner.ScanStaleMedia().ConfigureAwait(false);
     }
 
-    public IEnumerable<SeriesInfo> GetSeriesInfo()
+    public async Task<IEnumerable<SeriesInfo>> GetTvSeriesInfo()
     {
+        // Filter only TV
+        // Get all series on tv sonarr server
+        HttpHelper tvHttpHelper = new HttpHelper(ServerType.Sonarr);
+        var tvSeriesResponse = await tvHttpHelper.SendHttpRequestAsync(HttpMethod.Get,"/api/v3/series").ConfigureAwait(false);
+        var tvSeries = JsonSerializer.Deserialize<IEnumerable<SonarrSeries>>(tvSeriesResponse.GetRawText());
+
+        if(tvSeries == null)
+        {
+            return [];
+        }
+
         lock (_lock)
         {
-            return _mediaInfo.OfType<SeriesInfo>();
+            var allSeries = _mediaInfo.OfType<SeriesInfo>();
+
+            var tvSeriesInfo = allSeries
+            .Where(series => tvSeries.Any(tv => tv.TvdbId == int.Parse(series.TvdbId, CultureInfo.InvariantCulture)));
+
+            return [.. tvSeriesInfo];
         }
     }
 
-     public IEnumerable<MovieInfo> GetMovieInfo()
+    public async Task<IEnumerable<SeriesInfo>> GetAnimeSeriesInfo()
+    {
+        // Get all series on anime sonarr server
+        HttpHelper animeHttpHelper = new HttpHelper(ServerType.SonarrAnime);
+        var animeSeriesResponse = await animeHttpHelper.SendHttpRequestAsync(HttpMethod.Get,"/api/v3/series").ConfigureAwait(false);
+        var animeSeries = JsonSerializer.Deserialize<List<SonarrSeries>>(animeSeriesResponse.GetRawText());
+
+        if(animeSeries == null)
+        {
+            return Enumerable.Empty<SeriesInfo>();
+        }
+
+        lock (_lock)
+        {
+            var allSeries = _mediaInfo.OfType<SeriesInfo>();
+
+            var animeSeriesInfo = allSeries
+            .Where(series => animeSeries.Any(anime => anime.TvdbId == int.Parse(series.TvdbId, CultureInfo.InvariantCulture)));
+
+            return animeSeriesInfo;
+        }
+    }
+
+    public IEnumerable<MovieInfo> GetMovieInfo()
     {
         lock (_lock)
         {

Jellyfin.Plugin.MediaCleaner/Enums/ServerType.cs

@@ -0,0 +1,8 @@
+namespace Jellyfin.Plugin.MediaCleaner.Enums;
+
+public enum ServerType
+{
+    Radarr,
+    Sonarr,
+    SonarrAnime
+}

Jellyfin.Plugin.MediaCleaner/Helpers/HttpHelper.cs

@@ -1,23 +1,43 @@
 using System;
+using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
 using System.Net.Http;
+using System.Net.Http.Headers;
 using System.Text.Json;
 using System.Threading.Tasks;
+using Jellyfin.Plugin.MediaCleaner.Enums;
 using Microsoft.Extensions.Logging;
 
 namespace Jellyfin.Plugin.MediaCleaner.Helpers;
 
-public static class HttpHelper
+public class HttpHelper
 {
+    private string _baseAddress { get; }
+    private HttpClient _httpClient { get; }
+
+    private static Configuration Configuration =>
+            Plugin.Instance!.Configuration;
+
+    public HttpHelper(ServerType serverType)
+    {
+        _httpClient = new HttpClient();
+
+        // Set the default request headers
+        _httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+        _httpClient.DefaultRequestHeaders.Add("X-Api-Key", RetrieveApiKey(serverType));
+
+        _baseAddress = RetrieveBaseAddress(serverType);
+    }
+
     /// <summary>
     /// Sends a JSON request and returns the raw JSON element response.
     /// </summary>
     /// <remarks>
     /// Do NOT create a new HttpClient on every call; reuse one instance (DI or a singleton) to avoid socket exhaustion.
     /// </remarks>
-    public static async Task<JsonElement> SendHttpRequestAsync(HttpClient httpClient, string baseAddress, HttpMethod method, string path, object? body = null)
+    public async Task<JsonElement> SendHttpRequestAsync(HttpMethod method, string path, object? body = null)
     {
-        var uri = new UriBuilder($"{baseAddress}{path}").Uri;
+        var uri = new UriBuilder($"{_baseAddress}{path}").Uri;
         using var request = new HttpRequestMessage(method, uri);
 
         if (body != null)
@@ -26,10 +46,32 @@ public static class HttpHelper
             request.Content = new StringContent(json, System.Text.Encoding.UTF8, "application/json");
         }
 
-        var response = await httpClient.SendAsync(request).ConfigureAwait(false);
+        var response = await _httpClient.SendAsync(request).ConfigureAwait(false);
         response.EnsureSuccessStatusCode();
 
         var responseBody = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
         return JsonSerializer.Deserialize<JsonElement>(responseBody);
     }
+
+    private string RetrieveApiKey(ServerType serverType)
+    {
+        return serverType switch
+        {
+            ServerType.Sonarr => Configuration.SonarrAPIKey,
+            ServerType.SonarrAnime => Configuration.SonarrAnimeAPIKey,
+            ServerType.Radarr => Configuration.RadarrAPIKey,
+            _ => string.Empty,
+        };
+    }
+
+    private string RetrieveBaseAddress(ServerType serverType)
+    {
+        return serverType switch
+        {
+            ServerType.Sonarr => Configuration.SonarrAddress,
+            ServerType.SonarrAnime => Configuration.SonarrAnimeAddress,
+            ServerType.Radarr => Configuration.RadarrAddress,
+            _ => string.Empty,
+        };
+    }
 }

Jellyfin.Plugin.MediaCleaner/Models/ConnectionTestRequest.cs

@@ -0,0 +1,3 @@
+namespace Jellyfin.Plugin.MediaCleaner.Models;
+
+public record ConnectionTestRequest(string Address, string ApiKey);

Jellyfin.Plugin.MediaCleaner/Models/EpisodeDeletionDetails.cs

@@ -0,0 +1,10 @@
+using System.Text.Json.Serialization;
+
+namespace Jellyfin.Plugin.MediaCleaner.Models;
+
+public record EpisodeDeletionDetails(
+    [property: JsonPropertyName("id")] int EpisodeId,
+    [property: JsonPropertyName("episodeFileId")] int EpisodeFileId,
+    [property: JsonPropertyName("seasonNumber")] int SeasonNumber,
+    [property: JsonPropertyName("hasFile")] bool HasFile
+);

Jellyfin.Plugin.MediaCleaner/Models/EpisodeIdLists.cs

@@ -0,0 +1,5 @@
+using System.Collections.Generic;
+
+namespace Jellyfin.Plugin.MediaCleaner.Models;
+
+public record EpisodeIdLists(IReadOnlyList<int> EpisodeIds, IReadOnlyList<int> EpisodeFileIds);

Jellyfin.Plugin.MediaCleaner/Models/MediaInfo.cs

@@ -4,6 +4,6 @@ namespace Jellyfin.Plugin.MediaCleaner.Models;
 
 public abstract class MediaInfo
 {
-    public required string? TmdbId { get; set; }
+    public required string TmdbId { get; set; }
     public required string Name { get; set; }
 }

Jellyfin.Plugin.MediaCleaner/Models/RadarrMovie.cs

@@ -0,0 +1,8 @@
+using System.Text.Json.Serialization;
+
+namespace Jellyfin.Plugin.MediaCleaner.Models;
+
+public record RadarrMovie(
+    [property: JsonPropertyName("id")] int? Id,
+    [property: JsonPropertyName("title")] string? Title
+);

Jellyfin.Plugin.MediaCleaner/Models/SeriesInfo.cs

@@ -12,5 +12,5 @@ public class SeriesInfo : MediaInfo
 {
     public Guid SeriesId { get; set; }
     public IEnumerable<string> Seasons { get; set; } = [];
-    public required string? TvdbId { get; set; }
+    public required string TvdbId { get; set; }
 }

Jellyfin.Plugin.MediaCleaner/Models/SonarrSeries.cs

@@ -0,0 +1,18 @@
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
+
+namespace Jellyfin.Plugin.MediaCleaner.Models;
+
+public record SonarrSeries(
+    [property: JsonPropertyName("id")] int Id,
+    [property: JsonPropertyName("title")] string? Title,
+    [property: JsonPropertyName("seasons")] IReadOnlyList<Season> Seasons,
+    [property: JsonPropertyName("ended")] bool Ended,
+    [property: JsonPropertyName("tvdbId")] int TvdbId
+    // [property: JsonPropertyName("tmdbId")] int TmdbId,
+    // [property: JsonPropertyName("imdbId")] int ImdbId
+);
+
+public record Season(
+    [property: JsonPropertyName("seasonNumber")] int SeasonNumber
+);

Jellyfin.Plugin.MediaCleaner/Pages/configuration.html

@@ -47,6 +47,26 @@
                     </div>
                 </div>
 
+                <div class="inlineContainer">
+                    <div class="inputContainer">
+                        <label class="inputLabel inputLabelUnfocused" for="SonarrAnimeAddress">Sonarr Anime Address (http:port)</label>
+                        <input id="SonarrAnimeAddress" name="SonarrAnimeAddress" type="text" is="emby-input" />
+                        <div class="fieldDescription">The address and port of your sonarr instance.</div>
+                    </div>
+                    <div class="inputContainer">
+                        <label class="inputLabel inputLabelUnfocused" for="SonarrAnimeAPIKey">Sonarr Anime API Key</label>
+                        <input id="SonarrAnimeAPIKey" name="SonarrAnimeAPIKey" type="text" is="emby-input" />
+                        <div class="fieldDescription">The api key used by your sonarr instance</div>
+                    </div>
+                    <div class="inputContainer">
+                        <button id="SonarrAnimeTestConnectionButton" is="emby-button" type="button" class="raised button-submit block emby-button">
+                            <span>Test</span>
+                        </button>
+                        <div class="validation" id="SonarrAnimeConnectionValidation" hidden>
+                        </div>
+                    </div>
+                </div>
+
                 <h3>General Settings</h3>
                 <div class="inlineContainer">
                     <div class="inputContainer">

Jellyfin.Plugin.MediaCleaner/Pages/configuration.js

@@ -32,6 +32,14 @@ const startFadeIn = (element, interval = 100) => {
 };
 
 // Connection Methods
+const testConnectionSonarrAnime = async () => {
+    var apiKeyElement = document.getElementById('SonarrAnimeAPIKey');
+    var addressElement = document.getElementById('SonarrAnimeAddress');
+    var validationElement = document.getElementById('SonarrAnimeConnectionValidation');
+
+    await validateConnection(apiKeyElement, addressElement, validationElement, "sonarr");
+}
+
 const testConnectionSonarr = async () => {
     var apiKeyElement = document.getElementById('SonarrAPIKey');
     var addressElement = document.getElementById('SonarrAddress');
@@ -131,6 +139,9 @@ document.querySelector('#RadarrTestConnectionButton')
 document.querySelector('#SonarrTestConnectionButton')
     .addEventListener('click', testConnectionSonarr);
 
+document.querySelector('#SonarrAnimeTestConnectionButton')
+    .addEventListener('click', testConnectionSonarrAnime);
+
 document.querySelector('#MediaCleanerConfigPage')
     .addEventListener('pageshow', function() {
         Dashboard.showLoadingMsg();
@@ -139,6 +150,8 @@ document.querySelector('#MediaCleanerConfigPage')
             document.querySelector('#RadarrAddress').value = config.RadarrAddress;
             document.querySelector('#SonarrAPIKey').value = config.SonarrAPIKey;
             document.querySelector('#SonarrAddress').value = config.SonarrAddress;
+            document.querySelector('#SonarrAnimeAPIKey').value = config.SonarrAnimeAPIKey;
+            document.querySelector('#SonarrAnimeAddress').value = config.SonarrAnimeAddress;
             document.querySelector('#StaleMediaCutoff').value = config.StaleMediaCutoff;
             document.querySelector('#DebugMode').checked = config.DebugMode;
             Dashboard.hideLoadingMsg();
@@ -153,6 +166,8 @@ document.querySelector('#MediaCleanerConfigForm')
         config.RadarrAddress = document.querySelector('#RadarrAddress').value;
         config.SonarrAPIKey = document.querySelector('#SonarrAPIKey').value;
         config.SonarrAddress = document.querySelector('#SonarrAddress').value;
+        config.SonarrAnimeAPIKey = document.querySelector('#SonarrAnimeAPIKey').value;
+        config.SonarrAnimeAddress = document.querySelector('#SonarrAnimeAddress').value;
         config.StaleMediaCutoff = document.querySelector('#StaleMediaCutoff').value;
         config.DebugMode = document.querySelector('#DebugMode').checked;
         ApiClient.updatePluginConfiguration(MediaCleanerConfig.pluginUniqueId, config).then(function (result) {

Jellyfin.Plugin.MediaCleaner/Pages/home.html

@@ -33,6 +33,20 @@
                     <tbody></tbody>
                 </table>
                 <button id="seriesDeleteButton" class="delete-button raised button-submit emby-button" style="visibility: hidden;">Delete</button>
+                <br>
+
+                <h3 id="animeSeriesTitle"></h3>
+                <table id="animeSeriesTable">
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Seasons</th>
+                            <th></th>
+                        </tr>
+                    </thead>
+                    <tbody></tbody>
+                </table>
+                <button id="animeSeriesDeleteButton" class="delete-button raised button-submit emby-button" style="visibility: hidden;">Delete</button>
             </div>
 		</div>
 	</div>

Jellyfin.Plugin.MediaCleaner/Pages/home.js

@@ -8,9 +8,11 @@ const refreshFrontEnd = async () => {
 
     var moviesTitle = document.getElementById("moviesTitle");
     var seriesTitle = document.getElementById("seriesTitle");
+    var animeSeriesTitle = document.getElementById("animeSeriesTitle");
 
     moviesTitle.innerHTML = await getMediaCleanerMoviesTitle();
     seriesTitle.innerHTML = await getMediaCleanerSeriesTitle();
+    animeSeriesTitle.innerHTML = await getMediaCleanerAnimeSeriesTitle();
 
     await populateTables();
     addClickHandlersToLinks();
@@ -18,14 +20,24 @@ const refreshFrontEnd = async () => {
     finishLoading();
 }
 
-const getMediaCleanerSeriesInfo = async () => {
-    const response = await fetch("/mediacleaner/state/getSeriesInfo");
+const getMediaCleanerTvSeriesInfo = async () => {
+    const response = await fetch("/mediacleaner/state/getTvSeriesInfo");
 
     if(!response.ok){
         throw new Error(`Response status: ${response.status}`)
     }
 
-    return response.json();
+    return await response.json();
+};
+
+const getMediaCleanerAnimeSeriesInfo = async () => {
+    const response = await fetch("/mediacleaner/state/getAnimeSeriesInfo");
+
+    if(!response.ok){
+        throw new Error(`Response status: ${response.status}`)
+    }
+
+    return await response.json();
 };
 
 const getMediaCleanerMovieInfo = async () => {
@@ -35,7 +47,7 @@ const getMediaCleanerMovieInfo = async () => {
         throw new Error(`Response status: ${response.status}`)
     }
 
-    return response.json();
+    return await response.json();
 };
 
 const updateMediaCleanerState = async () => {
@@ -48,6 +60,16 @@ const updateMediaCleanerState = async () => {
     return response.json();
 };
 
+const getMediaCleanerAnimeSeriesTitle = async () => {
+    const response = await fetch("/mediacleaner/state/getAnimeSeriesTitle");
+
+    if(!response.ok){
+        throw new Error(`Response status: ${response.status}`);
+    }
+
+    return response.json();
+};
+
 const getMediaCleanerSeriesTitle = async () => {
     const response = await fetch("/mediacleaner/state/getSeriesTitle");
 
@@ -71,7 +93,12 @@ const getMediaCleanerMoviesTitle = async () => {
 
 const populateTables = async () => {
     var moviesInfo = await getMediaCleanerMovieInfo();
-    var seriesInfo = await getMediaCleanerSeriesInfo();
+    var seriesInfo = await getMediaCleanerTvSeriesInfo();
+    var animeSeriesInfo = await getMediaCleanerAnimeSeriesInfo();
+
+    var seriesTable = document.getElementById("seriesTable");
+    var moviesTable = document.getElementById("moviesTable");
+    var animeSeriesTable = document.getElementById("animeSeriesTable");
 
     var seriesTableBody = seriesTable.getElementsByTagName('tbody')[0];
     seriesTableBody.replaceChildren();
@@ -81,6 +108,10 @@ const populateTables = async () => {
     moviesTableBody.replaceChildren();
     var moviesDeleteButton = document.getElementById('moviesDeleteButton');
 
+    var animeSeriesTableBody = animeSeriesTable.getElementsByTagName('tbody')[0];
+    animeSeriesTableBody.replaceChildren();
+    var animeSeriesDeleteButton = document.getElementById('animeSeriesDeleteButton');
+
     if (moviesInfo.length > 0){
         for(let i = 0; i < moviesInfo.length; i++){
             var row = moviesTableBody.insertRow(-1);
@@ -120,7 +151,30 @@ const populateTables = async () => {
         var row = seriesTableBody.insertRow(-1);
         var cell1 = row.insertCell(0);
         cell1.colSpan = columnCount;
-        cell1.innerHTML = "No stale series found.";
+        cell1.innerHTML = "No stale tv series found.";
+        cell1.className = "table-text";
+    }
+
+    if(animeSeriesInfo.length > 0){
+        for(let i = 0; i < animeSeriesInfo.length; i++){
+            var row = animeSeriesTableBody.insertRow(-1);
+            var cell1 = row.insertCell(0);
+            var cell2 = row.insertCell(1);
+            var cell3 = row.insertCell(2);
+            cell1.innerHTML = animeSeriesInfo[i].Name;
+            cell1.className = "table-text";
+            cell2.innerHTML = animeSeriesInfo[i].Seasons.map(season => season).join(", ");
+            cell2.className = "table-text";
+            cell3.appendChild(createCheckbox(animeSeriesInfo[i], animeSeriesTable, animeSeriesDeleteButton));
+            cell3.className = "table-checkbox"
+        }
+    }
+    else{
+        var columnCount = animeSeriesTable.tHead.rows[0].cells.length;
+        var row = animeSeriesTableBody.insertRow(-1);
+        var cell1 = row.insertCell(0);
+        cell1.colSpan = columnCount;
+        cell1.innerHTML = "No stale anime series found.";
         cell1.className = "table-text";
     }
 };
@@ -179,8 +233,10 @@ const addClickHandlersToLinks = () => {
 const addClickHandlersToDeleteButtons = () => {
     const deleteMoviesButtonElement = document.getElementById("moviesDeleteButton");
     const deleteSeriesButtonElement = document.getElementById("seriesDeleteButton");
+    const deleteAnimeSeriesButtonElement = document.getElementById("animeSeriesDeleteButton");
     deleteMoviesButtonElement.addEventListener("click", deleteFromRadarr);
     deleteSeriesButtonElement.addEventListener("click", deleteFromSonarr);
+    deleteAnimeSeriesButtonElement.addEventListener("click", deleteFromAnimeSonarr);
 }
 
 const getCheckedMedia = (table) => {
@@ -219,6 +275,20 @@ const deleteSeriesFromSonarrApi = async (series) => {
     }
 }
 
+const deleteSeriesFromAnimeSonarrApi = async (series) => {
+    const response = await fetch("/sonarr/deleteSeriesFromAnimeSonarr", {
+        method: "POST",
+        headers: {
+            'Content-Type': 'application/json'
+        },
+        body: JSON.stringify(series)
+    });
+
+    if(!response.ok){
+        throw new Error(`Response status: ${response.status}`)
+    }
+}
+
 const deleteFromRadarr = async () => {
     const selectedMovies = getCheckedMedia(moviesTable);
     selectedMovies.forEach(async movie => await deleteMovieFromRadarrApi(movie));
@@ -231,6 +301,12 @@ const deleteFromSonarr = () => {
     refreshFrontEnd();
 }
 
+const deleteFromAnimeSonarr = () => {
+    const selectedSeries = getCheckedMedia(animeSeriesTable);
+    selectedSeries.forEach(async series => await deleteSeriesFromAnimeSonarrApi(series));
+    refreshFrontEnd();
+}
+
 const finishLoading = () => {
     const loadingElement = document.getElementById("loading");
     const homepage = document.getElementById("homepage");

Jellyfin.Plugin.MediaCleaner/StaleMediaScanner.cs

@@ -103,7 +103,7 @@ public sealed class StaleMediaScanner
                 movie.ProviderIds.TryGetValue("Tmdb", out string? tmdbId);
                 return new MovieInfo
                 {
-                    TmdbId = tmdbId,
+                    TmdbId = tmdbId ?? string.Empty,
                     Name = movie.Name
                 };
             });
@@ -189,34 +189,6 @@ public sealed class StaleMediaScanner
 
         List<BaseItem> staleSeasons = [.. GetStaleSeasonsWithShortCircuitOnNonStaleSeason(seasons)];
 
-        // [ ..seasons
-        // .Where(season => {
-        //     var episodes = _libraryManager.GetItemList(new InternalItemsQuery
-        //     {
-        //         ParentId = season.Id,
-        //         Recursive = false
-        //     });
-
-        //     _loggingHelper.LogDebugInformation("Season debug information for {SeasonNumber}:", season);
-
-        //     bool isSeasonDataStale = false;
-
-        //     try
-        //     {
-        //         isSeasonDataStale = _seriesHelper.IsSeasonDataStale(episodes);
-        //     }
-        //     catch (ArgumentNullException ex)
-        //     {
-        //         _loggingHelper.LogInformation("Arguement Null Exception in GetStaleSeasons!");
-        //         _loggingHelper.LogInformation(ex.Message);
-        //     }
-
-        //     _loggingHelper.LogDebugInformation("End of season debug information for {SeasonNumber}.", season);
-
-        //     return isSeasonDataStale;
-        // })];
-
-
         _loggingHelper.LogDebugInformation("-------------------------------------------------");
         _loggingHelper.LogDebugInformation("End of scanning for series: {Series}", item);
 
@@ -236,11 +208,12 @@ public sealed class StaleMediaScanner
         {
             series.ProviderIds.TryGetValue("Tvdb", out string? tvdbId);
             series.ProviderIds.TryGetValue("Tmdb", out string? tmdbId);
+
             return new SeriesInfo
             {
                 SeriesId = series.Id,
-                TmdbId = tmdbId,
-                TvdbId = tvdbId,
+                TmdbId = tmdbId ?? string.Empty,
+                TvdbId = tvdbId ?? string.Empty,
                 Name = series.Name,
                 Seasons = [.. seasons.Where(season => season.ParentId == series.Id).Select(season => season.Name.Replace("Season ", "", StringComparison.OrdinalIgnoreCase))]
             };