diff --git a/definitions/v7/1337x.yml b/definitions/v7/1337x.yml index 6db4dd21f..9119f87c1 100644 --- a/definitions/v7/1337x.yml +++ b/definitions/v7/1337x.yml @@ -13,7 +13,7 @@ links: - https://x1337x.eu/ - https://x1337x.se/ - https://1337x.so/ - - https://1337x.unblockit.ing/ + - https://1337x.unblockit.date/ - https://1337x.ninjaproxy1.com/ - https://1337x.mrunblock.bond/ legacylinks: @@ -22,7 +22,6 @@ legacylinks: - https://1337x.nocensor.biz/ - https://1337x.gd/ - https://1337x.nocensor.sbs/ - - https://1337x.unblockit.cat/ - https://1337x.unblockit.nz/ - https://1337x.nocensor.world/ - https://1337x.unblockit.page/ @@ -43,6 +42,7 @@ legacylinks: - https://1337x.unblockit.esq/ - https://1337x.unblockit.zip/ - https://1337x.unblockit.foo/ + - https://1337x.unblockit.ing/ caps: categorymappings: diff --git a/definitions/v7/brsociety-api.yml b/definitions/v7/brsociety-api.yml index afa2840f0..2d55715cc 100644 --- a/definitions/v7/brsociety-api.yml +++ b/definitions/v7/brsociety-api.yml @@ -30,7 +30,7 @@ settings: - name: info_key type: info label: About your API key - default: "Find or Generate a new API Token by accessing your BrSociety account My Security page and clicking on the API Token tab." + default: "Find or Generate a new API Token by accessing your BrSociety account My Settings page and clicking on the API Key tab." - name: freeleech type: checkbox label: Search freeleech only @@ -130,14 +130,15 @@ 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 - minimumratio: - text: 1.0 + False: 1 # normal + True: 2 # double +# global MR is 0.7 but torrents must be seeded for 4 days regardless of ratio +# minimumratio: +# text: 0.7 minimumseedtime: # 4 days (as seconds = 4 x 24 x 60 x 60) text: 345600 -# json UNIT3D 6.5.0 (custom) +# json UNIT3D 7.1.3 (custom) diff --git a/definitions/v7/cpabien.yml b/definitions/v7/cpabien.yml index dead86938..cd82f8410 100644 --- a/definitions/v7/cpabien.yml +++ b/definitions/v7/cpabien.yml @@ -76,20 +76,28 @@ search: story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ end }}" # does not support imdbid search and does not return imdb link in results. keywordsfilters: - # if searching for season packs swith S01 to saison 1 #9712 + # if searching for season packs with S01 to saison 1 #9712 - name: re_replace - args: ["(?i)(S0)(\\d{1,2})$", "saison $2"] - - name: re_replace - args: ["(?i)(S)(\\d{1,3})$", "saison $2"] + args: ["(?i)\\b(?:S0?)(\\d{1,3})\\b", "saison $1"] rows: - selector: div#gauche > table > tbody > tr:has(a), div#dle-content > table > tbody > tr:has(a) + selector: div#gauche > table > tbody > tr:has(a), div#dle-content > a.cover2 fields: category: text: Other - title_phase1: + title_phase1_title: + selector: a + title_phase1_url: selector: a + attribute: href + filters: + - name: regexp + args: torrents\d+\/(.+?)\/ + - name: replace + args: ["-", " "] + title_phase1: + text: "{{ if .Result.title_phase1_title }}{{ .Result.title_phase1_title }}{{ else }}{{ .Result.title_phase1_url }}{{ end }}" filters: - name: re_replace args: ["(?i)\\b(FRENCH|MULTI|TRUEFRENCH|VOSTFR|SUBFRENCH)\\b(.+?)(\\b(19|20\\d{2})\\b)$", "$3 $1$2"] @@ -113,8 +121,14 @@ search: download: selector: a attribute: href - size: + poster: + selector: img + attribute: src + size_optional: selector: div.poid + optional: true + size: + text: "{{ if .Result.size_optional }}{{ .Result.size_optional }}{{ else }}512 MB{{ end }}" date: text: now seeders_optional: diff --git a/definitions/v7/demonoid.yml b/definitions/v7/demonoid.yml index be1c775a3..d8f3e5c8f 100644 --- a/definitions/v7/demonoid.yml +++ b/definitions/v7/demonoid.yml @@ -9,14 +9,13 @@ links: - https://www.demonoid.is/ - https://www.dnoid.to/ - https://www.dnoid.pw/ - - https://demonoid.unblockit.ing/ + - https://demonoid.unblockit.date/ - https://demonoid.torrentbay.net/ - https://demonoid.mrunblock.bond/ - https://demonoid.nocensor.cloud/ legacylinks: - https://demonoid.nocensor.biz/ - https://demonoid.nocensor.sbs/ - - https://demonoid.unblockit.cat/ - https://demonoid.unblockit.nz/ - https://demonoid.nocensor.world/ - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.onion.ws/ @@ -43,6 +42,7 @@ legacylinks: - https://demonoid.unblockit.esq/ - https://demonoid.unblockit.zip/ - https://demonoid.unblockit.foo/ + - https://demonoid.unblockit.ing/ caps: categorymappings: diff --git a/definitions/v7/extratorrent-st.yml b/definitions/v7/extratorrent-st.yml index e9f560008..896a122bc 100644 --- a/definitions/v7/extratorrent-st.yml +++ b/definitions/v7/extratorrent-st.yml @@ -7,14 +7,13 @@ type: public encoding: UTF-8 links: - https://extratorrent.st/ - - https://extratorrent.unblockit.ing/ + - https://extratorrent.unblockit.date/ - https://extratorrent.mrunblock.bond/ - https://extratorrent.nocensor.cloud/ legacylinks: - https://extratorrent.nocensor.work/ - https://extratorrent.nocensor.biz/ - https://extratorrent.nocensor.sbs/ - - https://extratorrent.unblockit.cat/ - https://extratorrent.unblockit.nz/ - https://extratorrent.nocensor.world/ - https://extratorrent.unblockit.page/ @@ -35,6 +34,7 @@ legacylinks: - https://extratorrent.unblockit.esq/ - https://extratorrent.unblockit.zip/ - https://extratorrent.unblockit.foo/ + - https://extratorrent.unblockit.ing/ caps: categorymappings: diff --git a/definitions/v7/eztv.yml b/definitions/v7/eztv.yml index a12718ffa..731a60ee0 100644 --- a/definitions/v7/eztv.yml +++ b/definitions/v7/eztv.yml @@ -11,7 +11,7 @@ links: - https://eztv.tf/ - https://eztv.yt/ - https://eztv1.xyz/ - - https://eztv.unblockit.ing/ + - https://eztv.unblockit.date/ - https://eztv.unblockninja.com/ - https://eztv.mrunblock.bond/ - https://eztv.nocensor.cloud/ @@ -22,7 +22,6 @@ legacylinks: - https://eztv.io/ - https://eztv.nocensor.biz/ - https://eztv.nocensor.sbs/ - - https://eztv.unblockit.cat/ - https://eztv.unblockit.nz/ - https://eztv.nocensor.world/ - https://eztv.unblockit.page/ @@ -45,6 +44,7 @@ legacylinks: - https://eztv.re/ - https://eztv.li/ - https://eztv.unblockit.foo/ + - https://eztv.unblockit.ing/ caps: categories: diff --git a/definitions/v7/fluxzone.yml b/definitions/v7/fluxzone.yml index b0cb9d635..b83ff112e 100644 --- a/definitions/v7/fluxzone.yml +++ b/definitions/v7/fluxzone.yml @@ -4,7 +4,7 @@ name: Flux-Zone description: "Flux-Zone is a ROMANIAN Private Torrent Tracker for MOVIES / TV / GENERAL" language: ro-RO type: private -encoding: utf-8 +encoding: UTF-8 links: - http://fluxzone.org/ legacylinks: diff --git a/definitions/v7/glodls.yml b/definitions/v7/glodls.yml index e115e434f..080280d40 100644 --- a/definitions/v7/glodls.yml +++ b/definitions/v7/glodls.yml @@ -7,8 +7,8 @@ type: public encoding: UTF-8 links: - https://glodls.to/ - - https://www.gtdb.to/ - - https://glotorrents.unblockit.ing/ + - https://gtso.cc/ + - https://glotorrents.unblockit.date/ - https://glotorrents.mrunblock.bond/ - https://glodls.unblockninja.com/ - https://glotorrents.nocensor.cloud/ @@ -17,7 +17,6 @@ legacylinks: - https://gtdb.to/ - https://glotorrents.nocensor.biz/ - https://glotorrents.nocensor.sbs/ - - https://glotorrents.unblockit.cat/ - https://glotorrents.unblockit.nz/ - https://glotorrents.nocensor.world/ - https://glotorrents.unblockit.page/ @@ -39,6 +38,8 @@ legacylinks: - https://glotorrents.unblockit.esq/ - https://glotorrents.unblockit.zip/ - https://glotorrents.unblockit.foo/ + - https://glotorrents.unblockit.ing/ + - https://www.gtdb.to/ caps: categorymappings: diff --git a/definitions/v7/hd-club.yml b/definitions/v7/hd-club.yml index 9e42e7923..14a91554b 100644 --- a/definitions/v7/hd-club.yml +++ b/definitions/v7/hd-club.yml @@ -1,9 +1,9 @@ --- id: hd-club name: HD-CLUB -description: "HD-CLUB is a CZECH Semi-Private site for TV / MOVIES / GENERAL" +description: "HD-CLUB is a CZECH Private site for TV / MOVIES / GENERAL" language: cs-CZ -type: semi-private +type: private encoding: UTF-8 links: - https://freecztorrent.eu/ diff --git a/definitions/v7/isohunt2.yml b/definitions/v7/isohunt2.yml index e54aca45b..479e1d05e 100644 --- a/definitions/v7/isohunt2.yml +++ b/definitions/v7/isohunt2.yml @@ -78,6 +78,8 @@ search: selector: table > tbody > tr[data-key="0"] fields: + categorydesc: + selector: a[href^="/torrents/?iht="] title: selector: td.title-row > a[href^="/"] > span details: @@ -92,18 +94,6 @@ search: selector: td.sn date: selector: td.date-row - category: - selector: td.category-row > span - case: - "span[title=\"anime\"]": 1 - "span[title=\"software\"]": 2 - "span[title=\"games\"]": 3 - "span[title=\"adult\"]": 4 - "span[title=\"movies\"]": 5 - "span[title=\"music\"]": 6 - "span[title=\"other\"]": 7 - "span[title=\"seriestv\"]": 8 - "span[title=\"books\"]": 9 downloadvolumefactor: text: 0 uploadvolumefactor: diff --git a/definitions/v7/jptv-api.yml b/definitions/v7/jptv-api.yml new file mode 100644 index 000000000..b198cb543 --- /dev/null +++ b/definitions/v7/jptv-api.yml @@ -0,0 +1,146 @@ +--- +id: jptv-api +name: JPTV (API) +description: "JPTV is a JAPANESE Private Torrent Tracker for JAPANESE TV / MOVIES / GENERAL" +language: ja-JP +type: private +encoding: UTF-8 +links: + - https://jptv.club/ + +caps: + categorymappings: + - {id: 1, cat: Movies, desc: "Movies"} + - {id: 2, cat: TV, desc: "TV Shows"} + - {id: 6, cat: TV, desc: "TS Firehose"} + - {id: 7, cat: Movies/Other, desc: "Anime Movies"} + - {id: 9, cat: TV/Anime, desc: "Anime Series"} + - {id: 8, cat: Audio, desc: "Audio"} + - {id: 10, cat: Books, desc: "Book"} + + modes: + search: [q] + tv-search: [q, season, ep, imdbid, tvdbid, tmdbid] + movie-search: [q, imdbid, tmdbid] + music-search: [q] + book-search: [q] + +settings: + - name: apikey + type: text + label: APIKey + - name: info_key + type: info + label: About your API key + default: "Find or Generate a new API Token by accessing your JPTV account My Security page and clicking on the API Token tab." + - name: freeleech + type: checkbox + label: Search freeleech only + default: false + - name: sort + type: select + label: Sort requested from site + default: created_at + options: + created_at: created + seeders: seeders + size: size + name: title + - name: type + type: select + label: Order requested from site + default: desc + options: + desc: desc + asc: asc + +login: + path: /api/torrents + method: get + error: + - selector: a[href*="/login"] + message: + text: "The API key was not accepted by {{ .Config.sitelink }}." + +search: + paths: + # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0) + # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349 + - path: "/api/torrents/filter" + response: + type: json + + headers: + Authorization: ["Bearer {{ .Config.apikey }}"] + + inputs: + $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}" + name: "{{ .Keywords }}" + imdb: "{{ .Query.IMDBIDShort }}" + tmdb: "{{ .Query.TMDBID }}" + tvdb: "{{ .Query.TVDBID }}" + freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}" + sorting: "{{ .Config.sort }}" + direction: "{{ .Config.type }}" + qty: 100 + + keywordsfilters: + - name: re_replace + args: ["\\.", " "] + + rows: + selector: data + attribute: attributes + + fields: + categorydesc: + selector: category + title: + selector: name + details: + selector: details_link + download: + selector: download_link + imdbid: + selector: imdb_id + tmdbid: + selector: tmdb_id + tvdbid: + selector: tvdb_id + files: + selector: num_file + seeders: + selector: seeders + leechers: + selector: leechers + grabs: + selector: times_completed + date: + # "created_at": "2021-10-18T00:34:50.000000Z" is returned by Newtonsoft.Json.Linq as 18/10/2021 00:34:50 + selector: created_at + filters: + - name: append + args: " +00:00" # GMT + - name: dateparse + args: "MM/dd/yyyy HH:mm:ss zzz" + size: + selector: size + downloadvolumefactor: + # api returns 0=false, 1=true + selector: freeleech + case: + 0: 1 # not free + 1: 0 # freeleech + uploadvolumefactor: + # api returns 0=false, 1=true + selector: double_upload + case: + 0: 1 # normal + 1: 2 # double +# global MR is 0.4 but torrents must be seeded for 7 days regardless of ratio +# minimumratio: +# text: 0.4 + minimumseedtime: + # 7 days (as seconds = 7 x 24 x 60 x 60) + text: 604800 +# json UNIT3D 5.2.0 diff --git a/definitions/v7/jptv.yml b/definitions/v7/jptv.yml deleted file mode 100644 index 89a62e3d7..000000000 --- a/definitions/v7/jptv.yml +++ /dev/null @@ -1,207 +0,0 @@ ---- -id: jptv -name: JPTV -description: "JPTV is a JAPANESE Private Torrent Tracker for JAPANESE TV / MOVIES" -language: ja-JP -type: private -encoding: UTF-8 -links: - - https://jptv.club/ - -caps: - categorymappings: - - {id: 1, cat: Movies, desc: "Movies"} - - {id: 2, cat: TV, desc: "TV Shows"} - - {id: 6, cat: TV, desc: "TS Firehose"} - - {id: 7, cat: Movies/Other, desc: "Anime Movies"} - - {id: 9, cat: TV/Anime, desc: "Anime Series"} - - {id: 8, cat: Audio, desc: "Audio"} - - {id: 10, cat: Books, desc: "Book"} - - modes: - search: [q] - tv-search: [q, season, ep, imdbid, tvdbid, tmdbid] - movie-search: [q, imdbid, tmdbid] - music-search: [q] - book-search: [q] - -settings: - - name: username - type: text - label: Username - - name: password - type: password - label: Password - - name: freeleech - type: checkbox - label: Search freeleech only - default: false - - name: sort - type: select - label: Sort requested from site - default: created_at - options: - created_at: created - seeders: seeders - size: size - name: title - - name: type - type: select - label: Order requested from site - default: desc - options: - desc: desc - asc: asc - -login: - path: login - method: form - form: form[action$="/login"] - inputs: - username: "{{ .Config.username }}" - password: "{{ .Config.password }}" - remember: on - selectorinputs: - _token: - selector: input[name="_token"] - attribute: value - error: - - selector: div#ERROR_COPY -# test: -# path: / -# selector: a[href$="/logout"] - -search: - paths: - - path: torrents/filter - inputs: - $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}" - search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search - imdb: "{{ .Query.IMDBIDShort }}" - tvdb: "{{ .Query.TVDBID }}" - tmdb: "{{ .Query.TMDBID }}" - sorting: "{{ .Config.sort }}" - direction: "{{ .Config.type }}" - qty: 100 - page: 0 - view: list - freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}" - # can search for genre but you need to know the id. &genres[]=10765 for Sci-Fi & Fantasy - - rows: - selector: table > tbody > tr - - fields: - category: - selector: a[href*="/categories/"] - attribute: href - filters: - - name: regexp - args: "/categories/(\\d+)" - title: - selector: a.view-torrent - download: - selector: a[href*="/download/"] - attribute: href - details: - selector: a.view-torrent - attribute: href - poster: - selector: div.torrent-poster img - attribute: src - filters: - - name: replace - args: ["https://via.placeholder.com/90x135", ""] - - name: replace - args: ["https://via.placeholder.com/400x600", ""] - genre: - selector: td:nth-last-child(8) - filters: - - name: replace - args: ["\n", ""] - - name: replace - args: [" & ", "_&_"] - - name: re_replace - args: ["(?i)(Science Fiction)", "Science_Fiction"] - - name: re_replace - args: ["(?i)(TV Movie)", "TV_Movie"] - - name: validate - args: "Action, Action_&_Adventure, Adventure, Animation, Comedy, Crime, Documentary, Drama, Family, Fantasy, History, Horror, Kids, Music, Mystery, News, Reality, Romance, Sci-Fi_&_Fantasy, Science_Fiction, Soap, TV_Movie, Talk, Thriller, War, War_&_Politics, Western" - description: - text: "{{ .Result.genre }}" - size: - selector: td:nth-last-child(4) - seeders: - selector: td:nth-last-child(3) - leechers: - selector: td:nth-last-child(2) - grabs: - selector: td:nth-last-child(1) - imdbid: - selector: a[href*="imdb.com/title/tt"] - attribute: href - tmdbid: - selector: a[href*="themoviedb.org/movie/"], a[href*="themoviedb.org/tv/"] - attribute: href - date: - selector: time - filters: - # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish - - name: re_replace - args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前|sedan)", " ago"] - - name: re_replace - args: ["(?i)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"] - - name: re_replace - args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten|minuter)", "minutes"] - - name: re_replace - args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"] - - name: re_replace - args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden|timmar)", "hours"] - - name: re_replace - args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間|timme)", " hour"] - - name: re_replace - args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen|dagar)", "days"] - - name: re_replace - args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"] - - name: re_replace - args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken|veckor)", "weeks"] - - name: re_replace - args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間|vecka)", " week"] - - name: re_replace - args: ["(?i) (ay)", "month"] - - name: re_replace - args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden|månader)", "months"] - - name: re_replace - args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月|månad)", " month"] - - name: re_replace - args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"] - - name: re_replace - args: ["(?i)(yil|aasta|år|anno|rok|ano|год|año|Jahr|година|jaar|年)", " year"] - - name: re_replace - args: ["(?i) (an)", "year"] - - name: re_replace - args: ["(?i)(För |und)", ""] # Misc removals - - name: timeago - downloadvolumefactor: - case: - i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store - i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups - i[class*="fa-star text-bold"]: 0 # Freeleech From Token - i[class*="fa-coins text-bold"]: 0 # Freeleech From Token - i[class*="fa-globe text-blue"]: 0 # Global Freeleech - i[class*="fa-star text-gold"]: 0 # Freeleech - i[class*="fa-certificate text-pink"]: 0 # Featured Torrent - "*": 1 - uploadvolumefactor: - case: - i[class*="fa-gem text-green"]: 2 # Single Torrent Double Upload - i[class*="fa-globe text-green"]: 2 # Global Double Upload - i[class*="fa-certificate text-pink"]: 2 # Featured Torrent - "*": 1 - # overall ratio of 0.4 but must seed for 7 days regardless of ratio - # minimumratio: - # text: 0.4 - minimumseedtime: - # 7 days (as seconds = 7 x 24 x 60 x 60) - text: 604800 -# UNIT3D 5.1.0 diff --git a/definitions/v7/lastfiles.yml b/definitions/v7/lastfiles.yml index 33eabcc7e..a112de13a 100644 --- a/definitions/v7/lastfiles.yml +++ b/definitions/v7/lastfiles.yml @@ -4,7 +4,7 @@ name: LastFiles description: "LastFiles (LF) is a ROMANIAN Private Torrent Tracker for 0DAY / GENERAL" language: ro-RO type: private -encoding: utf-8 +encoding: UTF-8 followredirect: true requestDelay: 2 links: diff --git a/definitions/v7/limetorrents.yml b/definitions/v7/limetorrents.yml index 1437c232f..0667ebcb2 100644 --- a/definitions/v7/limetorrents.yml +++ b/definitions/v7/limetorrents.yml @@ -8,7 +8,7 @@ encoding: UTF-8 # changes to this indexer should also be made to limetorrentsclone links: - https://www.limetorrents.lol/ - - https://limetorrents.unblockit.ing/ + - https://limetorrents.unblockit.date/ - https://limetorrents.ninjaproxy1.com/ - https://limetorrents.mrunblock.bond/ - https://limetorrents.nocensor.cloud/ @@ -23,7 +23,6 @@ legacylinks: - https://limetor.com/ - https://www.limetor.pro/ - https://www.limetorrents.pro/ - - https://limetorrents.unblockit.cat/ - https://limetorrents.unblockit.nz/ - https://limetorrents.nocensor.world/ - https://limetorrents.unblockit.page/ @@ -45,6 +44,7 @@ legacylinks: - https://limetorrents.unblockit.esq/ - https://limetorrents.unblockit.zip/ - https://limetorrents.unblockit.foo/ + - https://limetorrents.unblockit.ing/ caps: categorymappings: diff --git a/definitions/v7/proporno.yml b/definitions/v7/proporno.yml index 222bbdd22..540fdadc2 100644 --- a/definitions/v7/proporno.yml +++ b/definitions/v7/proporno.yml @@ -4,26 +4,26 @@ name: ProPorno description: "ProPorno is a RUSSIAN Public tracker for 3X" language: ru-RU type: public -encoding: windows-1251 +encoding: UTF-8 links: - https://proporno.org/ caps: categorymappings: - - {id: 2, cat: XXX, desc: "порно видео (video)"} - - {id: 4, cat: XXX, desc: " блондинки (blondes)"} - - {id: 5, cat: XXX, desc: " лесбиянки (lesbians)"} - - {id: 19, cat: XXX, desc: " эротика (erotic)"} - - {id: 20, cat: XXX, desc: " груповушка (group)"} - - {id: 16, cat: XXX, desc: " анальный секс (anal)"} - - {id: 22, cat: XXX, desc: " молодые (young)"} - - {id: 24, cat: XXX, desc: " минет / куннилингус / орал (blowjob / cunnilingus / screaming)"} - - {id: 25, cat: XXX, desc: " большая грудь (big breasts)"} - - {id: 21, cat: XXX, desc: "любительское видео (ameteur)"} - - {id: 3, cat: XXX, desc: "порно фильмы (movies)"} - - {id: 7, cat: XXX, desc: "русское порно (Russian)"} - - {id: 27, cat: XXX, desc: "убойная эротика (killer erotica)"} - - {id: 26, cat: XXX, desc: "онлайн порно (online)"} + - {id: 2, cat: XXX, desc: "порно видео"} + - {id: 4, cat: XXX, desc: "блондинки"} + - {id: 5, cat: XXX, desc: "лесбиянки"} + - {id: 19, cat: XXX, desc: "эротика"} + - {id: 20, cat: XXX, desc: "груповушка"} + - {id: 16, cat: XXX, desc: "анальный секс"} + - {id: 22, cat: XXX, desc: "молодые"} + - {id: 24, cat: XXX, desc: "минет / куннилингус / орал"} + - {id: 25, cat: XXX, desc: "большая грудь"} + - {id: 21, cat: XXX, desc: "любительское видео"} + - {id: 3, cat: XXX, desc: "порно фильмы"} + - {id: 7, cat: XXX, desc: "русское порно"} + - {id: 27, cat: XXX, desc: "убойная эротика"} + - {id: 26, cat: XXX, desc: "онлайн порно"} modes: search: [q] @@ -37,14 +37,14 @@ download: search: paths: - # https://proporno.org/index.php?do=search&subaction=search&search_start=0&full_search=1&result_from=1&story= + # https://proporno.org/index.php?do=search&subaction=search&story=2024&titleonly=3&sortby=date&resorder=desc&showposts=0 - path: index.php inputs: do: search subaction: search story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}" # 0 articles, 1 comments, 2 static, 3 titles - titleonly: 3 + titleonly: "{{ if .Keywords }}3{{ else }}0{{ end }}" sortby: date resorder: desc showposts: 0 @@ -55,23 +55,8 @@ search: after: 1 fields: - category: - selector: div.inmy - case: - "a:last-of-type:contains(\"порно видео\")": 2 - "a:last-of-type:contains(\"блондинки\")": 4 - "a:last-of-type:contains(\"лесбиянки\")": 5 - "a:last-of-type:contains(\"эротика\")": 19 - "a:last-of-type:contains(\"груповушка\")": 20 - "a:last-of-type:contains(\"анальный\")": 16 - "a:last-of-type:contains(\"молодые\")": 22 - "a:last-of-type:contains(\"минет\")": 24 - "a:last-of-type:contains(\"большая\")": 25 - "a:last-of-type:contains(\"любительское\")": 21 - "a:last-of-type:contains(\"фильмы\")": 3 - "a:last-of-type:contains(\"русское\")": 7 - "a:last-of-type:contains(\"убойная\")": 27 - "a:last-of-type:contains(\"онлайн\")": 26 + categorydesc: + selector: div.inmy > a:last-of-type title: selector: div.news_text > a details: diff --git a/definitions/v7/torlock.yml b/definitions/v7/torlock.yml index 08f317fcf..b09419000 100644 --- a/definitions/v7/torlock.yml +++ b/definitions/v7/torlock.yml @@ -9,7 +9,7 @@ requestDelay: 2 links: - https://www.torlock2.com/ - https://www.torlock.com/ - - https://torlock.unblockit.ing/ + - https://torlock.unblockit.date/ - https://torlock.nocensor.cloud/ - https://torlock.mrunblock.bond/ legacylinks: @@ -17,7 +17,6 @@ legacylinks: - https://torlock.nocensor.biz/ - https://www.torlock.icu/ - https://torlock.nocensor.sbs/ - - https://torlock.unblockit.cat/ - https://torlock.unblockit.nz/ - https://torlock.nocensor.world/ - https://torlock.unblockit.page/ @@ -37,6 +36,7 @@ legacylinks: - https://torlock.unblockit.esq/ - https://torlock.unblockit.zip/ - https://torlock.unblockit.foo/ + - https://torlock.unblockit.ing/ caps: # dont forget to update the search fields category case block diff --git a/definitions/v7/torrentdownload.yml b/definitions/v7/torrentdownload.yml index 79670b03d..ebd9a6893 100644 --- a/definitions/v7/torrentdownload.yml +++ b/definitions/v7/torrentdownload.yml @@ -7,7 +7,7 @@ type: public encoding: UTF-8 links: - https://www.torrentdownload.info/ - - https://torrentdownload.unblockit.ing/ + - https://torrentdownload.unblockit.date/ - https://torrentdownload.mrunblock.bond/ - https://torrentdownload.nocensor.cloud/ legacylinks: @@ -15,7 +15,6 @@ legacylinks: - https://torrentdownload.nocensor.work/ - https://torrentdownload.nocensor.biz/ - https://torrentdownload.nocensor.sbs/ - - https://torrentdownload.unblockit.cat/ - https://torrentdownload.unblockit.nz/ - https://torrentdownload.nocensor.world/ - https://torrentdownload.unblockit.page/ @@ -35,6 +34,7 @@ legacylinks: - https://torrentdownload.unblockit.esq/ - https://torrentdownload.unblockit.zip/ - https://torrentdownload.unblockit.foo/ + - https://torrentdownload.unblockit.ing/ caps: categorymappings: diff --git a/definitions/v7/torrentdownloads.yml b/definitions/v7/torrentdownloads.yml index 8e941a0b0..5636516de 100644 --- a/definitions/v7/torrentdownloads.yml +++ b/definitions/v7/torrentdownloads.yml @@ -7,7 +7,7 @@ type: public encoding: UTF-8 links: - https://www.torrentdownloads.pro/ - - https://torrentdownloads.unblockit.ing/ + - https://torrentdownloads.unblockit.date/ - https://torrentdownloads.mrunblock.bond/ - https://torrentdownloads.unblockninja.com/ - https://torrentdownloads.nocensor.cloud/ @@ -16,7 +16,6 @@ legacylinks: - https://torrentdownloads.nocensor.work/ - https://torrentdownloads.nocensor.biz/ - https://torrentdownloads.nocensor.sbs/ - - https://torrentdownloads.unblockit.cat/ - https://torrentdownloads.unblockit.nz/ - https://torrentdownloads.nocensor.world/ - https://torrentdownloads.unblockit.page/ @@ -37,6 +36,7 @@ legacylinks: - https://torrentdownloads.unblockit.esq/ - https://torrentdownloads.unblockit.zip/ - https://torrentdownloads.unblockit.foo/ + - https://torrentdownloads.unblockit.ing/ caps: categorymappings: diff --git a/definitions/v7/torrentfunk.yml b/definitions/v7/torrentfunk.yml index 49c78e838..4ebeefaea 100644 --- a/definitions/v7/torrentfunk.yml +++ b/definitions/v7/torrentfunk.yml @@ -8,7 +8,7 @@ encoding: UTF-8 links: - https://www.torrentfunk.com/ - https://www.torrentfunk2.com/ - - https://torrentfunk.unblockit.ing/ + - https://torrentfunk.unblockit.date/ - https://torrentfunk.nocensor.cloud/ - https://torrentfunk.mrunblock.bond/ - https://torrentfunk.ninjaproxy1.com/ @@ -17,7 +17,6 @@ legacylinks: - https://torrentfunk.nocensor.work/ - https://torrentfunk.nocensor.biz/ - https://torrentfunk.nocensor.sbs/ - - https://torrentfunk.unblockit.cat/ - https://torrentfunk.unblockit.nz/ - https://torrentfunk.nocensor.world/ - https://torrentfunk.unblockit.page/ @@ -37,6 +36,7 @@ legacylinks: - https://torrentfunk.unblockit.esq/ - https://torrentfunk.unblockit.zip/ - https://torrentfunk.unblockit.foo/ + - https://torrentfunk.unblockit.ing/ caps: categorymappings: diff --git a/definitions/v7/torrentqq.yml b/definitions/v7/torrentqq.yml index 34ece899f..61ea905fc 100644 --- a/definitions/v7/torrentqq.yml +++ b/definitions/v7/torrentqq.yml @@ -7,9 +7,8 @@ type: public encoding: UTF-8 followredirect: true links: - - https://torrentqq289.com/ + - https://torrentqq290.com/ legacylinks: - - https://torrentqq274.com/ - https://torrentqq275.com/ - https://torrentqq276.com/ - https://torrentqq277.com/ @@ -24,6 +23,7 @@ legacylinks: - https://torrentqq286.com/ - https://torrentqq287.com/ - https://torrentqq288.com/ + - https://torrentqq289.com/ caps: categorymappings: diff --git a/definitions/v7/torrentsir.yml b/definitions/v7/torrentsir.yml index e5ef7a61a..ab3a2434e 100644 --- a/definitions/v7/torrentsir.yml +++ b/definitions/v7/torrentsir.yml @@ -7,10 +7,8 @@ type: public encoding: UTF-8 followredirect: true links: - - https://torrentsir128.com/ + - https://torrentsir129.com/ legacylinks: - - http://torrentsir119.com/ - - https://torrentsir119.com/ - http://torrentsir120.com/ - https://torrentsir120.com/ - http://torrentsir121.com/ @@ -29,6 +27,8 @@ legacylinks: - httsp://torrentsir127.com/ - https://torrentsir127.com/ - http://torrentsir128.com/ + - https://torrentsir128.com/ + - http://torrentsir129.com/ caps: categorymappings: diff --git a/definitions/v7/yts.yml b/definitions/v7/yts.yml index 2c45b2c5d..92a8bc818 100644 --- a/definitions/v7/yts.yml +++ b/definitions/v7/yts.yml @@ -9,7 +9,7 @@ requestDelay: 2.5 # 2.5 requests per second (2 causes problems) links: # dont forget to update the details, download and poster replace args - https://yts.mx/ - - https://yts.unblockit.ing/ + - https://yts.unblockit.date/ - https://yts.ninjaproxy1.com/ - https://yts.mrunblock.bond/ - https://yts.nocensor.cloud/ @@ -19,7 +19,6 @@ legacylinks: - https://yts.lt/ - https://yts.nocensor.biz/ - https://yts.nocensor.sbs/ - - https://yts.unblockit.cat/ - https://yts.unblockit.nz/ - https://yts.nocensor.world/ - https://yts.unblockit.page/ @@ -41,6 +40,7 @@ legacylinks: - https://yts.unblockit.esq/ - https://yts.unblockit.zip/ - https://yts.unblockit.foo/ + - https://yts.unblockit.ing/ caps: categorymappings: diff --git a/definitions/v9/brsociety-api.yml b/definitions/v9/brsociety-api.yml index 5536df310..fe19c9acc 100644 --- a/definitions/v9/brsociety-api.yml +++ b/definitions/v9/brsociety-api.yml @@ -30,7 +30,7 @@ settings: - name: info_key type: info label: About your API key - default: "Find or Generate a new API Token by accessing your BrSociety account My Security page and clicking on the API Token tab." + default: "Find or Generate a new API Token by accessing your BrSociety account My Settings page and clicking on the API Key tab." - name: freeleech type: checkbox label: Search freeleech only @@ -131,14 +131,15 @@ 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 - minimumratio: - text: 1.0 + False: 1 # normal + True: 2 # double +# global MR is 0.7 but torrents must be seeded for 4 days regardless of ratio +# minimumratio: +# text: 0.7 minimumseedtime: # 4 days (as seconds = 4 x 24 x 60 x 60) text: 345600 -# json UNIT3D 6.5.0 (custom) +# json UNIT3D 7.1.3 (custom) diff --git a/definitions/v9/cpabien.yml b/definitions/v9/cpabien.yml index bef9d6b64..a22cb6344 100644 --- a/definitions/v9/cpabien.yml +++ b/definitions/v9/cpabien.yml @@ -72,24 +72,34 @@ search: paths: - path: "{{ if .Keywords }}index.php?do=search&subaction=search{{ else }}{{ end }}" method: post + # postData is mandatory FlareSolverr/FlareSolverr#789 + allowEmptyInputs: true inputs: story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ end }}" # does not support imdbid search and does not return imdb link in results. keywordsfilters: - # if searching for season packs swith S01 to saison 1 #9712 + # if searching for season packs with S01 to saison 1 #9712 - name: re_replace - args: ["(?i)(S0)(\\d{1,2})$", "saison $2"] - - name: re_replace - args: ["(?i)(S)(\\d{1,3})$", "saison $2"] + args: ["(?i)\\b(?:S0?)(\\d{1,3})\\b", "saison $1"] rows: - selector: div#gauche > table > tbody > tr:has(a), div#dle-content > table > tbody > tr:has(a) + selector: div#gauche > table > tbody > tr:has(a), div#dle-content > a.cover2 fields: category: text: Other - title_phase1: + title_phase1_title: + selector: a + title_phase1_url: selector: a + attribute: href + filters: + - name: regexp + args: torrents\d+\/(.+?)\/ + - name: replace + args: ["-", " "] + title_phase1: + text: "{{ if .Result.title_phase1_title }}{{ .Result.title_phase1_title }}{{ else }}{{ .Result.title_phase1_url }}{{ end }}" filters: - name: re_replace args: ["(?i)\\b(FRENCH|MULTI|TRUEFRENCH|VOSTFR|SUBFRENCH)\\b(.+?)(\\b(19|20\\d{2})\\b)$", "$3 $1$2"] @@ -113,18 +123,25 @@ search: download: selector: a attribute: href + poster: + selector: img + attribute: src size: selector: div.poid + optional: true + default: "512 MB" date: text: now - seeders: + seeders_optional: selector: div.up optional: true - default: 0 - leechers: + seeders: + text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}" + leechers_optional: selector: div.down optional: true - default: 0 + leechers: + text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}" downloadvolumefactor: text: 0 uploadvolumefactor: diff --git a/definitions/v9/demonoid.yml b/definitions/v9/demonoid.yml index 38a4d6cc0..4be19dc9f 100644 --- a/definitions/v9/demonoid.yml +++ b/definitions/v9/demonoid.yml @@ -9,14 +9,13 @@ links: - https://www.demonoid.is/ - https://www.dnoid.to/ - https://www.dnoid.pw/ - - https://demonoid.unblockit.ing/ + - https://demonoid.unblockit.date/ - https://demonoid.torrentbay.net/ - https://demonoid.mrunblock.bond/ - https://demonoid.nocensor.cloud/ legacylinks: - https://demonoid.nocensor.biz/ - https://demonoid.nocensor.sbs/ - - https://demonoid.unblockit.cat/ - https://demonoid.unblockit.nz/ - https://demonoid.nocensor.world/ - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.onion.ws/ @@ -43,6 +42,7 @@ legacylinks: - https://demonoid.unblockit.esq/ - https://demonoid.unblockit.zip/ - https://demonoid.unblockit.foo/ + - https://demonoid.unblockit.ing/ caps: categorymappings: diff --git a/definitions/v9/extratorrent-st.yml b/definitions/v9/extratorrent-st.yml index 6b07d1f66..12c39e63a 100644 --- a/definitions/v9/extratorrent-st.yml +++ b/definitions/v9/extratorrent-st.yml @@ -7,14 +7,13 @@ type: public encoding: UTF-8 links: - https://extratorrent.st/ - - https://extratorrent.unblockit.ing/ + - https://extratorrent.unblockit.date/ - https://extratorrent.mrunblock.bond/ - https://extratorrent.nocensor.cloud/ legacylinks: - https://extratorrent.nocensor.work/ - https://extratorrent.nocensor.biz/ - https://extratorrent.nocensor.sbs/ - - https://extratorrent.unblockit.cat/ - https://extratorrent.unblockit.nz/ - https://extratorrent.nocensor.world/ - https://extratorrent.unblockit.page/ @@ -35,6 +34,7 @@ legacylinks: - https://extratorrent.unblockit.esq/ - https://extratorrent.unblockit.zip/ - https://extratorrent.unblockit.foo/ + - https://extratorrent.unblockit.ing/ caps: categorymappings: diff --git a/definitions/v9/eztv.yml b/definitions/v9/eztv.yml index 1c5cd433b..97b782e9d 100644 --- a/definitions/v9/eztv.yml +++ b/definitions/v9/eztv.yml @@ -11,7 +11,7 @@ links: - https://eztv.tf/ - https://eztv.yt/ - https://eztv1.xyz/ - - https://eztv.unblockit.ing/ + - https://eztv.unblockit.date/ - https://eztv.unblockninja.com/ - https://eztv.mrunblock.bond/ - https://eztv.nocensor.cloud/ @@ -22,7 +22,6 @@ legacylinks: - https://eztv.io/ - https://eztv.nocensor.biz/ - https://eztv.nocensor.sbs/ - - https://eztv.unblockit.cat/ - https://eztv.unblockit.nz/ - https://eztv.nocensor.world/ - https://eztv.unblockit.page/ @@ -45,6 +44,7 @@ legacylinks: - https://eztv.re/ - https://eztv.li/ - https://eztv.unblockit.foo/ + - https://eztv.unblockit.ing/ caps: categories: diff --git a/definitions/v9/glodls.yml b/definitions/v9/glodls.yml index 26f8ef66d..740a0be26 100644 --- a/definitions/v9/glodls.yml +++ b/definitions/v9/glodls.yml @@ -7,8 +7,8 @@ type: public encoding: UTF-8 links: - https://glodls.to/ - - https://www.gtdb.to/ - - https://glotorrents.unblockit.ing/ + - https://gtso.cc/ + - https://glotorrents.unblockit.date/ - https://glotorrents.mrunblock.bond/ - https://glodls.unblockninja.com/ - https://glotorrents.nocensor.cloud/ @@ -17,7 +17,6 @@ legacylinks: - https://gtdb.to/ - https://glotorrents.nocensor.biz/ - https://glotorrents.nocensor.sbs/ - - https://glotorrents.unblockit.cat/ - https://glotorrents.unblockit.nz/ - https://glotorrents.nocensor.world/ - https://glotorrents.unblockit.page/ @@ -39,6 +38,8 @@ legacylinks: - https://glotorrents.unblockit.esq/ - https://glotorrents.unblockit.zip/ - https://glotorrents.unblockit.foo/ + - https://glotorrents.unblockit.ing/ + - https://www.gtdb.to/ caps: categorymappings: diff --git a/definitions/v9/limetorrents.yml b/definitions/v9/limetorrents.yml index bff6cb609..c911ef340 100644 --- a/definitions/v9/limetorrents.yml +++ b/definitions/v9/limetorrents.yml @@ -8,7 +8,7 @@ encoding: UTF-8 # changes to this indexer should also be made to limetorrentsclone links: - https://www.limetorrents.lol/ - - https://limetorrents.unblockit.ing/ + - https://limetorrents.unblockit.date/ - https://limetorrents.ninjaproxy1.com/ - https://limetorrents.mrunblock.bond/ - https://limetorrents.nocensor.cloud/ @@ -23,7 +23,6 @@ legacylinks: - https://limetor.com/ - https://www.limetor.pro/ - https://www.limetorrents.pro/ - - https://limetorrents.unblockit.cat/ - https://limetorrents.unblockit.nz/ - https://limetorrents.nocensor.world/ - https://limetorrents.unblockit.page/ @@ -45,6 +44,7 @@ legacylinks: - https://limetorrents.unblockit.esq/ - https://limetorrents.unblockit.zip/ - https://limetorrents.unblockit.foo/ + - https://limetorrents.unblockit.ing/ caps: categorymappings: diff --git a/definitions/v9/twisted-music.yml b/definitions/v9/twisted-music.yml index 045858c42..8fe69cae3 100644 --- a/definitions/v9/twisted-music.yml +++ b/definitions/v9/twisted-music.yml @@ -6,6 +6,8 @@ language: en-US type: private encoding: UTF-8 links: + - https://twisted-music.org/ +legacylinks: - https://twisted-music.info/ caps: diff --git a/definitions/v9/yts.yml b/definitions/v9/yts.yml index a609924bd..aff2bfe46 100644 --- a/definitions/v9/yts.yml +++ b/definitions/v9/yts.yml @@ -9,7 +9,7 @@ requestDelay: 2.5 # 2.5 requests per second (2 causes problems) links: # dont forget to update the details, download and poster replace args - https://yts.mx/ - - https://yts.unblockit.ing/ + - https://yts.unblockit.date/ - https://yts.ninjaproxy1.com/ - https://yts.mrunblock.bond/ - https://yts.nocensor.cloud/ @@ -19,7 +19,6 @@ legacylinks: - https://yts.lt/ - https://yts.nocensor.biz/ - https://yts.nocensor.sbs/ - - https://yts.unblockit.cat/ - https://yts.unblockit.nz/ - https://yts.nocensor.world/ - https://yts.unblockit.page/ @@ -41,6 +40,7 @@ legacylinks: - https://yts.unblockit.esq/ - https://yts.unblockit.zip/ - https://yts.unblockit.foo/ + - https://yts.unblockit.ing/ caps: categorymappings: