Merge tag 'v0.16.2207'

README.md

@@ -46,7 +46,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Byrutor
  * CiliPro (LIAORENCILI)
  * ConCen
- * Corsaro.red
  * cpasbien
  * cpasbienClone
  * Demonoid
@@ -73,7 +72,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Internet Archive (archive.org)
  * Isohunt2
  * iTorrent
- * KickAssTorrent (KATcr)
  * kickasstorrents (kickass.ws)
  * kickasstorrents.to
  * Legit Torrents
@@ -144,6 +142,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TorrentKitty
  * TorrentMafya
  * TorrentParadise
+ * TorrentProject
  * TorrentProject2
  * TorrentQuest
  * Torrents.csv
@@ -156,7 +155,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * UnionDHT
  * VSTHouse
  * VST Torrents
- * XFSUB
  * xxxAdultTorrent
  * xxxtor
  * xxxtorrents

src/Jackett.Common/Definitions/0daykiev.yml

@@ -99,7 +99,7 @@ search:
     - name: re_replace # S01E01 to Сезон 1 Серии 1
       args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "езон $1 ерии $2"]
   inputs:
-    $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     search: "{{ .Keywords }}"
     # 0 active, 1 incldead, 2 onlydead, 3 gold, 4 noseed, 5 silver
     incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"

src/Jackett.Common/Definitions/2fast4you.yml

@@ -149,7 +149,7 @@ search:
   paths:
     - path: torrents-search.php
   inputs:
-    $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     search: "{{ .Keywords }}"
     # 0 active, 1 incldead, 2 onlydead
     incldead: 1

src/Jackett.Common/Definitions/3evils.yml

@@ -98,7 +98,7 @@ search:
     # https://www.3evils.net/browse.php?c16=1&c17=1&c3=1&c4=1&search=&searchin=title&incldead=0&only_free=1
     - path: browse.php
   inputs:
-    $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     search: "{{ .Keywords }}"
     # title, descr, genre, all
     searchin: title

src/Jackett.Common/Definitions/DasUnerwartete.yml

@@ -77,7 +77,7 @@ login:
 search:
   path: browse.php
   inputs:
-    $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     search: "{{ .Keywords }}"
     incldead: 1
 
@@ -119,8 +119,8 @@ search:
       selector: .tablea tr:nth-child(2) td:nth-child(2) b:nth-child(3) font
     downloadvolumefactor:
       case:
-        img[src="pic/oupic.gif"]: "0"
-        "*": "1"
+        img[src="pic/oupic.gif"]: 0
+        "*": 1
     uploadvolumefactor:
       text: 1
 # engine tbd

src/Jackett.Common/Definitions/acidlounge.yml

@@ -81,7 +81,7 @@ search:
   paths:
     - path: browse.php
   inputs:
-    $raw: "{{range .Categories}}cid[]={{.}}&{{end}}"
+    $raw: "{{ range .Categories }}cid[]={{.}}&{{end}}"
     search: "{{ .Keywords }}"
     search_type: title
 

src/Jackett.Common/Definitions/ast4u.yml

@@ -69,7 +69,7 @@ search:
   paths:
     - path: browse.php
   inputs:
-    $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     search: "{{ .Keywords }}"
     incldead: 0
     orderby: added

src/Jackett.Common/Definitions/audiobooktorrents.yml

@@ -114,7 +114,7 @@ search:
   paths:
     - path: browse.php
   inputs:
-    $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     search: "{{ .Keywords }}"
     # title, descr
     searchin: title

src/Jackett.Common/Definitions/bigtorrent.yml

@@ -67,7 +67,7 @@ search:
   paths:
     - path: browse.php
   inputs:
-    $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
     search: "{{ if .Keywords }}{{ .Keywords }}{{ else }}  {{ end }}"
 
   rows:

src/Jackett.Common/Definitions/btgigs.yml

@@ -72,7 +72,7 @@ search:
   error:
     - selector: a.altlink
   inputs:
-    $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     search: "{{ .Keywords }}"
     incldead: 1
     tyt: 0

src/Jackett.Common/Definitions/btschool.yml

@@ -58,7 +58,7 @@ search:
     - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
     # 0 incldead, 1 active, 2 justdead
     incldead: 0
     # promotion: 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x 50%, 7 30%

src/Jackett.Common/Definitions/btsow.yml

@@ -6,7 +6,7 @@ language: en-us
 type: public
 encoding: UTF-8
 links:
-  - https://btsow.work/
+  - https://btsow.store/
 legacylinks:
   - https://btos.pw/
   - https://btio.pw/
@@ -20,6 +20,7 @@ legacylinks:
   - https://btsow.casa/
   - https://btsow.website/
   - https://btsow.online/
+  - https://btsow.work/
 
 caps:
   categories:

src/Jackett.Common/Definitions/cinematik.yml

@@ -74,7 +74,7 @@ search:
   paths:
     - path: browse.php
   inputs:
