assorted yml: code tidy

2020-11-17 16:28:44 +13:00 · 2020-11-17 16:28:44 +13:00 · f5fc110aac
parent 271a745f93
commit f5fc110aac
43 changed files with 98 additions and 95 deletions
--- a/src/Jackett.Common/Definitions/asiancinema.yml
+++ b/src/Jackett.Common/Definitions/asiancinema.yml
@ -71,7 +71,7 @@ search:
    - path: torrents/filter
  inputs:
    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}" # for dashboard imdbid search
+    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
    description: ""
    uploader: ""
    imdb: "{{ .Query.IMDBIDShort }}"
--- a/src/Jackett.Common/Definitions/audionews.yml
+++ b/src/Jackett.Common/Definitions/audionews.yml
@ -243,7 +243,7 @@ search:
    - path: tracker.php
      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
--- a/src/Jackett.Common/Definitions/bibliotik.yml
+++ b/src/Jackett.Common/Definitions/bibliotik.yml
@ -68,7 +68,7 @@ search:
  paths:
    - path: torrents/
  inputs:
-    search: "{{ if .Query.Author }} @authors {{ .Query.Author }}{{else}}{{end}}{{ if .Query.Title }} @title {{ .Query.Title }}{{else}}{{end}}{{ .Keywords }}"
+    search: "{{ if .Query.Author }} @authors {{ .Query.Author }}{{ else }}{{ end }}{{ if .Query.Title }} @title {{ .Query.Title }}{{ else }}{{ end }}{{ .Keywords }}"
    $raw: "{{ range .Categories }}cat[]={{.}}&{{end}}"
    orderby: "{{ .Config.orderby }}"
    order: "{{ .Config.order }}"
@ -105,10 +105,10 @@ search:
    booktitle:
      selector: .title a
    title:
-      text: "{{.Result.booktitle}}"
+      text: "{{ .Result.booktitle }}"
      filters:
        - name: append
-          args: "{{ if .Result.author }} by {{ .Result.author }}{{else}}{{end}}{{ if .Result._year }} {{ .Result._year }}{{else}}{{end}}{{ if .Result._filetype }} {{ .Result._filetype }}{{else}}{{end}}{{ if .Result._retail }} {{ .Result._retail }}{{else}}{{end}}"
+          args: "{{ if .Result.author }} by {{ .Result.author }}{{ else }}{{ end }}{{ if .Result._year }} {{ .Result._year }}{{ else }}{ {end }}{{ if .Result._filetype }} {{ .Result._filetype }}{{ else }}{{ end }}{{ if .Result._retail }} {{ .Result._retail }}{{ else }}{{ end }}"
    details:
      selector: .title a
      attribute: href
@ -143,9 +143,7 @@ search:
      optional: true
      selector: .snatches
    downloadvolumefactor:
-      case:
-        "*": 1
+      text: 1
    uploadvolumefactor:
-      case:
-        "*": 1
+      text: 1
 # engine tbc
--- a/src/Jackett.Common/Definitions/bigtorrent.yml
+++ b/src/Jackett.Common/Definitions/bigtorrent.yml
@ -52,8 +52,8 @@ login:
  inputs:
    username: "{{ .Config.username }}"
    password: "{{ .Config.password }}"
-    sent: "yes"
-    returnto: "/"
+    sent: yes
+    returnto: /
  error:
    - selector: div.error
  test:
@ -68,9 +68,11 @@ search:
    - path: browse.php
  inputs:
    $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
-    search: "{{if .Keywords}}{{ .Keywords }}{{else}}  {{end}}"
+    search: "{{ if .Keywords }}{{ .Keywords }}{{ else }}  {{ end }}"
+
  rows:
    selector: table#torrent_table > tbody > tr:has(a[href^="browse.php?cat="])
+
  fields:
    category:
      selector: a[href^="browse.php?cat="]
@ -98,8 +100,7 @@ search:
    date:
      selector: td:nth-child(4)
    downloadvolumefactor:
-      case:
-        "*": "1"
+      text: 1
    uploadvolumefactor:
-      case:
-        "*": "1"
+      text: 1
+# engine tbd
--- a/src/Jackett.Common/Definitions/bithumen.yml
+++ b/src/Jackett.Common/Definitions/bithumen.yml
@ -64,7 +64,7 @@ search:
    - path: browse.php
  inputs:
    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
    incldead: 1

  rows:
@ -123,7 +123,7 @@ search:
    size:
      selector: td:nth-child(6) > u
    downloadvolumefactor:
-      text: "1"
+      text: 1
    downloadvolumefactor:
      optional: true
      selector: td:nth-child(6) > nobr > font:contains(" × ")
@ -131,7 +131,7 @@ search:
        - name: replace
          args: ["×", ""]
    uploadvolumefactor:
-      text: "1"
+      text: 1
    uploadvolumefactor:
      optional: true
      selector: td:nth-child(5) > nobr > font:contains(" × ")
--- a/src/Jackett.Common/Definitions/btdb.yml
+++ b/src/Jackett.Common/Definitions/btdb.yml
@ -57,11 +57,11 @@ settings:

 search:
  paths:
-    - path: "{{ if .Keywords }}search/{{ .Keywords }}/{{else}}recent{{end}}?sort={{ .Config.sort }}"
-    - path: "{{ if .Keywords }}search/{{ .Keywords }}/{{else}}recent{{end}}?sort={{ .Config.sort }}&page=2"
-    - path: "{{ if .Keywords }}search/{{ .Keywords }}/{{else}}recent{{end}}?sort={{ .Config.sort }}&page=3"
-    - path: "{{ if .Keywords }}search/{{ .Keywords }}/{{else}}recent{{end}}?sort={{ .Config.sort }}&page=4"
-    - path: "{{ if .Keywords }}search/{{ .Keywords }}/{{else}}recent{{end}}?sort={{ .Config.sort }}&page=5"
+    - path: "{{ if .Keywords }}search/{{ .Keywords }}/{{ else }}recent{{ end }}?sort={{ .Config.sort }}"
+    - path: "{{ if .Keywords }}search/{{ .Keywords }}/{{ else }}recent{{ end }}?sort={{ .Config.sort }}&page=2"
+    - path: "{{ if .Keywords }}search/{{ .Keywords }}/{{ else }}recent{{ end }}?sort={{ .Config.sort }}&page=3"
+    - path: "{{ if .Keywords }}search/{{ .Keywords }}/{{ else }}recent{{ end }}?sort={{ .Config.sort }}&page=4"
+    - path: "{{ if .Keywords }}search/{{ .Keywords }}/{{ else }}recent{{ end }}?sort={{ .Config.sort }}&page=5"

  rows:
    selector: div.media
--- a/src/Jackett.Common/Definitions/carpathians.yml
+++ b/src/Jackett.Common/Definitions/carpathians.yml
@ -82,8 +82,8 @@ search:
    - path: browse.php
  inputs:
    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}https://www.imdb.com/title/{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-    # 0 both 1 only active 2 only dead
+    search: "{{ if .Query.IMDBID }}https://www.imdb.com/title/{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
+    # 0 both, 1 only active, 2 only dead
    incldead: 0
    onlyname: 1
    onlyname2: true
--- a/src/Jackett.Common/Definitions/chilebt.yml
+++ b/src/Jackett.Common/Definitions/chilebt.yml
@ -82,7 +82,7 @@ search:
    - path: filterTorrents
  inputs:
    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}" # for dashboard imdbid search
+    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
    description: ""
    uploader: ""
    imdb: "{{ .Query.IMDBIDShort }}"
--- a/src/Jackett.Common/Definitions/classix.yml
+++ b/src/Jackett.Common/Definitions/classix.yml
@ -36,9 +36,11 @@ search:
    - path: torrents-search.php
  inputs:
    $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
-    search: "{{if .Keywords}}\"{{.Keywords}}\"{{else}}{{end}}"
+    search: "{{ if .Keywords }}\"{{ .Keywords }}\"{{ else }}{{ end }}"
+
  rows:
    selector: table > tbody > tr:has(a[href^="torrents.php?cat="])
+
  fields:
    category:
      text: 1
@ -60,8 +62,7 @@ search:
    leechers:
      selector: td:nth-child(9)
    downloadvolumefactor:
-      case:
-        "*": "1"
+      text: 1
    uploadvolumefactor:
-      case:
-        "*": "1"
+      text: 1
+# engine tbd
--- a/src/Jackett.Common/Definitions/darktracker.yml
+++ b/src/Jackett.Common/Definitions/darktracker.yml
@ -667,7 +667,7 @@ search:
    - name: re_replace # S01E01 to сезон 1 серии 1
      args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "сезон $1 серии $2"]
  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
@ -682,9 +682,9 @@ search:
    prev_df: 1
    prev_ds: 0
    prev_tor_type: 0
-    # sort by 1=registered 2=topicTitle 4=completed 10=seed 11=leech 12=up 13=down 5=replies 6=views 7=size 8=lastPost 9=seedLastSeen
+    # sort by 1=registered, 2=topicTitle, 4=completed, 10=seed, 11=leech, 12=up, 13=down, 5=replies, 6=views, 7=size, 8=lastPost, 9=seedLastSeen
    o: "{{ .Config.sort }}"
-    # 1=asc 2=desc
+    # 1=asc, 2=desc
    s: "{{ .Config.type }}"
    # show category
    dc: 0
--- a/src/Jackett.Common/Definitions/datascene.yml
+++ b/src/Jackett.Common/Definitions/datascene.yml
@ -103,8 +103,8 @@ search:
  paths:
    - path: browse.php
  inputs:
-    $raw: "{{ if .Categories}}{{ range .Categories }}c{{.}}=1&{{end}}{{else}}cat=0{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    $raw: "{{ if .Categories}}{{ range .Categories }}c{{.}}=1&{{end}}{{ else }}cat=0{{ end }}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
    # 1 active, 2 incldead, 3 onlydead, 4 free
    # note: searching with 4 (freeleech) does not return any results!
    # incldead: "{{ if .Config.freeleech }}4{{ else }}2{{ end }}"
--- a/src/Jackett.Common/Definitions/emtrek.yml
+++ b/src/Jackett.Common/Definitions/emtrek.yml
@ -221,7 +221,7 @@ search:
  paths:
    - path: tracker.php
  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
@ -236,9 +236,9 @@ search:
    prev_df: 1
    prev_ds: 0
    prev_tor_type: 0
-    # sort by 1=registered 2=topicTitle 4=completed 10=seed 11=leech 12=up 13=down 5=replies 6=views 7=size 8=lastPost 9=seedLastSeen
+    # sort by 1=registered, 2=topicTitle, 4=completed, 10=seed, 11=leech, 12=up, 13=down, 5=replies, 6=views, 7=size, 8=lastPost, 9=seedLastSeen
    o: "{{ .Config.sort }}"
-    # 1=asc 2=desc
+    # 1=asc, 2=desc
    s: "{{ .Config.type }}"
    # show category
    dc: 0
--- a/src/Jackett.Common/Definitions/eniahd.yml
+++ b/src/Jackett.Common/Definitions/eniahd.yml
@ -90,7 +90,7 @@ search:
    - name: re_replace # S01E01 to сезон 1 серии 1
      args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "сезон $1 серии $2"]
  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: 0
    prev_a: 0
    prev_dla: 0
--- a/src/Jackett.Common/Definitions/erzsebet.yml
+++ b/src/Jackett.Common/Definitions/erzsebet.yml
@ -124,7 +124,7 @@ search:
    - name: re_replace # S01E01 to сезон 1 серии 1
      args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "сезон $1 серии $2"]
  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
--- a/src/Jackett.Common/Definitions/erzsebetpl.yml
+++ b/src/Jackett.Common/Definitions/erzsebetpl.yml
@ -250,7 +250,7 @@ search:
    - name: re_replace # S01E01 to сезон 1 серии 1
      args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "сезон $1 серии $2"]
  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
--- a/src/Jackett.Common/Definitions/fanoin.yml
+++ b/src/Jackett.Common/Definitions/fanoin.yml
@ -98,7 +98,7 @@ search:
    - path: browse_old.php
  inputs:
    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
    # 0 active 1 incldead 2 onlydead
    incldead: 1
    sort: "{{ .Config.sort }}"
--- a/src/Jackett.Common/Definitions/generationfree.yml
+++ b/src/Jackett.Common/Definitions/generationfree.yml
@ -219,7 +219,7 @@ search:
        - name: re_replace
          args: ["(?i)(\\sMULTI\\s)", " {{ .Config.multilanguage }} "]
    title:
-      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{else}}{{ .Result.title_original }}{{end}}"
+      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_original }}{{ end }}"
    category:
      selector: a[href^="torrents.php?cat="]
      attribute: href
--- a/src/Jackett.Common/Definitions/hdforever.yml
+++ b/src/Jackett.Common/Definitions/hdforever.yml
@ -128,7 +128,7 @@ search:
        - name: append
          args: "&usetoken=1"
    download:
-      text: "{{if .Config.usetoken}}{{ .Result.download-usetoken }}{{else}}{{ .Result.download-regular }}{{end}}"
+      text: "{{ if .Config.usetoken }}{{ .Result.download-usetoken }}{{ else }}{{ .Result.download-regular }}{{ end }}"
    title_phase1:
      selector: div.group_info
      remove: span:nth-child(1), div.tags
--- a/src/Jackett.Common/Definitions/hdroute.yml
+++ b/src/Jackett.Common/Definitions/hdroute.yml
@ -51,7 +51,7 @@ search:
    # order: 1 uptime, 2 imdb, 3 comment, 4 size, 5 complete, 6 upload
    or: 1
    action: s
-    imdb: "{{ if .Query.IMDBID }}{{ .Query.IMDBIDShort }}{{else}}{{end}}"
+    imdb: "{{ if .Query.IMDBID }}{{ .Query.IMDBIDShort }}{{ else }}{{ end }}"

  rows:
    selector: div#unsticky-torrent-table dl, div#sticky-torrent-table dl
--- a/src/Jackett.Common/Definitions/iv-torrents.yml
+++ b/src/Jackett.Common/Definitions/iv-torrents.yml
@ -621,7 +621,7 @@ search:
    - name: re_replace # S01E01 to сезон 1 серии 1
      args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "сезон $1 серии $2"]
  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
@ -636,7 +636,7 @@ search:
    prev_df: 1
    prev_ds: 0
    prev_tor_type: 0
-    # sort by 1=registered 2=topicTitle 4=completed 10=seed 11=leech 12=up 13=down 5=replies 6=views 7=size 8=lastPost 9=seedLastSeen
+    # sort by 1=registered, 2=topicTitle, 4=completed, 10=seed, 11=leech, 12=up, 13=down, 5=replies, 6=views, 7=size, 8=lastPost, 9=seedLastSeen
    o: "{{ .Config.sort }}"
    # 1=asc 2=desc
    s: "{{ .Config.type }}"
--- a/src/Jackett.Common/Definitions/lepornoinfo.yml
+++ b/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
--- a/src/Jackett.Common/Definitions/marinetracker.yml
+++ b/src/Jackett.Common/Definitions/marinetracker.yml
@ -140,7 +140,7 @@ search:
    - path: tracker.php
      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 }}"
    nm: "{{ .Keywords }}"
    allw: 1
    o: "{{ .Config.sort }}"
--- a/src/Jackett.Common/Definitions/movcr.yml
+++ b/src/Jackett.Common/Definitions/movcr.yml
@ -40,7 +40,7 @@ download:

 search:
  paths:
-    - path: "{{ if .Keywords }}search/search.php?q={{ .Keywords }}{{else}}/{{end}}"
+    - path: "{{ if .Keywords }}search/search.php?q={{ .Keywords }}{{ else }}/{{ end }}"

  rows:
    selector: tr:has(td.name a[href^="/download-"])
--- a/src/Jackett.Common/Definitions/mypornclub.yml
+++ b/src/Jackett.Common/Definitions/mypornclub.yml
@ -28,7 +28,7 @@ download:

 search:
  paths:
-    - path: "{{ if .Keywords }}search/{{ re_replace .Keywords \"\\s+\" \"-\" }}{{else}}torrents{{end}}"
+    - path: "{{ if .Keywords }}search/{{ re_replace .Keywords \"\\s+\" \"-\" }}{{ else }}torrents{{ end }}"

  rows:
    selector: div.torrents_list > div.torrent_element
--- a/src/Jackett.Common/Definitions/noname-club.yml
+++ b/src/Jackett.Common/Definitions/noname-club.yml
@ -745,7 +745,7 @@ search:
    - path: forum/tracker.php
      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 }}"
    o: "{{ .Config.sort }}"
    s: "{{ .Config.type }}"
    tm: -1
@ -805,7 +805,7 @@ search:
        - name: re_replace
          args: [".*(\\d{2}-\\d{2}-\\d{4})(\\d{2}:\\d{2})", "$1 $2"]
        - name: append
-          args: ":00 +03:00"
+          args: ":00 +03:00" # MSK
        - name: dateparse
          args: "02-01-2006 15:04:05 -07:00"
    seeders:
--- a/src/Jackett.Common/Definitions/onejav.yml
+++ b/src/Jackett.Common/Definitions/onejav.yml
@ -19,8 +19,8 @@ settings: []

 search:
  paths:
-    - path: "{{ if .Keywords }}search/{{ .Keywords }}{{else}}new{{end}}"
-    - path: "{{ if .Keywords }}search/{{ .Keywords }}{{else}}new{{end}}?page=2"
+    - path: "{{ if .Keywords }}search/{{ .Keywords }}{{ else }}new{{ end }}"
+    - path: "{{ if .Keywords }}search/{{ .Keywords }}{{ else }}new{{ end }}?page=2"

  rows:
    selector: div.mb-3
--- a/src/Jackett.Common/Definitions/pctorrent.yml
+++ b/src/Jackett.Common/Definitions/pctorrent.yml
@ -26,7 +26,7 @@ download:

 search:
  paths:
-    - path: "{{ if .Keywords }}?do=search&subaction=search&search_start=0&full_search=1&result_from=1&story={{ .Keywords }}{{else}}{{end}}"
+    - path: "{{ if .Keywords }}?do=search&subaction=search&search_start=0&full_search=1&result_from=1&story={{ .Keywords }}{{ else }}{{ end }}"

  rows:
    selector: div.dshort:has(div.d3-raz):not(:has(div.d3-raz:contains("Анонс!"))) # no size means indirect download via 3rd party site, not supported by cardigann. #8020
--- a/src/Jackett.Common/Definitions/piratbit.yml
+++ b/src/Jackett.Common/Definitions/piratbit.yml
@ -658,7 +658,7 @@ search:
    - name: re_replace # S01E01 to Сезон 1 Серии 1
      args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "Сезон $1 Серии $2"]
  inputs:
-    $raw: "{{ if .Categories }}{{ range .Categories }}f[]={{.}}&{{end}}{{else}}f[]=-1{{end}}"
+    $raw: "{{ if .Categories }}{{ range .Categories }}f[]={{.}}&{{end}}{{ else }}f[]=-1{{ end }}"
    prev_a: 0
    prev_gold: 0
    prev_silver: 0
--- a/src/Jackett.Common/Definitions/piratbitl.yml
+++ b/src/Jackett.Common/Definitions/piratbitl.yml
@ -673,7 +673,7 @@ search:
    - name: re_replace # S01E01 to Сезон 1 Серии 1
      args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "Сезон $1 Серии $2"]
  inputs:
-    $raw: "{{ if .Categories }}{{ range .Categories }}f[]={{.}}&{{end}}{{else}}f[]=-1{{end}}"
+    $raw: "{{ if .Categories }}{{ range .Categories }}f[]={{.}}&{{end}}{{ else }}f[]=-1{{ end }}"
    prev_a: 0
    prev_gold: 0
    prev_silver: 0
--- a/src/Jackett.Common/Definitions/polishsource.yml
+++ b/src/Jackett.Common/Definitions/polishsource.yml
@ -78,7 +78,7 @@ search:
    - path: browse.php
  inputs:
    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
    # 0 onlyactive, 1 all, 2 onlydead
    incldead: 1
    # 0 all, 1 scene, 2 notscene, 3 internal
@ -88,7 +88,7 @@ search:
    # subcat blank=all
    sub: ""
    # title, both, nfo
-    search_in: "{{ if .Query.IMDBID }}nfo{{else}}title{{end}}"
+    search_in: "{{ if .Query.IMDBID }}nfo{{ else }}title{{ end }}"
    sort: "{{ .Config.sort }}"
    type: "{{ .Config.type }}"

--- a/src/Jackett.Common/Definitions/rintor.yml
+++ b/src/Jackett.Common/Definitions/rintor.yml
@ -143,7 +143,7 @@ search:
    pn: ""
    # despite the all words flag the search engine returns anywords matching.
    allw: 1
-    $raw: "{{ if .Categories }}{{range .Categories}}&f[]={{.}}{{end}}{{else}}&f[]=-1{{end}}"
+    $raw: "{{ if .Categories }}{{range .Categories}}&f[]={{.}}{{end}}{{ else }}&f[]=-1{{ end }}"
  keywordsfilters:
    - name: re_replace
      args: ["(\\w+)", " +$1"] # prepend + to each word
--- a/src/Jackett.Common/Definitions/romanianmetaltorrents.yml
+++ b/src/Jackett.Common/Definitions/romanianmetaltorrents.yml
@ -41,7 +41,7 @@ download:
  method: get
  before:
    path: login.php
-    method: "post"
+    method: post
    inputs:
      username: "{{ .Config.username }}"
      password: "{{ .Config.password }}"
@ -51,9 +51,11 @@ search:
    - path: browse.php
      method: get
  inputs:
-    "search": "{{if .Query.Artist}}{{ .Query.Artist }}{{else}}{{ .Keywords }}{{end}}"
+    "search": "{{ if .Query.Artist }}{{ .Query.Artist }}{{ else }}{{ .Keywords }}{{ end }}"
+
  rows:
    selector: table.torrents_table tbody tr:has(a[href^="download2.php?id="])
+
  fields:
    title:
      selector: td a[href^="details.php?id="]
@ -97,13 +99,14 @@ search:
        - name: regexp
          args: '([\d]+) times'
    category:
-      text: "Music"
+      text: Music
    downloadvolumefactor:
      case:
-        img[src$="pic/freedownload.gif"]: "0"
-        img[src$="pic/half.gif"]: "0.5"
-        "*": "1"
+        img[src$="pic/freedownload.gif"]: 0
+        img[src$="pic/half.gif"]: 0.5
+        "*": 1
    uploadvolumefactor:
      case:
-        img[src$="pic/sticky2.gif"]: "1.5"
-        "*": "1"
+        img[src$="pic/sticky2.gif"]: 1.5
+        "*": 1
+# engine tbd
--- a/src/Jackett.Common/Definitions/rus-media.yml
+++ b/src/Jackett.Common/Definitions/rus-media.yml
@ -309,7 +309,7 @@ search:
    sf: titleonly
    fp: 1
    tracker_search: torrent
-    keywords: "{{ if .Keywords }}{{ .Keywords }}{{else}}{{ .Today.Year }}{{end}}"
+    keywords: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
    sk: "{{ .Config.sort }}"
    sd: "{{ .Config.type }}"
    $raw: "{{ range .Categories }}&fid[]={{.}}{{end}}"
--- a/src/Jackett.Common/Definitions/rustorka.yml
+++ b/src/Jackett.Common/Definitions/rustorka.yml
@ -818,7 +818,7 @@ search:
    - name: re_replace # S01E01 to сезон 1 серии 1
      args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "сезон $1 серии $2"]
  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: 0
    prev_a: 0
    prev_dla: 0
@ -846,9 +846,9 @@ search:
    prev_mod: 0
    prev_gold: 0
    prev_silver: 0
-    # sort by 1=registered 2=topicTitle 4=completed 10=seed 11=leech 12=up 13=down 5=replies 6=views 7=size 8=lastPost 9=seedLastSeen
+    # sort by 1=registered, 2=topicTitle, 4=completed, 10=seed, 11=leech, 12=up, 13=down, 5=replies, 6=views, 7=size, 8=lastPost, 9=seedLastSeen
    o: "{{ .Config.sort }}"
-    # 1=asc 2=desc
+    # 1=asc, 2=desc
    s: "{{ .Config.type }}"
    # show category
    dc: 0
--- a/src/Jackett.Common/Definitions/rutracker-ru.yml
+++ b/src/Jackett.Common/Definitions/rutracker-ru.yml
@ -391,7 +391,7 @@ search:
    - name: re_replace # S01E01 to сезон 1 серии 1
      args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "сезон $1 серии $2"]
  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
--- a/src/Jackett.Common/Definitions/sexypics.yml
+++ b/src/Jackett.Common/Definitions/sexypics.yml
@ -46,8 +46,8 @@ search:
    # return results for 'of' if there are no search parms supplied (for use with the TEST button)
    # https://www.sexy-pics.us/h/hegre-1080p/age/desc/
    # https://www.sexy-pics.us/browse/all/age/desc/2/
-    - path: "{{ if .Keywords }}{{ re_replace .Keywords \"(.).*\" \"$1\" }}/{{ .Keywords }}/{{else}}browse/all/{{end}}{{ .Config.sort }}/{{ .Config.type }}/"
-    - path: "{{ if .Keywords }}{{ re_replace .Keywords \"(.).*\" \"$1\" }}/{{ .Keywords }}/{{else}}browse/all/{{end}}{{ .Config.sort }}/{{ .Config.type }}/2/"
+    - path: "{{ if .Keywords }}{{ re_replace .Keywords \"(.).*\" \"$1\" }}/{{ .Keywords }}/{{ else }}browse/all/{{ end }}{{ .Config.sort }}/{{ .Config.type }}/"
+    - path: "{{ if .Keywords }}{{ re_replace .Keywords \"(.).*\" \"$1\" }}/{{ .Keywords }}/{{ else }}browse/all/{{ end }}{{ .Config.sort }}/{{ .Config.type }}/2/"

  rows:
    selector: tr:has(td.m)
--- a/src/Jackett.Common/Definitions/tapochek.yml
+++ b/src/Jackett.Common/Definitions/tapochek.yml
@ -499,7 +499,7 @@ search:
    # https://tapochek.net/tracker.php?f=-1&gold=1&silver=1&o=1&s=2&tm=-1&sns=-1#results
    - path: tracker.php
  inputs:
-    $raw: "{{ if .Categories }}{{ range .Categories }}f[]={{.}}&{{end}}{{else}}f[]=-1{{end}}"
+    $raw: "{{ if .Categories }}{{ range .Categories }}f[]={{.}}&{{end}}{{ else }}f[]=-1{{ end }}"
    nm: "{{ .Keywords }}"
    o: "{{ .Config.sort }}"
    s: "{{ .Config.type }}"
--- a/src/Jackett.Common/Definitions/torrentv.yml
+++ b/src/Jackett.Common/Definitions/torrentv.yml
@ -32,7 +32,7 @@ download:

 search:
  paths:
-    - path: "{{ if .Keywords }}search/{{ .Keywords }}/{{ .Config.sort }}/{{else}}new.html{{end}}"
+    - path: "{{ if .Keywords }}search/{{ .Keywords }}/{{ .Config.sort }}/{{ else }}new.html{{ end }}"

  rows:
    selector: div.grid_4
--- a/src/Jackett.Common/Definitions/torrentz2k.yml
+++ b/src/Jackett.Common/Definitions/torrentz2k.yml
@ -74,8 +74,8 @@ search:
      selector: span.btntitle
      attribute: title
    details:
-      # details page is only accessible via  form and post which Cardigann does not support.
-      text: /
+      # details page is only accessible via form and post which Cardigann does not support.
+      text: "{{ .Config.sitelink }}"
    download:
      selector: a[href^="magnet:?xt="]
      attribute: href
@ -94,7 +94,7 @@ search:
    _size:
      selector: td:nth-child(6)
    size:
-      text: "{{ if .Result._size }}{{ .Result._size }}{{else}}0 B{{end}}"
+      text: "{{ if .Result._size }}{{ .Result._size }}{{ else }}0 B{{ end }}"
    seeders:
      selector: td:nth-child(3)
    leechers:
--- a/src/Jackett.Common/Definitions/tvchaosuk.yml
+++ b/src/Jackett.Common/Definitions/tvchaosuk.yml
@ -83,7 +83,7 @@ search:
    - path: torrents/filter
  inputs:
    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}" # for dashboard imdbid search
+    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
    description: ""
    uploader: ""
    imdb: "{{ .Query.IMDBIDShort }}"
--- a/src/Jackett.Common/Definitions/xxxtorrents.yml
+++ b/src/Jackett.Common/Definitions/xxxtorrents.yml
@ -102,7 +102,7 @@ search:
  paths:
    - path: tracker.php
  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
--- a/src/Jackett.Common/Definitions/yggcookie.yml
+++ b/src/Jackett.Common/Definitions/yggcookie.yml
@ -210,10 +210,10 @@ search:
      args: ["  ", " "]
    - name: trim
  paths:
-    - path: "https://{{ .Config.searchanddlurl }}/{{ if .Config.betasearchengine }}new_search{{else}}engine{{end}}/search?category={{ .Config.category }}&name={{ if .Config.betasearchengine }}{{ .Keywords }}{{else}}{{ re_replace .Keywords \"\\b[^\\s]+\\b\"  \"\"$&\"\"}}{{end}}&description=&file=&uploader=&sub_category=&do=search&order={{ .Config.type }}&sort={{ .Config.sort }}"
+    - path: "https://{{ .Config.searchanddlurl }}/{{ if .Config.betasearchengine }}new_search{{ else }}engine{{ end }}/search?category={{ .Config.category }}&name={{ if .Config.betasearchengine }}{{ .Keywords }}{{ else }}{{ re_replace .Keywords \"\\b[^\\s]+\\b\"  \"\"$&\"\"}}{{ end }}&description=&file=&uploader=&sub_category=&do=search&order={{ .Config.type }}&sort={{ .Config.sort }}"
      followredirect: true
    # Saison Word
-    - path: "https://{{ .Config.searchanddlurl }}/{{ if .Config.betasearchengine }}new_search{{else}}engine{{end}}/search?category={{ .Config.category }}&name={{ re_replace .Keywords \"[sS]0(\\d{1,2})\"  \"Saison.$1\"}}&description=&file=&uploader=&sub_category=&do=search&order={{ .Config.type }}&sort={{ .Config.sort }}"
+    - path: "https://{{ .Config.searchanddlurl }}/{{ if .Config.betasearchengine }}new_search{{ else }}engine{{ end }}/search?category={{ .Config.category }}&name={{ re_replace .Keywords \"[sS]0(\\d{1,2})\"  \"Saison.$1\"}}&description=&file=&uploader=&sub_category=&do=search&order={{ .Config.type }}&sort={{ .Config.sort }}"
      followredirect: true

  rows:
@ -269,7 +269,7 @@ search:
        - name: re_replace
          args: ["(?i)[\\.\\s\\[\\-]multi[\\.\\s\\]\\-]", ".{{ .Config.multilanguage }}."]
    title_phase2:
-      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{else}}{{ .Result.title_phase1 }}{{end}}"
+      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
    title_vostfr:
      text: "{{ .Result.title_phase2 }}"
      filters:
@ -278,7 +278,7 @@ search:
        - name: re_replace
          args: ["(?i)[\\.\\s\\[\\-]subfrench[\\.\\s\\]\\-]", ".ENGLISH."]
    title_phase3:
-      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{else}}{{ .Result.title_phase2 }}{{end}}"
+      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
    title_anime:
      text: "{{ .Result.title_phase3 }}"
      filters:
@ -287,7 +287,7 @@ search:
        - name: re_replace
          args: ["(.*)(\\.| |\\-)(\\d{2,3})(\\.| |\\-)(.*)", "$1 E$3 $5"]
    title:
-      text: "{{ if .Config.enhancedAnime }}{{ .Result.title_anime }}{{else}}{{ .Result.title_phase3 }}{{end}}"
+      text: "{{ if .Config.enhancedAnime }}{{ .Result.title_anime }}{{ else }}{{ .Result.title_phase3 }}{{ end }}"
    details:
      selector: td:nth-child(2) > a
      attribute: href
--- a/src/Jackett.Common/Definitions/yggtorrent.yml
+++ b/src/Jackett.Common/Definitions/yggtorrent.yml
@ -218,10 +218,10 @@ search:
      args: ["  ", " "]
    - name: trim
  paths:
-    - path: "https://{{ .Config.searchanddlurl }}/{{ if .Config.betasearchengine }}new_search{{else}}engine{{end}}/search?category={{ .Config.category }}&name={{ if .Config.betasearchengine }}{{ .Keywords }}{{else}}{{ re_replace .Keywords \"\\b[^\\s]+\\b\"  \"\"$&\"\"}}{{end}}&description=&file=&uploader=&sub_category=&do=search&order={{ .Config.type }}&sort={{ .Config.sort }}"
+    - path: "https://{{ .Config.searchanddlurl }}/{{ if .Config.betasearchengine }}new_search{{ else }}engine{{ end }}/search?category={{ .Config.category }}&name={{ if .Config.betasearchengine }}{{ .Keywords }}{{ else }}{{ re_replace .Keywords \"\\b[^\\s]+\\b\"  \"\"$&\"\"}}{{ end }}&description=&file=&uploader=&sub_category=&do=search&order={{ .Config.type }}&sort={{ .Config.sort }}"
      followredirect: true
    # Saison Word
-    - path: "https://{{ .Config.searchanddlurl }}/{{ if .Config.betasearchengine }}new_search{{else}}engine{{end}}/search?category={{ .Config.category }}&name={{ re_replace .Keywords \"[sS]0(\\d{1,2})\"  \"Saison.$1\"}}&description=&file=&uploader=&sub_category=&do=search&order={{ .Config.type }}&sort={{ .Config.sort }}"
+    - path: "https://{{ .Config.searchanddlurl }}/{{ if .Config.betasearchengine }}new_search{{ else }}engine{{ end }}/search?category={{ .Config.category }}&name={{ re_replace .Keywords \"[sS]0(\\d{1,2})\"  \"Saison.$1\"}}&description=&file=&uploader=&sub_category=&do=search&order={{ .Config.type }}&sort={{ .Config.sort }}"
      followredirect: true

  rows:
@ -277,7 +277,7 @@ search:
        - name: re_replace
          args: ["(?i)[\\.\\s\\[\\-]multi[\\.\\s\\]\\-]", ".{{ .Config.multilanguage }}."]
    title_phase2:
-      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{else}}{{ .Result.title_phase1 }}{{end}}"
+      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
    title_vostfr:
      text: "{{ .Result.title_phase2 }}"
      filters:
@ -286,7 +286,7 @@ search:
        - name: re_replace
          args: ["(?i)[\\.\\s\\[\\-]subfrench[\\.\\s\\]\\-]", ".ENGLISH."]
    title_phase3:
-      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{else}}{{ .Result.title_phase2 }}{{end}}"
+      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
    title_anime:
      text: "{{ .Result.title_phase3 }}"
      filters:
@ -295,7 +295,7 @@ search:
        - name: re_replace
          args: ["(.*)(\\.| |\\-)(\\d{2,3})(\\.| |\\-)(.*)", "$1 E$3 $5"]
    title:
-      text: "{{ if .Config.enhancedAnime }}{{ .Result.title_anime }}{{else}}{{ .Result.title_phase3 }}{{end}}"
+      text: "{{ if .Config.enhancedAnime }}{{ .Result.title_anime }}{{ else }}{{ .Result.title_phase3 }}{{ end }}"
    details:
      selector: td:nth-child(2) > a
      attribute: href