assorted yml: code tidy

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/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/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/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

@@ -81,7 +81,7 @@ search:
   paths:
     - path: "{{if .Query.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/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/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

src/Jackett.Common/Definitions/hdbitscom.yml

@@ -39,22 +39,17 @@ search:
   paths:
     - path: torrents.php
   inputs:
-    $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
-    searchstr: "{{ .Query.Keywords }}"
+    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
+    searchstr: "{{ .Keywords }}"
     order_by: time
     order_way: desc
     action: basic
     searchsubmit: 1
+
   rows:
     selector: table#torrent_table > tbody > tr.torrent
+
   fields:
-    download:
-      selector: a[href^="torrents.php?action=download&id="]
-      attribute: href
-    description:
-      selector: div.group_info div.tags
-    title:
-      selector: div.group_info a[href^="torrents.php?id="]
     category:
       selector: td.cats_col
       case:
@@ -63,9 +58,16 @@ search:
         div.cats_tvseries: 3
         div.cats_applications: 4
         div.cats_xxx: 5
+    title:
+      selector: div.group_info a[href^="torrents.php?id="]
     details:
       selector: a[href^="torrents.php?id="]
       attribute: href
+    download:
+      selector: a[href^="torrents.php?action=download&id="]
+      attribute: href
+    description:
+      selector: div.group_info div.tags
     imdb:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
@@ -86,8 +88,8 @@ search:
       selector: td:nth-child(8)
     downloadvolumefactor:
       case:
-        "div.freeleech:contains('Freeleech!')": "0"
-        "*": "1"
+        "div.freeleech:contains('Freeleech!')": 0
+        "*": 1
     uploadvolumefactor:
-      case:
-        "*": "1"
+      text: 1
+# engine tbd

src/Jackett.Common/Definitions/hdforever.yml

@@ -94,7 +94,7 @@ search:
   # https://hdf.world/torrents.php?groupname=blood&freetorrent=1&order_by=time&order_way=desc&action=advanced&searchsubmit=1
   path: torrents.php
   inputs:
-    $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
     groupname: "{{ .Keywords }}"
     order_by: "{{ .Config.sort }}"
     order_way: "{{ .Config.type }}"

src/Jackett.Common/Definitions/hdonly.yml

@@ -97,7 +97,7 @@ search:
   path: torrents.php
   inputs:
     # does not support categories, uses releasetype for single filter so we canot do multi releasetype filtering either.
-    # $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+    # $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
     groupname: "{{ .Keywords }}"
     order_by: "{{ .Config.sort }}"
     order_way: "{{ .Config.type }}"

src/Jackett.Common/Definitions/hdspain.yml

@@ -57,7 +57,7 @@ search:
     b: "{{ .Keywords }}"
     ver: 0
     relanz: 0
-    $raw: "{{range .Categories}}&cat[]={{.}}{{end}}"
+    $raw: "{{ range .Categories }}&cat[]={{.}}{{end}}"
 
   rows:
     selector: "table.listatorrents tr:not(:first-child)"

src/Jackett.Common/Definitions/hqsource.yml

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

src/Jackett.Common/Definitions/kinonavse100.yml

@@ -123,7 +123,7 @@ search:
     ch: 300
     t: 0
     submit: Search
-    $raw: "{{range .Categories}}&fid[]={{.}}{{end}}"
+    $raw: "{{ range .Categories }}&fid[]={{.}}{{end}}"
 
   rows:
     selector: table.tablebg > tbody > tr:has(a[href^="./download/file.php?id="])

src/Jackett.Common/Definitions/lepornoinfo.yml

@@ -55,7 +55,7 @@ search:
     - path: tracker.php#results
       method: post
   inputs:
-    $raw: "{{ if .Categories }}{{range .Categories}}&f[]={{.}}{{end}}{{ else }}&f[]=-1{{ end }}"
+    $raw: "{{ if .Categories }}{{ range .Categories }}&f[]={{.}}{{end}}{{ else }}&f[]=-1{{ end }}"
     prev_allw: 1
     prev_a: 0
     prev_dla: 0

src/Jackett.Common/Definitions/linkomanija.yml

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

src/Jackett.Common/Definitions/mnv.yml

@@ -98,7 +98,7 @@ search:
   # https://mnvv2.info/browse.php?showsearch=1&c13=1&c3=1&search=&blah=0&incldead=1&team=0&orderby=added&sort=desc&language=all
   path: browse.php
   inputs:
-    $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     search: "{{ .Keywords }}"
     # 0 name, 1 descr, 2 both, 3 filelist
     blah: 0

src/Jackett.Common/Definitions/mteamtp2fa.yml

@@ -109,7 +109,7 @@ search:
     - path: music.php
       categories: [406, 408, 434]
   inputs:
-    $raw: "{{range .Categories}}cat{{.}}=1&{{end}}"
+    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
     search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
     # 0 incldead, 1 active, 2 dead
     incldead: 0