From 1f7403f6a5e286e4ab970207720c19002e67cdc2 Mon Sep 17 00:00:00 2001 From: Garfield69 Date: Thu, 2 Jan 2020 08:26:57 +1300 Subject: [PATCH] girotorrent: add new categories add config sort options --- .../Definitions/girotorrent.yml | 105 ++++++++++-------- 1 file changed, 60 insertions(+), 45 deletions(-) diff --git a/src/Jackett.Common/Definitions/girotorrent.yml b/src/Jackett.Common/Definitions/girotorrent.yml index 8f0342f0a..43dc655fe 100644 --- a/src/Jackett.Common/Definitions/girotorrent.yml +++ b/src/Jackett.Common/Definitions/girotorrent.yml @@ -11,11 +11,11 @@ caps: categorymappings: # LIBREDICOLA - - {id: 13, cat: Books, desc: "Giornali e Riviste"} - - {id: 15, cat: Books, desc: "Ebook"} - - {id: 16, cat: Books, desc: "Fumetti"} + - {id: 13, cat: Books/Magazines, desc: "Giornali e Riviste"} + - {id: 15, cat: Books/Ebook, desc: "E-Book"} + - {id: 16, cat: Books/Comics, desc: "Fumetti"} - {id: 70, cat: Books, desc: "Manuali e Guide"} - - {id: 72, cat: Audio/Audiobook, desc: "Audiolibri"} + - {id: 72, cat: Audio/Audiobook, desc: "Audio Libri"} # CINEMA - {id: 17, cat: Movies/Other, desc: "Movie Cam-Ts"} - {id: 18, cat: Movies/Other, desc: "Movie Screener"} @@ -40,11 +40,12 @@ - {id: 32, cat: TV/Anime, desc: "Anime Disney"} - {id: 33, cat: TV/Anime, desc: "Anime"} - {id: 34, cat: TV/Anime, desc: "Anime Altri Cartoni"} + - {id: 62, cat: TV/Anime, desc: "Anime Natale Bimbi Girotor"} # TELEVISIONE - {id: 36, cat: TV, desc: "TV Serie TV"} - {id: 77, cat: TV, desc: "TV Reality"} - {id: 37, cat: TV, desc: "TV Film TV"} - - {id: 59, cat: TV, desc: "TV Sport"} + - {id: 59, cat: TV/Sport, desc: "TV Sport"} - {id: 38, cat: TV, desc: "TV Concerti-Spettacoli"} - {id: 39, cat: TV, desc: "TV Teatro-Cabaret"} - {id: 40, cat: TV/Documentary, desc: "Tv Documentario"} @@ -53,20 +54,21 @@ - {id: 43, cat: Audio, desc: "Musica Italiana"} - {id: 44, cat: Audio, desc: "Musica Straniera"} - {id: 45, cat: Audio, desc: "Musica Compilation"} - - {id: 46, cat: Audio, desc: "Musica Video Clip"} + - {id: 46, cat: Audio/Video, desc: "Musica Video Clip"} - {id: 58, cat: Audio, desc: "Musica Discografie"} # SALA GIOCHI - {id: 47, cat: PC/Games, desc: "PC Games"} - - {id: 48, cat: PC/Games, desc: "PC Giochi PS2-PS3"} - - {id: 49, cat: PC/Games, desc: "PC Giochi Nintendo Wii"} - - {id: 50, cat: PC/Games, desc: "PC Giochi Xbox"} - - {id: 52, cat: PC/Games, desc: "PC Giochi DS-DS3"} + - {id: 48, cat: Console/PS3, desc: "PC Giochi PS2-PS3"} + - {id: 49, cat: Console/Wii, desc: "PC Giochi Nintendo Wii"} + - {id: 50, cat: Console/Xbox, desc: "PC Giochi Xbox"} + - {id: 52, cat: Console/3DS, desc: "PC Giochi DS-DS3"} # SOFTWARE - {id: 54, cat: PC, desc: "PC Programmi Windows"} - {id: 55, cat: PC/Mac, desc: "PC Mac"} - {id: 69, cat: PC, desc: "PC Portable"} - {id: 56, cat: PC, desc: "PC Linux"} # CELLULARI-PALMARI + - {id: 68, cat: PC/Phone-IOS, desc: "IPhone-IPad"} - {id: 71, cat: PC/Phone-Android, desc: "Android APP"} - {id: 74, cat: Other, desc: "Varie"} - {id: 75, cat: Other, desc: "Immagini Wallpaper"} @@ -76,6 +78,30 @@ tv-search: [q, season, ep] movie-search: [q] + settings: + - name: username + type: text + label: Username + - name: password + type: password + label: Password + - name: sort + type: select + label: Sort requested from site + default: "3" + options: + "3": "created" + "5": "seeders" + "4": "size" + "2": "title" + - name: type + type: select + label: Order requested from site + default: "2" + options: + "2": "desc" + "1": "asc" + login: path: index.php?page=login method: post @@ -100,6 +126,7 @@ search: paths: + # 15 results per page fetch 5 (site is slow, dont be greedy and fetch more) - path: index.php inputs: pages: 1 @@ -115,28 +142,16 @@ - path: index.php inputs: pages: 5 - - path: index.php - inputs: - pages: 6 - - path: index.php - inputs: - pages: 7 - - path: index.php - inputs: - pages: 8 - - path: index.php - inputs: - pages: 9 - - path: index.php - inputs: - pages: 10 inputs: search: "{{ .Keywords }}" - category: "{{range .Categories}}{{.}};{{end}}" - page: "torrents" + category: "{{ range .Categories }}{{.}};{{end}}" + page: torrents + # 0 all 1 activeonly 2 deadonly active: 0 - order: 3 - by: 2 + # 0 name 1 name&descr 2 descr 3 uploader 5 gold 6 silver 7 bronze + options: 0 + order: "{{ .Config.sort }}" + by: "{{ .Config.type }}" keywordsfilters: - name: diacritics args: replace @@ -144,19 +159,22 @@ args: ["(?i)\\bS0*(\\d+)\\b", "$1"] - name: re_replace # S01E01 to 1 1 args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "$1 $2"] + rows: selector: div.b-content > table > tbody > tr > td > table.lista > tbody > tr:has(a[href^="index.php?page=torrent-details&id="]) filters: - name: andmatch + fields: - download: - selector: a[href^="index.php?page=downloadcheck&id="] + category: + selector: a[href^="index.php?page=torrents&category="] attribute: href + filters: + - name: querystring + args: category title: selector: a[onmouseover][href^="index.php?page=torrent-details&id="] filters: - # - name: re_replace # replace special characters with " " (space) - # args: ["[^a-zA-Z0-9\\s]|\\.", " "] - name: re_replace # replace special characters with " " (space) args: ["[\\[!\"#$%&'()*+,\\-.\\/:;<=>?@[\\]^_`{|}~]", " "] - name: diacritics @@ -180,15 +198,12 @@ args: ["(?i)\\b(?:Puntate\\s*)(\\d+)\\s?(\\d+)", "E0$1-0$2"] - name: re_replace # rimozioni varie args: ["(?i)(Serie completa|Completat?a?|in pausa)", ""] - category: - selector: a[href^="index.php?page=torrents&category="] - attribute: href - filters: - - name: querystring - args: category details: selector: a[onmouseover][href^="index.php?page=torrent-details&id="] attribute: href + download: + selector: a[href^="index.php?page=downloadcheck&id="] + attribute: href banner: optional: true selector: a[onmouseover][href^="index.php?page=torrent-details&id="] @@ -214,13 +229,13 @@ selector: td:nth-last-child(6) downloadvolumefactor: case: - img[alt="Free Leech"]: "0" - img[alt="Gold 100% Free"]: "0" - img[alt="Silver 50% Free"]: "0.5" - img[alt="Bronze 25% Free"]: "0.75" - "*": "1" + img[alt="Free Leech"]: 0 + img[alt="Gold 100% Free"]: 0 + img[alt="Silver 50% Free"]: 0.5 + img[alt="Bronze 25% Free"]: 0.75 + "*": 1 uploadvolumefactor: - text: "1" + text: 1 uploadvolumefactor: optional: true selector: img[alt$="x Upload Multiplier"]