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

src/Jackett.Common/Definitions/beyond-hd.yml

@@ -116,7 +116,7 @@ search:
       selector: a[href$="/peers"] span.text-red
     grabs:
       selector: a[href$="/history"]
-    imdb:
+    imdbid:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
     tmdbid:

src/Jackett.Common/Definitions/bithumen.yml

@@ -96,7 +96,7 @@ search:
     details:
       selector: a[href^="details.php?id="]
       attribute: href
-    imdb:
+    imdbid:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
     poster:

src/Jackett.Common/Definitions/hdatmos.yml

@@ -121,7 +121,7 @@ search:
     download:
       selector: a[href^="download.php?id="]
       attribute: href
-    imdb:
+    imdbid:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
     date_elapsed:

src/Jackett.Common/Definitions/lemonhd.yml

@@ -102,7 +102,7 @@ search:
     download:
       selector: a[href^="download.php?"]
       attribute: href
-    imdb:
+    imdbid:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
     date_elapsed:

src/Jackett.Common/Definitions/totheglorycookie.yml

@@ -164,7 +164,7 @@ search:
           args: " +08:00" # CST
         - name: dateparse
           args: "2006-01-0215:04:05 -07:00"
-    imdb:
+    imdbid:
       selector: span.imdb_rate > a
       attribute: href
     downloadvolumefactor:

src/Jackett.Common/Definitions/u2.yml

@@ -113,19 +113,21 @@ search:
       filters:
         - name: querystring
           args: cat
-    title:
+    title_default:
       selector: a[href^="details.php?id="]
-    title:
+    title_optional:
       optional: true
       selector: a[title][href^="details.php?id="]
       attribute: title
+    title:
+      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
     details:
       selector: a[href^="details.php?id="]
       attribute: href
     download:
       selector: a[href^="download.php?id="]
       attribute: href
-    date:
+    date_elapsed:
       # time type: time elapsed (default)
       selector: td:nth-child(4) > time[title]
       attribute: title
@@ -135,7 +137,7 @@ search:
           args: " +08:00" # CST
         - name: dateparse
           args: "2006-01-02 15:04:05 -07:00"
-    date:
+    date_added:
       # time added
       selector: td:nth-child(4):not(time[title]) > time
       optional: true
@@ -144,6 +146,8 @@ search:
           args: " +08:00" # CST
         - name: dateparse
           args: "2006-01-0215:04:05 -07:00"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
     size:
       selector: td:nth-child(5)
     seeders:

src/Jackett.Common/Definitions/vizuk.yml

@@ -166,10 +166,10 @@ search:
     poster:
       selector: td.torrent_image div.relativeDiv div:not(.category_image) a, .previewImage a
       attribute: href
-    imdb:
+    imdbid:
       selector: .torrentFlags a[href*="www.imdb.com/title/tt"]
       attribute: href
-    date:
+    date1:
       selector: td.torrent_name:contains("Subido"):contains("-"), .torrentOwner:contains("Subido"):contains("-")
       optional: true
       filters:
@@ -181,7 +181,7 @@ search:
           args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
           args: "02-01-2006 15:04 -07:00"
-    date:
+    date2:
       selector: td.torrent_name:contains("Subido"):not(:contains("-")), .torrentOwner:contains("Subido"):not(:contains("-"))
       optional: true
       filters:
@@ -210,7 +210,7 @@ search:
         - name: replace
           args: ["Domingo a", "Sunday at"]
         - name: fuzzytime # eg: Yesterday 14:22 or Monday at 14:22
-    date:
+    date3:
       selector: td.torrent_name:contains("Uploaded"):contains("-"), .torrentOwner:contains("Uploaded"):contains("-")
       optional: true
       filters:
@@ -220,7 +220,7 @@ search:
           args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
           args: "02-01-2006 15:04 -07:00"
-    date:
+    date4:
       selector: td.torrent_name:contains("Uploaded"):not(:contains("-")), .torrentOwner:contains("Uploaded"):not(:contains("-"))
       optional: true
       filters:
@@ -231,6 +231,8 @@ search:
         - name: replace
           args: ["Today at", "Today"]
         - name: fuzzytime # eg: Yesterday 14:22 or Monday at 14:22
+    date:
+      text: "{{ if or .Result.date1 .Result.date2 .Result.date3 .Result.date4 }}{{ or .Result.date1 .Result.date2 .Result.date3 .Result.date4 }}{{ else }}now{{ end }}"
     size:
       selector: td.size a, .torrentInfo a[rel="torrent_size"]
     grabs:

src/Jackett.Common/Definitions/vsttorrents.yml

@@ -52,15 +52,9 @@ search:
       attribute: src
     description:
       selector: div.cat-links
-      optional: true
     date:
       selector: time
       attribute: datetime
-      filters:
-        - name: replace
-          args: ["T", " "]
-        - name: dateparse
-          args: "2006-01-02 15:04:05-07:00"
     size:
       text: "512 MB"
     seeders:

src/Jackett.Common/Definitions/wihd.yml

@@ -9,6 +9,7 @@ links:
   - https://world-in-hd.net/
 
 caps:
+  # dont forget to update the search fields category (and size) case block(s)
   categorymappings:
     - {id: 565af82b1fd35761568b4572, cat: Movies/HD, desc: "1080p"}
     - {id: 565af82b1fd35761568b4574, cat: Movies/HD, desc: "720p"}

src/Jackett.Common/Definitions/woot.yml

@@ -101,7 +101,7 @@ search:
       filters:
         - name: regexp
           args: src="(.+?)"
-    imdb:
+    imdbid:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
     size:

src/Jackett.Common/Definitions/xbytes2.yml

