diff --git a/definitions/v3/schema.json b/definitions/v3/schema.json index 2d60bfc9f..386b18bda 100644 --- a/definitions/v3/schema.json +++ b/definitions/v3/schema.json @@ -951,4 +951,4 @@ "title": "IndexerCategories" } } -} +} \ No newline at end of file diff --git a/definitions/v4/abnormal.yml b/definitions/v4/abnormal.yml index 79ae857f5..801d8cf40 100644 --- a/definitions/v4/abnormal.yml +++ b/definitions/v4/abnormal.yml @@ -1,30 +1,32 @@ ---- +--- id: abnormal name: Abnormal description: "General French Private Tracker" language: fr-FR type: private encoding: UTF-8 +requestDelay: 2.1 links: - https://abn.lol/ -followredirect: true +legacylinks: + - https://abnormal.ws caps: categorymappings: - - { id: 1, cat: TV, desc: "Series" } - - { id: 2, cat: Movies, desc: "Movies" } - - { id: 3, cat: TV/Documentary, desc: "Documentaries" } - - { id: 4, cat: TV/Anime, desc: "Anime" } - - { id: 5, cat: PC/Games, desc: "Games" } - - { id: 6, cat: PC, desc: "Applications" } - - { id: 7, cat: Books/EBook, desc: "Ebooks" } - - { id: 9, cat: TV, desc: "Emissions" } + - {id: 1, cat: TV, desc: "Series"} + - {id: 2, cat: Movies, desc: "Movies"} + - {id: 3, cat: TV/Documentary, desc: "Documentaries"} + - {id: 4, cat: TV/Anime, desc: "Anime"} + - {id: 5, cat: PC/Games, desc: "Games"} + - {id: 6, cat: PC, desc: "Applications"} + - {id: 7, cat: Books/EBook, desc: "Ebooks"} + - {id: 9, cat: TV, desc: "Emissions"} modes: - search: [ q ] - tv-search: [ q, season, ep ] - movie-search: [ q ] - book-search: [ q ] + search: [q] + tv-search: [q, season, ep] + movie-search: [q] + book-search: [q] settings: - name: username @@ -33,13 +35,45 @@ settings: - name: password type: password label: Password + - name: multilang + type: checkbox + label: Replace MULTI by another language in release name + default: false - name: multilanguage - type: text - label: Replace MULTI by this word - default: MULTI - - name: subfrench - type: text - label: Replace "VOSTFR" and "SUBFRENCH" by this word + 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 with ENGLISH + default: false + - name: freeleech + type: checkbox + label: Search freeleech only + default: false + - name: sort + type: select + label: Sort requested from site + default: Created + options: + Created: created + Seeders: seeders + Size: size + ReleaseName: title + - name: type + type: select + label: Order requested from site + default: desc + options: + desc: desc + asc: asc login: method: form @@ -48,13 +82,13 @@ login: inputs: Username: "{{ .Config.username }}" Password: "{{ .Config.password }}" - RememberMe: "true" + RememberMe: true selectorinputs: __RequestVerificationToken: selector: input[name="__RequestVerificationToken"] attribute: value error: - - selector: span.text-danger.validation-summary-errors > span + - selector: div.validation-summary-errors[data-valmsg-summary="true"] message: text: " - Bad username/password." test: @@ -65,11 +99,18 @@ search: - path: Torrent inputs: $raw: "{{ range .Categories }}SelectedCats={{.}}&{{end}}" - search: "{{ .Keywords }}" - page: torrents - category: 0 - 3dformat: 0 - active: 1 + Search: "{{ .Keywords }}" + UserId: "" + YearOperator: ≥ + Year: "" + RatingOperator: ≥ + Rating: "" + Pending: "" + Pack: "" + Scene: "" + Freeleech: "{{ if .Config.freeleech }}true{{ else }}{{ end }}" + SortOn: "{{ .Config.sort }}" + SortOrder: "{{ .Config.type }}" rows: selector: table.table-rows > tbody > tr @@ -83,35 +124,37 @@ search: args: SelectedCats title_phase1: selector: td.grid-release-column > a - title_multilanguage: + title_multilang: text: "{{ .Result.title_phase1 }}" filters: - name: re_replace - args: [ "(?i)[\\.\\s\\[\\-]multi[\\.\\s\\]\\-]", ".{{ .Config.multilanguage }}." ] + args: ["(?i)(\\smulti\\s)", " {{ .Config.multilanguage }} "] title_phase2: - text: "{{ if .Config.multilanguage }}{{ .Result.title_multilanguage }}{{ else }}{{ .Result.title_phase1 }}{{ end }}" + text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}" title_vostfr: text: "{{ .Result.title_phase2 }}" filters: - name: re_replace - args: [ "(?i)[\\.\\s\\[\\-]vostfr[\\.\\s\\]\\-]", ".{{ .Config.subfrench }}." ] + args: ["(?i)(\\svostfr\\s)", " ENGLISH "] - name: re_replace - args: [ "(?i)[\\.\\s\\[\\-]subfrench[\\.\\s\\]\\-]", ".{{ .Config.subfrench }}." ] + args: ["(?i)(\\ssubfrench\\s)", " ENGLISH "] title: - text: "{{ if .Config.subfrench }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}" - download: - selector: a[href^="/Torrent/Download?ReleaseId="] - attribute: href + text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}" details: selector: a[href^="/Torrent/Details?ReleaseId="] attribute: href + download: + selector: a[href^="/Torrent/Download?ReleaseId="] + attribute: href + date: + text: now size: selector: td:nth-child(6) filters: - name: re_replace - args: [ ",", "." ] + args: [",", "."] - name: replace - args: [ "o", "B" ] + args: ["o", "B"] seeders: selector: td:nth-child(7) leechers: @@ -123,3 +166,9 @@ search: uploadvolumefactor: case: "*": 1 + minimumratio: + text: 1.0 + minimumseedtime: + # 2 days (as seconds = 2 x 24 x 60 x 60) + text: 172800 +# Gazelle diff --git a/definitions/v4/acrossthetasman.yml b/definitions/v4/acrossthetasman.yml index 30efb83aa..233b165c2 100644 --- a/definitions/v4/acrossthetasman.yml +++ b/definitions/v4/acrossthetasman.yml @@ -25,6 +25,7 @@ settings: - name: sort label: Sort type: select + label: Sort requested from site default: date options: date: created @@ -34,6 +35,7 @@ settings: - name: order label: Order type: select + label: Order requested from site default: desc options: desc: desc diff --git a/definitions/v4/bitturk.yml b/definitions/v4/bitturk.yml index 62d192094..58e739e27 100644 --- a/definitions/v4/bitturk.yml +++ b/definitions/v4/bitturk.yml @@ -64,6 +64,7 @@ caps: - {id: 88, cat: Console/Other, desc: "Oyun NEO-GEO"} - {id: 89, cat: Console/Wii, desc: "Oyun Nintendo Wii"} - {id: 6, cat: PC/0day, desc: "Program"} + - {id: 92, cat: PC/Mobile-Android, desc: "Android"} - {id: 47, cat: Other, desc: "Resimler"} - {id: 48, cat: TV, desc: "Televizyon"} - {id: 49, cat: TV/HD, desc: "Tv HD"} diff --git a/definitions/v4/danishbytes-api.yml b/definitions/v4/danishbytes-api.yml index 6fca82807..4029e557a 100644 --- a/definitions/v4/danishbytes-api.yml +++ b/definitions/v4/danishbytes-api.yml @@ -97,6 +97,8 @@ search: text: "{{ .Config.sitelink }}torrents/{{ .Result._id }}" download: text: "{{ .Config.sitelink }}torrent/download/{{ .Result._id }}.{{ .Config.rsskey }}" + infohash: + selector: info_hash poster: selector: poster_image imdbid: diff --git a/definitions/v4/fuzer.yml b/definitions/v4/fuzer.yml index 078bcb5bf..b26701c48 100644 --- a/definitions/v4/fuzer.yml +++ b/definitions/v4/fuzer.yml @@ -1,80 +1,67 @@ --- id: fuzer name: Fuzer -description: "Another Hebrew tracker" -language: en-US +description: "Fuzer is a private torrent website with israeli torrents." +language: he-IL type: private encoding: windows-1255 links: - https://www.fuzer.me/ +legacylinks: + - https://fuzer.me/ caps: categorymappings: # Movies - - {id: 73, cat: Movies, desc: "Movies"} - - {id: 7, cat: Movies/SD, desc: "Movies/SD"} - - {id: 60, cat: Movies/SD, desc: "Israeli Movies/SD"} - - {id: 9, cat: Movies/HD, desc: "Movies/HD"} - - {id: 101, cat: Movies/HD, desc: "BDRIP-BRRip"} - - {id: 59, cat: Movies/HD, desc: "Movies/HD"} - - {id: 61, cat: Movies/HD, desc: "Israeli Movies/HD"} - - {id: 97, cat: Movies/UHD, desc: "Movies/UHD"} - - {id: 58, cat: Movies/DVD, desc: "Movies/DVD"} - - {id: 83, cat: Movies/Other, desc: "Movies/HebDub"} - + - {id: 73, cat: Movies, desc: "סרטים"} + - {id: 7, cat: Movies/SD, desc: "סרטים"} + - {id: 60, cat: Movies/SD, desc: "סרטים ישראליים"} + - {id: 9, cat: Movies/HD, desc: "סרטים HD"} + - {id: 101, cat: Movies/HD, desc: "סרטים x265"} + - {id: 59, cat: Movies/HD, desc: "סרטי BDRIP-BRRip"} + - {id: 61, cat: Movies/HD, desc: "סרטים ישראליים HD"} + - {id: 97, cat: Movies/UHD, desc: "סרטים UHD"} + - {id: 58, cat: Movies/DVD, desc: "סרטים DVD-R"} + - {id: 83, cat: Movies/Other, desc: "סרטים מדובבים"} # TV - - {id: 76, cat: TV, desc: "TV"} - - {id: 8, cat: TV/SD, desc: "TV/SD"} - - {id: 62, cat: TV/SD, desc: "Israeli TV/SD"} - - {id: 10, cat: TV/HD, desc: "TV/HD"} - - {id: 63, cat: TV/HD, desc: "Israeli TV/HD"} - - {id: 100, cat: TV/UHD, desc: "TV/UHD"} - - {id: 84, cat: TV/Other, desc: "TV/HebDub"} - - {id: 65, cat: TV/Anime, desc: "TV/Anime"} - - {id: 64, cat: TV/Sport, desc: "TV/Sport"} - + - {id: 76, cat: TV, desc: "סדרות"} + - {id: 8, cat: TV/SD, desc: "סדרות"} + - {id: 62, cat: TV/SD, desc: "סדרות ישראליות"} + - {id: 10, cat: TV/HD, desc: "Tסדרות HD"} + - {id: 63, cat: TV/HD, desc: "סדרות ישראליות HD"} + - {id: 100, cat: TV/UHD, desc: "סדרות UHD"} + - {id: 84, cat: TV/Other, desc: "סדרות מדובבות"} + - {id: 65, cat: TV/Anime, desc: "אנימה"} + - {id: 64, cat: TV/Sport, desc: "ספורט"} # PC - - {id: 74, cat: PC, desc: "PC"} - - {id: 15, cat: PC/0day, desc: "PC/Apps"} - - {id: 11, cat: PC/Games, desc: "PC/Games"} - - {id: 13, cat: PC/Mobile-Android, desc: "Mobile/Android"} - - {id: 70, cat: PC/Mobile-iOS, desc: "Mobile/iOS"} - - {id: 71, cat: PC/Mac, desc: "Mac/Apps"} - + - {id: 74, cat: PC, desc: "תוכנות"} + - {id: 15, cat: PC/0day, desc: "תוכנות PC"} + - {id: 11, cat: PC/Games, desc: "משחקים PC"} + - {id: 13, cat: PC/Mobile-Android, desc: "אפליקציות לאנדרואיד"} + - {id: 70, cat: PC/Mobile-iOS, desc: "אפליקציות לאייפון"} + - {id: 71, cat: PC/Mac, desc: "תוכנות MAC"} # XXX - - {id: 16, cat: XXX, desc: "XXX"} - + - {id: 16, cat: XXX, desc: "למבוגרים בלבד"} # Games - - {id: 72, cat: Console, desc: "Games"} - - {id: 55, cat: Console/XBox, desc: "Console/XBox"} - - {id: 55, cat: Console/XBox One, desc: "Console/XBox"} - - {id: 55, cat: Console/XBox 360, desc: "Console/XBox"} - - {id: 55, cat: Console/XBox 360 DLC, desc: "Console/XBox"} - - {id: 12, cat: Console/PS3, desc: "Console/PS"} - - {id: 12, cat: Console/PS4, desc: "Console/PS"} - - {id: 56, cat: Console/Wii, desc: "Console/Wii"} - - {id: 57, cat: Console/3DS, desc: "Console/Mobile"} - - {id: 57, cat: Console/WiiU, desc: "Console/Mobile"} - - {id: 57, cat: Console/PS Vita, desc: "Console/Mobile"} - - {id: 57, cat: Console/NDS, desc: "Console/Mobile"} - - {id: 57, cat: Console/PSP, desc: "Console/Mobile"} - + - {id: 72, cat: Console, desc: "משחקים"} + - {id: 55, cat: Console/XBox, desc: "משחקים XBOX"} + - {id: 12, cat: Console/PSP, desc: "משחקים PS"} + - {id: 56, cat: Console/Wii, desc: "משחקים WII"} + - {id: 57, cat: PC/Mobile-Other, desc: "משחקי קונסולות ניידות"} # Music - - {id: 75, cat: Audio, desc: "Music"} - - {id: 14, cat: Audio, desc: "World Music"} - - {id: 66, cat: Audio, desc: "Israeli Music"} - - {id: 68, cat: Audio, desc: "Soundtracks"} - - {id: 67, cat: Audio/Lossless, desc: "Lossless Music"} - + - {id: 75, cat: Audio, desc: "שירים"} + - {id: 14, cat: Audio, desc: "מוזיקה עולמית"} + - {id: 66, cat: Audio, desc: "מוזיקה ישראלית"} + - {id: 68, cat: Audio, desc: "פסקולים"} + - {id: 67, cat: Audio/Lossless, desc: "FLAC"} # Books - - {id: 69, cat: Books, desc: "Books"} - + - {id: 69, cat: Books, desc: "Ebooks"} # Other - - {id: 17, cat: Other, desc: "Other"} + - {id: 17, cat: Other, desc: "שונות"} modes: search: [q] - tv-search: [q, imdbid] + tv-search: [q, season, ep, imdbid] movie-search: [q, imdbid] music-search: [q] book-search: [q] @@ -91,47 +78,67 @@ settings: type: checkbox label: Search freeleech only default: false - - name: dead - type: checkbox - label: Include dead torrents - default: false + - name: sort + type: select + label: Sort requested from site + default: dateadded + options: + dateadded: created + seeders: seeders + size: size + name: title + - name: type + type: select + label: Order requested from site + default: desc + options: + desc: desc + asc: asc login: method: cookie inputs: cookie: "{{ .Config.cookie }}" test: - path: /browse.php + path: browse.php search: paths: - - path: "browse.php" + - path: browse.php inputs: query: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" - order: dateadde - sort: desc + order: "{{ .Config.sort }}" + sort: "{{ .Config.type }}" matchquery: any freeleech: "{{ if .Config.freeleech }}1{{ else }}0{{ end }}" - dead: "{{ if .Config.dead }}on{{ else }}off{{ end }}" + # on, off, only_dead + dead: on $raw: "{{ range .Categories }}c[]={{.}}&{{end}}" + rows: selector: .box_torrent fields: - title: - selector: .main_title - _id: - selector: a[href^="/showthread.php?t="] + category: + selector: a[href^="/browse.php?cat="] attribute: href filters: - - name: split - args: ["=", 1] + - name: querystring + args: cat + title: + selector: .main_title details: selector: a[href^="/showthread.php?t="] attribute: href download: selector: a[href^="/attachment.php?attachmentid="] attribute: href + imdbid: + selector: span.imdb-inline > a + attribute: href + poster: + selector: a[imgsrc] + attribute: imgsrc size: selector: td:nth-child(4) grabs: @@ -153,12 +160,22 @@ search: selector: .up_info2 filters: - name: append - args: " +02:00" + args: " +02:00" # EET - name: re_replace args: ["[^:]+: ", ""] - name: dateparse args: "02/01/06 15:04 -07:00" + description: + selector: div.sub_title downloadvolumefactor: case: a[href*="freeleech=1"]: 0 - "*": 1 \ No newline at end of file + "*": 1 + uploadvolumefactor: + text: 1 + minimumratio: + text: 1.0 + minimumseedtime: + # 2 days (as seconds = 2 x 24 x 60 x 60) + text: 172800 +# engine n/a diff --git a/definitions/v4/haidan.yml b/definitions/v4/haidan.yml index 8a5853f84..002cc55f6 100644 --- a/definitions/v4/haidan.yml +++ b/definitions/v4/haidan.yml @@ -118,10 +118,11 @@ search: filters: - name: replace args: ["年份:", " "] - _title: - selector: a.video_name_str title: - text: "{{ .Result._title }}{{ .Result._year }}" + selector: a.video_name_str + filters: + - name: append + args: "{{ .Result._year }}" details: selector: a.video_name_str attribute: href diff --git a/definitions/v4/noname-club.yml b/definitions/v4/noname-club.yml index eb32c7f70..5822b8676 100644 --- a/definitions/v4/noname-club.yml +++ b/definitions/v4/noname-club.yml @@ -55,6 +55,7 @@ caps: - {id: 1330, cat: TV, desc: " |- Отечественные Мультфильмы 20-го века HD, FHD, UHD"} - {id: 1331, cat: TV, desc: " |- Отечественные мультфильмы 21-го века (SD)"} - {id: 1332, cat: TV, desc: " |- Отечественные мультфильмы 21-го века (HD, FHD, UHD, 3D)"} + - {id: 1340, cat: TV, desc: " |- Отечественные Мультфильмы (коллекции, сборники / *логии)"} - {id: 658, cat: TV, desc: " |- Отечественные Мультсериалы"} - {id: 1336, cat: TV, desc: " |- Зарубежные Мультфильмы 20-го века SD"} - {id: 1337, cat: TV, desc: " |- Зарубежные Мультфильмы 20-го века HD, FHD, UHD"} @@ -299,7 +300,6 @@ caps: - {id: 610, cat: TV, desc: "Юмор"} - {id: 613, cat: TV, desc: " |- КВН"} - {id: 612, cat: TV, desc: " |- ПостКВН"} - - {id: 655, cat: TV, desc: " |- Кривое зеркало"} - {id: 653, cat: TV, desc: " |- Украинские шоу"} - {id: 654, cat: TV, desc: " |- Маски-шоу"} - {id: 611, cat: TV, desc: " |- Сатирики"} @@ -368,8 +368,8 @@ caps: - {id: 896, cat: Books, desc: " |- Публицистика"} - {id: 480, cat: Books, desc: " |- Другие"} - {id: 482, cat: Books, desc: "Комиксы"} - - {id: 484, cat: Books, desc: " |- Комиксы без перевода"} - {id: 483, cat: Books, desc: " |- Комиксы на русском языке"} + - {id: 484, cat: Books, desc: " |- Комиксы без перевода"} - {id: 436, cat: Books, desc: "Обучающие аудиоматериалы"} - {id: 460, cat: Books, desc: " |- Медитации"} - {id: 459, cat: Books, desc: " |- Популярная психология"} diff --git a/definitions/v4/noname-clubl.yml b/definitions/v4/noname-clubl.yml index f3b06c2f9..a33335bd7 100644 --- a/definitions/v4/noname-clubl.yml +++ b/definitions/v4/noname-clubl.yml @@ -65,6 +65,7 @@ caps: - {id: 1330, cat: TV, desc: " |- Отечественные Мультфильмы 20-го века HD, FHD, UHD"} - {id: 1331, cat: TV, desc: " |- Отечественные мультфильмы 21-го века (SD)"} - {id: 1332, cat: TV, desc: " |- Отечественные мультфильмы 21-го века (HD, FHD, UHD, 3D)"} + - {id: 1340, cat: TV, desc: " |- Отечественные Мультфильмы (коллекции, сборники / *логии)"} - {id: 658, cat: TV, desc: " |- Отечественные Мультсериалы"} - {id: 1336, cat: TV, desc: " |- Зарубежные Мультфильмы 20-го века SD"} - {id: 1337, cat: TV, desc: " |- Зарубежные Мультфильмы 20-го века HD, FHD, UHD"} @@ -309,7 +310,6 @@ caps: - {id: 610, cat: TV, desc: "Юмор"} - {id: 613, cat: TV, desc: " |- КВН"} - {id: 612, cat: TV, desc: " |- ПостКВН"} - - {id: 655, cat: TV, desc: " |- Кривое зеркало"} - {id: 653, cat: TV, desc: " |- Украинские шоу"} - {id: 654, cat: TV, desc: " |- Маски-шоу"} - {id: 611, cat: TV, desc: " |- Сатирики"} @@ -378,8 +378,8 @@ caps: - {id: 896, cat: Books, desc: " |- Публицистика"} - {id: 480, cat: Books, desc: " |- Другие"} - {id: 482, cat: Books, desc: "Комиксы"} - - {id: 484, cat: Books, desc: " |- Комиксы без перевода"} - {id: 483, cat: Books, desc: " |- Комиксы на русском языке"} + - {id: 484, cat: Books, desc: " |- Комиксы без перевода"} - {id: 436, cat: Books, desc: "Обучающие аудиоматериалы"} - {id: 460, cat: Books, desc: " |- Медитации"} - {id: 459, cat: Books, desc: " |- Популярная психология"} diff --git a/definitions/v4/pixelados.yml b/definitions/v4/pixelados.yml index 0c766c356..35361f885 100644 --- a/definitions/v4/pixelados.yml +++ b/definitions/v4/pixelados.yml @@ -118,6 +118,8 @@ search: selector: details_link download: selector: download_link + infohash: + selector: info_hash poster: selector: poster filters: diff --git a/definitions/v4/slosoul.yml b/definitions/v4/slosoul.yml index 78c2ca1d5..a09a5886c 100644 --- a/definitions/v4/slosoul.yml +++ b/definitions/v4/slosoul.yml @@ -53,8 +53,8 @@ settings: label: Filter freeleech only default: false - name: sort - label: Sort type: select + label: Sort requested from site default: added options: added: created diff --git a/definitions/v4/themixingbowl.yml b/definitions/v4/themixingbowl.yml index 3967e7609..d16a47fba 100644 --- a/definitions/v4/themixingbowl.yml +++ b/definitions/v4/themixingbowl.yml @@ -104,7 +104,7 @@ search: attribute: href size: selector: td:nth-child(5) - artist: + _artist: selector: span.artist optional: true _tag: @@ -117,7 +117,7 @@ search: selector: td:nth-child(7) optional: true description: - text: "Artist=[{{ .Result.artist }}] , Tags={{ .Result._tag }} , Codec=[{{ .Result._codec }}] , BitRate=[{{ .Result._bit }}]" + text: "Artist=[{{ .Result._artist }}] , Tags={{ .Result._tag }} , Codec=[{{ .Result._codec }}] , BitRate=[{{ .Result._bit }}]" grabs: selector: td:nth-child(8) seeders: diff --git a/definitions/v4/torrentview.yml b/definitions/v4/torrentview.yml index 8d3c8b698..b3d9367cc 100644 --- a/definitions/v4/torrentview.yml +++ b/definitions/v4/torrentview.yml @@ -7,12 +7,10 @@ type: public encoding: UTF-8 followredirect: true links: - - https://torrentview63.com/ + - https://torrentview65.com/ legacylinks: - https://torrentview.net/ - https://torrentview.co/ - - https://torrentview40.com/ - - https://torrentview41.com/ - https://torrentview42.com/ - https://torrentview44.com/ - https://torrentview45.com/ @@ -25,6 +23,7 @@ legacylinks: - https://torrentview57.com/ - https://torrentview60.com/ - https://torrentview62.com/ + - https://torrentview63.com/ caps: categorymappings: diff --git a/definitions/v4/torrentwhiz.yml b/definitions/v4/torrentwhiz.yml index d967102d7..29e8cc64b 100644 --- a/definitions/v4/torrentwhiz.yml +++ b/definitions/v4/torrentwhiz.yml @@ -7,12 +7,10 @@ type: public encoding: UTF-8 followredirect: true links: - - https://torrentwiz45.com/ + - https://torrentwiz47.com/ legacylinks: - https://torrentwiz28.me/ - https://torrentwiz29.me/ - - https://torrentwiz30.com/ - - https://torrentwiz31.com/ - https://torrentwiz32.com/ - https://torrentwiz33.com/ - https://torrentwiz34.com/ @@ -25,6 +23,7 @@ legacylinks: - https://torrentwiz41.com/ - https://torrentwiz42.com/ - https://torrentwiz43.com/ + - https://torrentwiz45.com/ caps: categorymappings: diff --git a/definitions/v4/turktracker.yml b/definitions/v4/turktracker.yml index a934db850..5a45cc9d0 100644 --- a/definitions/v4/turktracker.yml +++ b/definitions/v4/turktracker.yml @@ -49,8 +49,8 @@ settings: label: Filter freeleech only default: false - name: sort - label: Sort type: select + label: Sort requested from site default: added options: added: created diff --git a/definitions/v6/danishbytes-api.yml b/definitions/v6/danishbytes-api.yml index 616f618e4..fa90fb15a 100644 --- a/definitions/v6/danishbytes-api.yml +++ b/definitions/v6/danishbytes-api.yml @@ -97,6 +97,8 @@ search: text: "{{ .Config.sitelink }}torrents/{{ .Result._id }}" download: text: "{{ .Config.sitelink }}torrent/download/{{ .Result._id }}.{{ .Config.rsskey }}" + infohash: + selector: info_hash poster: selector: poster_image imdbid: diff --git a/definitions/v6/haidan.yml b/definitions/v6/haidan.yml index dfd48cb70..ae3928a4a 100644 --- a/definitions/v6/haidan.yml +++ b/definitions/v6/haidan.yml @@ -118,10 +118,11 @@ search: filters: - name: replace args: ["年份:", " "] - _title: - selector: a.video_name_str title: - text: "{{ .Result._title }}{{ .Result._year }}" + selector: a.video_name_str + filters: + - name: append + args: "{{ .Result._year }}" details: selector: a.video_name_str attribute: href diff --git a/definitions/v6/pixelados.yml b/definitions/v6/pixelados.yml index 1628bb68b..0b77fac35 100644 --- a/definitions/v6/pixelados.yml +++ b/definitions/v6/pixelados.yml @@ -126,8 +126,6 @@ search: args: ["(?i)T(\\d{1,2})\\b", "S$1"] - name: re_replace args: ["(\\d{2})[×|x](\\d{2})", "S$1E$2"] - - name: re_replace - args: ["(\\d{2})[×|x](\\d{2})", "S$1E$2"] - name: re_replace args: ["(\\d{1})[×|x](\\d{2})", "S0$1E$2"] - name: re_replace @@ -138,6 +136,8 @@ search: selector: details_link download: selector: download_link + infohash: + selector: info_hash poster: selector: poster filters: