diff --git a/definitions/v11/amigosshare.yml b/definitions/v11/amigosshare.yml
index 796e3af60..1dc8c9ff6 100644
--- a/definitions/v11/amigosshare.yml
+++ b/definitions/v11/amigosshare.yml
@@ -152,7 +152,7 @@ search:
keywordsfilters:
# drop the year from searches since site titles do not include year
- name: re_replace
- args: ["(\\b((19|20)\\d{2})\\b)", ""]
+ args: ["(\\s*\\b((19|20)\\d{2})\\b)", ""]
rows:
selector: "div#fancy-list-group ul.list-group li.list-group-item{{ if .Config.freeleech }}:has(span.badge-success:contains(\"FREE\")){{ else }}{{ end }}"
diff --git a/definitions/v11/huntorrent-bithorlo.yml b/definitions/v11/huntorrent-bithorlo.yml
new file mode 100644
index 000000000..3d19a7e51
--- /dev/null
+++ b/definitions/v11/huntorrent-bithorlo.yml
@@ -0,0 +1,181 @@
+---
+id: huntorrent-bithorlo
+name: HunTorrent-bithorlo
+description: "HunTorrent-bithorlo is a HUNGARIAN Semi-Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: hu-HU
+type: semi-private
+encoding: UTF-8
+requestDelay: 2
+links:
+ - https://huntorrent.org/
+legacylinks:
+ - https://huntorrent.net/
+
+caps:
+ categorymappings:
+ - {id: 51, cat: Movies/SD, desc: "Cam/Eng", default: true}
+ - {id: 50, cat: Movies/SD, desc: "Cam/Hun", default: true}
+ - {id: 2, cat: Movies/DVD, desc: "DVD/Eng", default: true}
+ - {id: 1, cat: Movies/DVD, desc: "DVD/Hun", default: true}
+ - {id: 42, cat: Movies/DVD, desc: "Dvd9/Eng", default: true}
+ - {id: 41, cat: Movies/DVD, desc: "Dvd9/Hun", default: true}
+ - {id: 40, cat: Books, desc: "E-book/Eng", default: true}
+ - {id: 19, cat: Books, desc: "E-book/Hun", default: true}
+ - {id: 29, cat: Movies/HD, desc: "HD/Eng", default: true}
+ - {id: 28, cat: Movies/HD, desc: "HD/Hun", default: true}
+ - {id: 15, cat: PC/Games, desc: "Játék/ISO", default: true}
+ - {id: 38, cat: Console, desc: "Játék/Konzol", default: true}
+ - {id: 37, cat: PC/Games, desc: "Játék/Rip", default: true}
+ - {id: 20, cat: Other, desc: "Képek", default: true}
+ - {id: 21, cat: PC/Mobile-Other, desc: "Mobil", default: true}
+ - {id: 54, cat: PC/ISO, desc: "Prog/ISO", default: true}
+ - {id: 23, cat: PC/0day, desc: "Prog/Rip", default: true}
+ - {id: 33, cat: TV/SD, desc: "Sorozat/Eng", default: true}
+ - {id: 52, cat: TV/HD, desc: "Sorozat/Eng/HD", default: true}
+ - {id: 5, cat: TV/SD, desc: "Sorozat/Hun", default: true}
+ - {id: 53, cat: TV/HD, desc: "Sorozat/Hun/HD", default: true}
+ - {id: 4, cat: Movies/SD, desc: "Xvid/Eng", default: true}
+ - {id: 3, cat: Movies/SD, desc: "Xvid/Hun", default: true}
+ - {id: 12, cat: Audio, desc: "Zene/Eng", default: true}
+ - {id: 13, cat: Audio, desc: "Zene/Hun", default: true}
+ - {id: 9, cat: XXX/x264, desc: "XXX/Film", default: false}
+ - {id: 10, cat: XXX/ImageSet, desc: "XXX/Kép", default: false}
+
+ modes:
+ search: [q]
+ tv-search: [q, season, ep]
+ movie-search: [q]
+ music-search: [q]
+ book-search: [q]
+
+settings:
+ - name: info_about
+ type: info
+ label: About this HunTorrent-bithorlo indexer
+ default: This indexer accesses the HunTorrent WebSite with a focus on only the bithorlo torrent browser pages.
+ - name: cookie
+ type: text
+ label: Cookie
+ - name: info_cookie
+ type: info_cookie
+ - name: useragent
+ type: text
+ label: User-Agent
+ - name: info_useragent
+ type: info_useragent
+ - 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: 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:
+ method: cookie
+ # using cookie method because login page has embedded Google reCAPTCHA
+ inputs:
+ cookie: "{{ .Config.cookie }}"
+ test:
+ path: browse.php
+ selector: a[href^="logout.php?k="]
+
+search:
+ headers:
+ User-Agent: ["{{ .Config.useragent }}"]
+ paths:
+ # https://huntorrent.net/browse.php?&korhatar=0&incldead=1&xyz=yes&c28=1&c27=1&c6=1&c5=1&sort=4&type=desc
+ - path: browse.php
+ categories: [51, 50, 2, 1, 42, 41, 40, 19, 29, 28, 15, 38, 37, 20, 21, 54, 23, 33, 52, 53, 4, 3, 12, 13]
+ inputs:
+ viewMode: bithorlo
+ - path: browse.php
+ categories: [9, 10]
+ inputs:
+ viewMode: bithorloxxx
+ inputs:
+ $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+ xyz: yes
+ search: "{{ .Keywords }}"
+ # Age Limit: 0 all, 1 no, 5 6, 2 12, 3 16, 4 18
+ korhatar: 0
+ # 0 active, 1 active+dead, 2 dead, 3 my uploads, 4 waiting for seed, 7 my bookmarks, 12 reseeded by me
+ incldead: 1
+ sort: "{{ .Config.sort }}"
+ type: "{{ .Config.type }}"
+
+ rows:
+ selector: table.torrent-table > tbody > tr[id^="torrent-main-"]
+
+ fields:
+ category:
+ selector: a[href^="browse.php?cat="]
+ attribute: href
+ filters:
+ - name: querystring
+ args: cat
+ title:
+ selector: a.torrent-title-link
+ details:
+ selector: a.torrent-title-link
+ attribute: href
+ filters:
+ - name: replace
+ args: ["&hit=1", ""]
+ download:
+ selector: a[href^="download.php?"]
+ attribute: href
+ genre:
+ selector: a[data-mufaj]
+ attribute: data-mufaj
+ description:
+ selector: div.torrent-subtitle
+ filters:
+ - name: append
+ args: "{{ if .Result.genre }}{{ .Result.genre }}{{ else }}{{ end }}"
+ imdbid:
+ selector: a[href*="imdb.com/title/tt"]
+ attribute: href
+ poster:
+ selector: a[data-poster]
+ attribute: data-poster
+ date:
+ selector: a[data-added]
+ attribute: data-added
+ filters:
+ - name: append
+ args: " +01:00" # CET
+ - name: dateparse
+ args: "yyyy-MM-dd HH:mm zzz"
+ size:
+ selector: a[data-size]
+ attribute: data-size
+ grabs:
+ selector: td:nth-last-child(3)
+ seeders:
+ selector: td:nth-last-child(2)
+ leechers:
+ selector: td:nth-last-child(1)
+ downloadvolumefactor:
+ text: 1
+ uploadvolumefactor:
+ text: 2
+ minimumratio:
+ text: 1.0
+ minimumseedtime:
+ # 32 hours (as seconds = 32 x 60 x 60)
+ text: 115200
+# engine n/a
diff --git a/definitions/v11/huntorrent.yml b/definitions/v11/huntorrent.yml
index 912567b39..d86463b0e 100644
--- a/definitions/v11/huntorrent.yml
+++ b/definitions/v11/huntorrent.yml
@@ -39,37 +39,10 @@ caps:
- {id: 12, cat: Audio/Video, desc: "Klip/Külföldi", default: true}
- {id: 11, cat: Audio/MP3, desc: "MP3/Külföldi", default: true}
- {id: 10, cat: Audio/MP3, desc: "MP3/Magyar", default: true}
- - {id: 51bithorlo, cat: Movies/SD, desc: "Cam/Eng", default: true}
- - {id: 50bithorlo, cat: Movies/SD, desc: "Cam/Hun", default: true}
- - {id: 2bithorlo, cat: Movies/DVD, desc: "DVD/Eng", default: true}
- - {id: 1bithorlo, cat: Movies/DVD, desc: "DVD/Hun", default: true}
- - {id: 42bithorlo, cat: Movies/DVD, desc: "Dvd9/Eng", default: true}
- - {id: 41bithorlo, cat: Movies/DVD, desc: "Dvd9/Hun", default: true}
- - {id: 40bithorlo, cat: Books, desc: "E-book/Eng", default: true}
- - {id: 19bithorlo, cat: Books, desc: "E-book/Hun", default: true}
- - {id: 29bithorlo, cat: Movies/HD, desc: "HD/Eng", default: true}
- - {id: 28bithorlo, cat: Movies/HD, desc: "HD/Hun", default: true}
- - {id: 15bithorlo, cat: PC/Games, desc: "Játék/ISO", default: true}
- - {id: 38bithorlo, cat: Console, desc: "Játék/Konzol", default: true}
- - {id: 37bithorlo, cat: PC/Games, desc: "Játék/Rip", default: true}
- - {id: 20bithorlo, cat: Other, desc: "Képek", default: true}
- - {id: 21bithorlo, cat: PC/Mobile-Other, desc: "Mobil", default: true}
- - {id: 54bithorlo, cat: PC/ISO, desc: "Prog/ISO", default: true}
- - {id: 23bithorlo, cat: PC/0day, desc: "Prog/Rip", default: true}
- - {id: 33bithorlo, cat: TV/SD, desc: "Sorozat/Eng", default: true}
- - {id: 52bithorlo, cat: TV/HD, desc: "Sorozat/Eng/HD", default: true}
- - {id: 5bithorlo, cat: TV/SD, desc: "Sorozat/Hun", default: true}
- - {id: 53bithorlo, cat: TV/HD, desc: "Sorozat/Hun/HD", default: true}
- - {id: 4bithorlo, cat: Movies/SD, desc: "Xvid/Eng", default: true}
- - {id: 3bithorlo, cat: Movies/SD, desc: "Xvid/Hun", default: true}
- - {id: 12bithorlo, cat: Audio, desc: "Zene/Eng", default: true}
- - {id: 13bithorlo, cat: Audio, desc: "Zene/Hun", default: true}
- - {id: 16xxx, cat: XXX/DVD, desc: "XXX/DVD", default: false}
- - {id: 32xxx, cat: XXX/x264, desc: "XXX/HD", default: false}
- - {id: 14xxx, cat: XXX/ImageSet, desc: "XXX/Kép", default: false}
- - {id: 15xxx, cat: XXX/SD, desc: "XXX/XVID", default: false}
- - {id: 9bithorloxxx, cat: XXX/x264, desc: "XXX/Film, default: false"}
- - {id: 10bithorloxxx, cat: XXX/ImageSet, desc: "XXX/Kép", default: false}
+ - {id: 16, cat: XXX/DVD, desc: "XXX/DVD", default: false}
+ - {id: 32, cat: XXX/x264, desc: "XXX/HD", default: false}
+ - {id: 14, cat: XXX/ImageSet, desc: "XXX/Kép", default: false}
+ - {id: 15, cat: XXX/SD, desc: "XXX/XVID", default: false}
modes:
search: [q]
@@ -79,6 +52,10 @@ caps:
book-search: [q]
settings:
+ - name: info_about
+ type: info
+ label: About this HunTorrent indexer
+ default: This indexer does not include the bithorlo torrent pages. Use the HunTorrent-bithorlo indexer to access those.
- name: cookie
type: text
label: Cookie
@@ -126,54 +103,33 @@ search:
# https://huntorrent.net/browse.php?&korhatar=0&incldead=1&xyz=yes&c28=1&c27=1&c6=1&c5=1&sort=4&type=desc
- path: browse.php
categories: [28, 27, 4, 3, 6, 5, 2, 1, 17, 18, 19, 25, 24, 23, 38, 26, 20, 21, 31, 9, 8, 7, 13, 12, 11, 10]
- - path: browse.php
- categories: [51bithorlo, 50bithorlo, 2bithorlo, 1bithorlo, 42bithorlo, 41bithorlo, 40bithorlo, 19bithorlo, 29bithorlo, 28bithorlo, 15bithorlo, 38bithorlo, 37bithorlo, 20bithorlo, 21bithorlo, 54bithorlo, 23bithorlo, 33bithorlo, 52bithorlo, 53bithorlo, 4bithorlo, 3bithorlo, 12bithorlo, 13bithorlo]
inputs:
- viewMode: bithorlo
+ search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
- path: browse.php
- categories: [16xxx, 32xxx, 14xxx, 15xxx]
+ categories: [16, 32, 14, 15]
inputs:
viewMode: xxx
- - path: browse.php
- categories: [9bithorloxxx, 10bithorloxxx]
- inputs:
- viewMode: bithorloxxx
+ search: "{{ .Keywords }}"
inputs:
$raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
xyz: yes
- search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
# Age Limit: 0 all, 1 no, 5 6, 2 12, 3 16, 4 18
korhatar: 0
# 0 active, 1 active+dead, 2 dead, 3 my uploads, 4 waiting for seed, 7 my bookmarks, 12 reseeded by me
incldead: 1
sort: "{{ .Config.sort }}"
type: "{{ .Config.type }}"
- # no freeleech atm
- # can search by genre but you need to know the id. &mufaj[]=20 for Romantikus
rows:
selector: table.torrent-table > tbody > tr[id^="torrent-main-"]
fields:
- category_view:
- # browse.php?cat=9&viewMode=
- # browse.php?cat=9&viewMode=xxx
- # browse.php?cat=9&viewMode=bithorlo
- # browse.php?cat=9&viewMode=bithorloxxx
- selector: a[href^="browse.php?cat="]
- attribute: href
- optional: true
- filters:
- - name: querystring
- args: viewMode
category:
selector: a[href^="browse.php?cat="]
attribute: href
filters:
- name: querystring
args: cat
- - name: append
- args: "{{ if .Result.category_view }}{{ .Result.category_view }}{{ else }}{{ end }}"
title:
selector: a.torrent-title-link
details:
diff --git a/definitions/v11/oxtorrent-vip.yml b/definitions/v11/oxtorrent-vip.yml
deleted file mode 100644
index 93e3cefba..000000000
--- a/definitions/v11/oxtorrent-vip.yml
+++ /dev/null
@@ -1,178 +0,0 @@
----
-id: oxtorrent-vip
-replaces:
- - oxtorrent
- - torrent911
-name: OxTorrent-vip
-description: "OxTorrent-vip is a FRENCH Public site for MOVIES / TV / GENERAL"
-language: fr-FR
-type: public
-encoding: UTF-8
-# to fetch current domain use https://www.rantop.my/
-links:
- - https://www.oxtorrent.town/
- - https://www.zone-torrent.town/
- - https://www.mega-torrent.town/
-legacylinks:
- # latest domains list
- - https://www.rantop.my/
- - https://www.site-torrent.cc/
- - https://www.torrent-site.com/
- # domain lists no longer working
- - https://www.protege-torrent.com/
- - https://www.torrent.ws/
- - https://www.protege-liens.com/
- - https://www.protege-liens.net/
- - https://www.torrent.onl/
- - https://www.rantop.org/
- - https://oxtorrent.blog/
- - https://www.site-torrent.com/
- # actual legacylinks
- - https://www.zone-torrent.com/
- - https://www.mega-torrent3.com/
- - https://www.mega-torrent4.com/
- - https://www.oxtorrent3.com/
- - https://www.oxtorrent4.com/
- - https://www.mega-torrent5.com/
- - https://www.zone-torrent1.com/
- - https://www.oxtorrent5.com/
- - hhttps://www.zone-torrent2.com/
- - https://www.zone-torrent2.com/
- - https://www.oxtorrent7.com/
- - https://www.mega-torrent6.com/
- - https://www.zone-torrent3.com/
- - https://www.oxtorrent8.com/
- - https://www.oxtorrent.diy/
- - https://www.zone-torrent.me/
- - https://www.mega-torrent.net/
- - https://www.oxtorrent.fyi/
- - https://www.zone-torrent4.com/
- - https://www.mega-torrent7.com/
- - https://www.oxtorrent10.com/
-
-caps:
- categorymappings:
- - {id: Films, cat: Movies, desc: "Movies"}
- - {id: Animes, cat: TV/Anime, desc: "Anime"}
- - {id: Documentaires, cat: TV/Documentary, desc: "Documentaires"}
- - {id: Séries, cat: TV, desc: "TV"}
- - {id: Musiques, cat: Audio, desc: "Music"}
- - {id: Ebooks, cat: Books, desc: "Books"}
- - {id: Livres, cat: Books, desc: "Livres"}
- - {id: Logiciels, cat: PC, desc: "Software"}
- - {id: Applications, cat: PC, desc: "Applications"}
- - {id: Jeux-PC, cat: PC/Games, desc: "PC Games"}
- - {id: Jeux-Consoles, cat: Console/XBox 360, desc: "Console Games"}
- - {id: Porno, cat: XXX, desc: "Porno"}
- - {id: Spectacles, cat: TV/Other, desc: "Spectacles"}
- - {id: Sports, cat: TV/Sport, desc: "Sports"}
- - {id: Formations, cat: Other, desc: "Formations"}
- - {id: Vidéos, cat: TV, desc: "Vidéos"}
-
- modes:
- search: [q]
- tv-search: [q, season, ep]
- movie-search: [q]
- music-search: [q]
- book-search: [q]
- allowrawsearch: true
-
-settings:
- - 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
-
-download:
- selectors:
- - selector: a[href^="magnet:?"]
- attribute: href
- - selector: script:contains("magnet:?")
- filters:
- - name: regexp
- args: "\\s'(magnet:\\?.+?)';"
-
-search:
- paths:
- - path: "{{ if .Keywords }}recherche/{{ .Keywords }}{{ else }}derniers{{ end }}"
- keywordsfilters:
- # if searching for season packs swith 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"]
-
- rows:
- selector: table.table-hover > tbody > tr:has(td a[href])
- filters:
- - name: andmatch
-
- fields:
- category:
- selector: td:nth-child(1) i
- attribute: class
- title_phase1:
- selector: td:nth-child(1) a
- filters:
- - name: re_replace
- args: ["(?i)\\b(FRENCH|MULTI|TRUEFRENCH|VOSTFR|SUBFRENCH)\\b(.+?)(\\b((19|20)\\d{2})\\b)$", "$3 $1$2"]
- 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_href:
- selector: td:nth-child(1) a[href]
- attribute: href
- optional: true
- filters:
- - name: regexp
- args: (/?detail/\d+)
- details_onclick:
- selector: td:nth-child(1) a[onclick]
- attribute: onclick
- optional: true
- filters:
- - name: regexp
- args: (/?detail/\d+)
- details:
- text: "{{ or .Result.details_href .Result.details_onclick }}"
- download:
- text: "{{ .Result.details }}"
- size:
- selector: td:nth-child(2)
- date:
- text: now
- seeders:
- selector: td:nth-child(3)
- leechers:
- selector: td:nth-child(4)
- downloadvolumefactor:
- text: 0
- uploadvolumefactor:
- text: 1
-# engine n/a
diff --git a/definitions/v11/rudub.yml b/definitions/v11/rudub.yml
index 5644039e8..fa3d16a85 100644
--- a/definitions/v11/rudub.yml
+++ b/definitions/v11/rudub.yml
@@ -9,12 +9,8 @@ type: semi-private
encoding: windows-1251
followredirect: true
links:
- - https://nov11.rudub.pics/
+ - https://nov13.rudub.pics/
legacylinks:
- - https://oct27.rudub.homes/
- - http://oct28.rudub.homes/
- - https://oct28.rudub.homes/
- - http://oct29.rudub.homes/
- https://oct29.rudub.homes/
- http://oct30.rudub.homes/
- https://oct30.rudub.homes/
@@ -41,6 +37,10 @@ legacylinks:
- http://nov10.rudub.pics/
- https://nov10.rudub.pics/
- http://nov11.rudub.pics/
+ - https://nov11.rudub.pics/
+ - http://nov12.rudub.pics/
+ - https://nov12.rudub.pics/
+ - http://nov13.rudub.pics/
caps:
categorymappings:
- {id: 1, cat: TV, desc: "TV"}
diff --git a/definitions/v11/torrentsome.yml b/definitions/v11/torrentsome.yml
index 7163aaf21..64ee053e4 100644
--- a/definitions/v11/torrentsome.yml
+++ b/definitions/v11/torrentsome.yml
@@ -9,9 +9,8 @@ followredirect: true
requestDelay: 2
# to fetch current domain use https://tzip.top/
links:
- - https://torrentsome220.com/
+ - https://torrentsome221.com/
legacylinks:
- - https://torrentsome205.com/
- https://torrentsome206.com/
- https://torrentsome207.com/
- https://torrentsome208.com/
@@ -26,6 +25,7 @@ legacylinks:
- https://torrentsome217.com/
- https://torrentsome218.com/
- https://torrentsome219.com/
+ - https://torrentsome220.com/
caps:
categorymappings:
diff --git a/definitions/v11/torrenttip.yml b/definitions/v11/torrenttip.yml
index 6513fa880..a0168a113 100644
--- a/definitions/v11/torrenttip.yml
+++ b/definitions/v11/torrenttip.yml
@@ -9,9 +9,8 @@ followredirect: true
requestDelay: 2
# to fetch current domain use https://tzip.top/
links:
- - https://torrenttip201.top/
+ - https://torrenttip202.top/
legacylinks:
- - https://torrenttip186.top/
- https://torrenttip187.top/
- https://torrenttip188.top/
- https://torrenttip189.top/
@@ -26,6 +25,7 @@ legacylinks:
- https://torrenttip198.top/
- https://torrenttip199.top/
- https://torrenttip200.top/
+ - https://torrenttip201.top/
caps:
categorymappings: