diff --git a/src/Jackett.Common/Definitions/torrent-pirat.yml b/src/Jackett.Common/Definitions/torrent-pirat.yml index 0a40abe36..c56972b9a 100644 --- a/src/Jackett.Common/Definitions/torrent-pirat.yml +++ b/src/Jackett.Common/Definitions/torrent-pirat.yml @@ -144,33 +144,31 @@ caps: modes: search: [q] - tv-search: [q] - movie-search: [q] settings: - name: sort type: select label: Sort requested from site - default: "t" + default: t options: - "t": "created" - "ts": "seeders" - "sz": "size" - "i": "title" + t: created + ts: seeders + sz: size + i: title - name: type type: select label: Order requested from site - default: "d" + default: d options: - "d": "desc" - "a": "asc" + d: desc + a: asc search: paths: - path: search.php inputs: tracker_search: torrent - keywords: "{{ if .Keywords }}{{ .Keywords }}{{else}}2020{{end}}" + keywords: "{{ if .Keywords }}{{ .Keywords }}{{ else }}2020{{ end }}" terms: all fp: 1 author: "" @@ -235,7 +233,7 @@ search: - name: dateparse args: "02.01.2006" date: - text: "{{ if .Result.find_date }}{{ .Result.find_date}}{{else}}now{{end}}" + text: "{{ if .Result.find_date }}{{ .Result.find_date}}{{ else }}now{{ end }}" downloadvolumefactor: text: 0 uploadvolumefactor: diff --git a/src/Jackett.Common/Definitions/torrentgalaxyorg.yml b/src/Jackett.Common/Definitions/torrentgalaxyorg.yml index 3ee8a24c0..bdfd1a446 100644 --- a/src/Jackett.Common/Definitions/torrentgalaxyorg.yml +++ b/src/Jackett.Common/Definitions/torrentgalaxyorg.yml @@ -82,19 +82,19 @@ settings: - name: sort type: select label: Sort requested from site - default: "id" + default: id options: - "id": "created" - "seeders": "seeders" - "size": "size" - "name": "title" + id: created + seeders: seeders + size: size + name: title - name: type type: select label: Order requested from site - default: "desc" + default: desc options: - "desc": "desc" - "asc": "asc" + desc: desc + asc: asc login: # https://torrentgalaxy.to/galaxyfence.php?f&dropoff=%2Ftorrents.php%3Fsearch%3DHarry%2BPotter diff --git a/src/Jackett.Common/Definitions/torrenthr.yml b/src/Jackett.Common/Definitions/torrenthr.yml index 2c265d8b3..d26980691 100644 --- a/src/Jackett.Common/Definitions/torrenthr.yml +++ b/src/Jackett.Common/Definitions/torrenthr.yml @@ -49,7 +49,7 @@ login: inputs: username: "{{ .Config.username }}" password: "{{ .Config.password }}" - ssl: "yes" + ssl: yes error: - selector: div.glavni:has(div.glavni_naslov:contains("Greška")) test: @@ -60,12 +60,14 @@ search: - path: browse.php inputs: $raw: "{{range .Categories}}c{{.}}=1&{{end}}" - search: "{{ .Query.Keywords }}" - incldead: "1" - sort: "4" - type: "desc" + search: "{{ .Keywords }}" + incldead: 1 + sort: 4 + type: desc + rows: selector: div.glavni_txt table > tbody > tr[id^="record-"] + fields: title: selector: a[href^="details.php?id="] @@ -104,10 +106,10 @@ search: grabs: selector: td:nth-child(7) filters: - - name: regexp - args: ([\d,]+) - name: replace args: [",", ""] + - name: regexp + args: (\d+) seeders: selector: td:nth-child(9) leechers: @@ -120,19 +122,20 @@ search: - name: regexp args: "return overlibImage\\('.*','(.*)'\\);" downloadvolumefactor: - text: "0" + text: 0 uploadvolumefactor: - text: "1" + text: 1 date: selector: td:nth-child(2) > small filters: - name: replace args: [" u ", " "] - name: append - args: " +00:00" + args: " +00:00" # auto adjusted by site account profile - name: dateparse args: "02.01.2006 15:04:05 -07:00" description: optional: true selector: td:nth-child(2) remove: a, br, small +# engine tbd diff --git a/src/Jackett.Common/Definitions/torrentleech-pl.yml b/src/Jackett.Common/Definitions/torrentleech-pl.yml index b6132dc76..35ac73795 100644 --- a/src/Jackett.Common/Definitions/torrentleech-pl.yml +++ b/src/Jackett.Common/Definitions/torrentleech-pl.yml @@ -52,27 +52,10 @@ settings: type: info label: How to get the Cookie default: "
  1. Login to this tracker with your browser
  2. Open the DevTools panel by pressing F12
  3. Select the Network tab
  4. Click on the Doc button (Chrome Browser) or HTML button (FireFox)
  5. Refresh the page by pressing F5
  6. Click on the first row entry
  7. Select the Headers tab on the Right panel
  8. Find 'cookie:' in the Request Headers section
  9. Select and Copy the whole cookie string (everything after 'cookie: ') and Paste here.
