Fix DMM parser and a couple of other minor issues. (#226 )

Adds missing body parameter (#232 )
Automate pull request for changelog (#231 )
2024-11-19 19:00:06 +00:00 · 2024-11-15 08:35:46 -05:00 · 2024-11-15 08:34:09 -05:00 · 2024-11-15 08:27:29 -05:00 · 2024-11-15 08:26:33 -05:00 · 2024-11-15 08:16:24 -05:00
28 changed files with 298 additions and 87 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -12,6 +12,9 @@ A clear and concise description of what the bug is.

 **To Reproduce**
 Steps to reproduce the behavior:
+1.
+2.
+3.

 **Expected behavior**
 A clear and concise description of what you expected to happen.
@@ -23,6 +26,7 @@ If the logs are short, make sure to triple backtick them, or use https://pastebi
 **Hardware:**
 - OS and distro: [e.g. Raspberry Pi OS, Ubuntu, Rocky]
 - Server: [e.g. VM, Baremetal, Pi]
+ - Knightcrawler Version: [2.0.xx]

 **Additional context**
 Add any other context about the problem here.
--- a/.github/workflows/git_cliff.yml
+++ b/.github/workflows/git_cliff.yml
@@ -0,0 +1,39 @@
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  changelog:
+    name: Generate changelog
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Generate a changelog
+        uses: orhun/git-cliff-action@v3
+        with:
+          config: cliff.toml
+          args: --verbose
+        env:
+          OUTPUT: CHANGELOG.md
+          GITHUB_REPO: ${{ github.repository }}
+
+      - name: Commit
+        run: |
+          git config user.name 'github-actions[bot]'
+          git config user.email 'github-actions[bot]@users.noreply.github.com'
+          set +e
+          git checkout -b feat/changelog_$(date +"%d_%m")
+          git add CHANGELOG.md
+          git commit -m "[skip ci] Update changelog"
+          git push https://${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git feat/changelog_$(date +"%d_%m")
+
+      - name: create pull request
+        run: gh pr create -B main -H feat/changelog_$(date +"%d_%m") --title '[skip ci] Update changelog' --body 'Changelog update by git-cliff'
+        env:
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -0,0 +1,22 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [1.0.0] - 2024-03-25
+### Details
+#### Changed
+- Change POSTGRES_USERNAME to POSTGRES_USER. Oops by @purple-emily
+- Change POSTGRES_DATABASE to POSTGRES_DB by @purple-emily
+- Two movie commands instead of movie and tv by @purple-emily
+- Cleanup RabbitMQ env vars, and Github Pat by @iPromKnight
+
+#### Fixed
+- HRD -> HDR by @mplewis
+
+## New Contributors
+* @mplewis made their first contribution
+
+<!-- generated by git-cliff -->
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -0,0 +1,34 @@
+We use [Meaningful commit messages](https://reflectoring.io/meaningful-commit-messages/)
+
+Tl;dr:
+1. It should answer the question: “What happens if the changes are applied?".
+2. Use the imperative, present tense. It is easier to read and scan quickly:
+```
+Right: Add feature to alert admin for new user registration
+Wrong: Added feature ... (past tense)
+```
+3. The summary should always be able to complete the following sentence:
+`If applied, this commit will… `
+
+We use [git-cliff] for our changelog.
+
+The breaking flag is set to true when the commit has an exclamation mark after the commit type and scope, e.g.:
+`feat(scope)!: this is a breaking change`
+
+Keywords (Commit messages should start with these):
+```
+# Added
+add
+support
+# Removed
+remove
+delete
+# Fixed
+test
+fix
+```
+
+Any other commits will fall under the `Changed` category
+
+
+This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html)
--- a/README.md
+++ b/README.md
@@ -67,30 +67,6 @@ Then set any of the values you wouldd like to customize.

 By default, Knight Crawler is configured to be *relatively* conservative in its resource usage. If running on a decent machine (16GB RAM, i5+ or equivalent), you can increase some settings to increase consumer throughput. This is especially helpful if you have a large backlog from [importing databases](#importing-external-dumps).

-### DebridMediaManager setup (optional)
-
-There are some optional steps you should take to maximise the number of movies/tv shows we can find.
-
-We can search DebridMediaManager hash lists which are hosted on GitHub. This allows us to add hundreds of thousands of movies and tv shows, but it requires a Personal Access Token to be generated. The software only needs read access and only for public repositories. To generate one, please follow these steps:
-
-1. Navigate to GitHub settings -> Developer Settings -> Personal access tokens -> Fine-grained tokens (click [here](https://github.com/settings/tokens?type=beta) for a direct link)
-2. Press `Generate new token`
-3. Fill out the form (example data below):
-   ```
-    Token name:
-        KnightCrawler
-    Expiration:
-        90 days
-    Description:
-        <blank>
-    Repository access
-        (checked) Public Repositories (read-only)
-   ```
-4. Click `Generate token`
-5. Take the new token and add it to the bottom of the [stack.env](deployment/docker/stack.env) file
-   ```
-   GITHUB_PAT=<YOUR TOKEN HERE>
-   ```
 ### Configure external access

 Please choose which applies to you:
--- a/cliff.toml
+++ b/cliff.toml
@@ -0,0 +1,112 @@
+# git-cliff ~ configuration file
+# https://git-cliff.org/docs/configuration
+
+[changelog]
+# changelog header
+header = """
+# Changelog\n
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).\n
+"""
+# template for the changelog body
+# https://keats.github.io/tera/docs/#introduction
+body = """
+{%- macro remote_url() -%}
+  https://github.com/{{ remote.github.owner }}/{{ remote.github.repo }}
+{%- endmacro -%}
+
+{% if version -%}
+    ## [{{ version | trim_start_matches(pat="v") }}] - {{ timestamp | date(format="%Y-%m-%d") }}
+{% else -%}
+    ## [Unreleased]
+{% endif -%}
+
+### Details\
+
+{% for group, commits in commits | group_by(attribute="group") %}
+    #### {{ group | upper_first }}
+    {%- for commit in commits %}
+        - {{ commit.message | upper_first | trim }}\
+            {% if commit.github.username %} by @{{ commit.github.username }}{%- endif -%}
+            {% if commit.github.pr_number %} in \
+              [#{{ commit.github.pr_number }}]({{ self::remote_url() }}/pull/{{ commit.github.pr_number }}) \
+            {%- endif -%}
+    {% endfor %}
+{% endfor %}
+
+{%- if github.contributors | filter(attribute="is_first_time", value=true) | length != 0 %}
+  ## New Contributors
+{%- endif -%}
+
+{% for contributor in github.contributors | filter(attribute="is_first_time", value=true) %}
+  * @{{ contributor.username }} made their first contribution
+    {%- if contributor.pr_number %} in \
+      [#{{ contributor.pr_number }}]({{ self::remote_url() }}/pull/{{ contributor.pr_number }}) \
+    {%- endif %}
+{%- endfor %}\n
+"""
+# template for the changelog footer
+footer = """
+{%- macro remote_url() -%}
+  https://github.com/{{ remote.github.owner }}/{{ remote.github.repo }}
+{%- endmacro -%}
+
+{% for release in releases -%}
+    {% if release.version -%}
+        {% if release.previous.version -%}
+            [{{ release.version | trim_start_matches(pat="v") }}]: \
+                {{ self::remote_url() }}/compare/{{ release.previous.version }}..{{ release.version }}
+        {% endif -%}
+    {% else -%}
+        [unreleased]: {{ self::remote_url() }}/compare/{{ release.previous.version }}..HEAD
+    {% endif -%}
+{% endfor %}
+<!-- generated by git-cliff -->
+"""
+# remove the leading and trailing whitespace from the templates
+trim = true
+
+[git]
+# parse the commits based on https://www.conventionalcommits.org
+conventional_commits = true
+# filter out the commits that are not conventional
+filter_unconventional = true
+# process each line of a commit as an individual commit
+split_commits = false
+# regex for preprocessing the commit messages
+commit_preprocessors = [
+    # remove issue numbers from commits
+    { pattern = '\((\w+\s)?#([0-9]+)\)', replace = "" },
+]
+# regex for parsing and grouping commits
+commit_parsers = [
+    { message = "^.*: add", group = "Added" },
+    { message = "^add", group = "Added" },
+    { message = "^.*: support", group = "Added" },
+    { message = "^support", group = "Added" },
+    { message = "^.*: remove", group = "Removed" },
+    { message = "^remove", group = "Removed" },
+    { message = "^.*: delete", group = "Removed" },
+    { message = "^delete", group = "Removed" },
+    { message = "^.*: test", group = "Fixed" },
+    { message = "^test", group = "Fixed" },
+    { message = "^.*: fix", group = "Fixed" },
+    { message = "^fix", group = "Fixed" },
+    { message = "^.*", group = "Changed" },
+]
+# protect breaking changes from being skipped due to matching a skipping commit_parser
+protect_breaking_commits = false
+# filter out the commits that are not matched by commit parsers
+filter_commits = true
+# regex for matching git tags
+tag_pattern = "v[0-9].*"
+# regex for skipping tags
+skip_tags = "v0.1.0-beta.1"
+# regex for ignoring tags
+ignore_tags = ""
+# sort the tags topologically
+topo_order = false
+# sort the commits inside sections by oldest/newest order
+sort_commits = "oldest"
--- 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.23
+    image: gabisonfire/knightcrawler-addon:2.0.26
    labels:
      logging: promtail
    networks:
@@ -117,7 +117,7 @@ services:
      redis:
        condition: service_healthy
    env_file: stack.env
-    image: gabisonfire/knightcrawler-consumer:2.0.23
+    image: gabisonfire/knightcrawler-consumer:2.0.26
    labels:
      logging: promtail
    networks:
@@ -138,7 +138,7 @@ services:
      redis:
        condition: service_healthy
    env_file: stack.env
-    image: gabisonfire/knightcrawler-debrid-collector:2.0.23
+    image: gabisonfire/knightcrawler-debrid-collector:2.0.26
    labels:
      logging: promtail
    networks:
@@ -152,7 +152,7 @@ services:
      migrator:
        condition: service_completed_successfully
    env_file: stack.env
-    image: gabisonfire/knightcrawler-metadata:2.0.23
+    image: gabisonfire/knightcrawler-metadata:2.0.26
    networks:
      - knightcrawler-network
    restart: "no"
@@ -163,7 +163,7 @@ services:
      postgres:
        condition: service_healthy
    env_file: stack.env
-    image: gabisonfire/knightcrawler-migrator:2.0.23
+    image: gabisonfire/knightcrawler-migrator:2.0.26
    networks:
      - knightcrawler-network
    restart: "no"
@@ -182,7 +182,7 @@ services:
      redis:
        condition: service_healthy
    env_file: stack.env
-    image: gabisonfire/knightcrawler-producer:2.0.23
+    image: gabisonfire/knightcrawler-producer:2.0.26
    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.23
+    image: gabisonfire/knightcrawler-qbit-collector:2.0.26
    labels:
      logging: promtail
    networks:
--- 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.23
+    image: gabisonfire/knightcrawler-metadata:2.0.26
    env_file: ../../.env
    networks:
      - knightcrawler-network
@@ -30,7 +30,7 @@ services:
        condition: service_completed_successfully

  migrator:
-    image: gabisonfire/knightcrawler-migrator:2.0.23
+    image: gabisonfire/knightcrawler-migrator:2.0.26
    env_file: ../../.env
    networks:
      - knightcrawler-network
@@ -40,7 +40,7 @@ services:
        condition: service_healthy

  addon:
-    image: gabisonfire/knightcrawler-addon:2.0.23
+    image: gabisonfire/knightcrawler-addon:2.0.26
    <<: [*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.23
+    image: gabisonfire/knightcrawler-consumer:2.0.26
    <<: [*knightcrawler-app, *knightcrawler-app-depends]
    restart: unless-stopped

  debridcollector:
-    image: gabisonfire/knightcrawler-debrid-collector:2.0.23
+    image: gabisonfire/knightcrawler-debrid-collector:2.0.26
    <<: [*knightcrawler-app, *knightcrawler-app-depends]
    restart: unless-stopped
        
  producer:
-    image: gabisonfire/knightcrawler-producer:2.0.23
+    image: gabisonfire/knightcrawler-producer:2.0.26
    <<: [*knightcrawler-app, *knightcrawler-app-depends]
    restart: unless-stopped

  qbitcollector:
-    image: gabisonfire/knightcrawler-qbit-collector:2.0.23
+    image: gabisonfire/knightcrawler-qbit-collector:2.0.26
    <<: [*knightcrawler-app, *knightcrawler-app-depends]
    restart: unless-stopped
    depends_on:
--- a/src/addon/package-lock.json
+++ b/src/addon/package-lock.json
@@ -12,7 +12,7 @@
        "@redis/client": "^1.5.14",
        "@redis/json": "^1.0.6",
        "@redis/search": "^1.1.6",
-        "all-debrid-api": "^1.1.0",
+        "all-debrid-api": "^1.2.0",
        "axios": "^1.6.1",
        "bottleneck": "^2.19.5",
        "cache-manager": "^3.4.4",
--- a/src/addon/package.json
+++ b/src/addon/package.json
@@ -10,7 +10,7 @@
  },
  "dependencies": {
    "@putdotio/api-client": "^8.42.0",
-    "all-debrid-api": "^1.1.0",
+    "all-debrid-api": "^1.2.0",
    "axios": "^1.6.1",
    "bottleneck": "^2.19.5",
    "cache-manager": "^3.4.4",
--- a/src/addon/src/addon.js
+++ b/src/addon/src/addon.js
@@ -3,6 +3,7 @@ import { addonBuilder } from 'stremio-addon-sdk';
 import { cacheWrapStream } from './lib/cache.js';
 import { dummyManifest } from './lib/manifest.js';
 import * as repository from './lib/repository.js';
+import applyFilters from "./lib/filter.js";
 import applySorting from './lib/sort.js';
 import { toStreamInfo, applyStaticInfo } from './lib/streamInfo.js';
 import { Type } from './lib/types.js';
@@ -32,6 +33,7 @@ builder.defineStreamHandler((args) => {
      .then(records => records
          .sort((a, b) => b.torrent.seeders - a.torrent.seeders || b.torrent.uploadDate - a.torrent.uploadDate)
          .map(record => toStreamInfo(record)))))
+      .then(streams => applyFilters(streams, args.extra))
      .then(streams => applySorting(streams, args.extra))
      .then(streams => applyStaticInfo(streams))
      .then(streams => applyMochs(streams, args.extra))
--- a/src/addon/src/lib/repository.js
+++ b/src/addon/src/lib/repository.js
@@ -84,7 +84,7 @@ export function getImdbIdMovieEntries(imdbId) {
        where: {
            imdbId: { [Op.eq]: imdbId }
        },
-        include: [Torrent],
+        include: { model: Torrent, required: true },
        limit: 500,
        order: [
            [Torrent, 'size', 'DESC']
@@ -99,7 +99,7 @@ export function getImdbIdSeriesEntries(imdbId, season, episode) {
            imdbSeason: { [Op.eq]: season },
            imdbEpisode: { [Op.eq]: episode }
        },
-        include: [Torrent],
+        include: { model: Torrent, required: true },
        limit: 500,
        order: [
            [Torrent, 'size', 'DESC']
@@ -112,7 +112,7 @@ export function getKitsuIdMovieEntries(kitsuId) {
        where: {
            kitsuId: { [Op.eq]: kitsuId }
        },
-        include: [Torrent],
+        include: { model: Torrent, required: true },
        limit: 500,
        order: [
            [Torrent, 'size', 'DESC']
@@ -126,7 +126,7 @@ export function getKitsuIdSeriesEntries(kitsuId, episode) {
            kitsuId: { [Op.eq]: kitsuId },
            kitsuEpisode: { [Op.eq]: episode }
        },
-        include: [Torrent],
+        include: { model: Torrent, required: true },
        limit: 500,
        order: [
            [Torrent, 'size', 'DESC']
--- a/src/addon/src/lib/streamInfo.js
+++ b/src/addon/src/lib/streamInfo.js
@@ -20,7 +20,7 @@ export function toStreamInfo(record) {
  const title = joinDetailParts(
      [
        joinDetailParts([record.torrent.title.replace(/[, ]+/g, ' ')]),
-        joinDetailParts([!sameInfo && record.title || undefined]),
+        joinDetailParts([record.title || undefined]),
        joinDetailParts([
          joinDetailParts([formatSize(record.size)], '💾 ')
        ]),
--- a/src/debrid-collector/Dockerfile
+++ b/src/debrid-collector/Dockerfile
@@ -15,7 +15,7 @@ WORKDIR /app

 ENV PYTHONUNBUFFERED=1

-RUN apk add --update --no-cache python3=~3.11.8-r0 py3-pip && ln -sf python3 /usr/bin/python
+RUN apk add --update --no-cache python3=~3.11 py3-pip && ln -sf python3 /usr/bin/python

 COPY --from=build /src/out .

--- a/src/metadata/Features/Configuration/PostgresConfiguration.cs
+++ b/src/metadata/Features/Configuration/PostgresConfiguration.cs
@@ -8,12 +8,14 @@ public class PostgresConfiguration
    private const string PasswordVariable = "PASSWORD";
    private const string DatabaseVariable = "DB";
    private const string PortVariable = "PORT";
+    private const string CommandTimeoutVariable = "COMMAND_TIMEOUT_SEC"; // Seconds

    private string Host { get; init; } = Prefix.GetRequiredEnvironmentVariableAsString(HostVariable);
    private string Username { get; init; } = Prefix.GetRequiredEnvironmentVariableAsString(UsernameVariable);
    private string Password { get; init; } = Prefix.GetRequiredEnvironmentVariableAsString(PasswordVariable);
    private string Database { get; init; } = Prefix.GetRequiredEnvironmentVariableAsString(DatabaseVariable);
    private int PORT { get; init; } = Prefix.GetEnvironmentVariableAsInt(PortVariable, 5432);
+    private int CommandTimeout { get; init; } = Prefix.GetEnvironmentVariableAsInt(CommandTimeoutVariable, 300);

-    public string StorageConnectionString => $"Host={Host};Port={PORT};Username={Username};Password={Password};Database={Database};";
+    public string StorageConnectionString => $"Host={Host};Port={PORT};Username={Username};Password={Password};Database={Database};CommandTimeout={CommandTimeout}";
 }
--- a/src/metadata/Features/ImportImdbData/ImdbDbService.cs
+++ b/src/metadata/Features/ImportImdbData/ImdbDbService.cs
@@ -134,7 +134,7 @@ public class ImdbDbService(PostgresConfiguration configuration, ILogger<ImdbDbSe
    {
        try
        {
-            await using var connection = CreateNpgsqlConnection();
+            await using var connection = new NpgsqlConnection(configuration.StorageConnectionString);
            await connection.OpenAsync();

            await operation(connection);
@@ -145,16 +145,6 @@ public class ImdbDbService(PostgresConfiguration configuration, ILogger<ImdbDbSe
        }
    }

-    private NpgsqlConnection CreateNpgsqlConnection()
-    {
-        var connectionStringBuilder = new NpgsqlConnectionStringBuilder(configuration.StorageConnectionString)
-        {
-            CommandTimeout = 3000,
-        };
-
-        return new(connectionStringBuilder.ConnectionString);
-    }
-
    private async Task ExecuteCommandWithTransactionAsync(Func<NpgsqlConnection, NpgsqlTransaction, Task> operation, NpgsqlTransaction transaction, string errorMessage)
    {
        try
--- a/src/metadata/Metadata.csproj
+++ b/src/metadata/Metadata.csproj
@@ -13,7 +13,7 @@
      <PackageReference Include="Dapper" Version="2.1.35" />
      <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
      <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
-      <PackageReference Include="Npgsql" Version="8.0.2" />
+      <PackageReference Include="Npgsql" Version="8.0.3" />
      <PackageReference Include="Serilog" Version="3.1.1" />
      <PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
      <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
--- a/src/producer/src/Configuration/scrapers.json
+++ b/src/producer/src/Configuration/scrapers.json
@@ -5,7 +5,7 @@
        "Name": "SyncEzTvJob",
        "IntervalSeconds": 60,
        "Enabled": true,
-        "Url": "https://eztv1.xyz/ezrss.xml",
+        "Url": "https://eztvx.to/ezrss.xml",
        "XmlNamespace": "http://xmlns.ezrss.it/0.1/"
      },
      {
--- a/src/producer/src/Dockerfile
+++ b/src/producer/src/Dockerfile
@@ -14,7 +14,7 @@ WORKDIR /app

 ENV PYTHONUNBUFFERED=1

-RUN apk add --update --no-cache python3=~3.11.8-r0 py3-pip && ln -sf python3 /usr/bin/python
+RUN apk add --update --no-cache python3=~3.11 py3-pip && ln -sf python3 /usr/bin/python

 COPY --from=build /src/out .

--- a/src/producer/src/Features/Crawlers/Dmm/DebridMediaManagerCrawler.cs
+++ b/src/producer/src/Features/Crawlers/Dmm/DebridMediaManagerCrawler.cs
@@ -14,7 +14,7 @@ public partial class DebridMediaManagerCrawler(
    protected override string Source => "DMM";

    private const int ParallelismCount = 4;
-    
+
    public override async Task Execute()
    {
        var tempDirectory = await dmmFileDownloader.DownloadFileToTempPath(CancellationToken.None);
@@ -24,7 +24,7 @@ public partial class DebridMediaManagerCrawler(
        logger.LogInformation("Found {Files} files to parse", files.Length);

        var options = new ParallelOptions { MaxDegreeOfParallelism = ParallelismCount };
-        
+
        await Parallel.ForEachAsync(files, options, async (file, token) =>
        {
            var fileName = Path.GetFileName(file);
@@ -69,9 +69,9 @@ public partial class DebridMediaManagerCrawler(
            if (page.TryGetValue(infoHash, out var dmmContent) &&
                successfulResponses.TryGetValue(dmmContent.Filename, out var parsedResponse))
            {
-                page[infoHash] = dmmContent with {ParseResponse = parsedResponse};
+                page[infoHash] = dmmContent with { ParseResponse = parsedResponse };
            }
-            
+
            return ValueTask.CompletedTask;
        });
    }
@@ -86,7 +86,7 @@ public partial class DebridMediaManagerCrawler(
        }

        var pageSource = await File.ReadAllTextAsync(filePath);
-        
+
        var match = HashCollectionMatcher().Match(pageSource);

        if (!match.Success)
@@ -106,9 +106,34 @@ public partial class DebridMediaManagerCrawler(

        var decodedJson = LZString.DecompressFromEncodedURIComponent(encodedJson.Value);

-        var json = JsonDocument.Parse(decodedJson);
-        
-        var torrents = await json.RootElement.EnumerateArray()
+        JsonElement arrayToProcess;
+        try
+        {
+            var json = JsonDocument.Parse(decodedJson);
+
+            if (json.RootElement.ValueKind == JsonValueKind.Object &&
+                json.RootElement.TryGetProperty("torrents", out var torrentsProperty) &&
+                torrentsProperty.ValueKind == JsonValueKind.Array)
+            {
+                arrayToProcess = torrentsProperty;
+            }
+            else if (json.RootElement.ValueKind == JsonValueKind.Array)
+            {
+                arrayToProcess = json.RootElement;
+            }
+            else
+            {
+                logger.LogWarning("Unexpected JSON format in {Name}", name);
+                return [];
+            }
+        }
+        catch (Exception ex)
+        {
+            logger.LogError("Failed to parse JSON {decodedJson} for {Name}: {Exception}", decodedJson, name, ex);
+            return [];
+        }
+
+        var torrents = await arrayToProcess.EnumerateArray()
            .ToAsyncEnumerable()
            .Select(ParsePageContent)
            .Where(t => t is not null)
@@ -120,7 +145,7 @@ public partial class DebridMediaManagerCrawler(
            await Storage.MarkPageAsIngested(filenameOnly);
            return [];
        }
-        
+
        var torrentDictionary = torrents
            .Where(x => x is not null)
            .GroupBy(x => x.InfoHash)
@@ -141,7 +166,7 @@ public partial class DebridMediaManagerCrawler(
        {
            var (infoHash, dmmContent) = kvp;
            var parsedTorrent = dmmContent.ParseResponse;
-            if (parsedTorrent is not {Success: true})
+            if (parsedTorrent is not { Success: true })
            {
                return;
            }
@@ -192,7 +217,7 @@ public partial class DebridMediaManagerCrawler(
            Category = AssignCategory(result),
            RtnResponse = parsedTorrent.Response.ToJson(),
        };
-    
+

    private Task AddToCache(string cacheKey, ImdbEntry best)
    {
@@ -200,19 +225,19 @@ public partial class DebridMediaManagerCrawler(
        {
            AbsoluteExpirationRelativeToNow = TimeSpan.FromDays(1),
        };
-        
+
        return cache.SetStringAsync(cacheKey, JsonSerializer.Serialize(best), cacheOptions);
    }

    private async Task<(bool Success, ImdbEntry? Entry)> CheckIfInCacheAndReturn(string cacheKey)
    {
        var cachedImdbId = await cache.GetStringAsync(cacheKey);
-        
+
        if (!string.IsNullOrEmpty(cachedImdbId))
        {
            return (true, JsonSerializer.Deserialize<ImdbEntry>(cachedImdbId));
        }
-        
+
        return (false, null);
    }

@@ -222,7 +247,7 @@ public partial class DebridMediaManagerCrawler(

        return (pageIngested, filename);
    }
-    
+
    private static string AssignCategory(ImdbEntry entry) =>
        entry.Category.ToLower() switch
        {
@@ -230,9 +255,9 @@ public partial class DebridMediaManagerCrawler(
            var category when string.Equals(category, "tvSeries", StringComparison.OrdinalIgnoreCase) => "tv",
            _ => "unknown",
        };
-    
+
    private static string GetCacheKey(string category, string title, int year) => $"{category.ToLowerInvariant()}:{year}:{title.ToLowerInvariant()}";
-    
+
    private static ExtractedDMMContent? ParsePageContent(JsonElement item)
    {
        if (!item.TryGetProperty("filename", out var filenameElement) ||
@@ -241,10 +266,10 @@ public partial class DebridMediaManagerCrawler(
        {
            return null;
        }
-        
+
        return new(filenameElement.GetString(), bytesElement.GetInt64(), hashElement.GetString());
    }
-    
+
    private record DmmContent(string Filename, long Bytes, ParseTorrentTitleResponse? ParseResponse);
    private record ExtractedDMMContent(string Filename, long Bytes, string InfoHash);
    private record RtnBatchProcessable(string InfoHash, string Filename);
--- a/src/producer/src/Features/Crawlers/Dmm/ServiceCollectionExtensions.cs
+++ b/src/producer/src/Features/Crawlers/Dmm/ServiceCollectionExtensions.cs
@@ -9,6 +9,7 @@ public static class ServiceCollectionExtensions
            client.BaseAddress = new("https://github.com/debridmediamanager/hashlists/zipball/main/");
            client.DefaultRequestHeaders.Add("Accept-Encoding", "gzip");
            client.DefaultRequestHeaders.UserAgent.ParseAdd("curl");
+            client.Timeout = TimeSpan.FromMinutes(10); // 10 minute timeout, #217
        });

        return services;
--- a/src/producer/src/Features/Crawlers/EzTv/EzTvCrawler.cs
+++ b/src/producer/src/Features/Crawlers/EzTv/EzTvCrawler.cs
@@ -4,7 +4,7 @@ public class EzTvCrawler(IHttpClientFactory httpClientFactory, ILogger<EzTvCrawl
 {
    protected override string Url => scrapeConfiguration.Scrapers.FirstOrDefault(x => x.Name.Equals("SyncEzTvJob", StringComparison.OrdinalIgnoreCase))?.Url ?? string.Empty;
    protected override string Source => "EZTV";
-    private XNamespace XmlNamespace => scrapeConfiguration.Scrapers.FirstOrDefault(x => x.Name.Equals("SyncEzTvJob", StringComparison.OrdinalIgnoreCase))?.Url ?? string.Empty;
+    private XNamespace XmlNamespace => scrapeConfiguration.Scrapers.FirstOrDefault(x => x.Name.Equals("SyncEzTvJob", StringComparison.OrdinalIgnoreCase))?.XmlNamespace ?? string.Empty;

    protected override IReadOnlyDictionary<string, string> Mappings =>
        new Dictionary<string, string>
--- a/src/producer/src/Features/Crawlers/Nyaa/NyaaCrawler.cs
+++ b/src/producer/src/Features/Crawlers/Nyaa/NyaaCrawler.cs
@@ -4,7 +4,7 @@ public class NyaaCrawler(IHttpClientFactory httpClientFactory, ILogger<NyaaCrawl
 {
    protected override string Url => scrapeConfiguration.Scrapers.FirstOrDefault(x => x.Name.Equals("SyncNyaaJob", StringComparison.OrdinalIgnoreCase))?.Url ?? string.Empty;
    protected override string Source => "Nyaa";
-    private XNamespace XmlNamespace => scrapeConfiguration.Scrapers.FirstOrDefault(x => x.Name.Equals("SyncNyaaJob", StringComparison.OrdinalIgnoreCase))?.Url ?? string.Empty;
+    private XNamespace XmlNamespace => scrapeConfiguration.Scrapers.FirstOrDefault(x => x.Name.Equals("SyncNyaaJob", StringComparison.OrdinalIgnoreCase))?.XmlNamespace ?? string.Empty;

    protected override IReadOnlyDictionary<string, string> Mappings =>
        new Dictionary<string, string>
--- a/src/qbit-collector/Dockerfile
+++ b/src/qbit-collector/Dockerfile
@@ -15,7 +15,7 @@ WORKDIR /app

 ENV PYTHONUNBUFFERED=1

-RUN apk add --update --no-cache python3=~3.11.8-r0 py3-pip && ln -sf python3 /usr/bin/python
+RUN apk add --update --no-cache python3=~3.11 py3-pip && ln -sf python3 /usr/bin/python

 COPY --from=build /src/out .

--- a/src/shared/Configuration/PostgresConfiguration.cs
+++ b/src/shared/Configuration/PostgresConfiguration.cs
@@ -8,12 +8,14 @@ public class PostgresConfiguration
    private const string PasswordVariable = "PASSWORD";
    private const string DatabaseVariable = "DB";
    private const string PortVariable = "PORT";
+    private const string CommandTimeoutVariable = "COMMAND_TIMEOUT_SEC"; // Seconds

    private string Host { get; init; } = Prefix.GetRequiredEnvironmentVariableAsString(HostVariable);
    private string Username { get; init; } = Prefix.GetRequiredEnvironmentVariableAsString(UsernameVariable);
    private string Password { get; init; } = Prefix.GetRequiredEnvironmentVariableAsString(PasswordVariable);
    private string Database { get; init; } = Prefix.GetRequiredEnvironmentVariableAsString(DatabaseVariable);
    private int PORT { get; init; } = Prefix.GetEnvironmentVariableAsInt(PortVariable, 5432);
+    private int CommandTimeout { get; init; } = Prefix.GetEnvironmentVariableAsInt(CommandTimeoutVariable, 300);

-    public string StorageConnectionString => $"Host={Host};Port={PORT};Username={Username};Password={Password};Database={Database};";
+    public string StorageConnectionString => $"Host={Host};Port={PORT};Username={Username};Password={Password};Database={Database};CommandTimeout={CommandTimeout}";
 }
--- a/src/shared/SharedContracts.csproj
+++ b/src/shared/SharedContracts.csproj
@@ -15,7 +15,7 @@
  <PackageReference Include="Dapper" Version="2.1.35" />
  <PackageReference Include="MassTransit.Abstractions" Version="8.2.0" />
  <PackageReference Include="MassTransit.RabbitMQ" Version="8.2.0" />
-  <PackageReference Include="Npgsql" Version="8.0.2" />
+  <PackageReference Include="Npgsql" Version="8.0.3" />
  <PackageReference Include="pythonnet" Version="3.0.3" />
  <PackageReference Include="Serilog" Version="3.1.1" />
  <PackageReference Include="Serilog.Extensions.Hosting" Version="8.0.0" />
--- a/src/tissue/Features/DataProcessing/PostgresConfiguration.cs
+++ b/src/tissue/Features/DataProcessing/PostgresConfiguration.cs
@@ -8,12 +8,14 @@ public class PostgresConfiguration
    private const string PasswordVariable = "PASSWORD";
    private const string DatabaseVariable = "DB";
    private const string PortVariable = "PORT";
+    private const string CommandTimeoutVariable = "COMMAND_TIMEOUT_SEC"; // Seconds

    private string Host { get; init; } = Prefix.GetRequiredEnvironmentVariableAsString(HostVariable);
    private string Username { get; init; } = Prefix.GetRequiredEnvironmentVariableAsString(UsernameVariable);
    private string Password { get; init; } = Prefix.GetRequiredEnvironmentVariableAsString(PasswordVariable);
    private string Database { get; init; } = Prefix.GetRequiredEnvironmentVariableAsString(DatabaseVariable);
    private int PORT { get; init; } = Prefix.GetEnvironmentVariableAsInt(PortVariable, 5432);
+    private int CommandTimeout { get; init; } = Prefix.GetEnvironmentVariableAsInt(CommandTimeoutVariable, 300);

-    public string StorageConnectionString => $"Host={Host};Port={PORT};Username={Username};Password={Password};Database={Database};";
+    public string StorageConnectionString => $"Host={Host};Port={PORT};Username={Username};Password={Password};Database={Database};CommandTimeout={CommandTimeout}";
 }
--- a/src/tissue/Tissue.csproj
+++ b/src/tissue/Tissue.csproj
@@ -12,7 +12,7 @@
      <PackageReference Include="Dapper" Version="2.1.28" />
      <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
      <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
-      <PackageReference Include="Npgsql" Version="8.0.1" />
+      <PackageReference Include="Npgsql" Version="8.0.3" />
      <PackageReference Include="Serilog" Version="3.1.1" />
      <PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
      <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
Author	SHA1	Message	Date
Giorgi	594320ed63	Fix DMM parser and a couple of other minor issues. (#226 )	2024-11-19 19:00:06 +00:00
Gabisonfire	a7d5944d25	Adds missing body parameter (#232 )	2024-11-15 08:35:46 -05:00
Gabisonfire	c053a5f8da	Automate pull request for changelog (#231 )	2024-11-15 08:34:09 -05:00
Gabisonfire	5611d3776f	[skip ci] Update changelog (#230 ) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2024-11-15 08:27:29 -05:00
Gabisonfire	833ac11a96	Update git_cliff.yml (#229 )	2024-11-15 08:26:33 -05:00
Gabisonfire	16d8707c48	Commit git cliff to the proper branch (#228 )	2024-11-15 08:16:24 -05:00
Gabisonfire	6dfbaa4739	Fix git cliff branch protection issues (#227 )	2024-11-15 08:11:50 -05:00
FunkeCoder23	03b5617312	Update release workflow (#219 ) * add bare-bones contributing guide * remove GITLAB_PAT token instructions as unneeded * add git cliff workflow and config add git cliff information to contributing.md squash --------- Co-authored-by: funkecoder23 <funkecoder@DESKTOP-AMVOBPG>	2024-11-15 07:39:15 -05:00
David Young	19cb42af77	Update all-debrid-api to v1.2.0 for new IP requirement (#212 ) Signed-off-by: David Young <davidy@funkypenguin.co.nz>	2024-11-15 07:29:53 -05:00
FunkeCoder23	9344531b34	Add longer timeout for DMM (#218 )	2024-07-01 11:40:09 +01:00
FunkeCoder23	723aa6b6a0	update eztv url (#220 ) Co-authored-by: funkecoder23 <funkecoder@DESKTOP-AMVOBPG>	2024-05-18 21:39:14 -04:00
Davide Marcoli	e17b476801	Re-add filter step in the processing of the streams (#215 )	2024-05-15 12:00:02 +01:00
David Young	2a414d8bc0	Always return title and filename (#210 ) Signed-off-by: David Young <davidy@funkypenguin.co.nz>	2024-05-15 11:55:42 +01:00
iPromKnight	9b5f454e6e	Python version bump in alpine (#209 )	2024-04-22 12:49:59 +01:00
iPromKnight	ad9549c695	Version bump for release (#208 )	2024-04-22 12:46:02 +01:00
David Young	1e85cb00ff	INNER JOIN when selecting files and torrents to avoid null results (#207 ) * INNER JOIN when selecting files and torrents to avoid null results Signed-off-by: David Young <davidy@funkypenguin.co.nz> * Extend fix to all torrent types Signed-off-by: David Young <davidy@funkypenguin.co.nz> --------- Signed-off-by: David Young <davidy@funkypenguin.co.nz>	2024-04-22 12:43:57 +01:00
iPromKnight	da640a4071	Fix namespaces on extracted scraper info (#204 ) * Fix namespaces on extracted scrapers * version bump	2024-04-11 18:56:29 +01:00