diff --git a/definitions/v7/1337x.yml b/definitions/v7/1337x.yml index 8d52cb00b..bfb7fa4d8 100644 --- a/definitions/v7/1337x.yml +++ b/definitions/v7/1337x.yml @@ -5,7 +5,6 @@ description: "1337X is a Public torrent site that offers verified torrent downlo language: en-US type: public encoding: UTF-8 -followredirect: true requestDelay: 2 links: - https://1337x.to/ diff --git a/definitions/v7/exttorrents.yml b/definitions/v7/exttorrents.yml index e1fbe9f5c..965943f0c 100644 --- a/definitions/v7/exttorrents.yml +++ b/definitions/v7/exttorrents.yml @@ -109,6 +109,7 @@ search: paths: - path: "{{ if .Keywords }}search/{{ .Keywords }}/?order={{ .Config.sort }}&sort={{ .Config.type }}{{ else }}latest/{{ end }}" - path: "{{ if .Keywords }}search/{{ .Keywords }}/2/?order={{ .Config.sort }}&sort={{ .Config.type }}{{ else }}latest/2/{{ end }}" + followredirect: true keywordsfilters: - name: tolower diff --git a/definitions/v7/nordichd.yml b/definitions/v7/nordichd.yml index 027817faa..a17cad695 100644 --- a/definitions/v7/nordichd.yml +++ b/definitions/v7/nordichd.yml @@ -6,9 +6,9 @@ language: en-US type: private encoding: UTF-8 links: - - http://nordichd.org/ + - https://nordichd.org/ legacylinks: - - https://nordichd.org/ # ERR_CONNECTION_TIMED_OUT + - http://nordichd.org/ caps: categorymappings: diff --git a/definitions/v7/spidertk.yml b/definitions/v7/spidertk.yml deleted file mode 100644 index de88bc166..000000000 --- a/definitions/v7/spidertk.yml +++ /dev/null @@ -1,261 +0,0 @@ ---- -id: spidertk -name: SpiderTK -description: "SpiderTK is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL" -language: fr-FR -type: private -encoding: UTF-8 -links: - - https://spidertk.top/ -legacylinks: - - https://spidertk.xyz/ - -caps: - categorymappings: - - {id: 401, cat: Movies/BluRay, desc: "Films / 2160p / BluRay Full"} - - {id: 410, cat: Movies/UHD, desc: "Films / 2160p / REMUX"} - - {id: 411, cat: Movies/UHD, desc: "Films / 2160p / AV1"} - - {id: 412, cat: Movies/UHD, desc: "Films / 2160p / x265"} - - {id: 413, cat: Movies/BluRay, desc: "Films / 1080p / BluRay Full"} - - {id: 414, cat: Movies/HD, desc: "Films / 1080p / REMUX"} - - {id: 415, cat: Movies/HD, desc: "Films / 1080p / AV1"} - - {id: 416, cat: Movies/HD, desc: "Films / 1080p / x265"} - - {id: 417, cat: Movies/HD, desc: "Films / 1080p / x264"} - - {id: 418, cat: Movies/HD, desc: "Films / 720p / x264"} - - {id: 419, cat: Movies/SD, desc: "Films / SD / x264"} - - {id: 420, cat: Movies/3D, desc: "Films / 3D"} - - {id: 421, cat: Movies/SD, desc: "Films / XviD"} - - {id: 422, cat: Movies/HD, desc: "Films / HDTV / 1080p"} - - {id: 423, cat: Movies/WEB-DL, desc: "Films / WEB / 1080p"} - - {id: 424, cat: TV/Documentary, desc: "Films / Documentaire"} - - {id: 425, cat: TV/Sport, desc: "Films / Sport"} - - {id: 426, cat: Movies, desc: "Films / Animation"} - - {id: 427, cat: Movies/Other, desc: "Films / Spectacle"} - - {id: 428, cat: Audio/Video, desc: "Films / Concerts, Clips"} - - {id: 430, cat: TV, desc: "Séries / BluRay"} - - {id: 431, cat: TV, desc: "Séries / Pack VF"} - - {id: 432, cat: TV/HD, desc: "Séries / HD VF"} - - {id: 433, cat: TV/SD, desc: "Séries / SD VF"} - - {id: 434, cat: TV, desc: "Séries / Pack VOSTFR"} - - {id: 435, cat: TV/HD, desc: "Séries / HD VOSTFR"} - - {id: 436, cat: TV/SD, desc: "Séries / SD VOSTFR"} - - {id: 437, cat: TV/Anime, desc: "Séries / Pack Animé"} - - {id: 438, cat: TV/Anime, desc: "Séries / Animé VF"} - - {id: 439, cat: TV/Anime, desc: "Séries / Animé VOSTFR"} - - {id: 440, cat: Movies/HD, desc: "Films / HDTV / 720p"} - - {id: 441, cat: TV/Documentary, desc: "Séries / Documentaire"} - - {id: 442, cat: TV/Sport, desc: "Séries / Sport"} - - {id: 443, cat: TV, desc: "Séries / Émission TV"} - - {id: 444, cat: Books/EBook, desc: "Livres / Roman"} - - {id: 445, cat: Audio/Audiobook, desc: "Livres / Audio"} - - {id: 446, cat: Books/Mags, desc: "Livres / Magazine"} - - {id: 447, cat: Books/Comics, desc: "Livres / Bande Dessinée"} - - {id: 448, cat: Books/Comics, desc: "Livres / Comic"} - - {id: 449, cat: Books/Comics, desc: "Livres / Manga"} - - {id: 450, cat: PC/Games, desc: "Logiciels / Jeu PC"} - - {id: 451, cat: PC/Games, desc: "Logiciels / Jeu Mac"} - - {id: 452, cat: PC/Games, desc: "Logiciels / Jeu Linux"} - - {id: 453, cat: PC/0day, desc: "Logiciels / Appli Windows"} - - {id: 454, cat: PC/Mac, desc: "Logiciels / Appli Mac"} - - {id: 455, cat: PC, desc: "Logiciels / Appli Linux"} - - {id: 456, cat: Console, desc: "Logiciels / Console"} - - {id: 457, cat: PC/Mobile-iOS, desc: "Logiciels / iOS"} - - {id: 458, cat: Movies/WEB-DL, desc: "Films / WEB / 720p"} - - {id: 459, cat: PC/Mobile-Android, desc: "Logiciels / Android"} - - {id: 460, cat: Movies, desc: "Films / VO"} - - {id: 461, cat: TV, desc: "Séries / VO"} - - {id: 462, cat: Movies/WEB-DL, desc: "Films / WEB / SD"} - - {id: 463, cat: Movies/WEB-DL, desc: "Films / WEB / 2160p"} - - {id: 468, cat: Books/Other, desc: "Livres / Divers"} - - {id: 469, cat: Books/Other, desc: "Livres / Bricolage"} - - {id: 470, cat: Books/Other, desc: "Livres / RPG"} - - modes: - search: [q] - tv-search: [q, season, ep, imdbid] - movie-search: [q, imdbid] - book-search: [q] - -settings: - - name: username - type: text - label: Username - - name: password - type: password - label: Password - - name: 2facode - type: text - label: 2FA code - - name: info_2fa - type: info - label: "About 2FA code" - default: "Only fill in the 2FA code box if you have enabled 2FA on the SpiderTK Web Site. Otherwise just leave it empty." - - name: freeleech - type: checkbox - label: Search freeleech only - 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 - - 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 and SUBFRENCH with ENGLISH - default: false - - name: info_tpp - type: info - label: Results Per Page - default: For best results, change the Torrents per page: setting to 100 on your account profile. - -login: - path: login.php - method: form - form: form[action="takelogin.php"] - captcha: - type: image - selector: img[alt="CAPTCHA"] - input: imagestring - inputs: - username: "{{ .Config.username }}" - password: "{{ .Config.password }}" - two_step_code: "{{ .Config.2facode }}" - logout: "" - securelogin: "" - ssl: yes - trackerssl: yes - error: - - selector: td.embedded:has(h2:contains("Echoué")) # invalid captcha - - selector: td.embedded:has(h2:contains("Échec")) # invalid uid or pwd - message: - selector: td.text - test: - path: index.php - selector: a[href*="logout.php"] - -search: - paths: - - path: torrents.php - inputs: - $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}" - search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" - # 0 incldead, 1 active, 2 dead - incldead: 0 - # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30% - spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}" - inclbookmarked: 0 - # 0 title, 1 descr, 3 uploader, 4 imdburl - search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}" - # 0 AND, 1 OR, 2 exact - search_mode: 0 - sort: "{{ .Config.sort }}" - type: "{{ .Config.type }}" - notnewword: 1 - - rows: - selector: table.torrents > tbody > tr:has(table.torrentname) - - fields: - category: - selector: a[href^="?cat="] - attribute: href - filters: - - name: querystring - args: cat - title_phase1: - selector: a[href^="details.php?id="] - title_vostfr: - text: "{{ .Result.title_phase1 }}" - filters: - - name: re_replace - args: ["(?i)\\b(vostfr|subfrench)\\b", "ENGLISH"] - title_phase2: - text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase1 }}{{ end }}" - title_multilang: - text: "{{ .Result.title_phase2 }}" - filters: - - name: re_replace - args: ["(?i)\\b(MULTI(?!.*(?:FRENCH|ENGLISH|VOSTFR)))\\b", "{{ .Config.multilanguage }}"] - title: - text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase2 }}{{ end }}" - details: - selector: a[href^="details.php?id="] - attribute: href - download: - selector: a[href^="download.php?id="] - attribute: href - poster: - selector: img[data-src] - attribute: data-src - date_elapsed: - # time type: time elapsed (default) - selector: td.rowfollow:nth-child(4) > span[title] - attribute: title - optional: true - filters: - - name: append - args: " +01:00" # CET - - name: dateparse - args: "yyyy-MM-dd HH:mm:ss zzz" - date_added: - # time added - selector: td.rowfollow:nth-child(4):not(:has(span)) - optional: true - filters: - - name: append - args: " +01:00" # CET - - name: dateparse - args: "yyyy-MM-ddHH:mm:ss zzz" - date: - text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}" - size: - selector: td.rowfollow:nth-child(5) - seeders: - selector: td.rowfollow:nth-child(6) - leechers: - selector: td.rowfollow:nth-child(7) - grabs: - selector: td.rowfollow:nth-child(8) - downloadvolumefactor: - case: - img[src="pic/freeleech.png"]: 0 - img[src="pic/2xupfree.png"]: 0 - img[src="pic/50pc.png"]: 0.5 - img[src="pic/2x50pc.png"]: 0.5 - img[src="pic/30pc.png"]: 0.3 - "*": 1 - uploadvolumefactor: - case: - img[src="pic/2x.png"]: 2 - img[src="pic/2xupfree.png"]: 2 - img[src="pic/2x50pc.png"]: 2 - "*": 1 - minimumratio: - text: 0.81 -# NexusPHP v1.7.33 2022-12-19 (custom) diff --git a/definitions/v7/thorsland.yml b/definitions/v7/thorsland.yml index 0f6c04a84..e1b2aaf73 100644 --- a/definitions/v7/thorsland.yml +++ b/definitions/v7/thorsland.yml @@ -217,7 +217,7 @@ download: to: give torrent: "{{ .DownloadUri.Query.id }}" selectors: - - selector: a[href^="download?id="] + - selector: a[href^="download?id="], a[href^="magnet:?xt="] attribute: href search: @@ -272,9 +272,6 @@ search: download: selector: a[href^="/torrents-details?id="] attribute: href - magnet: - selector: a[href^="magnet:?xt="] - attribute: href poster: selector: img[src^="uploads/images/"] attribute: src diff --git a/definitions/v7/torrentqq.yml b/definitions/v7/torrentqq.yml index c406a507f..dfb401f76 100644 --- a/definitions/v7/torrentqq.yml +++ b/definitions/v7/torrentqq.yml @@ -7,9 +7,8 @@ type: public encoding: UTF-8 followredirect: true links: - - https://torrentqq269.com/ + - https://torrentqq270.com/ legacylinks: - - https://torrentqq254.com/ - https://torrentqq255.com/ - https://torrentqq256.com/ - https://torrentqq257.com/ @@ -24,6 +23,7 @@ legacylinks: - https://torrentqq266.com/ - https://torrentqq267.com/ - https://torrentqq268.com/ + - https://torrentqq269.com/ caps: categorymappings: diff --git a/definitions/v7/torrentsir.yml b/definitions/v7/torrentsir.yml index 842ff49ab..b02ef8dc9 100644 --- a/definitions/v7/torrentsir.yml +++ b/definitions/v7/torrentsir.yml @@ -7,10 +7,8 @@ type: public encoding: UTF-8 followredirect: true links: - - https://torrentsir114.com/ + - https://torrentsir115.com/ legacylinks: - - http://torrentsir95.com/ - - https://torrentsir95.com/ - http://torrentsir96.com/ - https://torrentsir96.com/ - http://torrentsir100.com/ @@ -40,6 +38,8 @@ legacylinks: - http://torrentsir113.com/ - https://torrentsir113.com/ - http://torrentsir114.com/ + - https://torrentsir114.com/ + - http://torrentsir115.com/ caps: categorymappings: diff --git a/definitions/v7/yggcookie.yml b/definitions/v7/yggcookie.yml index 3babc2d81..cc7faa207 100644 --- a/definitions/v7/yggcookie.yml +++ b/definitions/v7/yggcookie.yml @@ -370,34 +370,12 @@ search: selector: td:nth-child(2) > a attribute: href category: - selector: ":nth-child(1) > div.hidden" + selector: td:nth-child(1) > div.hidden download: text: "{{ .Config.sitelink }}engine/download_torrent?id={{ .Result._id }}" date: - selector: td:nth-child(5) - filters: - - name: replace - args: ["il y a ", ""] - - name: replace - args: [" jours", " days"] - - name: replace - args: [" jour", " day"] - - name: replace - args: [" heures", " hours"] - - name: replace - args: [" heure", " hour"] - - name: replace - args: [" semaines", " weeks"] - - name: replace - args: [" semaine", " week"] - - name: replace - args: [" mois", " month"] - - name: replace - args: [" ans", " years"] - - name: replace - args: [" an", " year"] - - name: append - args: " ago" + # unix + selector: td:nth-child(5) > div.hidden size: selector: td:nth-child(6) filters: diff --git a/definitions/v7/yggtorrent.yml b/definitions/v7/yggtorrent.yml index 0f80a8fa9..0d5ee64f7 100644 --- a/definitions/v7/yggtorrent.yml +++ b/definitions/v7/yggtorrent.yml @@ -374,34 +374,12 @@ search: selector: td:nth-child(2) > a attribute: href category: - selector: ":nth-child(1) > div.hidden" + selector: td:nth-child(1) > div.hidden download: text: "{{ .Config.sitelink }}engine/download_torrent?id={{ .Result._id }}" date: - selector: td:nth-child(5) - filters: - - name: replace - args: ["il y a ", ""] - - name: replace - args: [" jours", " days"] - - name: replace - args: [" jour", " day"] - - name: replace - args: [" heures", " hours"] - - name: replace - args: [" heure", " hour"] - - name: replace - args: [" semaines", " weeks"] - - name: replace - args: [" semaine", " week"] - - name: replace - args: [" mois", " month"] - - name: replace - args: [" ans", " years"] - - name: replace - args: [" an", " year"] - - name: append - args: " ago" + # unix + selector: td:nth-child(5) > div.hidden size: selector: td:nth-child(6) filters: diff --git a/definitions/v9/exttorrents.yml b/definitions/v9/exttorrents.yml index 1acdb2773..791c6ceb5 100644 --- a/definitions/v9/exttorrents.yml +++ b/definitions/v9/exttorrents.yml @@ -109,6 +109,7 @@ search: paths: - path: "{{ if .Keywords }}search/{{ .Keywords }}/?order={{ .Config.sort }}&sort={{ .Config.type }}{{ else }}latest/{{ end }}" - path: "{{ if .Keywords }}search/{{ .Keywords }}/2/?order={{ .Config.sort }}&sort={{ .Config.type }}{{ else }}latest/2/{{ end }}" + followredirect: true keywordsfilters: - name: tolower diff --git a/definitions/v9/yggcookie.yml b/definitions/v9/yggcookie.yml index 2b6a579f7..602542964 100644 --- a/definitions/v9/yggcookie.yml +++ b/definitions/v9/yggcookie.yml @@ -370,34 +370,12 @@ search: selector: td:nth-child(2) > a attribute: href category: - selector: ":nth-child(1) > div.hidden" + selector: td:nth-child(1) > div.hidden download: text: "{{ .Config.sitelink }}engine/download_torrent?id={{ .Result._id }}" date: - selector: td:nth-child(5) - filters: - - name: replace - args: ["il y a ", ""] - - name: replace - args: [" jours", " days"] - - name: replace - args: [" jour", " day"] - - name: replace - args: [" heures", " hours"] - - name: replace - args: [" heure", " hour"] - - name: replace - args: [" semaines", " weeks"] - - name: replace - args: [" semaine", " week"] - - name: replace - args: [" mois", " month"] - - name: replace - args: [" ans", " years"] - - name: replace - args: [" an", " year"] - - name: append - args: " ago" + # unix + selector: td:nth-child(5) > div.hidden size: selector: td:nth-child(6) filters: @@ -407,12 +385,8 @@ search: selector: td:nth-child(7) seeders: selector: td:nth-child(8) - optional: true - default: 0 leechers: selector: td:nth-child(9) - optional: true - default: 0 downloadvolumefactor: text: 1 uploadvolumefactor: diff --git a/definitions/v9/yggtorrent.yml b/definitions/v9/yggtorrent.yml index 1f4f3ea28..5b7613391 100644 --- a/definitions/v9/yggtorrent.yml +++ b/definitions/v9/yggtorrent.yml @@ -374,34 +374,12 @@ search: selector: td:nth-child(2) > a attribute: href category: - selector: ":nth-child(1) > div.hidden" + selector: td:nth-child(1) > div.hidden download: text: "{{ .Config.sitelink }}engine/download_torrent?id={{ .Result._id }}" date: - selector: td:nth-child(5) - filters: - - name: replace - args: ["il y a ", ""] - - name: replace - args: [" jours", " days"] - - name: replace - args: [" jour", " day"] - - name: replace - args: [" heures", " hours"] - - name: replace - args: [" heure", " hour"] - - name: replace - args: [" semaines", " weeks"] - - name: replace - args: [" semaine", " week"] - - name: replace - args: [" mois", " month"] - - name: replace - args: [" ans", " years"] - - name: replace - args: [" an", " year"] - - name: append - args: " ago" + # unix + selector: td:nth-child(5) > div.hidden size: selector: td:nth-child(6) filters: @@ -411,12 +389,8 @@ search: selector: td:nth-child(7) seeders: selector: td:nth-child(8) - optional: true - default: 0 leechers: selector: td:nth-child(9) - optional: true - default: 0 downloadvolumefactor: text: 1 uploadvolumefactor: