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

src/Jackett.Common/Definitions/ilcorsaroblu.yml

@@ -230,12 +230,12 @@ search:
       attribute: href
     size:
       selector: td:nth-last-child(2)
-    date:
+    date_ago:
       selector: td:nth-last-child(7):contains('ago')
       optional: true
       filters:
         - name: timeago
-    date:
+    date_year:
       selector: td:nth-last-child(7):contains('/')
       optional: true
       filters:
@@ -243,6 +243,8 @@ search:
           args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
           args: "02/01/2006 -07:00"
+    date:
+      text: "{{ if or .Result.date_year .Result.date_ago }}{{ or .Result.date_year .Result.date_ago }}{{ else }}now{{ end }}"
     grabs:
       selector: td:nth-last-child(4)
     seeders:

src/Jackett.Common/Definitions/immortuos.yml

@@ -131,7 +131,7 @@ search:
       selector: td:nth-last-child(2)
     grabs:
       selector: td:nth-last-child(1)
-    imdb:
+    imdbid:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
     tmdbid:

src/Jackett.Common/Definitions/insanetracker.yml

@@ -119,39 +119,22 @@ search:
     download:
       selector: a[href*="/download.php/"]
       attribute: href
-    imdb:
+    imdbid:
       selector: a[title="IMDb link"]
       attribute: href
     poster:
-      selector: img[alt="offer"]
+      selector: img[alt="offer"], a.cover
       attribute: src
-    poster:
-      selector: a.cover
-      attribute: href
     files:
       selector: div.files > a.button.small
-      filters:
-        - name: replace
-          args: [".", ""]
     size:
       selector: td.center.size
     seeders:
       selector: td.center.data > a:first-child
-      filters:
-        - name: replace
-          args: [".", ""]
     leechers:
       selector: td.center.data > a:nth-child(2)
-      filters:
-        - name: replace
-          args: [".", ""]
     grabs:
       selector: td.center.data
-      filters:
-        - name: replace
-          args: [".", ""]
-        - name: replace
-          args: [" ", ""]
       remove: div.uploader, div.moderation, a.leftborder
     date:
       selector: td.center.date
@@ -172,7 +155,6 @@ search:
         "*": 1
     description:
       selector: div.contenttext
-      optional: true
       remove: div.contenttitle
     minimumratio:
       text: 1.0

src/Jackett.Common/Definitions/itorrent.yml

@@ -78,7 +78,7 @@ search:
     download:
       selector: td:nth-child(2) a
       attribute: href
-    date:
+    date_time:
       selector: td:nth-child(4) span
       optional: true
       attribute: title
@@ -87,7 +87,7 @@ search:
           args: " +01:00" # CET
         - name: dateparse
           args: "2006.01.02 15:04 -07:00"
-    date:
+    date_year:
       selector: td:nth-child(4):not(:has(span))
       optional: true
       filters:
@@ -95,13 +95,12 @@ search:
           args: " +01:00" # CET
         - name: dateparse
           args: "2006.01.02 -07:00"
+    date:
+      text: "{{ if or .Result.date_year .Result.date_time }}{{ or .Result.date_year .Result.date_time }}{{ else }}now{{ end }}"
     size:
       selector: td:nth-child(5)
     grabs:
       selector: td:nth-child(6)
-      filters:
-        - name: replace
-          args: [" ", ""]
     seeders:
       selector: td:nth-child(7)
     leechers:

src/Jackett.Common/Definitions/karagarga.yml

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

src/Jackett.Common/Definitions/keepfriends.yml

@@ -109,12 +109,14 @@ search:
       filters:
         - name: querystring
           args: cat
-    title_raw:
+    title_default:
       selector: a[href^="details.php?id="]
-    title_raw:
+    title_optional:
       optional: true
       selector: a[title][href^="details.php?id="]
       attribute: title
+    title_raw:
+      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
     # note: final title processing is at the bottom after descrptions is fetched.
     details:
       selector: a[href^="details.php?id="]
@@ -122,10 +124,10 @@ search:
     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
@@ -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(:has(span))
       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/kinonavse100.yml

@@ -1,4 +1,4 @@
----
+---
 id: kinonavse100
 name: KinoNaVse100
 description: "Кино на все 100 is a RUSSIAN Semi-Private Torrent Tracker for MOVIES / TV / MUSIC"
@@ -171,7 +171,7 @@ search:
       selector: span.leech
     grabs:
       selector: span.complet
-    date:
+    date_day:
       # Сегодня, 12:35
       selector: td:last-of-type p:first-of-type:contains("Сегодня"), td:last-of-type p:first-of-type:contains("Вчера")
       optional: true
@@ -181,7 +181,7 @@ search:
         - name: replace
           args: ["Вчера", "Yesterday"]
         - name: fuzzytime
-    date:
+    date_year:
       # 12 янв 2019, 11:26
       selector: td:last-of-type p:first-of-type:not(:contains("Сегодня")):not(:contains("Вчера"))
       optional: true
@@ -215,6 +215,8 @@ search:
           args: " +03:00" # MSK
         - name: dateparse
           args: "02 Jan 2006, 15:04 -07:00"
+    date:
+      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
     downloadvolumefactor:
       case:
         img[src="./images/tracker/3_bookmark.gif"]: 0 # gold 100% free

src/Jackett.Common/Definitions/kinorun.yml

@@ -137,7 +137,6 @@ search:
     description:
       selector: a[href^="browse.php?cat="] img
       attribute: alt
-      optional: true
     poster:
       selector: td[onmouseover]
       attribute: onmouseover

src/Jackett.Common/Definitions/kinozal.yml

@@ -215,7 +215,7 @@ search:
     leechers:
       selector: td:nth-child(6)
     # dates come in four flavours:
-    date:
+    date_day:
       # now
       # Today 09:10
       # Yesterday 13:04
@@ -230,7 +230,7 @@ search:
           args: ["сегодня", "Today"]
         - name: replace
           args: ["вчера", "Yesterday"]
-    date:
+    date_year:
       # 24.10.2017 at 23:44
       selector: td:nth-child(7):contains(".")
       optional: true
@@ -241,6 +241,8 @@ search:
           args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
           args: "02.01.2006 15:04 -07:00"
+    date:
+      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
     downloadvolumefactor:
       case:
         a.r1: 0 # gold