diff --git a/definitions/v11/dxp.yml b/definitions/v11/dxp.yml index f3dcdba75..aacdaf1a4 100644 --- a/definitions/v11/dxp.yml +++ b/definitions/v11/dxp.yml @@ -1,38 +1,38 @@ --- id: dxp name: DXP -description: "Deaf Experts (DXP) is a RUSSIAN Semi-Private Torrent Tracker for MOVIES / TV with Russian Subtitles." +description: "Deaf Experts (DXP) is a RUSSIAN Semi-Private Torrent Tracker for MOVIES / TV with Russian Subtitles" language: ru-RU type: semi-private -encoding: windows-1251 +encoding: UTF-8 links: - https://dxp.ru/ caps: categorymappings: - - {id: 14, cat: Movies/HD, desc: "Фильмы HDTV"} - - {id: 15, cat: Movies/DVD, desc: "Фильмы DVD"} - - {id: 13, cat: Movies/SD, desc: "Фильмы XviD"} - - {id: 12, cat: Movies/Other, desc: "Мультфильмы"} - - {id: 9, cat: TV/Documentary, desc: "Документальные"} - - {id: 11, cat: TV, desc: "Сериалы"} - - {id: 10, cat: Audio, desc: "Музыка"} - - {id: 16, cat: Books, desc: "Книги"} - - {id: 22, cat: Other, desc: "Картинки"} + - {id: 18, cat: Other, desc: "Эксклюзивы"} + - {id: 17, cat: Other/Misc, desc: "VIP"} + - {id: 25, cat: Other, desc: "OnLine"} - {id: 1, cat: PC, desc: "Приложения Windows"} - - {id: 3, cat: PC, desc: "Приложения Unix/Linux"} - - {id: 4, cat: PC/Mac, desc: "Приложения Mac"} - {id: 2, cat: PC/Mobile-Other, desc: "Приложения PDA"} - - {id: 5, cat: PC/Games, desc: "Игры PC"} + - {id: 3, cat: PC, desc: "Приложения Unix/Linux"} - {id: 23, cat: PC/Games, desc: "Игры Unix/Linux"} + - {id: 4, cat: PC/Mac, desc: "Приложения Mac"} + - {id: 5, cat: PC/Games, desc: "Игры PC"} - {id: 6, cat: Console/PS3, desc: "Игры PlayStation 3"} - {id: 7, cat: Console/XBox, desc: "Игры X-Box"} - {id: 8, cat: Console/PSP, desc: "Игры PSP"} - - {id: 18, cat: Other, desc: "Эксклюзивы"} - - {id: 21, cat: Other, desc: "Лавка субтитров"} + - {id: 9, cat: TV/Documentary, desc: "Документация"} + - {id: 10, cat: Audio, desc: "Музыка"} + - {id: 11, cat: TV, desc: "Сериалы"} + - {id: 12, cat: Movies/Other, desc: "Мультфильмы"} + - {id: 14, cat: Movies/HD, desc: "Фильмы HDTV"} + - {id: 15, cat: Movies/DVD, desc: "Фильмы DVD"} + - {id: 13, cat: Movies/SD, desc: "Фильмы XviD"} + - {id: 16, cat: Books, desc: "Книги"} - {id: 20, cat: Other, desc: "DEMO"} - - {id: 17, cat: Other/Misc, desc: "VIP"} - - {id: 24, cat: Other/Misc, desc: "SuperVIP"} + - {id: 21, cat: Other, desc: "Лавка субтитров"} + - {id: 22, cat: Other, desc: "Картинки"} modes: search: [q] @@ -72,6 +72,10 @@ settings: options: desc: desc asc: asc + - name: info_tpp + type: info + label: Results Per Page + default: For best results, change the Торрентов на страницу setting to 100 on your account profile. - name: info_flaresolverr type: info_flaresolverr @@ -88,24 +92,14 @@ login: path: index.php selector: a[href="logout.php"] -download: - selectors: - - selector: a[href^="download.php?id="] - attribute: href - - selector: a[href^="magnet:?xt="] - attribute: href - filters: - - name: re_replace - args: ["(\\([\\p{IsCyrillic}\\W]+\\))|(^[\\p{IsCyrillic}\\W\\d]+\\/ )|([\\p{IsCyrillic} \\-]+,+)|([\\p{IsCyrillic}]+)", ""] - search: - # https://dxp.ru/torrents.php?search=&sort=4&type=desc - # https://dxp.ru/torrents.php?search=&cat=0&incldead=1 + # https://dxp.ru/torrents.php?search=&sort=4&type=desc&wh=name&incldead=1 paths: - path: torrents.php inputs: $raw: "{{ range .Categories }}c{{.}}=1&{{end}}" search: "{{ .Keywords }}" + wh: name incldead: 1 sort: "{{ .Config.sort }}" type: "{{ .Config.type }}" @@ -115,25 +109,14 @@ search: - name: re_replace args: ["(?i)\\b(?:[SE]\\d{1,4}){1,2}\\b\\s?", ""] - headers: - Referer: ["{{ .Config.sitelink }}torrents.php"] - rows: - selector: table#loading-table tbody#highlighted tr:has(a[href^="torrents.php?cat="]), table#loading-table tbody#highlighted tr:has(a[href^="details.php?id="]) - after: 1 + selector: div.torrent-card fields: - category: - selector: a[href^="torrents.php?cat="] - attribute: href - filters: - - name: querystring - args: cat - download: - selector: a[href^="torrent-"] - attribute: href + categorydesc: + selector: div.poster-badge title: - selector: a[href^="torrent-"] + selector: div.torrent-card-title filters: # normalize to SXXEYY format - name: re_replace @@ -189,36 +172,30 @@ search: details: selector: a[href^="torrent-"] attribute: href + download: + selector: a[href^="download.php?id="] + attribute: href + poster: + selector: div.torrent-poster img + attribute: src date: - selector: i - filters: - - name: append - args: " +03:00" # MSK - - name: dateparse - args: "yyyy-MM-dd HH:mm:ss zzz" - files: - selector: td:nth-child(4) + text: now size: - selector: td:nth-child(6) + text: 2GB + grabs: + selector: div.stat-item:nth-child(3) span seeders: - selector: td:nth-child(7) - filters: - - name: split - args: ["|", 0] + selector: div.stat-item:nth-child(1) span leechers: - selector: td:nth-child(7) - filters: - - name: split - args: ["|", 1] + selector: div.stat-item:nth-child(2) span downloadvolumefactor: case: - a[href="torrents.php?cat=17"]: 1 # vip - a[href="torrents.php?cat=24"]: 1 # super vip + div.poster-badge:contains("VIP"): 1 # vip "*": 0 uploadvolumefactor: text: 1 minimumratio: text: 0.3 description: - selector: a[href^="torrent-"] + selector: div.torrent-card-title # engine n/a diff --git a/definitions/v11/nyaasi.yml b/definitions/v11/nyaasi.yml index 479ffd43c..7a046234a 100644 --- a/definitions/v11/nyaasi.yml +++ b/definitions/v11/nyaasi.yml @@ -10,6 +10,7 @@ links: - https://nyaa.si/ - https://nyaa.iss.ink/ - https://nyaa.land/ + - https://nyaa.mom/ - https://nyaa.unblockninja.com/ # for magnets only legacylinks: - https://nyaa.black-mirror.xyz/ diff --git a/definitions/v11/p2pbg.yml b/definitions/v11/p2pbg.yml index fa21dcbe6..882504329 100644 --- a/definitions/v11/p2pbg.yml +++ b/definitions/v11/p2pbg.yml @@ -27,6 +27,9 @@ caps: - {id: 35, cat: Movies, desc: "Movies GSM"} - {id: 38, cat: TV/Anime, desc: "Cartoons"} - {id: 55, cat: Movies/3D, desc: "Movies 3D"} + - {id: 58, cat: Movies/HD, desc: "Movies x265"} + - {id: 59, cat: Movies/SD, desc: "Movies VHS"} + - {id: 60, cat: Movies/UHD, desc: "Movies 4K"} # music - {id: 2, cat: Audio/MP3, desc: "Music Song"} - {id: 3, cat: Audio/Video, desc: "Music DVD"} @@ -49,8 +52,9 @@ caps: - {id: 31, cat: PC/0day, desc: "Appz Ripped"} - {id: 49, cat: PC/Mac, desc: "Appz MacOS"} # sports - - {id: 5, cat: TV/Sport, desc: "Sport F1"} + - {id: 5, cat: TV/Sport, desc: "Formula 1"} - {id: 51, cat: TV/Sport, desc: "Sport"} + - {id: 57, cat: TV/Sport, desc: "Formula 2"} # other - {id: 4, cat: Other, desc: "Other"} - {id: 6, cat: Books, desc: "Books"} diff --git a/definitions/v11/racing4everyone-api.yml b/definitions/v11/racing4everyone-api.yml index b01417a0a..c8884fe37 100644 --- a/definitions/v11/racing4everyone-api.yml +++ b/definitions/v11/racing4everyone-api.yml @@ -34,6 +34,7 @@ caps: - {id: 78, cat: TV/Sport, desc: "Porsche Supercup"} - {id: 32, cat: TV/Sport, desc: "Stock Car Brazil"} - {id: 63, cat: TV/Sport, desc: "Supercars"} + - {id: 84, cat: TV/Sport, desc: "Super Formula"} - {id: 83, cat: TV/Sport, desc: "Super GT"} - {id: 80, cat: TV/Sport, desc: "Touring Cars"} - {id: 57, cat: TV/Sport, desc: "WEC"}