Allow trackers url to be configurable + version bump (#173)

this allows people to use only the udp collection, only the tcp collection, or all.

deployment/docker/.env.example

@@ -30,6 +30,8 @@ METADATA_INSERT_BATCH_SIZE=50000
 COLLECTOR_QBIT_ENABLED=false
 COLLECTOR_DEBRID_ENABLED=true
 COLLECTOR_REAL_DEBRID_API_KEY=
+QBIT_HOST=http://qbittorrent:8080
+QBIT_TRACKERS_URL=https://ngosang.github.io/trackerslist/trackers_all.txt
 
 # Addon
 DEBUG_MODE=false

deployment/docker/components/knightcrawler.yaml

@@ -20,7 +20,7 @@ x-depends: &knightcrawler-app-depends
 
 services:
   metadata:
-    image: gabisonfire/knightcrawler-metadata:2.0.4
+    image: gabisonfire/knightcrawler-metadata:2.0.7
     env_file: ../.env
     networks:
       - knightcrawler-network
@@ -30,7 +30,7 @@ services:
         condition: service_completed_successfully
 
   migrator:
-    image: gabisonfire/knightcrawler-migrator:2.0.4
+    image: gabisonfire/knightcrawler-migrator:2.0.7
     env_file: ../.env
     networks:
       - knightcrawler-network
@@ -40,7 +40,7 @@ services:
         condition: service_healthy
 
   addon:
-    image: gabisonfire/knightcrawler-addon:2.0.4
+    image: gabisonfire/knightcrawler-addon:2.0.7
     <<: [*knightcrawler-app, *knightcrawler-app-depends]
     restart: unless-stopped
     hostname: knightcrawler-addon
@@ -48,22 +48,22 @@ services:
       - "7000:7000"
 
   consumer:
-    image: gabisonfire/knightcrawler-consumer:2.0.4
+    image: gabisonfire/knightcrawler-consumer:2.0.7
     <<: [*knightcrawler-app, *knightcrawler-app-depends]
     restart: unless-stopped
 
   debridcollector:
-    image: gabisonfire/knightcrawler-debrid-collector:2.0.4
+    image: gabisonfire/knightcrawler-debrid-collector:2.0.7
     <<: [*knightcrawler-app, *knightcrawler-app-depends]
     restart: unless-stopped
         
   producer:
-    image: gabisonfire/knightcrawler-producer:2.0.4
+    image: gabisonfire/knightcrawler-producer:2.0.7
     <<: [*knightcrawler-app, *knightcrawler-app-depends]
     restart: unless-stopped
 
   qbitcollector:
-    image: gabisonfire/knightcrawler-qbit-collector:2.0.4
+    image: gabisonfire/knightcrawler-qbit-collector:2.0.7
     <<: [*knightcrawler-app, *knightcrawler-app-depends]
     restart: unless-stopped
     depends_on:

src/debrid-collector/Extensions/ServiceCollectionExtensions.cs

@@ -62,7 +62,10 @@ public static class ServiceCollectionExtensions
                     cfg.UseMessageRetry(r => r.Intervals(1000,2000,5000));
                     cfg.UseInMemoryOutbox();
                 })
-            .RedisRepository(redisConfiguration.ConnectionString)
+            .RedisRepository(redisConfiguration.ConnectionString, options =>
+            {
+                options.KeyPrefix = "debrid-collector:";
+            })
             .Endpoint(
                 e =>
                 {

src/qbit-collector/Extensions/ServiceCollectionExtensions.cs

@@ -99,7 +99,10 @@ public static class ServiceCollectionExtensions
                             timeout.Timeout = TimeSpan.FromMinutes(1);
                         });
                 })
-            .RedisRepository(redisConfiguration.ConnectionString);
+            .RedisRepository(redisConfiguration.ConnectionString, options =>
+            {
+                options.KeyPrefix = "qbit-collector:";
+            });
     
     private static void AddQBitTorrentClient(this IServiceCollection services)
     {

src/qbit-collector/Features/Qbit/QbitConfiguration.cs

@@ -3,7 +3,9 @@ namespace QBitCollector.Features.Qbit;
 public class QbitConfiguration
 {
     private const string Prefix = "QBIT";
-    private const string ConnectionStringVariable = "HOST";
+    private const string HOST_VARIABLE = "HOST";
+    private const string TRACKERS_URL_VARIABLE = "TRACKERS_URL";
     
-    public string? Host { get; init; } = Prefix.GetRequiredEnvironmentVariableAsString(ConnectionStringVariable);
+    public string? Host { get; init; } = Prefix.GetRequiredEnvironmentVariableAsString(HOST_VARIABLE);
+    public string? TrackersUrl { get; init; } = Prefix.GetRequiredEnvironmentVariableAsString(TRACKERS_URL_VARIABLE);
 }

src/qbit-collector/Features/Trackers/TrackersService.cs

@@ -1,8 +1,7 @@
 namespace QBitCollector.Features.Trackers;
 
-public class TrackersService(IDistributedCache cache, HttpClient client, IMemoryCache memoryCache) : ITrackersService
+public class TrackersService(IDistributedCache cache, HttpClient client, IMemoryCache memoryCache, QbitConfiguration configuration) : ITrackersService
 {
-    private const string TrackersListUrl = "https://ngosang.github.io/trackerslist/trackers_all.txt";
     private const string CacheKey = "trackers";
 
     public async Task<List<string>> GetTrackers()
@@ -42,7 +41,7 @@ public class TrackersService(IDistributedCache cache, HttpClient client, IMemory
 
     private async Task<List<string>> GetTrackersAsync()
     {
-        var response = await client.GetStringAsync(TrackersListUrl);
+        var response = await client.GetStringAsync(configuration.TrackersUrl);
 
         var lines = response.Split(["\r\n", "\r", "\n"], StringSplitOptions.None);