From 22f1fd53a97b63bba0a0e7b10355ffb56e24daca Mon Sep 17 00:00:00 2001 From: martylukyy <35452459+martylukyy@users.noreply.github.com> Date: Sun, 22 Jun 2025 14:24:05 +0200 Subject: [PATCH] feat(indexers): revert UHDBits to old announce format (#2100) * feat(indexers): revert UHDBits regex pattern * feat(indexers): add more tests * feat(indexers): capture year and group --- internal/indexer/definitions/uhdbits.yaml | 42 ++++++++++++++++++----- 1 file changed, 34 insertions(+), 8 deletions(-) diff --git a/internal/indexer/definitions/uhdbits.yaml b/internal/indexer/definitions/uhdbits.yaml index acc3e02..b0bb805 100644 --- a/internal/indexer/definitions/uhdbits.yaml +++ b/internal/indexer/definitions/uhdbits.yaml @@ -66,21 +66,47 @@ irc: type: single lines: - tests: - - line: Category [Movie] A movie [1988] A.Movie.1988.Extended.720p.BluRay.x264-GROUP.mkv [720p, Encode, Freeleech, Scene, mkv] Size [4.99 GB] Url [https://uhdbits.org/torrents.php?action=download&id=00000] + - line: 'New Torrent: Final Destination: Bloodlines [2025] - GROUP Type: Movie / 1080p / WEB-DL / Freeleech: 100 Size: 4.28GB - https://uhdbits.org/torrents.php?id=00000 / https://uhdbits.org/torrents.php?action=download&id=00000' expect: + torrentName: 'Final Destination: Bloodlines' + year: 2025 + releaseGroup: GROUP category: Movie - year: "1988" - torrentName: A.Movie.1988.Extended.720p.BluRay.x264-GROUP.mkv - releaseTags: 720p, Encode, Freeleech, Scene, mkv - torrentSize: 4.99 GB + releaseTags: 1080p / WEB-DL + freeleechPercent: 100 + torrentSize: 4.28GB baseUrl: https://uhdbits.org/ torrentId: "00000" - pattern: 'Category \[(.+)\] .+ \[(\d+)\] (.+) \[(.+)\] Size \[(.+)\] Url \[(https?\:\/\/.+\/).+id=(\d+)\]' + - line: 'New Torrent: Dandadan Season 01 [2024] - GROUP Type: TV / 1080p / Blu-ray / Freeleech: 100 Size: 90.68GB - https://uhdbits.org/torrents.php?id=00000 / https://uhdbits.org/torrents.php?action=download&id=00000' + expect: + torrentName: 'Dandadan Season 01' + year: 2024 + releaseGroup: GROUP + category: TV + releaseTags: 1080p / Blu-ray + freeleechPercent: 100 + torrentSize: 90.68GB + baseUrl: https://uhdbits.org/ + torrentId: "00000" + - line: 'New Torrent: Load (Remastered Deluxe Box Set) [1996] Type: Music / CD / Freeleech: 100 Size: 14.16GB - https://uhdbits.org/torrents.php?id=00000 / https://uhdbits.org/torrents.php?action=download&id=00000' + expect: + torrentName: 'Load (Remastered Deluxe Box Set)' + year: 1996 + releaseGroup: "" + category: Music + releaseTags: CD + freeleechPercent: 100 + torrentSize: 14.16GB + baseUrl: https://uhdbits.org/ + torrentId: "00000" + pattern: 'New Torrent: (.+?) \[(\d{4})\](?: - (.*) )?\s*Type: (.+?) \/ (.*?)[\s\/]+? Freeleech: (.+) Size: (.+) - https?:\/\/.+ \/ (https?:\/\/.+\/).+id=(\d+)' vars: - - category - - year - torrentName + - year + - releaseGroup + - category - releaseTags + - freeleechPercent - torrentSize - baseUrl - torrentId