From 55b8a919106cf3a22462d7f5ed0c984b49c5c372 Mon Sep 17 00:00:00 2001
From: Garfield69 <garfield69@outlook.com>
Date: Sat, 24 Oct 2020 20:44:25 +1300
Subject: [PATCH] assorted x* yml: code tidy

---
 src/Jackett.Common/Definitions/x-ite.me.yml | 24 ++++++---------------
 src/Jackett.Common/Definitions/xbytes2.yml  | 16 +++++++-------
 src/Jackett.Common/Definitions/xfsub.yml    |  4 ++--
 3 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/src/Jackett.Common/Definitions/x-ite.me.yml b/src/Jackett.Common/Definitions/x-ite.me.yml
index 04e807797802e..66b3c16d6c9bf 100644
--- a/src/Jackett.Common/Definitions/x-ite.me.yml
+++ b/src/Jackett.Common/Definitions/x-ite.me.yml
@@ -1,9 +1,4 @@
 ---
-# By LA5T for https://x-ite.me (25.07.2018 17:34 UTC+2)
-#
-# TODO:
-#    x-ite.me doesn't support altering the number of results, therefore only the 20 first results are shown (this is hardcoded), Jackett may support pagination in the future tho
-#
 id: xiteme
 name: x-ite.me
 description: "Tracker for LGBTQ movies, TV, books, magazines, anime, PC and XXX."
@@ -20,14 +15,6 @@ settings:
   - name: password
     type: password
     label: Password
-  - name: incldead
-    type: select
-    label: Status
-    default: 1
-    options:
-      0: Active
-      1: "Active and Inactive"
-      2: Inactive
 
 caps:
   categorymappings:
@@ -101,7 +88,6 @@ caps:
     movie-search: [q]
     book-search: [q]
 
-
 login:
   method: post
   path: account-login.php
@@ -123,9 +109,11 @@ search:
   inputs:
     $raw: "{{range .Categories}}&c{{.}}=1&{{end}}"
     search: "{{ .Keywords }}"
-    incldead: "{{ .Config.incldead }}"
+    incldead: 1
+
   rows:
     selector: tr.t-row
+
   fields:
     title:
       selector: td:nth-child(2) > a:nth-child(1) > b:nth-child(1)
@@ -158,7 +146,7 @@ search:
         - name: re_replace
           args: ["(\\d{2})-(\\d{2})-(\\d{4}) ((?:\\d{2}:?){3})", "$3-$2-$1 $4"]
         - name: append
-          args: " +01:00"
+          args: " +01:00" # CET
         - name: dateparse
           args: "2006-01-02 15:04:05 -07:00"
     downloadvolumefactor:
@@ -166,5 +154,5 @@ search:
         "td:nth-child(2) > a:nth-child(1) > span:nth-child(2)": 0
         "*": 1
     uploadvolumefactor:
-      case:
-        "*": 1
+      text: 1
+# engine tbd
diff --git a/src/Jackett.Common/Definitions/xbytes2.yml b/src/Jackett.Common/Definitions/xbytes2.yml
index e9fe2757740e1..7803b03f5a41c 100644
--- a/src/Jackett.Common/Definitions/xbytes2.yml
+++ b/src/Jackett.Common/Definitions/xbytes2.yml
@@ -60,19 +60,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "3"
+    default: 3
     options:
-      "3": "created"
-      "5": "seeders"
-      "4": "size"
-      "2": "title"
+      3: created
+      5: seeders
+      4: size
+      2: title
   - name: type
     type: select
     label: Order requested from site
-    default: "2"
+    default: 2
     options:
-      "2": "desc"
-      "1": "asc"
+      2: desc
+      1: asc
   - name: info
     type: info
     label: Results Per Page
diff --git a/src/Jackett.Common/Definitions/xfsub.yml b/src/Jackett.Common/Definitions/xfsub.yml
index 0f615c5fff29c..f67366c9f0d4e 100644
--- a/src/Jackett.Common/Definitions/xfsub.yml
+++ b/src/Jackett.Common/Definitions/xfsub.yml
@@ -82,7 +82,7 @@ search:
         - name: replace
           args: ["前天", "Yesterday"] # dont have a day before yesterday time do we?
         - name: append
-          args: " +08:00"
+          args: " +08:00" # CST
         - name: fuzzytime
     date:
       # 03/02 12:44 (no year, so big problem for older dates which will appear as "0m ago" because 12/24 is in the future if today is 04/28)
@@ -90,7 +90,7 @@ search:
       optional: true
       filters:
         - name: append
-          args: " +08:00"
+          args: " +08:00" # CST
         - name: dateparse
           args: "01/02 15:04 -07:00"
     downloadvolumefactor: