mirror/Cleanuparr
1
0
Fork 0
mirror of https://github.com/Cleanuparr/Cleanuparr.git synced 2026-05-18 11:34:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

renamed classes; added series search call

Browse Source
This commit is contained in:
Flaminel
2024-11-10 03:17:43 +02:00
parent 781210e978
commit c48090db2f
6 changed files with 81 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/Common/Configuration/QuartzConfig.cs
View File

@@ -2,5 +2,5 @@
public sealed class QuartzConfig
{
public required string FrozenTorrentTrigger { get; init; }
public required string BlockedTorrentTrigger { get; init; }
}

18
code/Executable/DependencyInjection.cs
View File

@@ -1,6 +1,6 @@
using Common.Configuration;
using Executable.Jobs;
using Infrastructure.Verticals.FrozenTorrent;
using Infrastructure.Verticals.BlockedTorrent;
namespace Executable;
using Quartz;
@@ -23,8 +23,8 @@ public static class DependencyInjection
private static IServiceCollection AddServices(this IServiceCollection services) =>
services
.AddTransient<FrozenTorrentJob>()
.AddTransient<FrozenTorrentHandler>();
.AddTransient<BlockedTorrentJob>()
.AddTransient<BlockedTorrentHandler>();
private static IServiceCollection AddQuartzServices(this IServiceCollection services, IConfiguration configuration) =>
services
@@ -37,24 +37,24 @@ public static class DependencyInjection
throw new NullReferenceException("Quartz configuration is null");
}
q.AddFrozenTorrentJob(config.FrozenTorrentTrigger);
q.AddBlockedTorrentJob(config.BlockedTorrentTrigger);
})
.AddQuartzHostedService(opt =>
{
opt.WaitForJobsToComplete = true;
});
private static void AddFrozenTorrentJob(this IServiceCollectionQuartzConfigurator q, string trigger)
private static void AddBlockedTorrentJob(this IServiceCollectionQuartzConfigurator q, string trigger)
{
q.AddJob<FrozenTorrentJob>(opts =>
q.AddJob<BlockedTorrentJob>(opts =>
{
opts.WithIdentity(nameof(FrozenTorrentJob));
opts.WithIdentity(nameof(BlockedTorrentJob));
});
q.AddTrigger(opts =>
{
opts.ForJob(nameof(FrozenTorrentJob))
.WithIdentity($"{nameof(FrozenTorrentJob)}-trigger")
opts.ForJob(nameof(BlockedTorrentJob))
.WithIdentity($"{nameof(BlockedTorrentJob)}-trigger")
.WithCronSchedule(trigger);
});
}

29
code/Executable/Jobs/BlockedTorrentJob.cs Normal file
View File

@@ -0,0 +1,29 @@
using Infrastructure.Verticals.BlockedTorrent;
using Quartz;
namespace Executable.Jobs;
[DisallowConcurrentExecution]
public sealed class BlockedTorrentJob : IJob
{
private ILogger<BlockedTorrentJob> _logger;
private BlockedTorrentHandler _handler;
public BlockedTorrentJob(ILogger<BlockedTorrentJob> logger, BlockedTorrentHandler handler)
{
_logger = logger;
_handler = handler;
}
public async Task Execute(IJobExecutionContext context)
{
try
{
await _handler.HandleAsync();
}
catch (Exception ex)
{
_logger.LogError(ex, $"{nameof(BlockedTorrentJob)} failed");
}
}
}

29
code/Executable/Jobs/FrozenTorrentJob.cs
View File

@@ -1,29 +0,0 @@
using Infrastructure.Verticals.FrozenTorrent;
using Quartz;
namespace Executable.Jobs;
[DisallowConcurrentExecution]
public sealed class FrozenTorrentJob : IJob
{
private ILogger<FrozenTorrentJob> _logger;
private FrozenTorrentHandler _handler;
public FrozenTorrentJob(ILogger<FrozenTorrentJob> logger, FrozenTorrentHandler handler)
{
_logger = logger;
_handler = handler;
}
public async Task Execute(IJobExecutionContext context)
{
try
{
await _handler.HandleAsync();
}
catch (Exception ex)
{
_logger.LogError(ex, $"{nameof(FrozenTorrentJob)} failed");
}
}
}

2
code/Executable/appsettings.json
View File

@@ -8,7 +8,7 @@
}
},
"QuartzConfig": {
"FrozenTorrentTrigger": "0 0/5 * * * ?"
"BlockedTorrentTrigger": "0 0/5 * * * ?"
},
"QBitConfig": {
"Url": "http://localhost:8080",

53
code/Infrastructure/Verticals/FrozenTorrent/FrozenTorrentHandler.cs → code/Infrastructure/Verticals/BlockedTorrent/BlockedTorrentHandler.cs
View File

@@ -1,25 +1,27 @@
using Common.Configuration;
using System.Text;
using Common.Configuration;
using Domain.Sonarr.Queue;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using Newtonsoft.Json;
using QBittorrent.Client;
namespace Infrastructure.Verticals.FrozenTorrent;
namespace Infrastructure.Verticals.BlockedTorrent;
public sealed class FrozenTorrentHandler
public sealed class BlockedTorrentHandler
{
private readonly ILogger<FrozenTorrentHandler> _logger;
private readonly ILogger<BlockedTorrentHandler> _logger;
private readonly QBitConfig _qBitConfig;
private readonly SonarrConfig _sonarrConfig;
private readonly HttpClient _httpClient;
private const string SonarListUriTemplate = "/api/v3/queue?page={0}&pageSize=200&sortKey=timeleft";
private const string SonarDeleteUriTemplate = "/api/v3/queue/{0}?removeFromClient=true&blocklist=true&skipRedownload=true&changeCategory=false";
public FrozenTorrentHandler(
ILogger<FrozenTorrentHandler> logger,
private const string QueueListPathTemplate = "/api/v3/queue?page={0}&pageSize=200&sortKey=timeleft";
private const string QueueDeletePathTemplate = "/api/v3/queue/{0}?removeFromClient=true&blocklist=true&skipRedownload=true&changeCategory=false";
private const string SonarrCommandUriPath = "/api/v3/command";
private const string SearchCommandPayloadTemplate = "{\"name\":\"SeriesSearch\",\"seriesId\":{0}}";
public BlockedTorrentHandler(
ILogger<BlockedTorrentHandler> logger,
IOptions<QBitConfig> qBitConfig,
IOptions<SonarrConfig> sonarrConfig,
IHttpClientFactory httpClientFactory)
@@ -41,10 +43,11 @@ public sealed class FrozenTorrentHandler
ushort page = 1;
int totalRecords = 0;
int processedRecords = 0;
List<int> seriesToBeRefreshed = [];
do
{
Uri sonarrUri = new(sonarrInstance.Url, string.Format(SonarListUriTemplate, page));
Uri sonarrUri = new(sonarrInstance.Url, string.Format(QueueListPathTemplate, page));
HttpRequestMessage sonarrRequest = new(HttpMethod.Get, sonarrUri);
sonarrRequest.Headers.Add("x-api-key", sonarrInstance.ApiKey);
@@ -80,7 +83,9 @@ public sealed class FrozenTorrentHandler
continue;
}
sonarrUri = new(sonarrInstance.Url, string.Format(SonarDeleteUriTemplate, record.Id));
seriesToBeRefreshed.Add(record.SeriesId);
sonarrUri = new(sonarrInstance.Url, string.Format(QueueDeletePathTemplate, record.Id));
sonarrRequest = new(HttpMethod.Delete, sonarrUri);
sonarrRequest.Headers.Add("x-api-key", sonarrInstance.ApiKey);
@@ -96,6 +101,30 @@ public sealed class FrozenTorrentHandler
throw;
}
}
foreach (int id in seriesToBeRefreshed)
{
sonarrUri = new(sonarrInstance.Url, SonarrCommandUriPath);
sonarrRequest = new(HttpMethod.Post, sonarrUri);
sonarrRequest.Content = new StringContent(
SearchCommandPayloadTemplate.Replace("{0}", id.ToString()),
Encoding.UTF8,
"application/json"
);
sonarrRequest.Headers.Add("x-api-key", sonarrInstance.ApiKey);
response = await _httpClient.SendAsync(sonarrRequest);
try
{
response.EnsureSuccessStatusCode();
}
catch
{
_logger.LogError("series search failed | series id: {id}", id);
throw;
}
}
if (queueResponse.Records.Count is 0)
{