@@ -304,11 +304,11 @@ search:
       selector: td:nth-child(7) a
     leechers:
       selector: td:nth-child(8) a
-    grabs:
+    grabs_optional:
-      text: 0
-    grabs:
       selector: td:nth-child(9) a
       optional: true
+    grabs:
+      text: "{{ if .Result.grabs_optional }}{{ .Result.grabs_optional }}{{ else }}0{{ end }}"
     date:
       selector: td:nth-child(6)
       filters:

src/Jackett.Common/Definitions/ydypt.yml

@@ -105,22 +105,24 @@ search:
       filters:
         - name: querystring
           args: cat
-    title:
+    title_default:
       selector: a[href^="details.php?id="]
-    title:
+    title_optional:
       optional: true
       selector: a[title][href^="details.php?id="]
       attribute: title
+    title:
+      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
     details:
       selector: a[href^="details.php?id="]
       attribute: href
     download:
       selector: a[href^="download.php?id="]
       attribute: href
-    imdb:
+    imdbid:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
-    date:
+    date_elapsed:
       # time type: time elapsed (default)
       selector: td:nth-child(4) > span[title]
       attribute: title
@@ -130,7 +132,7 @@ search:
           args: " +08:00" # CST
         - name: dateparse
           args: "2006-01-02 15:04:05 -07:00"
-    date:
+    date_added:
       # time added
       selector: td:nth-child(4):not(:has(span))
       optional: true
@@ -139,6 +141,8 @@ search:
           args: " +08:00" # CST
         - name: dateparse
           args: "2006-01-0215:04:05 -07:00"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
     size:
       selector: td:nth-child(5)
     seeders:

src/Jackett.Common/Definitions/yggcookie.yml

@@ -114,7 +114,6 @@ settings:
   - name: useragent
     type: text
     label: User-Agent
-    label: User-Agent
   - name: info_useragent
     type: info
     label: How to get the User-Agent
@@ -335,16 +334,16 @@ search:
           args: ["o", "B"]
     grabs:
       selector: td:nth-child(7)
-    seeders:
+    seeders_optional:
-      text: 0
-    seeders:
       selector: td:nth-child(8)
       optional: true
-    leechers:
+    seeders:
-      text: 0
+      text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}"
-    leechers:
+    leechers_optional:
       selector: td:nth-child(9)
       optional: true
+    leechers:
+      text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"
     downloadvolumefactor:
       text: 1
     uploadvolumefactor:

src/Jackett.Common/Definitions/yggtorrent.yml

@@ -343,16 +343,16 @@ search:
           args: ["o", "B"]
     grabs:
       selector: td:nth-child(7)
-    seeders:
+    seeders_optional:
-      text: 0
-    seeders:
       selector: td:nth-child(8)
       optional: true
-    leechers:
+    seeders:
-      text: 0
+      text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}"
-    leechers:
+    leechers_optional:
       selector: td:nth-child(9)
       optional: true
+    leechers:
+      text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"
     downloadvolumefactor:
       text: 1
     uploadvolumefactor:

src/Jackett.Common/Definitions/yourbittorrent.yml

@@ -80,7 +80,7 @@ search:
           args: ".torrent"
     size:
       selector: td:nth-child(3)
-    date:
+    date_day:
       selector: td:nth-child(4):not(:contains("/"))
       optional: true
       filters:
@@ -89,7 +89,7 @@ search:
         - name: replace
           args: ["Yesterday", "1 day"]
         - name: timeago
-    date:
+    date_year:
       selector: td:nth-child(4):contains("/")
       optional: true
       filters:
@@ -97,6 +97,8 @@ search:
           args: " -07:00" # PDT
         - name: dateparse
           args: "02/01/06 -07:00"
+    date:
+      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
     seeders:
       selector: td:nth-child(5)
     leechers:

src/Jackett.Common/Definitions/yts.yml

@@ -95,7 +95,7 @@ search:
       selector: hash
     poster:
       selector: ..large_cover_image
-    imdb:
+    imdbid:
       selector: ..imdb_code
     date:
       selector: date_uploaded_unix

src/Jackett.Common/Definitions/zooqle.yml

@@ -131,9 +131,7 @@ search:
         # a size of '– N/A –' causes Jackett to reject the row with an error
         - name: replace
           args: ["– N/A –", "0 Bytes"]
-    seeders:
+    seeders_optional:
-      text: 0
-    seeders:
       # seeders can be missing
       optional: true
       selector: td:nth-child(6) div
@@ -143,9 +141,9 @@ search:
           args: [" ", 1]
         - name: replace
           args: [",", ""]
-    leechers:
+    seeders:
-      text: 0
+      text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}"
-    leechers:
+    leechers_optional:
       # leechers can be missing
       optional: true
       selector: td:nth-child(6) div
@@ -155,6 +153,8 @@ search:
           args: [" ", 4]
         - name: replace
           args: [",", ""]
+    leechers:
+      text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"
     downloadvolumefactor:
       text: 0
     uploadvolumefactor:

src/Jackett.Common/Definitions/ztracker.yml

@@ -143,17 +143,17 @@ search:
       filters:
         - name: regexp
           args: img src=\\'(.*?)\\'
-    imdb:
+    imdbid:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
     files:
       selector: td:nth-child(5)
-    size:
+    size_optional:
-      text: 0
-    size:
       selector: td:nth-child(11):has(b)
       optional: true
       remove: b
+    size:
+      text: "{{ if .Result.size_optional }}{{ .Result.size_optional }}{{ else }}0 B{{ end }}"
     seeders:
       selector: td:nth-child(7)
     leechers: