From 762e9991098022d6fe9d1dbe0090a48e25b0f9f4 Mon Sep 17 00:00:00 2001 From: Garfield69 Date: Mon, 11 Oct 2021 20:45:34 +1300 Subject: [PATCH] removed montorrent. resolves #10860 --- README.md | 1 - src/Jackett.Common/Definitions/montorrent.yml | 191 ------------------ src/Jackett.Updater/Program.cs | 1 + 3 files changed, 1 insertion(+), 192 deletions(-) delete mode 100644 src/Jackett.Common/Definitions/montorrent.yml diff --git a/README.md b/README.md index 7697cfb65..2043f940d 100644 --- a/README.md +++ b/README.md @@ -88,7 +88,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht * MegaPeer * MejorTorrent * MixTapeTorrent - * Montorrent * MoviesDVDR * MovieTorrent * MyPornClub diff --git a/src/Jackett.Common/Definitions/montorrent.yml b/src/Jackett.Common/Definitions/montorrent.yml deleted file mode 100644 index 11cfd0796..000000000 --- a/src/Jackett.Common/Definitions/montorrent.yml +++ /dev/null @@ -1,191 +0,0 @@ ---- -id: montorrent -name: MonTorrent -description: "MonTorrent is a FRENCH Public Indexer" -language: fr-FR -type: public -encoding: UTF-8 -followredirect: true -links: - - https://www.montorrent.com/ - -caps: - categorymappings: - - {id: "vo", cat: Movies, desc: "Films VO"} - - {id: "vostfr", cat: Movies, desc: "Films VOSTFR"} - - {id: "dvdrip", cat: Movies/SD, desc: "Films DVDRip"} - - {id: "brrip", cat: Movies/SD, desc: "Films BRRip"} - - {id: "bdrip", cat: Movies/SD, desc: "Films BDRip"} - - {id: "webrip", cat: Movies/WEB-DL, desc: "Films WEBRip"} - - {id: "hdrip", cat: Movies/SD, desc: "Films HDRip"} - - {id: "dvdscreener", cat: Movies, desc: "Films DVDScreener"} - - {id: "screener", cat: Movies, desc: "Films Screener"} - - {id: "hd2160p", cat: Movies/UHD, desc: "Films 2160p"} - - {id: "hd1080p", cat: Movies/HD, desc: "Films 1080p"} - - {id: "hd720p", cat: Movies/HD, desc: "Films 720p"} - - {id: "hd2160p-hdlight", cat: Movies/UHD, desc: "Films 2160p HDLight"} - - {id: "hd1080p-hdlight", cat: Movies/HD, desc: "Films 1080p HDLight"} - - {id: "hd720p-hdlight", cat: Movies/HD, desc: "Films 720p HDLight"} - - {id: "hd3d", cat: Movies/3D, desc: "Films 3D"} - - {id: "serie-vostfr", cat: TV, desc: "TV VOSTFR"} - - {id: "serie-vf", cat: TV, desc: "TV VF"} - - {id: "pack-vf", cat: TV, desc: "TV Pack VF"} - - {id: "pack-vostfr", cat: TV, desc: "TV Pack VOSTFR"} - - {id: "pack-vo", cat: TV, desc: "TV Pack VO"} - - {id: "albums", cat: Audio, desc: "Albums"} - - {id: "jeux-pc", cat: PC/Games, desc: "Jeux PC"} - - {id: "jeux-console", cat: Console, desc: "Jeux Consoles"} - - {id: "logiciels", cat: PC/0day, desc: "Logiciels"} - - {id: "ebooks", cat: Books/EBook, desc: "eBooks"} - - modes: - search: [q] - tv-search: [q, season, ep] - movie-search: [q] - music-search: [q] - book-search: [q] - -settings: - - name: filter_title - type: checkbox - label: Try to normalize releases names by moving year after the title - default: false - - name: langfilter - type: select - label: Lang Filter / Filtre Langue - default: on - options: - on: Tous - french: French - truefrench: TrueFrench - vostfr: VOSTFR - vo: VO - - name: multilang - type: checkbox - label: Replace MULTI by another language in release name - default: false - - name: multilanguage - type: select - label: Replace MULTI by this language - default: FRENCH - options: - FRENCH: FRENCH - MULTI.FRENCH: MULTI.FRENCH - ENGLISH: ENGLISH - MULTI.ENGLISH: MULTI.ENGLISH - VOSTFR: VOSTFR - MULTI.VOSTFR: MULTI.VOSTFR - - name: vostfr - type: checkbox - label: Replace VOSTFR with ENGLISH - default: false - - name: enhancedAnime - type: checkbox - label: Enhance sonarr compatibility with anime by renaming episode (xxx to exxx). Works only if episode is at the end of the query. Can disturb movies search. (back to the future 3 -> back to the future e3) - default: false - - name: order - type: select - label: Sort requested from site - default: id - options: - id: id - seeders: seeders - size: taille - rls: name - - name: orderby - type: select - label: Order requested from site - default: desc - options: - desc: desc - asc: asc - - name: flaresolverr - type: info - label: FlareSolverr - default: This site may use Cloudflare DDoS Protection, therefore Jackett requires FlareSolver to access it. - -search: - paths: - - path: "{{ if .Keywords }}/recherche/?query={{ .Keywords }}&{{ else }}/torrents/?{{ end }}langue={{ .Config.langfilter }}&order={{ .Config.order }}&orderby={{ .Config.orderby }}" - - path: "{{ if .Keywords }}/recherche/?query={{ .Keywords }}&{{ else }}/torrents/?{{ end }}langue={{ .Config.langfilter }}&order={{ .Config.order }}&orderby={{ .Config.orderby }}&page=2" - - rows: - selector: div.t-details - filters: - - name: andmatch - - fields: - category: - optional: true - selector: a[href*="id_cat"] - attribute: class - filters: - - name: replace - args: ["liste-categorie-couleur ", ""] - title_normal: - selector: a[href^="/torrent/"] - title_filtered: - text: "{{ .Result.title_normal }}" - filters: - - name: re_replace - args: ["(?i)^(?:(.+?)((?:[\\.\\-\\s_\\[]+(?:imax|(?:dvd|bd|tv)(?:rip|scr)|bluray(?:\\-?rip)?|720\\s*p?|1080\\s*p?|vof?|vost(?:fr)?|multi|vf(?:f|q)?[1-3]?|(?:true)?french|eng?)[\\.\\-\\s_\\]]*)*)([\\(\\[]?(?:20|1[7-9])\\d{2}[\\)\\]]?)(.*)$|(.*))$", "$1 $3 $2 $4 $5"] - - name: replace - args: [".", " "] - - name: trim - - name: re_replace - args: ["(?i)\\s(mkv|avi|divx|xvid|mp4)$", ""] - - name: re_replace - args: ["(\\s{2,5})", " "] - - name: trim - title_phase1: - text: "{{ if .Config.filter_title }}{{ .Result.title_filtered }}{{ else }}{{ .Result.title_normal }}{{ end }}" - title_multilang: - text: "{{ .Result.title_phase1 }}" - filters: - - name: re_replace - args: ["(?i)[\\.\\s\\[\\-]multi[\\.\\s\\]\\-]", ".{{ .Config.multilanguage }}."] - title_phase2: - text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}" - title_vostfr: - text: "{{ .Result.title_phase2 }}" - filters: - - name: re_replace - args: ["(?i)[\\.\\s\\[\\-]vostfr[\\.\\s\\]\\-]", ".ENGLISH."] - - name: re_replace - args: ["(?i)[\\.\\s\\[\\-]subfrench[\\.\\s\\]\\-]", ".ENGLISH."] - title_phase3: - text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}" - title_anime: - text: "{{ .Result.title_phase3 }}" - filters: - # Sonarr need E in front of 3 digit number or else it thinks it is episode - # S01E10 for number 110 for example ==> enhancedAnime - - name: re_replace - args: ["(.*)(\\.| |\\-)(\\d{2,3})(\\.| |\\-)(.*)", "$1 E$3 $5"] - title: - text: "{{ if .Config.enhancedAnime }}{{ .Result.title_anime }}{{ else }}{{ .Result.title_phase3 }}{{ end }}" - details: - selector: a[href^="/torrent/"] - attribute: href - download: - selector: a[href^="/telechargement/"] - attribute: href - size: - selector: div.t-taille - date: - text: now - seeders: - text: 0 - seeders: - selector: div.t-sources - optional: true - leechers: - text: 0 - leechers: - selector: div.t-clients - optional: true - downloadvolumefactor: - text: 0 - uploadvolumefactor: - text: 1 -# engine n/a diff --git a/src/Jackett.Updater/Program.cs b/src/Jackett.Updater/Program.cs index bfe9b9337..0dc5daaec 100644 --- a/src/Jackett.Updater/Program.cs +++ b/src/Jackett.Updater/Program.cs @@ -381,6 +381,7 @@ namespace Jackett.Updater "Definitions/mkvcage.yml", "Definitions/moecat.yml", "Definitions/monova.yml", + "Definitions/montorrent.yml", "Definitions/movcr.yml", "Definitions/moviezone.yml", // migrated to teracod #9743 "Definitions/music-master.yml",