-    $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     search: "{{ .Query.Keywords }}"
     incldead: "{{ .Config.incldead }}"
     srchdtls: "{{ if .Config.srchdtls }}1{{ else }}0{{ end }}"

src/Jackett.Common/Definitions/classix.yml

@@ -35,7 +35,7 @@ search:
   paths:
     - path: torrents-search.php
   inputs:
-    $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
     search: "{{ if .Keywords }}\"{{ .Keywords }}\"{{ else }}{{ end }}"
 
   rows:

src/Jackett.Common/Definitions/demonoid.yml

@@ -11,6 +11,7 @@ links:
   - https://www.dnoid.to/
   - https://www.dnoid.pw/
   - https://demonoid.unblockit.app/
+  - https://demonoid.torrentbay.to/
 legacylinks:
   - https://demonoid.unblockit.pro/
   - https://demonoid.unblockit.one/

src/Jackett.Common/Definitions/diablotorrent.yml

@@ -79,7 +79,7 @@ search:
   paths:
     - path: browse
   inputs:
-    $raw: "{{range .Categories}}category[]={{.}}&{{end}}"
+    $raw: "{{ range .Categories }}category[]={{.}}&{{end}}"
     search: "{{ .Keywords }}"
     s_alapjan: 7
     s_sorrend: desc

src/Jackett.Common/Definitions/ebooks-shares.yml

@@ -314,7 +314,7 @@ search:
   paths:
     - path: torrents-search.php
   inputs:
-    $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
     search: "{{ if .Keywords }}\"{{ .Keywords }}\"{{ else }}{{ end }}"
     # 0 only active 1 incl dead 2 only dead
     incldead: 0

src/Jackett.Common/Definitions/empornium.yml

@@ -93,7 +93,7 @@ search:
   paths:
     - path: torrents.php
   inputs:
-    $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
     searchtext: ""
     title: "{{ .Keywords }}"
     order_by: time

src/Jackett.Common/Definitions/empornium2fa.yml

@@ -89,7 +89,7 @@ search:
   paths:
     - path: torrents.php
   inputs:
-    $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
     searchtext: ""
     title: "{{ .Keywords }}"
     order_by: time

src/Jackett.Common/Definitions/ethor.yml

@@ -127,7 +127,7 @@ search:
         - name: re_replace
           args: ["(?i)[\\.\\s\\[\\-]VFQ[\\.\\s\\]\\-]", ".{{ .Config.multilanguage }}."]
     title:
-      text: "{{if .Config.multilang }}{{ .Result._title_multilang }}{{ else }}{{ .Result._title_normalized }}{{ end }}"
+      text: "{{ if .Config.multilang }}{{ .Result._title_multilang }}{{ else }}{{ .Result._title_normalized }}{{ end }}"
     category:
       selector: a[href^="/browse.php?cat="]
       attribute: href

src/Jackett.Common/Definitions/exttorrents.yml

@@ -8,8 +8,9 @@ encoding: UTF-8
 links:
   - https://ext.to/
   - https://torrent.extto.com/
+  - https://ext.torrentbay.to/
 legacylinks:
-  - https://ext.unblockninja.com/ # currently redirects to https://ext.to/
+  - https://ext.unblockninja.com/ # currently redirects to https://ext.torrentbay.to/
   - https://t.extto.com/ # redirects to https://torrent.extto.com/
 
 caps:
@@ -84,6 +85,9 @@ download:
 search:
   paths:
     - path: "{{ if .Keywords }}search/?q={{ .Keywords }}&{{ else }}latest/?{{ end }}order={{ .Config.sort }}&sort={{ .Config.type }}"
+    - path: "{{ if .Keywords }}search/?q={{ .Keywords }}/2/&{{ else }}latest/2/?{{ end }}order={{ .Config.sort }}&sort={{ .Config.type }}"
+    - path: "{{ if .Keywords }}search/?q={{ .Keywords }}/3/&{{ else }}latest/3/?{{ end }}order={{ .Config.sort }}&sort={{ .Config.type }}"
+    - path: "{{ if .Keywords }}search/?q={{ .Keywords }}/4/&{{ else }}latest/4/?{{ end }}order={{ .Config.sort }}&sort={{ .Config.type }}"
 
   rows:
     selector: table.table-striped > tbody > tr

src/Jackett.Common/Definitions/femdomcult.yml

@@ -78,7 +78,7 @@ search:
   paths:
     - path: torrents.php
   inputs:
-    $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
     title: "{{ .Keywords }}"
     order_by: "{{ .Config.sort }}"
     order_way: "{{ .Config.type }}"

src/Jackett.Common/Definitions/funkytorrents.yml

@@ -72,7 +72,7 @@ search:
   paths:
     - path: browse.php
   inputs:
-    # $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+    # $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     search: "{{ if .Query.Artist }}{{ .Query.Artist }}{{ else }}{{ .Keywords }}{{ end }}"
     incldead: 1
 

src/Jackett.Common/Definitions/gay-torrents.yml

