assorted: conform to yaml standards by avoiding duplicate keys #11917

src/Jackett.Common/Definitions/abtorrents.yml

@@ -137,7 +137,7 @@ search:
       attribute: src
     files:
       selector: td:nth-last-child(8)
-    date:
+    date_yday:
       # Yesterday<br/>6:00 AM
       selector: td:nth-last-child(7):contains("day")
       optional: true
@@ -145,7 +145,7 @@ search:
         - name: append
           args: " +00:00" # auto adjusted by site account profile
         - name: fuzzytime
-    date:
+    date_year:
       # Aug 6 2021<br/>7:25 PM
       selector: td:nth-last-child(7):not(:contains("day"))
       optional: true
@@ -154,6 +154,8 @@ search:
           args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
           args: "Jan 2 2006 3:04 PM -07:00"
+    date:
+      text: "{{ if or .Result.date_yday .Result.date_year }}{{ or .Result.date_yday .Result.date_year }}{{ else }}now{{ end }}"
     size:
       selector: td:nth-last-child(6)
     grabs:

src/Jackett.Common/Definitions/acgsou.yml

@@ -79,21 +79,15 @@ search:
     download:
       selector: td:nth-child(3) a
       attribute: href
-    date:
-      selector: td:nth-child(1):contains("昨天")
-      optional: true
-      filters:
-        - name: replace
-          args: ["昨天", "Yesterday"]
-    date:
-      selector: td:nth-child(1):contains(":"):not(:contains("昨天"))
+    date_year:
+      selector: td:nth-child(1):contains(":")
       optional: true
       filters:
         - name: append
           args: " +08:00" # CST
         - name: dateparse
           args: "01/02 15:04 -07:00"
-    date:
+    date_years:
       selector: td:nth-child(1):not(:contains(":"))
       optional: true
       filters:
@@ -101,6 +95,8 @@ search:
           args: " +08:00" # CST
         - name: dateparse
           args: "2006/01/02 -07:00"
+    date:
+      text: "{{ if or .Result.date_year .Result.date_years }}{{ or .Result.date_year .Result.date_years }}{{ else }}now{{ end }}"
     size:
       selector: td:nth-child(4)
     seeders:

src/Jackett.Common/Definitions/amigosshare.yml

@@ -292,9 +292,7 @@ search:
         "[src$=\"/Scripts.png\"]": 128
         "[src$=\"/Vetores.png\"]": 124
         "[src$=\"/outros2.png\"]": 130
-    date:
-      text: now
-    date:
+    date_optional:
       selector: p:contains("Lançado:")
       optional: true
       filters:
@@ -306,6 +304,8 @@ search:
           args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
           args: "02/01/06 15:04:05 -07:00"
+    date:
+      text: "{{ if .Result.date_optional }}{{ .Result.date_optional }}{{ else }}now{{ end }}"
     size:
       selector: div.list-group-item-content p.m-0 span.badge-info
     seeders:

src/Jackett.Common/Definitions/anime-free.yml

@@ -87,9 +87,7 @@ search:
     selector: article
 
   fields:
-    category:
-      text: 54
-    category|noappend:
+    category_optional:
       optional: true
       selector: a[href*="category="]
       attribute: href
@@ -111,6 +109,8 @@ search:
         a[href$="original_hentai"]: 48
         a[href$="rus-game"]: 57
         a[href$="uncensored"]: 45
+    category:
+      text: "{{ if .Result.category_optional }}{{ .Result.category_optional }}{{ else }}54{{ end }}"
     title:
       selector: h2.title a
     details:
@@ -134,11 +134,11 @@ search:
       text: 1
     leechers:
       text: 1
-    size:
-      text: "0 B"
-    size:
+    size_optional:
       optional: true
       selector: b.file_size
+    size:
+      text: "{{ if .Result.size_optional }}{{ .Result.size_optional }}{{ else }}0 B{{ end }}"
     downloadvolumefactor:
       text: 0
     uploadvolumefactor:

src/Jackett.Common/Definitions/audiobookbay.yml

@@ -137,7 +137,7 @@ search:
     poster:
       selector: img
       attribute: src
-    _date:
+    date_optional:
       selector: div.postContent
       filters:
         - name: regexp
@@ -145,8 +145,8 @@ search:
         - name: dateparse
           args: "2 Jan 2006"
     date:
-      text: "{{ if .Result._date }}{{ .Result._date }}{{ else }}now{{ end }}"
-    _size:
+      text: "{{ if .Result.date_optional }}{{ .Result.date_optional }}{{ else }}now{{ end }}"
+    size_optional:
       selector: div.postContent
       filters:
         - name: regexp
@@ -158,7 +158,7 @@ search:
         - name: replace
           args: ["KBs", "KB"]
     size:
-      text: "{{ if .Result._size }}{{ .Result._size }}{{ else }}0 B{{ end }}"
+      text: "{{ if .Result.size_optional }}{{ .Result.size_optional }}{{ else }}0 B{{ end }}"
     seeders:
       text: 1
     leechers:

src/Jackett.Common/Definitions/audionews.yml

@@ -295,35 +295,26 @@ search:
       filters:
         - name: querystring
           args: f
-    size:
-      text: "0 B"
-    size:
+    size_optional:
       optional: true
-      selector: td:contains(\00a0GB)
+      selector: td:contains(\00a0GB), td:contains(\00a0MB), td:contains(\00a0kB), td:contains(\00a0B)
     size:
-      optional: true
-      selector: td:contains(\00a0MB)
-    size:
-      optional: true
-      selector: td:contains(\00a0kB)
-    size:
-      optional: true
-      selector: td:contains(\00a0B)
-    seeders:
-      text: 0
-    seeders:
+      text: "{{ if .Result.size_optional }}{{ .Result.size_optional }}{{ else }}0 B{{ end }}"
+    seeders_optional:
       optional: true
       selector: td[title="Seeders"]
-    leechers:
-      text: 0
-    leechers:
+    seeders:
+      text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}"
+    leechers_optional:
       optional: true
       selector: td[title="Leechers"]
-    grabs:
-      text: 0
-    grabs:
+    leechers:
+      text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"
+    grabs_optional:
       optional: true
       selector: td[title^="Replies:"]
+    grabs:
+      text: "{{ if .Result.grabs_optional }}{{ .Result.grabs_optional }}{{ else }}0{{ end }}"
     downloadvolumefactor:
       text: 1
     uploadvolumefactor: