From 1e63493f7f8410db3ec4ef1bc151e0ed015a2414 Mon Sep 17 00:00:00 2001
From: Garfield69 <garfield69@outlook.com>
Date: Tue, 17 Nov 2020 09:41:45 +1300
Subject: [PATCH] assorted yml: code tidy

---
 .../Definitions/rainbowtracker.yml            |  2 +-
 .../Definitions/redstartorrent.yml            |  4 ++--
 src/Jackett.Common/Definitions/rptorrents.yml |  2 +-
 src/Jackett.Common/Definitions/rutor.yml      |  5 ++---
 src/Jackett.Common/Definitions/snowpt.yml     | 10 ++++-----
 src/Jackett.Common/Definitions/soulvoice.yml  |  4 ++--
 .../Definitions/speedmasterhd.yml             |  8 +++----
 .../Definitions/speedtorrentreloaded.yml      | 22 +++++++++----------
 .../Definitions/spiritofrevolution.yml        |  6 ++---
 9 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/src/Jackett.Common/Definitions/rainbowtracker.yml b/src/Jackett.Common/Definitions/rainbowtracker.yml
index eafa0ed9e..2ffe55d6e 100644
--- a/src/Jackett.Common/Definitions/rainbowtracker.yml
+++ b/src/Jackett.Common/Definitions/rainbowtracker.yml
@@ -121,7 +121,7 @@ search:
   paths:
     - path: forum/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_vote: 0
diff --git a/src/Jackett.Common/Definitions/redstartorrent.yml b/src/Jackett.Common/Definitions/redstartorrent.yml
index b3696d0eb..ebe2e1f00 100644
--- a/src/Jackett.Common/Definitions/redstartorrent.yml
+++ b/src/Jackett.Common/Definitions/redstartorrent.yml
@@ -96,7 +96,7 @@ search:
       selector: td:nth-child(5)
       filters:
         - name: append
-          args: " +00:00"
+          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
           args: "2006-01-0215:04:05 -07:00"
     grabs:
@@ -122,4 +122,4 @@ search:
         "*": 1
     uploadvolumefactor:
       text: 1
-#  engine tbc
+#  engine tbd
diff --git a/src/Jackett.Common/Definitions/rptorrents.yml b/src/Jackett.Common/Definitions/rptorrents.yml
index 9854c261a..e4f8eeb5f 100644
--- a/src/Jackett.Common/Definitions/rptorrents.yml
+++ b/src/Jackett.Common/Definitions/rptorrents.yml
@@ -102,7 +102,7 @@ search:
     freeleech: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
     # 0 both, 1 localonly, 2 extonly
     inclexternal: 0
-    # 0 al,l 1 English, 2 etc...
+    # 0 all, 1 English, 2 etc...
     lang: 0
     sort: "{{ .Config.sort }}"
     order: "{{ .Config.type }}"
diff --git a/src/Jackett.Common/Definitions/rutor.yml b/src/Jackett.Common/Definitions/rutor.yml
index 936ae5476..67fa24f5f 100644
--- a/src/Jackett.Common/Definitions/rutor.yml
+++ b/src/Jackett.Common/Definitions/rutor.yml
@@ -58,7 +58,7 @@ settings:
 search:
   paths:
     # http://rutor.info/search/0/0/100/0/gotham%2004x01
-    - path: "{{ if .Keywords }}search/0/0/100/{{ .Config.sort }}/{{ .Keywords }}/{{else}}top/{{end}}"
+    - path: "{{ if .Keywords }}search/0/0/100/{{ .Config.sort }}/{{ .Keywords }}/{{ else }}top/{{ end }}"
 
   rows:
     selector: tr:has(td:has(a.downgif))
@@ -117,9 +117,8 @@ search:
           args: ["Ноя", "Nov"]
         - name: replace
           args: ["Дек", "Dec"]
-          # Moscow +3 UTC
         - name: append
-          args: " 00:00:00 +03:00"
+          args: " 00:00:00 +03:00" # MSK
         - name: dateparse
           args: "02 Jan 06 15:04:05 -07:00"
     # some results don't have comments which throws off td count. So we go fishing for the following fields
diff --git a/src/Jackett.Common/Definitions/snowpt.yml b/src/Jackett.Common/Definitions/snowpt.yml
index afa00224b..198871477 100644
--- a/src/Jackett.Common/Definitions/snowpt.yml
+++ b/src/Jackett.Common/Definitions/snowpt.yml
@@ -21,11 +21,11 @@ login:
   method: form
   form: form[id^="loginform_"]
   inputs:
-    referer: "/"
+    referer: /
     loginfield: username
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
-    cookietime: "2592000"
+    cookietime: 2592000
   error:
     - selector: div#messagetext:contains("登录失败") p
   test:
@@ -66,7 +66,7 @@ search:
       optional: true
       filters:
         - name: append
-          args: " +08:00"
+          args: " +08:00" # CST
         - name: dateparse
           args: "2006-01-02 15:04:05 -07:00"
     date:
@@ -75,7 +75,7 @@ search:
       optional: true
       filters:
         - name: append
-          args: " +08:00"
+          args: " +08:00" # CST
         - name: dateparse
           args: "2006-01-0215:04:05 -07:00"
     size:
@@ -93,6 +93,6 @@ search:
         "*": 1
     uploadvolumefactor:
       case:
-#          img.sp_0: 2 # do not know what a flag of 2xSFC means, but I dont thing this is a 2xupload
+#          img.sp_0: 2 # do not know what a flag of 2xSFC means, but I dont think this is a 2xupload
         "*": 1
 # Discuz! X3.4
diff --git a/src/Jackett.Common/Definitions/soulvoice.yml b/src/Jackett.Common/Definitions/soulvoice.yml
index 0324a3661..4056b8380 100644
--- a/src/Jackett.Common/Definitions/soulvoice.yml
+++ b/src/Jackett.Common/Definitions/soulvoice.yml
@@ -115,7 +115,7 @@ search:
       optional: true
       filters:
         - name: append
-          args: " +08:00"
+          args: " +08:00" # CST
         - name: dateparse
           args: "2006-01-02 15:04:05 -07:00"
     date:
@@ -124,7 +124,7 @@ search:
       optional: true
       filters:
         - name: append
-          args: " +08:00"
+          args: " +08:00" # CST
         - name: dateparse
           args: "2006-01-0215:04:05 -07:00"
     size:
diff --git a/src/Jackett.Common/Definitions/speedmasterhd.yml b/src/Jackett.Common/Definitions/speedmasterhd.yml
index b7b7a5f85..a7d3b226e 100644
--- a/src/Jackett.Common/Definitions/speedmasterhd.yml
+++ b/src/Jackett.Common/Definitions/speedmasterhd.yml
@@ -129,9 +129,9 @@ search:
     - path: selection.php
   inputs:
     $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBIDShort }}{{else}}{{ .Keywords }}{{end}}"
-    # 0 name 1 descr 2 both 3 imdb
-    blah: "{{ if .Query.IMDBID }}3{{else}}0{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBIDShort }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 name, 1 descr, 2 both, 3 imdb
+    blah: "{{ if .Query.IMDBID }}3{{ else }}0{{ end }}"
     orderby: "{{ .Config.sort }}"
     sort: "{{ .Config.type }}"
 
@@ -209,7 +209,7 @@ search:
       optional: true
       filters:
         - name: append
-          args: " +01:00"
+          args: " +01:00" # CET
         - name: replace
           args: ["um ", ""]
         - name: dateparse
diff --git a/src/Jackett.Common/Definitions/speedtorrentreloaded.yml b/src/Jackett.Common/Definitions/speedtorrentreloaded.yml
index 56c6a07f6..cb6a8277c 100644
--- a/src/Jackett.Common/Definitions/speedtorrentreloaded.yml
+++ b/src/Jackett.Common/Definitions/speedtorrentreloaded.yml
@@ -90,7 +90,7 @@ login:
   method: form
   form: form
   inputs:
-    take: "yes"
+    take: yes
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
     secure_code: "{{ .Config.secure_code }}"
@@ -102,7 +102,7 @@ search:
     - path: tfiles.php
   inputs:
     showsearch: 1
-    $raw: "{{ if .Categories }}{{ range .Categories }}c{{.}}=1&{{end}}{{else}}{{end}}"
+    $raw: "{{ if .Categories }}{{ range .Categories }}c{{.}}=1&{{end}}{{ else }}{{ end }}"
     search: "{{ .Keywords }}"
     orderby: "{{ .Config.sort }}"
     sort: "{{ .Config.type }}"
@@ -112,26 +112,26 @@ search:
     selector: tr:has(a[href^="details.php?id="])
 
   fields:
-    title:
-      selector: a[href^="details.php?id="]
-    poster:
-      selector: a[href^="details.php?id="][onmouseover]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "<img src=(.*) width="
     category:
       selector: a[href^="tfiles.php?cat="]
       attribute: href
       filters:
         - name: querystring
           args: cat
+    title:
+      selector: a[href^="details.php?id="]
     details:
       selector: a[href^="details.php?id="]
       attribute: href
     download:
       selector: a[href^="download.php?torrent="]
       attribute: href
+    poster:
+      selector: a[href^="details.php?id="][onmouseover]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "<img src=(.*) width="
     grabs:
       selector: tr > th > span:nth-child(5)
       filters:
@@ -162,7 +162,7 @@ search:
         - name: regexp
           args: "(\\d{2}\\.\\d{2}\\.\\d{4}\\s\\d{2}:\\d{2}:\\d{2})"
         - name: append
-          args: " +01:00"
+          args: " +01:00" # CET
         - name: replace
           args: ["\xA0", " "]
         - name: replace
diff --git a/src/Jackett.Common/Definitions/spiritofrevolution.yml b/src/Jackett.Common/Definitions/spiritofrevolution.yml
index 3feaa3075..af31aaf68 100644
--- a/src/Jackett.Common/Definitions/spiritofrevolution.yml
+++ b/src/Jackett.Common/Definitions/spiritofrevolution.yml
@@ -108,10 +108,10 @@ search:
   paths:
     - path: selection.php
   inputs:
-    $raw: "{{ if .Categories }}{{ range .Categories }}scat[]={{.}}&{{end}}{{else}}{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+    $raw: "{{ if .Categories }}{{ range .Categories }}scat[]={{.}}&{{end}}{{ else }}{{ end }}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
     # 0 name, 1 descr, 2 both, 3 imdb
-    blah: "{{ if .Query.IMDBID }}3{{else}}0{{end}}"
+    blah: "{{ if .Query.IMDBID }}3{{ else }}0{{ end }}"
     orderby: "{{ .Config.sort }}"
     sort: "{{ .Config.type }}"