@@ -79,9 +79,9 @@ login:
 
 search:
   paths:
-    - path: "{{if .Query.Keywords}}search.php{{ else }}torrentslist.php{{ end }}"
+    - path: "{{ if .Keywords }}search.php{{ else }}torrentslist.php{{ end }}"
   inputs:
-    $raw: "{{range .Categories}}type={{.}}&{{end}}"
+    $raw: "{{ range .Categories }}type={{.}}&{{end}}"
     textsearch: "{{ .Keywords }}"
   keywordsfilters:
     - name: re_replace

src/Jackett.Common/Definitions/gay-torrentsorg.yml

@@ -85,7 +85,7 @@ search:
     - path: torrents_beta.php
       method: get
   inputs:
-    $raw: "{{range .Categories}}category[]={{.}}&{{end}}"
+    $raw: "{{ range .Categories }}category[]={{.}}&{{end}}"
     search: "{{ .Keywords }}"
     # 0 both, 1 active, 2 dead
     active: 0

src/Jackett.Common/Definitions/gaytorrentru.yml

@@ -108,7 +108,7 @@ search:
   paths:
     - path: browse.php
   inputs:
-    $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     search: "{{ .Keywords }}"
     # 0 active, 1 both, 2 dead
     incldead: 1

src/Jackett.Common/Definitions/gfxpeers.yml

@@ -37,7 +37,7 @@ search:
   paths:
     - path: torrents.php
   inputs:
-    $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
     searchstr: "{{ .Keywords }}"
     order_by: time
     order_way: desc

src/Jackett.Common/Definitions/greekdiamond.yml

@@ -144,29 +144,30 @@ search:
       filters:
         - name: regexp
           args: "src=(.*?) "
-    date: # some users will have a extra wait time column before the bookmark column, so use last-of-type
-      selector: td:nth-last-of-type(11)
+    # some users will have an extra wait time column before the bookmark column, so we count up from the bottom
+    date:
+      selector: td:nth-last-of-type(12)
       filters:
         - name: append
           args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
           args: "02/01/2006 -07:00"
     seeders:
-      selector: td:nth-last-of-type(9)
+      selector: td:nth-last-of-type(10)
     leechers:
-      selector: td:nth-last-of-type(8)
+      selector: td:nth-last-of-type(9)
     grabs:
-      selector: td:nth-last-of-type(7)
+      selector: td:nth-last-of-type(8)
       filters:
         - name: replace
           args: ["---", "0"]
     size:
-      selector: td:nth-last-of-type(5)
+      selector: td:nth-last-of-type(6)
       filters:
         - name: replace
           args: [",", ""]
     description:
-      selector: td:nth-last-of-type(3) img
+      selector: td:nth-last-of-type(4) img
       attribute: title
       filters:
         - name: prepend

src/Jackett.Common/Definitions/hachede.yml

@@ -153,7 +153,7 @@ search:
     p: torrents
     page: 1
     pid: 10
-    $raw: "{{range .Categories}}&cid[]={{.}}{{end}}"
+    $raw: "{{ range .Categories }}&cid[]={{.}}{{end}}"
     keywords: "{{ .Keywords }}"
     # name description both uploader
     search_type: name

src/Jackett.Common/Definitions/haidan.yml

@@ -104,7 +104,7 @@ search:
     # supports search using imdbid, does not return imdb links in results
 
   rows:
-    selector: div.torrent_panel > div.torrent_group > div.group_content
+    selector: div.group_content
 
   fields:
     category:
@@ -137,7 +137,7 @@ search:
       attribute: data-src
     date:
       # time type: time elapsed (default)
-      selector: div.time_col > span[title]
+      selector: div.time_col span[title]
       attribute: title
       optional: true
       filters:

src/Jackett.Common/Definitions/hdbits.yml

@@ -41,10 +41,12 @@ search:
   paths:
     - path: browse.php
   inputs:
-    $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
-    search: "{{ .Query.Keywords }}"
+    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
+    search: "{{ .Keywords }}"
+
   rows:
     selector: table#torrent-list > tbody > tr:has(a[href^="/details.php?id="])
+
   fields:
     category:
       selector: a[href^="?cat="]
@@ -75,10 +77,10 @@ search:
           args: " ago"
     downloadvolumefactor:
       case:
-        "a[title=\"25% Free Leech: only 75% of the download is counted.\"]": "0.25"
-        "a[title=\"50% Free Leech: only half the download is counted.\"]": "0.5"
-        "a[title=\"100% FL: no download is counted.\"]": "0"
-        "*": "1"
+        "a[title=\"25% Free Leech: only 75% of the download is counted.\"]": 0.25
+        "a[title=\"50% Free Leech: only half the download is counted.\"]": 0.5
+        "a[title=\"100% FL: no download is counted.\"]": 0
+        "*": 1
     uploadvolumefactor:
-      case:
-        "*": "1"
+      text: 1
+# engine tbd