From c6d4c06d703d95dddb8c76b8d8f50a84e3faeb73 Mon Sep 17 00:00:00 2001 From: iPromKnight <156901906+iPromKnight@users.noreply.github.com> Date: Sat, 30 Mar 2024 01:26:02 +0000 Subject: [PATCH] hotfix categories from imdb result instead (#189) * category mapping from imdb * version bump --- deployment/docker/docker-compose.yaml | 14 ++++++------- .../docker/src/components/knightcrawler.yaml | 14 ++++++------- .../Crawlers/Dmm/DebridMediaManagerCrawler.cs | 21 ++++++++++++++----- 3 files changed, 30 insertions(+), 19 deletions(-) diff --git a/deployment/docker/docker-compose.yaml b/deployment/docker/docker-compose.yaml index 5566fe3..5f9e1b9 100644 --- a/deployment/docker/docker-compose.yaml +++ b/deployment/docker/docker-compose.yaml @@ -94,7 +94,7 @@ services: condition: service_healthy env_file: stack.env hostname: knightcrawler-addon - image: gabisonfire/knightcrawler-addon:2.0.12 + image: gabisonfire/knightcrawler-addon:2.0.13 labels: logging: promtail networks: @@ -117,7 +117,7 @@ services: redis: condition: service_healthy env_file: stack.env - image: gabisonfire/knightcrawler-consumer:2.0.12 + image: gabisonfire/knightcrawler-consumer:2.0.13 labels: logging: promtail networks: @@ -138,7 +138,7 @@ services: redis: condition: service_healthy env_file: stack.env - image: gabisonfire/knightcrawler-debrid-collector:2.0.12 + image: gabisonfire/knightcrawler-debrid-collector:2.0.13 labels: logging: promtail networks: @@ -152,7 +152,7 @@ services: migrator: condition: service_completed_successfully env_file: stack.env - image: gabisonfire/knightcrawler-metadata:2.0.12 + image: gabisonfire/knightcrawler-metadata:2.0.13 networks: - knightcrawler-network restart: "no" @@ -163,7 +163,7 @@ services: postgres: condition: service_healthy env_file: stack.env - image: gabisonfire/knightcrawler-migrator:2.0.12 + image: gabisonfire/knightcrawler-migrator:2.0.13 networks: - knightcrawler-network restart: "no" @@ -182,7 +182,7 @@ services: redis: condition: service_healthy env_file: stack.env - image: gabisonfire/knightcrawler-producer:2.0.12 + image: gabisonfire/knightcrawler-producer:2.0.13 labels: logging: promtail networks: @@ -207,7 +207,7 @@ services: deploy: replicas: ${QBIT_REPLICAS:-0} env_file: stack.env - image: gabisonfire/knightcrawler-qbit-collector:2.0.12 + image: gabisonfire/knightcrawler-qbit-collector:2.0.13 labels: logging: promtail networks: diff --git a/deployment/docker/src/components/knightcrawler.yaml b/deployment/docker/src/components/knightcrawler.yaml index 9d4a8da..3c524ec 100644 --- a/deployment/docker/src/components/knightcrawler.yaml +++ b/deployment/docker/src/components/knightcrawler.yaml @@ -20,7 +20,7 @@ x-depends: &knightcrawler-app-depends services: metadata: - image: gabisonfire/knightcrawler-metadata:2.0.12 + image: gabisonfire/knightcrawler-metadata:2.0.13 env_file: ../../.env networks: - knightcrawler-network @@ -30,7 +30,7 @@ services: condition: service_completed_successfully migrator: - image: gabisonfire/knightcrawler-migrator:2.0.12 + image: gabisonfire/knightcrawler-migrator:2.0.13 env_file: ../../.env networks: - knightcrawler-network @@ -40,7 +40,7 @@ services: condition: service_healthy addon: - image: gabisonfire/knightcrawler-addon:2.0.12 + image: gabisonfire/knightcrawler-addon:2.0.13 <<: [*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.12 + image: gabisonfire/knightcrawler-consumer:2.0.13 <<: [*knightcrawler-app, *knightcrawler-app-depends] restart: unless-stopped debridcollector: - image: gabisonfire/knightcrawler-debrid-collector:2.0.12 + image: gabisonfire/knightcrawler-debrid-collector:2.0.13 <<: [*knightcrawler-app, *knightcrawler-app-depends] restart: unless-stopped producer: - image: gabisonfire/knightcrawler-producer:2.0.12 + image: gabisonfire/knightcrawler-producer:2.0.13 <<: [*knightcrawler-app, *knightcrawler-app-depends] restart: unless-stopped qbitcollector: - image: gabisonfire/knightcrawler-qbit-collector:2.0.12 + image: gabisonfire/knightcrawler-qbit-collector:2.0.13 <<: [*knightcrawler-app, *knightcrawler-app-depends] restart: unless-stopped depends_on: diff --git a/src/producer/src/Features/Crawlers/Dmm/DebridMediaManagerCrawler.cs b/src/producer/src/Features/Crawlers/Dmm/DebridMediaManagerCrawler.cs index b8f0701..431e44b 100644 --- a/src/producer/src/Features/Crawlers/Dmm/DebridMediaManagerCrawler.cs +++ b/src/producer/src/Features/Crawlers/Dmm/DebridMediaManagerCrawler.cs @@ -148,13 +148,10 @@ public partial class DebridMediaManagerCrawler( InfoHash = hashElement.ToString(), Seeders = 0, Leechers = 0, - Category = parsedTorrent.Response.IsMovie switch - { - true => "movies", - false => "tv", - }, + Category = AssignCategory(result), RtnResponse = parsedTorrent.Response.ToJson(), }; + private Task AddToCache(string lowerCaseTitle, ImdbEntry best) { @@ -208,4 +205,18 @@ public partial class DebridMediaManagerCrawler( return (pageIngested, name); } + + private static string AssignCategory(ImdbEntry entry) => + entry.Category switch + { + "movie" => "movies", + "tvMovie" => "movies", + "tvSeries" => "tv", + "tvEpisode" => "tv", + "tvSpecial" => "tv", + "tvMiniSeries" => "tv", + "tv" => "tv", + "short" => "tv", + _ => "unknown", + }; }