From 033505d24eb30f29a2da3c675ea0817a99636786 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Sat, 18 Nov 2023 16:59:54 +0200 Subject: [PATCH] jackett indexers as of 09a67a50f8067ea1de7b0722111cede546aab125 --- definitions/v7/aither-api.yml | 2 +- definitions/v7/blutopia-api.yml | 2 +- definitions/v7/torrentleech.yml | 2 + definitions/v7/torrentqq.yml | 5 +- definitions/v8/movieworld.yml | 18 +-- definitions/v9/aither-api.yml | 2 +- definitions/v9/blutopia-api.yml | 2 +- definitions/v9/fusionmayhem.yml | 158 --------------------------- definitions/v9/hdtorrentsit.yml | 10 +- definitions/v9/torrent-heaven.yml | 176 ++++++++++++++++++++++++++++++ 10 files changed, 199 insertions(+), 178 deletions(-) delete mode 100644 definitions/v9/fusionmayhem.yml create mode 100644 definitions/v9/torrent-heaven.yml diff --git a/definitions/v7/aither-api.yml b/definitions/v7/aither-api.yml index efdbb97dd..199d49e38 100644 --- a/definitions/v7/aither-api.yml +++ b/definitions/v7/aither-api.yml @@ -160,4 +160,4 @@ search: minimumseedtime: # 5 days (as seconds = 3 x 24 x 60 x 60) text: 432000 -# json UNIT3D 7.0.0 +# json UNIT3D 7.1.0b diff --git a/definitions/v7/blutopia-api.yml b/definitions/v7/blutopia-api.yml index 2c1cc689e..604eb7920 100644 --- a/definitions/v7/blutopia-api.yml +++ b/definitions/v7/blutopia-api.yml @@ -160,4 +160,4 @@ search: minimumseedtime: # 7 day (as seconds = 7 x 24 x 60 x 60) text: 604800 -# json UNIT3D 7.0.0b +# json UNIT3D 7.1.0b diff --git a/definitions/v7/torrentleech.yml b/definitions/v7/torrentleech.yml index ecdb1dbdd..7068b3bef 100644 --- a/definitions/v7/torrentleech.yml +++ b/definitions/v7/torrentleech.yml @@ -148,6 +148,8 @@ search: # remove dashes at the beginning of keywords as they exclude search strings (see issue #3096) - name: re_replace args: ["(^|\\s)-", " "] + - name: append + args: "{{ if .Config.exclude_archives }} -tags:rar{{ else }}{{ end }}" rows: selector: torrentList count: diff --git a/definitions/v7/torrentqq.yml b/definitions/v7/torrentqq.yml index 6077809ea..eaf90dc4a 100644 --- a/definitions/v7/torrentqq.yml +++ b/definitions/v7/torrentqq.yml @@ -7,10 +7,8 @@ type: public encoding: UTF-8 followredirect: true links: - - https://torrentqq282.com/ + - https://torrentqq283.com/ legacylinks: - - https://torrentqq266.com/ - - https://torrentqq267.com/ - https://torrentqq268.com/ - https://torrentqq269.com/ - https://torrentqq270.com/ @@ -25,6 +23,7 @@ legacylinks: - https://torrentqq279.com/ - https://torrentqq280.com/ - https://torrentqq281.com/ + - https://torrentqq282.com/ caps: categorymappings: diff --git a/definitions/v8/movieworld.yml b/definitions/v8/movieworld.yml index 42764c923..13fd9fb91 100644 --- a/definitions/v8/movieworld.yml +++ b/definitions/v8/movieworld.yml @@ -10,6 +10,7 @@ links: caps: categorymappings: + - {id: 37, cat: Movies, desc: "Freeleech"} - {id: 14, cat: Movies/WEB-DL, desc: "Movie/WEB"} - {id: 36, cat: Movies/UHD, desc: "Movie/4K Disc"} - {id: 5, cat: Movies/UHD, desc: "Movie/4K Rip"} @@ -19,17 +20,16 @@ caps: - {id: 15, cat: Movies, desc: "Movie/Packs"} - {id: 20, cat: Movies/SD, desc: "Movie/CAM"} - {id: 21, cat: XXX, desc: "Movie/XXX"} - - {id: 33, cat: Audio/Video, desc: "Music"} - {id: 28, cat: TV, desc: "Tv Packs"} - {id: 31, cat: TV, desc: "Tv Mini Series"} - {id: 30, cat: TV/HD, desc: "Tv Episodes"} - {id: 26, cat: TV/Sport, desc: "Tv Sport"} + - {id: 18, cat: Other, desc: "Other"} modes: search: [q] tv-search: [q, season, ep] movie-search: [q] - music-search: [q] settings: - name: username @@ -40,7 +40,7 @@ settings: label: Password - name: freeleech type: checkbox - label: Filter freeleech only + label: Search freeleech only default: false - name: sort type: select @@ -83,8 +83,8 @@ search: page: torrents search: "{{ .Keywords }}" category: "{{ range .Categories }}{{.}};{{end}}" - # 0 filename, 1 file&descr, 2 descr, 3 uploaders, 18 genre, 4 imdb, 8-17 upload multiplier 1x-10x - options: 0 + # 0 filename, 1 file&descr, 2 descr, 3 uploaders, 18 genre, 4 imdb, 5 gold, 6 silver, 7 bronze, 8-17 upload multiplier 1x-10x + options: "{{ if .Config.freeleech }}5{{ else }}0{{ end }}" # 0 all, 1 active only, 2 dead only active: 0 order: "{{ .Config.sort }}" @@ -96,7 +96,7 @@ search: args: ["\\.", " "] rows: - selector: "table.lista > tbody > tr:has(a[href^=\"download.php?id=\"]):not(:has(a[href^=\"index.php?page=userdetails\"])){{ if .Config.freeleech }}:has(img[src=\"images/freeleech.gif\"]){{ else }}{{ end }}" + selector: "table.lista > tbody > tr:has(a[href^=\"download.php?id=\"]):not(:has(a[href^=\"index.php?page=userdetails\"]))" fields: category: @@ -148,7 +148,9 @@ search: selector: "td:has(a[href^=\"download.php?id=\"]) ~ td ~ td ~ td ~ td ~ td ~ td" downloadvolumefactor: case: - img[src="images/freeleech.gif"]: 0 + img[src="images/gold.gif"]: 0 + img[src="images/silver.gif"]: 0.5 + img[src="images/bronze.gif"]: 0.75 "*": 1 uploadvolumefactor: case: @@ -165,4 +167,4 @@ search: minimumseedtime: # 3 days (as seconds = 3 x 24 x 60 x 60) text: 259200 -# xbtitFM v4.1.26 +# xbtitFM v4.1.28 diff --git a/definitions/v9/aither-api.yml b/definitions/v9/aither-api.yml index 9963b5bd5..eb7d5d9ee 100644 --- a/definitions/v9/aither-api.yml +++ b/definitions/v9/aither-api.yml @@ -166,4 +166,4 @@ search: minimumseedtime: # 5 days (as seconds = 3 x 24 x 60 x 60) text: 432000 -# json UNIT3D 7.0.0 +# json UNIT3D 7.1.0b diff --git a/definitions/v9/blutopia-api.yml b/definitions/v9/blutopia-api.yml index 09c0b485f..4a693624a 100644 --- a/definitions/v9/blutopia-api.yml +++ b/definitions/v9/blutopia-api.yml @@ -166,4 +166,4 @@ search: minimumseedtime: # 7 day (as seconds = 7 x 24 x 60 x 60) text: 604800 -# json UNIT3D 7.0.0b +# json UNIT3D 7.1.0b diff --git a/definitions/v9/fusionmayhem.yml b/definitions/v9/fusionmayhem.yml deleted file mode 100644 index c63fd43d4..000000000 --- a/definitions/v9/fusionmayhem.yml +++ /dev/null @@ -1,158 +0,0 @@ ---- -id: fusionmayhem -name: FusionMayhem -description: "FusionMayhem is a Private Torrent Tracker for MOVIES / TV / GENERAL" -language: en-US -type: private -encoding: UTF-8 -links: - - https://fusionmayhem.net/ - -caps: - categorymappings: - - {id: 3, cat: PC, desc: "Apps"} - - {id: 19, cat: Books, desc: "EBooks"} - - {id: 32, cat: Console, desc: "Games"} - - {id: 36, cat: Console/NDS, desc: "Nintendo"} - - {id: 33, cat: PC/Games, desc: "PC Games"} - - {id: 34, cat: Console/PS4, desc: "Playstation"} - - {id: 35, cat: Console/XBox, desc: "Xbox"} - - {id: 5, cat: Movies, desc: "Movies"} - - {id: 9, cat: Movies/UHD, desc: "Movies 4K"} - - {id: 6, cat: Movies/BluRay, desc: "Movies Bluray"} - - {id: 7, cat: Movies/DVD, desc: "Movies DVDR"} - - {id: 11, cat: Movies/Foreign, desc: "Movies Non-English"} - - {id: 13, cat: Movies, desc: "Movies Packs"} - - {id: 8, cat: Movies/WEB-DL, desc: "Movies WEB-DL/Webrip"} - - {id: 10, cat: Movies/SD, desc: "Movies XVID"} - - {id: 20, cat: Audio, desc: "Music"} - - {id: 21, cat: Audio, desc: "Music DMC"} - - {id: 26, cat: Audio/Lossless, desc: "Music Flac"} - - {id: 23, cat: Audio, desc: "Music Karaoke"} - - {id: 22, cat: Audio, desc: "Music MasterMix"} - - {id: 27, cat: Audio/MP3, desc: "Music MP3"} - - {id: 24, cat: Audio/MP3, desc: "Music mp3 weekly"} - - {id: 30, cat: Audio, desc: "Music Packs"} - - {id: 25, cat: Audio, desc: "Music Top 40/200 Albums/Singles"} - - {id: 21, cat: Audio/Video, desc: "Music Videos"} - - {id: 12, cat: TV, desc: "TV"} - - {id: 16, cat: TV/Foreign, desc: "TV Non--English"} - - {id: 17, cat: TV, desc: "TV Seasons"} - - {id: 18, cat: TV/Sport, desc: "TV Sports"} - - {id: 14, cat: TV/HD, desc: "TV x265"} - - {id: 15, cat: TV/SD, desc: "TV xvid"} - - {id: 37, cat: Other, desc: "VIP"} - - modes: - search: [q] - tv-search: [q, season, ep] - movie-search: [q] - music-search: [q] - -settings: - - name: username - type: text - label: Username - - name: password - type: password - label: Password - - name: freeleech - type: checkbox - label: Filter freeleech only - default: false - - name: info_tpp - type: info - label: Results Per Page - default: For best results, change the Torrents per page: setting to 40 on your account profile. - -login: - path: takelogin.php - method: post - inputs: - username: "{{ .Config.username }}" - password: "{{ .Config.password }}" - logout: "" - error: - - selector: td:contains("You will now be redirected...") - message: - text: "Error: Its likely your Username or Password is incorrect" - test: - path: / - selector: a[href*="/logout.php"] - -search: - paths: - - path: browse.php - keywordsfilters: - # remove words <= 3 characters and surrounding special characters - - name: re_replace - args: ["(?:^|\\s)[_\\+\\/\\.\\-\\(\\)]*[\\S]{0,3}[_\\+\\/\\.\\-\\(\\)]*(?:\\s|$)", " "] - inputs: - do: search - keywords: "{{ .Keywords }}" - # t_name, t_description, t_both, t_uploader, t_genre - search_type: t_name - category: 0 # multi cat search not supported - # yes, no - include_dead_torrents: yes - # sort is done via do=quick_sort, and freeleech sorting is part of that set - - rows: - selector: "table#sortabletable > tbody > tr:has(a[href*=\"/details.php?id=\"]){{ if .Config.freeleech }}:has(img[src$=\"freedownload.gif\"]){{ else }}{{ end }}" - filters: - - name: andmatch - args: 66 - - fields: - category: - selector: a[href*="/browse.php?category="] - attribute: href - filters: - - name: querystring - args: category - title_default: - selector: a[href*="/details.php?id="] - title: - selector: div.tooltip-content > div - optional: true - default: "{{ .Result.title_default }}" - details: - selector: a[href*="/details.php?id="] - attribute: href - download: - selector: a[href*="/download.php?id="] - attribute: href - size: - selector: td:nth-child(5) - grabs: - selector: td:nth-child(6) - seeders: - selector: td:nth-child(7) - leechers: - selector: td:nth-child(8) - poster: - selector: div.tooltip-content > img - attribute: src - downloadvolumefactor: - case: - img[src$="freedownload.gif"]: 0 - img[src$="silverdownload.gif"]: 0.5 - "*": 1 - uploadvolumefactor: - case: - img[src$="x2.gif"]: 2 - "*": 1 - date: - selector: "td:nth-child(2) > div:has(span[style=\"float: right;\"])" - remove: span - filters: - - name: append - args: " +00:00" # auto adjusted by site account profile - - name: dateparse - args: "dd-MM-yyyy HH:mm zzz" - minimumratio: - text: 1.0 - minimumseedtime: - # 1 day (as seconds = 24 x 60 x 60) - text: 86400 -# TS Special Edition v.8.0 diff --git a/definitions/v9/hdtorrentsit.yml b/definitions/v9/hdtorrentsit.yml index 8a93f7d21..d87698582 100644 --- a/definitions/v9/hdtorrentsit.yml +++ b/definitions/v9/hdtorrentsit.yml @@ -29,7 +29,7 @@ settings: - name: info_key type: info label: About your API key - default: "Find or Generate a new API Token by accessing your HDTorrents.it account My Security page and clicking on the API Token tab." + default: "Find or Generate a new API Token by accessing your HDTorrents.it account My Settings page and clicking on the API Key tab." - name: freeleech type: checkbox label: Search freeleech only @@ -164,10 +164,10 @@ search: 100%: 0 # freeleech "*": 0 # catch errors uploadvolumefactor: - # api returns 0=false, 1=true + # api returns False, True selector: double_upload case: - 0: 1 # normal - 1: 2 # double + False: 1 # normal + True: 2 # double # as a pay site there is no MR or MST -# json UNIT3D 6.5.0 +# json UNIT3D 7.0.3 diff --git a/definitions/v9/torrent-heaven.yml b/definitions/v9/torrent-heaven.yml new file mode 100644 index 000000000..f13b88fd1 --- /dev/null +++ b/definitions/v9/torrent-heaven.yml @@ -0,0 +1,176 @@ +--- +id: torrent-heaven +name: Torrent Heaven +description: "Torrent Heaven is a DUTCH Private Torrent Tracker for MOVIES / TV / GENERAL" +language: nl-NL +type: private +encoding: UTF-8 +links: + - https://www.torrentheaven.org/ + +caps: + categorymappings: + - {id: 129, cat: Movies/HD, desc: "Hd DVD"} + - {id: 123, cat: Movies/HD, desc: "MKV/X265"} + - {id: 130, cat: Movies/UHD, desc: "4K Films"} + - {id: 10, cat: Movies/DVD, desc: "Dvd rip"} + - {id: 111, cat: Movies/SD, desc: "HD2DVD / BR2DVD"} + - {id: 125, cat: Movies/SD, desc: "Xvid rip"} + - {id: 143, cat: Movies/HD, desc: "Divx 720P"} + - {id: 132, cat: TV, desc: "complete seizoen serie"} + - {id: 139, cat: TV, desc: "Losse afleveringen"} + - {id: 140, cat: Books/EBook, desc: "E-Book"} + - {id: 114, cat: Audio/MP3, desc: "Muziek MP3"} + - {id: 142, cat: Audio/Lossless, desc: "Muziek Flac"} + - {id: 115, cat: PC, desc: "pc apps"} + - {id: 105, cat: TV/Documentary, desc: "Documentaire"} + - {id: 120, cat: PC/Games, desc: "Pc Games"} + - {id: 106, cat: Other, desc: "Overig"} + - {id: 131, cat: Books/Comics, desc: "Stripboeken"} + - {id: 108, cat: XXX, desc: "18+ Adult"} + - {id: 116, cat: PC/Mac, desc: "Mac"} + - {id: 155, cat: Books/Mags, desc: "Tijdschriften"} + - {id: 128, cat: Audio/Video, desc: "muziek DVD"} + - {id: 156, cat: Other, desc: "Donateur"} + - {id: 118, cat: Movies, desc: "Kids Film"} + + modes: + search: [q] + tv-search: [q, season, ep] + movie-search: [q] + music-search: [q] + +settings: + - name: username + type: text + label: Username + - name: password + type: password + label: Password + - name: thankyou + type: text + label: Thank You Comment + - name: info + type: info + label: Thank you comment + default: This site requires you to leave a Thank You comment before you can download. Enter your personalised comment above. + +login: + path: login.php + method: form + form: form[action="takelogin.php"] + inputs: + username: "{{ .Config.username }}" + password: "{{ .Config.password }}" + returnto: "/" + error: + - selector: td.embedded:contains("fout") + test: + path: / + selector: a[href="logout.php"] + +download: + before: + path: comment.php + method: post + inputs: + action: add + tid: "{{ .DownloadUri.Query.id }}" + text: "{{ .Config.thankyou }}" + submit: Opslaan + selectors: + - selector: a[href^="download.php?id="] + attribute: href + +search: + paths: + # https://www.torrentheaven.org/browse.php?search=&cat=0&incldead=1 + - path: browse.php + inputs: + $raw: "{{ range .Categories }}c{{.}}=1&{{end}}" + search: "{{ .Keywords }}" + incldead: 1 + + rows: + selector: table.mainouter + filters: + - name: andmatch + + fields: + category: + selector: a[href^="browse.php?cat="] + attribute: href + filters: + - name: querystring + args: cat + title: + selector: a[href^="details.php?id="] + details: + selector: a[href^="details.php?id="] + attribute: href + download: + selector: a[href^="details.php?id="] + attribute: href + poster: + selector: div[id^="Style"] img + attribute: src + size: + selector: a[href^="details_bestanden.php?"] + filters: + - name: regexp + args: "(.+?) in" + files: + selector: a[href^="details_bestanden.php?"] + filters: + - name: regexp + args: "in (\\d+) bestan" + grabs: + selector: td:nth-child(5) table tbody tr:nth-child(2) td:first-child + date: + selector: td:nth-child(5) table tbody tr:nth-child(2) td:last-child + filters: + - name: replace + args: ["januari", "January"] + - name: replace + args: ["februari", "February"] + - name: replace + args: ["maart", "March"] + - name: replace + args: ["april", "April"] + - name: replace + args: ["mei", "May"] + - name: replace + args: ["juni", "June"] + - name: replace + args: ["juli", "July"] + - name: replace + args: ["augustus", "August"] + - name: replace + args: ["september", "September"] + - name: replace + args: ["oktober", "October"] + - name: replace + args: ["november", "November"] + - name: replace + args: ["december", "December"] + - name: re_replace + args: ["\\s*om\\s*", " "] + - name: append + args: " +01:00" # CET + - name: dateparse + args: "d MMMM yyyy HH:mm:ss zzz" + seeders: + selector: td:nth-child(5) table tbody tr:last-child td:nth-last-child(3) font b:first-child + optional: true + default: 0 + leechers: + selector: td:nth-child(5) table tbody tr:last-child td:nth-last-child(3) font b:nth-child(2) + optional: true + default: 0 + downloadvolumefactor: + text: 0 + uploadvolumefactor: + text: 1 + minimumratio: + text: 1.0 +# engine n/a