" - - name: drop_polish_prefix type: checkbox label: Drop the Polish title prefix default: false -# - name: sort -# type: select -# label: Sort requested from site -# default: "4" -# options: -# "4": "created" -# "7": "seeders" -# "5": "size" -# "1": "title" -# - name: type -# type: select -# label: Order requested from site -# default: "desc" -# options: -# "desc": "desc" -# "asc": "asc" login: method: cookie @@ -88,18 +71,16 @@ search: - path: browse.php inputs: $raw: "{{ range .Categories }}c{{.}}=1&{{end}}" - search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}" - # 0 onlyactive 1 all 2 onlydead 3 free + search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" + # 0 onlyactive, 1 all, 2 onlydead, 3 free incldead: 1 - # 0 title 1 descr 2 both + # 0 title, 1 descr, 2 both titlesearch: "{{ if .Query.IMDBID }}1{{else}}0{{end}}" - # 0 all 1 polish 2 not polish + # 0 all, 1 polish, 2 not polish polish: 0 cat_film: "" - # subtitles 0 everything 1 yes 2 no + # subtitles: 0 everything, 1 yes, 2 no napisy: 0 -# sort: "{{ .Config.sort }}" -# type: "{{ .Config.type }}" keywordsfilters: # remove the year from the titles as the site chokes on them during search #7424 - name: re_replace @@ -157,7 +138,7 @@ search: selector: td:nth-child(4) filters: - name: append - args: " +00:00" + args: " +00:00" # auto adjusted by site account profile - name: dateparse args: "2006-01-0215:04:05 -07:00" size: diff --git a/src/Jackett.Common/Definitions/torrentoyunindir.yml b/src/Jackett.Common/Definitions/torrentoyunindir.yml index 63daacac6..64950887e 100644 --- a/src/Jackett.Common/Definitions/torrentoyunindir.yml +++ b/src/Jackett.Common/Definitions/torrentoyunindir.yml @@ -23,7 +23,7 @@ download: search: paths: - - path: "{{ if .Keywords }}?s={{ .Keywords }}{{else}}{{end}}" + - path: "{{ if .Keywords }}?s={{ .Keywords }}{{ else }}{{ end }}" rows: selector: div.moviefilm diff --git a/src/Jackett.Common/Definitions/torrentparadise.yml b/src/Jackett.Common/Definitions/torrentparadise.yml index 27ea87302..b8412b237 100644 --- a/src/Jackett.Common/Definitions/torrentparadise.yml +++ b/src/Jackett.Common/Definitions/torrentparadise.yml @@ -14,172 +14,172 @@ legacylinks: caps: categories: "": Other - "ADULT": XXX - "ADULTLATINA": XXX - "ADULTMILF": XXX - "ADULTHDMOVIES": XXX - "ADULTPORN": XXX - "ADULTXXX": XXX - "ANDROID": PC - "ANIME": TV/Anime - "ANIMEDUBBEDSUBBED": TV/Anime - "APPLICATIONS": PC - "APPLICATIONSANDROID": PC - "APPLICATIONSHANDHELD": PC/Phone-Other - "APPLICATIONSMAC": PC/Mac - "APPLICATIONSOTHEROS": PC - "APPLICATIONSWINDOWS": PC/0day - "APPS": PC - "APPSANDROID": PC - "APPSHANDHELD": PC/Phone-Other - "APPSMAC": PC/Mac - "APPSOTHEROS": PC - "APPSPC": PC - "APPSWINDOWS": PC/0day - "AUDIO": Audio - "AUDIOBOOKS": Audio/Audiobook - "AUDIOAUDIOBOOKS": Audio/Audiobook - "AUDIOFLAC": Audio/Lossless - "AUDIOLOSSLESS": Audio/Lossless - "AUDIOMP3": Audio/MP3 - "AUDIOMUSIC": Audio - "AUDIOOTHER": Audio/Other - "AUDIOSOUNDCLIPS": Audio - "ADULTGAMES": XXX - "ADULTMOVIES": XXX - "BOOKS": Books - "BOOKSAUDIO": Audio/Audiobook - "BOOKSCOMICS": Books/Comics - "BOOKSEBOOKS": Books/Ebook - "BOOKSMAGAZINES": Books/Magazines - "BOOKSNONFICTION": Books - "BOOKSTEXTBOOKS": Books - "COMICSNEM43COMICS": Books/Comics - "DESIPORN": XXX - "DOCUMENTARIES": TV/Documentary - "DVDRVIDEO": Movies/DVD - "EBOOKS": Books/Ebook - "EBOOKSTUTORIALS": Books/Ebook - "ESTRENOS": XXX - "FLAC": Audio/Lossless - "FLACMUSIC": Audio/Lossless - "GAMES": PC/Games - "GAMESANDROID": PC/Games - "GAMESHANDHELD": Console - "GAMESOTHER": Console - "GAMESPC": PC/Games - "GAMESPS2": Console/PSP - "GAMESPS3": Console/PS3 - "GAMESPS4": Console/PS4 - "GAMESPSP": Console/PSP - "GAMESWII": Console/Wii - "GAMESWIIU": Console/WiiU - "GAMESWINDOWS": PC/Games - "GAMESXBOX": Console/Xbox - "GAMESXBOX360": Console/Xbox 360 - "IMAGES": Other - "JAPANESEANIME": TV/Anime - "JUEGOS": Console - "JUEGOSPC": PC/Games - "JUEGOSPS2": Console/PSP - "JUEGOSPS3": Console/PS3 - "JUEGOSPS4": Console/PS4 - "JUEGOSPSP": Console/PSP - "JUEGOSWII": Console/Wii - "JUEGOSWIIU": Console/WiiU - "JUEGOSXBOX": Console/Xbox - "JUEGOSXBOX360": Console/Xbox 360 - "MACINTOSH": PC/Mac - "MISCELLANEOUS": Other - "MOBILE": PC/Phone-Other - "MOVIES": Movies - "MOVIESBLURAYDISCREMUX": Movies/HD - "MOVIESBOLLYWOOD": Movies - "MOVIESCAMTS": Movies - "MOVIESDOCUMENTARY": TV/Documentary - "MOVIESDUBSDUALAUDIO": Movies - "MOVIESENGLISHSPANISHSUBT": Movies - "MOVIESSDX264H264": Movies/SD - "MOVIESHD": Movies/HD - "MOVIESHD720P": Movies/HD - "MOVIESHD1080P": Movies/HD - "MOVIESHEVCX265": Movies/HD - "MOVIESSPANISHLANGUAGE": Movies - "MOVIESSPANISHLATINAMERICA": Movies - "MOVIESULTRAHD4K": Movies/UHD - "MOVIESX264H264": Movies/HD - "MOVIESXVID": Movies/SD - "MP3": Audio/MP3 - "MP3MUSIC": Audio/MP3 - "MSICA": Other - "MUSIC": Audio - "MUSICFLAC": Audio/Lossless - "MUSICLOSSLESS": Audio/Lossless - "MUSICMP3": Audio/MP3 - "MUSICMUSICVIDEOS": Audio/Video - "MUSICVIDEOS": Audio/Video - "OTHER": Other - "OTHERCOMICS": Other - "OTHERCOVERS": Other - "OTHEREBOOKS": Other - "OTHEROTHER": Other - "OTHERPICTURES": Other - "OTHERSOUNDCLIPS": Other - "PELICULASCVCD": TV/SD - "PELICULASDIVX": TV/SD - "PELICULASHDRIP": TV/HD - "PELICULASMICROHD": TV/HD - "PICTURES": Other - "PORN": XXX - "PORNHDMOVIES": XXX - "PORNGAMES": XXX - "PORNMOVIECLIPS": XXX - "PORNMOVIESDVDR": XXX - "PORNMOVIES": XXX - "PORNOTHER": XXX - "PORNPICTURES": XXX - "SERIES": TV - "SOFTWARE": PC - "SOFTWAREANDROID": PC/Phone-Android - "SOFTWAREMAC": PC/Mac - "SOFTWAREWINDOWS": PC/0day - "SPORTS": TV/Sport - "TVHDSPORTS": TV/Sport - "TUTORIALS": Other - "TUTORIALSTUTORIALS": Other - "TV": TV - "TVHDX264H264": TV/HD - "TVHEVCX265": TV/HD - "TVDIVXXVID": TV/SD - "TVDOCUMENTARY": TV/Documentary - "TVSDXVID": TV/SD - "TVSDX264H264": TV/SD - "TVSDX264X265": TV/SD - "TVSHOWS": TV - "TVSPORT": TV/Sport - "TVULTRAHD4K": TV/UHD - "TVTVPACKS": TV - "VIDEO": Movies - "UNSORTEDUNSORTED": Other - "VIDEOHANDHELD": Movies - "VIDEOHDMOVIES": Movies/HD - "VIDEOHDRIP": Movies - "VIDEOHDTVSHOWS": TV/HD - "VIDEOMOVIESDVDR": Movies/DVD - "VIDEOMOVIECLIPS": Movies - "VIDEOMOVIES": Movies - "VIDEOMUSICVIDEOS": Audio/Video - "VIDEOOTHER": Movies - "VIDEOS": Movies - "VIDEOSDMOVIES": Movies/SD - "VIDEOSDTVSHOWS": TV/SD - "VIDEOTVSHOWS": TV - "VIDEOUHDMOVIES": Movies/UHD - "VIDEOUHDTVSHOWS": TV/UHD - "WINDOWS": PC/0day - "XXX": XXX - "XXXHDVIDEO": XXX - "XXXVIDEO": XXX + ADULT: XXX + ADULTLATINA: XXX + ADULTMILF: XXX + ADULTHDMOVIES: XXX + ADULTPORN: XXX + ADULTXXX: XXX + ANDROID: PC + ANIME: TV/Anime + ANIMEDUBBEDSUBBED: TV/Anime + APPLICATIONS: PC + APPLICATIONSANDROID: PC + APPLICATIONSHANDHELD: PC/Phone-Other + APPLICATIONSMAC: PC/Mac + APPLICATIONSOTHEROS: PC + APPLICATIONSWINDOWS: PC/0day + APPS: PC + APPSANDROID: PC + APPSHANDHELD: PC/Phone-Other + APPSMAC: PC/Mac + APPSOTHEROS: PC + APPSPC: PC + APPSWINDOWS: PC/0day + AUDIO: Audio + AUDIOBOOKS: Audio/Audiobook + AUDIOAUDIOBOOKS: Audio/Audiobook + AUDIOFLAC: Audio/Lossless + AUDIOLOSSLESS: Audio/Lossless + AUDIOMP3: Audio/MP3 + AUDIOMUSIC: Audio + AUDIOOTHER: Audio/Other + AUDIOSOUNDCLIPS: Audio + ADULTGAMES: XXX + ADULTMOVIES: XXX + BOOKS: Books + BOOKSAUDIO: Audio/Audiobook + BOOKSCOMICS: Books/Comics + BOOKSEBOOKS: Books/Ebook + BOOKSMAGAZINES: Books/Magazines + BOOKSNONFICTION: Books + BOOKSTEXTBOOKS: Books + COMICSNEM43COMICS: Books/Comics + DESIPORN: XXX + DOCUMENTARIES: TV/Documentary + DVDRVIDEO: Movies/DVD + EBOOKS: Books/Ebook + EBOOKSTUTORIALS: Books/Ebook + ESTRENOS: XXX + FLAC: Audio/Lossless + FLACMUSIC: Audio/Lossless + GAMES: PC/Games + GAMESANDROID: PC/Games + GAMESHANDHELD: Console + GAMESOTHER: Console + GAMESPC: PC/Games + GAMESPS2: Console/PSP + GAMESPS3: Console/PS3 + GAMESPS4: Console/PS4 + GAMESPSP: Console/PSP + GAMESWII: Console/Wii + GAMESWIIU: Console/WiiU + GAMESWINDOWS: PC/Games + GAMESXBOX: Console/Xbox + GAMESXBOX360: Console/Xbox 360 + IMAGES: Other + JAPANESEANIME: TV/Anime + JUEGOS: Console + JUEGOSPC: PC/Games + JUEGOSPS2: Console/PSP + JUEGOSPS3: Console/PS3 + JUEGOSPS4: Console/PS4 + JUEGOSPSP: Console/PSP + JUEGOSWII: Console/Wii + JUEGOSWIIU: Console/WiiU + JUEGOSXBOX: Console/Xbox + JUEGOSXBOX360: Console/Xbox 360 + MACINTOSH: PC/Mac + MISCELLANEOUS: Other + MOBILE: PC/Phone-Other + MOVIES: Movies + MOVIESBLURAYDISCREMUX: Movies/HD + MOVIESBOLLYWOOD: Movies + MOVIESCAMTS: Movies + MOVIESDOCUMENTARY: TV/Documentary + MOVIESDUBSDUALAUDIO: Movies + MOVIESENGLISHSPANISHSUBT: Movies + MOVIESSDX264H264: Movies/SD + MOVIESHD: Movies/HD + MOVIESHD720P: Movies/HD + MOVIESHD1080P: Movies/HD + MOVIESHEVCX265: Movies/HD + MOVIESSPANISHLANGUAGE: Movies + MOVIESSPANISHLATINAMERICA: Movies + MOVIESULTRAHD4K: Movies/UHD + MOVIESX264H264: Movies/HD + MOVIESXVID: Movies/SD + MP3: Audio/MP3 + MP3MUSIC: Audio/MP3 + MSICA: Other + MUSIC: Audio + MUSICFLAC: Audio/Lossless + MUSICLOSSLESS: Audio/Lossless + MUSICMP3: Audio/MP3 + MUSICMUSICVIDEOS: Audio/Video + MUSICVIDEOS: Audio/Video + OTHER: Other + OTHERCOMICS: Other + OTHERCOVERS: Other + OTHEREBOOKS: Other + OTHEROTHER: Other + OTHERPICTURES: Other + OTHERSOUNDCLIPS: Other + PELICULASCVCD: TV/SD + PELICULASDIVX: TV/SD + PELICULASHDRIP: TV/HD + PELICULASMICROHD: TV/HD + PICTURES: Other + PORN: XXX + PORNHDMOVIES: XXX + PORNGAMES: XXX + PORNMOVIECLIPS: XXX + PORNMOVIESDVDR: XXX + PORNMOVIES: XXX + PORNOTHER: XXX + PORNPICTURES: XXX + SERIES: TV + SOFTWARE: PC + SOFTWAREANDROID: PC/Phone-Android + SOFTWAREMAC: PC/Mac + SOFTWAREWINDOWS: PC/0day + SPORTS: TV/Sport + TVHDSPORTS: TV/Sport + TUTORIALS: Other + TUTORIALSTUTORIALS: Other + TV: TV + TVHDX264H264: TV/HD + TVHEVCX265: TV/HD + TVDIVXXVID: TV/SD + TVDOCUMENTARY: TV/Documentary + TVSDXVID: TV/SD + TVSDX264H264: TV/SD + TVSDX264X265: TV/SD + TVSHOWS: TV + TVSPORT: TV/Sport + TVULTRAHD4K: TV/UHD + TVTVPACKS: TV + VIDEO: Movies + UNSORTEDUNSORTED: Other + VIDEOHANDHELD: Movies + VIDEOHDMOVIES: Movies/HD + VIDEOHDRIP: Movies + VIDEOHDTVSHOWS: TV/HD + VIDEOMOVIESDVDR: Movies/DVD + VIDEOMOVIECLIPS: Movies + VIDEOMOVIES: Movies + VIDEOMUSICVIDEOS: Audio/Video + VIDEOOTHER: Movies + VIDEOS: Movies + VIDEOSDMOVIES: Movies/SD + VIDEOSDTVSHOWS: TV/SD + VIDEOTVSHOWS: TV + VIDEOUHDMOVIES: Movies/UHD + VIDEOUHDTVSHOWS: TV/UHD + WINDOWS: PC/0day + XXX: XXX + XXXHDVIDEO: XXX + XXXVIDEO: XXX modes: search: [q] diff --git a/src/Jackett.Common/Definitions/torrentproject2.yml b/src/Jackett.Common/Definitions/torrentproject2.yml index 8ea56980e..e7169f517 100644 --- a/src/Jackett.Common/Definitions/torrentproject2.yml +++ b/src/Jackett.Common/Definitions/torrentproject2.yml @@ -21,8 +21,8 @@ caps: "Video Lq": Movies/Foreign "audio mp3": Audio/MP3 "audio lossless": Audio/Lossless - "video": Movies - "ebooks": Books/Ebook + video: Movies + ebooks: Books/Ebook "Ebooks Comics": Books/Comics "Ebooks Magazines": Other "Ebooks Audiobook": Audio/Audiobook @@ -31,10 +31,10 @@ caps: "Games Nintendo": Console "Games PlayStation": Console "Games XBox": Console/XBox - "Mobile": PC/Phone-Other - "Applications": PC - "Images": Other - "Other": Other + Mobile: PC/Phone-Other + Applications: PC + Images: Other + Other: Other modes: search: [q] @@ -51,12 +51,12 @@ settings: - name: sort type: select label: Sort requested from site - default: "latest" + default: latest options: - "latest": "created desc" - "oldest": "created asc" - "seeders": "seeders" - "size": "size" + latest: "created desc" + oldest: "created asc" + seeders: seeders + size: size - name: info type: info label: A note about TP2 @@ -74,7 +74,7 @@ download: search: paths: - - path: "?t={{ if .Keywords }}{{ re_replace .Keywords \" \" \"+\" }}{{else}}test{{end}}&orderby={{ .Config.sort }}{{ if .Config.filter-verified }}&safe=on{{else}}{{end}}" + - path: "?t={{ if .Keywords }}{{ re_replace .Keywords \" \" \"+\" }}{{ else }}test{{ end }}&orderby={{ .Config.sort }}{{ if .Config.filter-verified }}&safe=on{{ else }}{{ end }}" followredirect: true rows: diff --git a/src/Jackett.Common/Definitions/torrentquest.yml b/src/Jackett.Common/Definitions/torrentquest.yml index 38524e690..90dc9c239 100644 --- a/src/Jackett.Common/Definitions/torrentquest.yml +++ b/src/Jackett.Common/Definitions/torrentquest.yml @@ -10,13 +10,13 @@ links: caps: categories: - "TV": TV - "Movie": Movies - "Music": Audio - "E-Book": Books/Ebook - "Game": PC/Games - "Software": PC - "Other": Other + TV: TV + Movie: Movies + Music: Audio + E-Book: Books/Ebook + Game: PC/Games + Software: PC + Other: Other modes: search: [q] @@ -29,18 +29,18 @@ settings: - name: sort type: select label: Sort requested from site - default: "age" + default: age options: - "age": "created" - "se": "seeders" - "size": "size" + age: created + se: seeders + size: size - name: type type: select label: Order requested from site - default: "desc" + default: desc options: - "desc": "desc" - "asc": "asc" + desc: desc + asc: asc search: headers: @@ -55,8 +55,8 @@ search: # return movie and tv results if there are no search parms supplied (for use with the TEST button) # https://torrentquest.com/download/movies/se/desc/ # https://torrentquest.com/m/mandalorian-s01e07/age/desc/ - - path: "{{ if .Keywords }}{{ re_replace .Keywords \"(.).*\" \"$1\" }}/{{ .Keywords }}{{else}}download/movies{{end}}/{{ .Config.sort }}/{{ .Config.type }}/" - - path: "{{ if .Keywords }}{{else}}download/tv/{{ .Config.sort }}/{{ .Config.type }}/{{end}}" + - path: "{{ if .Keywords }}{{ re_replace .Keywords \"(.).*\" \"$1\" }}/{{ .Keywords }}{{ else }}download/movies{{ end }}/{{ .Config.sort }}/{{ .Config.type }}/" + - path: "{{ if .Keywords }}{{ else }}download/tv/{{ .Config.sort }}/{{ .Config.type }}/{{ end }}" rows: selector: tr:has(td.m) diff --git a/src/Jackett.Common/Definitions/torrentv.yml b/src/Jackett.Common/Definitions/torrentv.yml index 3cd86b3d0..ffbbd13f2 100644 --- a/src/Jackett.Common/Definitions/torrentv.yml +++ b/src/Jackett.Common/Definitions/torrentv.yml @@ -20,11 +20,11 @@ settings: - name: sort type: select label: Sort requested from site (Applies only to Keyword searches) - default: "td-1" + default: td-1 options: - "td-1": "created" - "s-1": "seeders" - "na-1": "title" + td-1: created + s-1: seeders + na-1: title download: selector: a[href^="magnet:?xt="] diff --git a/src/Jackett.Common/Definitions/torrentz2.yml b/src/Jackett.Common/Definitions/torrentz2.yml index 8a868c095..33dc421f3 100644 --- a/src/Jackett.Common/Definitions/torrentz2.yml +++ b/src/Jackett.Common/Definitions/torrentz2.yml @@ -35,25 +35,25 @@ caps: categories: "video tv": TV "video anime": TV/Anime - "video": Movies + video: Movies "movies divx xvid": Movies "video movie dvd": Movies "video movie dvdrip": Movies "video movie hd": Movies/HD - "ebook": Books/Ebook + ebook: Books/Ebook "ebook comics": Books/Comics "ebook magazine": Books/Magazines "ebook tutorial": Books/Technical "ebook audio book": Audio/Audiobook - "audio": Audio + audio: Audio "audio music lossless": Audio/Lossless "audio music mp3": Audio/MP3 - "application": PC/0day - "game": PC/Games + application: PC/0day + game: PC/Games "game pc": PC/Games "game xbox": Console/Xbox "game nintendo": Console/NDS - "adult": XXX + adult: XXX "adult amateur": XXX "adult anal": XXX "adult asian": XXX @@ -68,8 +68,8 @@ caps: "adult milf": XXX "adult squirting": XXX "adult tattoo": XXX - "other": Other - "images": Other + other: Other + images: Other modes: @@ -95,19 +95,19 @@ settings: - name: sort type: select label: Sort requested from site - default: "A" + default: A options: - "_": "peers" - "N": "rating" - "A": "created" - "S": "size" + _: peers + N: rating + A: created + S: size search: paths: - - path: "{{if .Config.filter-verified }}verified{{else}}search{{end}}{{ re_replace .Config.sort \"_\" \"\" }}" + - path: "{{if .Config.filter-verified }}verified{{ else }}search{{ end }}{{ re_replace .Config.sort \"_\" \"\" }}" inputs: - f: "{{ if .Keywords }}title: {{ .Keywords }}{{else}}{{end}}" - safe: "{{ if .Config.filter-safe }}1{{else}}0{{end}}" + f: "{{ if .Keywords }}title: {{ .Keywords }}{{ else }}{{ end }}" + safe: "{{ if .Config.filter-safe }}1{{ else }}0{{ end }}" rows: selector: "html body #wrap .results dl:has(a)" @@ -131,7 +131,7 @@ search: - name: append args: ".torrent" download: - text: "{{if .Config.itorrents-links}}{{ .Result.download-itorrents }}{{else}}{{end}}" + text: "{{if .Config.itorrents-links}}{{ .Result.download-itorrents }}{{ else }}{{ end }}" magfile: text: "{{ .Result.title }}" filters: diff --git a/src/Jackett.Common/Definitions/totheglory.yml b/src/Jackett.Common/Definitions/totheglory.yml index ac40d58a6..b57543de4 100644 --- a/src/Jackett.Common/Definitions/totheglory.yml +++ b/src/Jackett.Common/Definitions/totheglory.yml @@ -17,12 +17,10 @@ caps: BluRay原盘: Movies/BluRay # BluRay original disc 影视2160p: Movies/UHD # Media - 2160p UHD原盘: Movies/UHD # Blu-ray UHD - # 纪录片 Docs 纪录片720p: Movies/HD # Documentary 720p 纪录片1080i/p: Movies/HD # Documentary 1080i / p 纪录片BluRay原盘: Movies/BluRay # Documentary BluRay Original - # 剧集 TV 欧美剧720p: TV/HD # TV Series - EU/US - 720p 欧美剧1080i/p: TV/HD # TV Series - EU/US - 1080i/p @@ -30,18 +28,15 @@ caps: 大陆港台剧1080i/p: TV/HD # TV Series - CN - 1080i/p 大陆港台剧720p: TV/HD # TV Series - CN - 720p 高清韩剧: TV/HD # TV Series - KR - # 剧集包 TV Packs 欧美剧包: TV/HD # TV Packs - EU/US 日剧包: TV/HD # TV Packs - JP 韩剧包: TV/HD # TV Packs - CN 华语剧包: TV/HD # TV Packs - KR - # 音乐 Audio (电影原声&Game)OST: Audio # OST - (Movie & Game) Track 无损音乐FLAC&APE: Audio/Lossless # FLAC & APE MV&演唱会: Audio/Video # MV & Concert - # 其他 Other 高清体育节目: TV/Sport # HD Sports 高清动漫: TV/Anime # HD Animation @@ -51,42 +46,35 @@ caps: MiniVideo: Other # MiniVideo 补充音轨: Audio # Supplemental audio tracks iPhone/iPad视频: PC/Phone-Other # IPhone / iPad video - # 单机游戏 PC: PC/Games # Games - PC MAC: PC/Mac # Games - MAC - # 微软系列 XBOX360: Console/Xbox 360 # MicroSoft - XBOX360 XBOX1: Console/Xbox # MicroSoft - XBOX360 XBLA: Console/Xbox # MicroSoft - XBLA XBOX+to+XBOX360: Console/Xbox # MicroSoft - XBOX to XBOX360 - # 索尼系列 PS2: Console/Other # SONY - PS2 PSP: Console/PSP # SONY - PSP PS4: Console/PS4 # SONY - PS4 PS3: Console/PS3 # SONY - PS3 PSV: Console/PS Vita # SONY - PSV - # 任天堂系列 WIIU: Console/WiiU # Nintendo - WIIU WII: Console/Wii # Nintendo- WII SWITCH: Console/Other # Nintendo - SWITCH NDS: Console/NDS # Nintendo - NDS NGC: Console/Other # Nintendo - NGC - # 主机影视 PS3兼容高清: Console/PS3 # Video - HD - PS3 PSP兼容高清&标清: Console/PSP # Video - SD&HD - PSP XBOX360兼容高清: Console/Xbox 360 # Video - HD - XBOX360 Game+Video: Console/Other # Video - Game Video - # 软件 APPZ: PC # Software - APPZ Game+Ebook: Books/Ebook # Software - Game Ebook Ebook: Books/Ebook # Software - Ebook - # 苹果系列 iPhone/iPad游戏: PC/Phone-IOS # Apple - Game - iPhone/iPad iPad书籍: Books/Ebook # Apple - Book - iPad @@ -116,16 +104,16 @@ settings: - name: passid type: select label: Security Question ID - default: "0" + default: 0 options: - "0": "Security question (Ignore not set)" - "1": "When did your start using PT?" - "2": "How did you get to know about TTG?" - "3": "What's the name of the first movie you watched in a cinema?" - "4": "What's your favorite movie?" - "5": "Who's your favorite porn star?" - "6": "Who's your favorite actor/actress?" - "7": "What's your most anticipated movie?" + 0: Security question (Ignore not set) + 1: When did your start using PT? + 2: How did you get to know about TTG? + 3: What's the name of the first movie you watched in a cinema? + 4: What's your favorite movie? + 5: Who's your favorite porn star? + 6: Who's your favorite actor/actress? + 7: What's your most anticipated movie? - name: info_passid type: info label: "About Security ID" @@ -214,9 +202,9 @@ search: selector: td:nth-child(5) filters: - name: append - args: " +0800" + args: " +08:00" # CST - name: dateparse - args: "2006-01-0215:04:05 -0700" + args: "2006-01-0215:04:05 -07:00" imdb: optional: true selector: span.imdb_rate > a diff --git a/src/Jackett.Common/Definitions/totheglorycookie.yml b/src/Jackett.Common/Definitions/totheglorycookie.yml index bea8c21cd..f532610d9 100644 --- a/src/Jackett.Common/Definitions/totheglorycookie.yml +++ b/src/Jackett.Common/Definitions/totheglorycookie.yml @@ -17,12 +17,10 @@ caps: BluRay原盘: Movies/BluRay # BluRay original disc 影视2160p: Movies/UHD # Media - 2160p UHD原盘: Movies/UHD # Blu-ray UHD - # 纪录片 Docs 纪录片720p: Movies/HD # Documentary 720p 纪录片1080i/p: Movies/HD # Documentary 1080i / p 纪录片BluRay原盘: Movies/BluRay # Documentary BluRay Original - # 剧集 TV 欧美剧720p: TV/HD # TV Series - EU/US - 720p 欧美剧1080i/p: TV/HD # TV Series - EU/US - 1080i/p @@ -30,18 +28,15 @@ caps: 大陆港台剧1080i/p: TV/HD # TV Series - CN - 1080i/p 大陆港台剧720p: TV/HD # TV Series - CN - 720p 高清韩剧: TV/HD # TV Series - KR - # 剧集包 TV Packs 欧美剧包: TV/HD # TV Packs - EU/US 日剧包: TV/HD # TV Packs - JP 韩剧包: TV/HD # TV Packs - CN 华语剧包: TV/HD # TV Packs - KR - # 音乐 Audio (电影原声&Game)OST: Audio # OST - (Movie & Game) Track 无损音乐FLAC&APE: Audio/Lossless # FLAC & APE MV&演唱会: Audio/Video # MV & Concert - # 其他 Other 高清体育节目: TV/Sport # HD Sports 高清动漫: TV/Anime # HD Animation @@ -51,42 +46,35 @@ caps: MiniVideo: Other # MiniVideo 补充音轨: Audio # Supplemental audio tracks iPhone/iPad视频: PC/Phone-Other # IPhone / iPad video - # 单机游戏 PC: PC/Games # Games - PC MAC: PC/Mac # Games - MAC - # 微软系列 XBOX360: Console/Xbox 360 # MicroSoft - XBOX360 XBOX1: Console/Xbox # MicroSoft - XBOX360 XBLA: Console/Xbox # MicroSoft - XBLA XBOX+to+XBOX360: Console/Xbox # MicroSoft - XBOX to XBOX360 - # 索尼系列 PS2: Console/Other # SONY - PS2 PSP: Console/PSP # SONY - PSP PS4: Console/PS4 # SONY - PS4 PS3: Console/PS3 # SONY - PS3 PSV: Console/PS Vita # SONY - PSV - # 任天堂系列 WIIU: Console/WiiU # Nintendo - WIIU WII: Console/Wii # Nintendo- WII SWITCH: Console/Other # Nintendo - SWITCH NDS: Console/NDS # Nintendo - NDS NGC: Console/Other # Nintendo - NGC - # 主机影视 PS3兼容高清: Console/PS3 # Video - HD - PS3 PSP兼容高清&标清: Console/PSP # Video - SD&HD - PSP XBOX360兼容高清: Console/Xbox 360 # Video - HD - XBOX360 Game+Video: Console/Other # Video - Game Video - # 软件 APPZ: PC # Software - APPZ Game+Ebook: Books/Ebook # Software - Game Ebook Ebook: Books/Ebook # Software - Ebook - # 苹果系列 iPhone/iPad游戏: PC/Phone-IOS # Apple - Game - iPhone/iPad iPad书籍: Books/Ebook # Apple - Book - iPad @@ -176,9 +164,9 @@ search: selector: td:nth-child(5) filters: - name: append - args: " +0800" + args: " +08:00" # CST - name: dateparse - args: "2006-01-0215:04:05 -0700" + args: "2006-01-0215:04:05 -07:00" imdb: optional: true selector: span.imdb_rate > a diff --git a/src/Jackett.Common/Definitions/trancetraffic.yml b/src/Jackett.Common/Definitions/trancetraffic.yml index 7e901b62f..b461e85fc 100644 --- a/src/Jackett.Common/Definitions/trancetraffic.yml +++ b/src/Jackett.Common/Definitions/trancetraffic.yml @@ -31,10 +31,14 @@ search: paths: - path: browse.php inputs: - search: "{{if .Query.Artist}}{{ .Query.Artist }}{{else}}{{ .Keywords }}{{end}}" + search: "{{if .Query.Artist}}{{ .Query.Artist }}{{ else }}{{ .Keywords }}{{ end }}" + rows: selector: table.mainouter table > tbody > tr:has(a[href^="details.php?id="]) + fields: + category: + text: 1 download: selector: a[href^="download.php/"] attribute: href @@ -43,13 +47,11 @@ search: details: selector: a[href^="details.php?id="] attribute: href - category: - text: 1 date: selector: td:nth-child(6) filters: - name: append - args: " +00:00" + args: " +00:00" # auto adjusted by site account profile - name: dateparse args: "2006-01-0215:04:05 -07:00" seeders: @@ -60,14 +62,13 @@ search: selector: td:nth-child(8) filters: - name: regexp - args: ([\d,]+) + args: (\d+) files: selector: td:nth-child(4) size: selector: td:nth-child(7) downloadvolumefactor: - case: - "*": "1" + text: 1 uploadvolumefactor: - case: - "*": "1" + text: 1 +# engine tbd diff --git a/src/Jackett.Common/Definitions/trupornolabs.yml b/src/Jackett.Common/Definitions/trupornolabs.yml index b1ffd8b99..b28216829 100644 --- a/src/Jackett.Common/Definitions/trupornolabs.yml +++ b/src/Jackett.Common/Definitions/trupornolabs.yml @@ -14,8 +14,6 @@ caps: modes: search: [q] - tv-search: [q] - movie-search: [q] settings: []