From bc8a59e513cdcf9153007c52dd7f1ce2325074aa Mon Sep 17 00:00:00 2001 From: ilike2burnthing <59480337+ilike2burnthing@users.noreply.github.com> Date: Mon, 25 Sep 2023 05:21:20 +0100 Subject: [PATCH] mircrew & ildragonero: update indexers with similarities (#14716) --- README.md | 2 +- .../Definitions/ildragonero.yml | 8 +++-- src/Jackett.Common/Definitions/mircrew.yml | 32 +++++++++---------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 4bfa64403..82b1223eb 100644 --- a/README.md +++ b/README.md @@ -189,6 +189,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht * Masters-TB * Mazepa * Metal Tracker + * MIRcrew * MovieWorld (Flicker) * MuseBootlegs (MB) * MVGroup Forum @@ -439,7 +440,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht * MeseVilág (Fairytale World) * MetalGuru [![(invite needed)][inviteneeded]](#) * Milkie - * MIRcrew * MMA-Torrents [![(invite needed)][inviteneeded]](#) * MNV (Max-New-Vision) * MOJBLiNK diff --git a/src/Jackett.Common/Definitions/ildragonero.yml b/src/Jackett.Common/Definitions/ildragonero.yml index dca4b7126..8dad4f296 100644 --- a/src/Jackett.Common/Definitions/ildragonero.yml +++ b/src/Jackett.Common/Definitions/ildragonero.yml @@ -162,11 +162,13 @@ search: filters: # normalize Stagione xx to Sxx format - name: re_replace - args: ["(?i)\\bS(?:tagione )?(\\d{1,3}(?:-\\d{1,3})?)\\b\\s*(.+?)\\s*(?:\\[IN CORSO\\])?\\s*\\[(\\d{1,3}(?:-\\d{1,3})?)\\/(\\d{1,3})\\]", "S$1E$3 of $4 $2"] + args: ["(?i)\\bS(?:tagion[ei] )?(\\d{1,3}(?:-\\d{1,3})?)\\b\\s*(.+?)\\s*(?:\\[IN CORSO\\])?\\s*\\[(\\d{1,3}(?:-\\d{1,3})?)\\/(\\d{1,3})\\]", "S$1E$3 of $4 $2"] - name: re_replace - args: ["(?i)\\bS(?:tagione )?(\\d{1,3}(?:-\\d{1,3})?)\\s+(E\\d{1,3}(?:-\\d{1,3})?)\\/(\\d{1,3})\\b", "S$1$2 of $3"] + args: ["(?i)\\bS(?:tagion[ei] )?(\\d{1,3}(?:-\\d{1,3})?)\\b\\s*(.+?)\\s*(?:\\[IN CORSO\\])?\\s*\\[(\\d{1,3}(?:-\\d{1,3})?)\\]", "S$1E$3 $2"] - name: re_replace - args: ["(?i)\\bStagione (\\d{1,3})\\b", "S$1"] + args: ["(?i)\\bS(?:tagion[ei] )?(\\d{1,3}(?:-\\d{1,3})?)\\s+(E\\d{1,3}(?:-\\d{1,3})?)\\/(\\d{1,3})\\b", "S$1$2 of $3"] + - name: re_replace + args: ["(?i)\\bStagion[ei] (\\d{1,3}(?:-\\d{1,3})?)\\b", "S$1"] - name: re_replace args: ["(?i)\\s*(?:\\[IN CORSO\\])?\\s*\\[(\\d{1,3}(?:-\\d{1,3})?)\\/(\\d{1,3})\\]", " E$1 of $2"] details: diff --git a/src/Jackett.Common/Definitions/mircrew.yml b/src/Jackett.Common/Definitions/mircrew.yml index be99b5c77..e61780bf5 100644 --- a/src/Jackett.Common/Definitions/mircrew.yml +++ b/src/Jackett.Common/Definitions/mircrew.yml @@ -1,9 +1,9 @@ --- id: mircrew name: MIRCrew -description: "MIRCrew is an ITALIAN Private Torrent Tracker for MOVIES / TV / MUSIC" +description: "MIRCrew is an ITALIAN Semi-Private Torrent Tracker for MOVIES / TV / GENERAL" language: it-IT -type: private +type: semi-private encoding: UTF-8 links: - https://mircrew-releases.org/ @@ -53,9 +53,9 @@ caps: # - {id: 55, cat: Movies, desc: "Richieste Video diverse"} # - {id: 57, cat: Movies, desc: "Richieste Video Soddisfatte"} - {id: 33, cat: TV/Anime, desc: "Animazione Releases", default: true} - - {id: 34, cat: TV/Anime, desc: "Anime - Movies", default: true} + - {id: 34, cat: Movies/Other, desc: "Anime - Movies", default: true} - {id: 35, cat: TV/Anime, desc: "Anime - Serie", default: true} - - {id: 36, cat: TV/Anime, desc: "Cartoon - Movies", default: true} + - {id: 36, cat: Movies/Other, desc: "Cartoon - Movies", default: true} - {id: 37, cat: TV/Anime, desc: "Cartoon - Serie", default: true} # - {id: 38, cat: TV/Anime, desc: "Richieste Animazione", default: true} # - {id: 58, cat: TV/Anime, desc: "Richieste Animazione Soddisfatte", default: true} @@ -79,14 +79,6 @@ caps: music-search: [q] book-search: [q] -settings: - - name: username - type: text - label: Username - - name: password - type: password - label: Password - login: path: ucp.php?mode=login method: form @@ -116,17 +108,15 @@ search: paths: - path: search.php keywordsfilters: - # the site's TV are seasonal packs only, so we swap Sxx with Stagione xx + # strip season and/or ep - name: re_replace - args: ["(?i)S0?(\\d{1,2})", "stagione $1"] + args: ["\\b(?:[SE]\\d{1,4}){1,2}\\b", ""] - name: re_replace args: ["(\\w+)", "+$1"] # prepend + to each word inputs: keywords: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}" # all, any terms: all - # Search by Author - author: "" # Search in subforums: yes 1, no 0 sc: 0 # Search For: all, msgonly, titleonly, firstpost @@ -162,7 +152,13 @@ search: filters: # normalize Stagione xx to Sxx format - name: re_replace - args: ["(?i)Stagione 0?(\\d{1,2})", "S$1"] + args: ["(?i)\\bStagion[ei] (\\d{1,3}(?:-\\d{1,3})?)\\b\\s*(.+?)\\s*(?:\\[IN CORSO\\])?\\s*\\[(\\d{1,3}(?:-\\d{1,3})?)\\/(\\d{1,3})\\]", "S$1E$3 of $4 $2"] + - name: re_replace + args: ["(?i)\\bStagion[ei] (\\d{1,3}(?:-\\d{1,3})?)\\b\\s*(.+?)\\s*(?:\\[IN CORSO\\])?\\s*\\[(\\d{1,3}(?:-\\d{1,3})?)\\]", "S$1E$3 $2"] + - name: re_replace + args: ["(?i)\\bStagion[ei] (\\d{1,3}(?:-\\d{1,3})?)\\b", "S$1"] + - name: re_replace + args: ["(?i)\\s*(?:\\[IN CORSO\\])?\\s*\\[(\\d{1,3}(?:-\\d{1,3})?)\\/(\\d{1,3})\\]", " E$1 of $2"] details: selector: a.topictitle attribute: href @@ -182,4 +178,6 @@ search: text: 1 uploadvolumefactor: text: 1 + description: + selector: a.topictitle # phpBB