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

src/Jackett.Common/Definitions/1ptbar.yml

@@ -110,7 +110,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/52pt.yml

@@ -113,7 +113,7 @@ search:
     download:
       selector: a[href^="download.php?id="]
       attribute: href
-    imdb:
+    imdbid:
       selector: div.imdb_100 > a
       attribute: href
     date_elapsed:

src/Jackett.Common/Definitions/aftershock.yml

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

src/Jackett.Common/Definitions/anaschcc.yml

@@ -104,7 +104,7 @@ search:
     download:
       selector: td a[href^="download.php"]
       attribute: href
-    imdb:
+    imdbid:
       selector: a[href^="index.php?page=torrent-details"]
       attribute: onmouseover
       filters:

src/Jackett.Common/Definitions/asiancinema.yml

@@ -122,7 +122,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/beitai.yml

@@ -115,7 +115,7 @@ search:
     download:
       selector: a[href^="download.php?id="]
       attribute: href
-    imdb:
+    imdbid:
       selector: div.imdb_100 > a
       attribute: href
     date_elapsed:

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

@@ -96,7 +96,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/brasiltracker.yml

@@ -97,7 +97,7 @@ search:
     poster:
       selector: img[alt="Cover"]
       attribute: src
-    imdb:
+    imdbid:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
     files:

src/Jackett.Common/Definitions/btnext.yml

@@ -202,15 +202,13 @@ search:
     poster:
       selector: a[rel="fancybox"]
       attribute: href
-    imdb:
+    imdbid:
       # a href="http://tracker.btnext.com/data/torrents/imdb/tt0249677.jpg"
       selector: a[href*="/imdb/tt"]
       attribute: href
       filters:
         - name: regexp
-          args: "imdb/(.+?).jpg"
+          args: tt(\d+)
-        - name: prepend
-          args: "https://www.imdb.com/title/"
     downloadvolumefactor:
       case:
         "img[title=\"FREE!\"]": 0

src/Jackett.Common/Definitions/carpathians.yml

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

src/Jackett.Common/Definitions/carphunter.yml

@@ -129,7 +129,7 @@ search:
       filters:
         - name: replace
           args: ["/details", "/download"]
-    imdb:
+    imdbid:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
     poster:

src/Jackett.Common/Definitions/ccfbits.yml

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

src/Jackett.Common/Definitions/ceskeforum.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/chilebt.yml

@@ -132,7 +132,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/cinemageddon.yml

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

src/Jackett.Common/Definitions/cinemamovies.yml

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

src/Jackett.Common/Definitions/diablotorrent.yml

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

src/Jackett.Common/Definitions/discfan.yml

@@ -127,7 +127,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/ebookparadijs.yml

@@ -159,16 +159,16 @@ search:
           args: " +01:00" # CET
         - name: dateparse
           args: "2 January 2006 15:04:05 -07:00"
-    seeders:
+    seeders_optional:
-      text: 0
-    seeders:
       optional: true
       selector: td:nth-child(4) table tr:nth-child(3) td:nth-child(5)  font b
-    leechers:
+    seeders:
-      text: 0
+      text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}"
-    leechers:
+    leechers_optional:
       optional: true
       selector: td:nth-child(4) table tr:nth-child(3) td:nth-child(5) font font b
+    leechers:
+      text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"
     downloadvolumefactor:
       case:
         img[src="pic/freedlfsu.gif"]: 0

src/Jackett.Common/Definitions/elitetorrent-biz.yml

@@ -130,14 +130,14 @@ search:
     poster:
       selector: .imagen img
       attribute: data-src
-    size:
+    size_optional:
-      text: "512 MB"
-    size:
       selector: .voto1
       optional: true
       filters:
         - name: replace
           args: ["s", ""]
+    size:
+      text: "{{ if .Result.size_optional }}{{ .Result.size_optional }}{{ else }}512 MB{{ end }}"
     date:
       text: now
     seeders:

src/Jackett.Common/Definitions/esharenet.yml

@@ -150,7 +150,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/extratorrent-cd.yml

@@ -62,7 +62,7 @@ search:
     download:
       selector: a[href^="magnet:?xt="]
       attribute: href
-    date:
+    date_day:
       # Y-day-2020 (seriously!?!, like there's a Y-day-2019 ?)
       # Today-22:03
       selector: td:nth-last-of-type(5):contains("day")
@@ -75,7 +75,7 @@ search:
         - name: re_replace
           args: ["(Y-day-.*)", "Yesterday"]
         - name: fuzzytime
-    date:
+    date_year:
       # 12-27-2019
       selector: td:nth-last-of-type(5):not(:contains(":")):not(:contains("day")):not(:contains("ago"))
       optional: true
@@ -86,7 +86,7 @@ search:
           args: " -07:00" # PDT
         - name: dateparse
           args: "01-02-2006 -07:00"
-    date:
+    date_ago:
       # 4-mins-ago
       selector: td:nth-last-of-type(5):contains("ago")
       optional: true
@@ -96,18 +96,20 @@ search:
         - name: replace
           args: ["-", " "]
         - name: timeago
+    date:
+      text: "{{ if or .Result.date_year .Result.date_day .Result.date_ago }}{{ or .Result.date_year .Result.date_day .Result.date_ago }}{{ else }}now{{ end }}"
     size:
       selector: td:nth-last-of-type(4)
-    seeders:
+    seeders_optional:
-      text: 0
-    seeders:
       optional: true
       selector: td.sy, td.sn
-    leechers:
+    seeders:
-      text: 0
+      text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}"
-    leechers:
+    leechers_optional:
       optional: true
       selector: td.ly, td.ln
+    leechers:
+      text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"
     downloadvolumefactor:
       text: 0
     uploadvolumefactor:

src/Jackett.Common/Definitions/extratorrent-st.yml

@@ -109,16 +109,16 @@ search:
         - name: timeago
     size:
       selector: td:nth-last-of-type(4)
-    seeders:
+    seeders_optional:
-      text: 0
-    seeders:
       optional: true
       selector: td.sy, td.sn
-    leechers:
+    seeders:
-      text: 0
+      text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}"
-    leechers:
+    leechers_optional:
       optional: true
       selector: td.ly, td.ln
+    leechers:
+      text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"
     downloadvolumefactor:
       text: 0
     uploadvolumefactor:

src/Jackett.Common/Definitions/extremetorrents.yml

@@ -168,16 +168,16 @@ search:
           args: " +01:00" # CET
         - name: dateparse
           args: "2 January 2006 15:04:05 -07:00"
-    seeders:
+    seeders_optional:
-      text: 0
-    seeders:
       optional: true
       selector: table tr:nth-child(3) td:nth-child(5)  font b
-    leechers:
+    seeders:
-      text: 0
+      text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}"
-    leechers:
+    leechers_optional:
       optional: true
       selector: table tr:nth-child(3) td:nth-child(5) font b:nth-child(2)
+    leechers:
+      text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"
     downloadvolumefactor:
       text: 0
     uploadvolumefactor:

src/Jackett.Common/Definitions/extremlymtorrents.yml

@@ -130,7 +130,6 @@ search:
     language:
       selector: td:nth-last-child(5)
     description:
-      optional: true
       selector: img[src="/images/vip-icon.png"]
       attribute: src
       filters:

src/Jackett.Common/Definitions/exttorrents.yml

@@ -129,11 +129,11 @@ search:
       attribute: href
     size:
       selector: td:nth-child(2)
-    files:
+    files_optional:
-      text: 0
-    files:
       selector: td:nth-child(3)
       optional: true
+    files:
+      text: "{{ if .Result.files_optional }}{{ .Result.files_optional }}{{ else }}0{{ end }}"
     date:
       selector: td:nth-child(4)
     seeders:

src/Jackett.Common/Definitions/eztv.yml

@@ -64,13 +64,16 @@ settings: []
 search:
   paths:
     - path: "{{ if .Keywords }}search/{{ .Keywords }}{{ else }}/{{ end }}"
+
   keywordsfilters:
     - name: re_replace
       args: ["S[0-9]{2}([^E]|$)", ""] # remove season tag without episode (search doesn't support it)
+
   rows:
     selector: "table.forum_header_border tr[name='hover'].forum_header_border:has(a.magnet)" # some torrents don't have any download links, skip them
     filters:
       - name: andmatch
+
   fields:
     category:
       text: 1
@@ -89,11 +92,11 @@ search:
     download:
       selector: td:nth-child(3) a.magnet, td:nth-child(3) a
       attribute: href
-    size:
+    size_optional:
-      text: "512 MB"
-    size:
       optional: true
       selector: td:nth-child(4)
+    size:
+      text: "{{ if .Result.size_optional }}{{ .Result.size_optional }}{{ else }}512 MB{{ end }}"
     date:
       selector: td:nth-child(5)
       filters:

src/Jackett.Common/Definitions/fanoin.yml

@@ -125,7 +125,7 @@ search:
       filters:
         - name: replace
           args: ["details.php", "download.php"]
-    imdb:
+    imdbid:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
     size:

src/Jackett.Common/Definitions/fantastiko.yml

@@ -128,7 +128,7 @@ search:
     download:
       selector: a[href*="?p=torrents"][href*="&action=download"]
       attribute: href
-    imdb:
+    imdbid:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
     size:
@@ -148,7 +148,7 @@ search:
         "*": 1
     uploadvolumefactor:
       text: 1
-    date:
+    date_day:
       optional: true
       selector: td.torrent_name:contains("day"), td.torrent_name:contains("σήμερα"), td.torrent_name:contains("εχθές"), td.torrent_name:contains("Δευτέρα"), td.torrent_name:contains("Τρίτη"), td.torrent_name:contains("Τετάρτη"), td.torrent_name:contains("Πέμπτη"), td.torrent_name:contains("Παρασκευή"), td.torrent_name:contains("Σάββατο"), td.torrent_name:contains("Κυριακή")
       remove: span, a
@@ -184,7 +184,7 @@ search:
         - name: replace
           args: ["Κυριακή", "Sunday"]
         - name: fuzzytime
-    date:
+    date_year:
       optional: true
       selector: td.torrent_name:contains("-")
       remove: span, a
@@ -207,6 +207,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 }}"
     minimumratio:
       text: 1.0
     minimumseedtime:

src/Jackett.Common/Definitions/femdomcult.yml

@@ -117,9 +117,7 @@ search:
           args: ["/static/common/noartwork/noimage.png", ""]
     files:
       selector: td:nth-child(3)
-    date: # some torrents have "Never" date
+    date_optional:
-      text: 20 years ago
-    date:
       selector: td:nth-child(5) > span
       attribute: title
       optional: true
@@ -128,6 +126,8 @@ search:
           args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
           args: "Jan 02 2006, 15:04 -07:00"
+    date: # some torrents have "Never" date
+      text: "{{ if .Result.date_optional }}{{ .Result.date_optional }}{{ else }}20 years ago{{ end }}"
     size:
       selector: td:nth-child(6)
     grabs:

src/Jackett.Common/Definitions/film-paleis.yml

@@ -164,16 +164,16 @@ search:
           args: " +01:00" # CET
         - name: dateparse
           args: "2 January 2006 15:04:05 -07:00"
-    seeders:
+    seeders_optional:
-      text: 0
-    seeders:
       optional: true
       selector: td:nth-child(4) table tr:nth-child(3) td:nth-child(5)  font b
-    leechers:
+    seeders:
-      text: 0
+      text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}"
-    leechers:
+    leechers_optional:
       optional: true
       selector: td:nth-child(4) table tr:nth-child(3) td:nth-child(5) font font b
+    leechers:
+      text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"
     downloadvolumefactor:
       case:
         img[src="pic/freedlfsu.gif"]: 0

src/Jackett.Common/Definitions/finelite.yml

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

src/Jackett.Common/Definitions/finvip.yml

@@ -136,15 +136,13 @@ search:
     download:
       selector: td a[href^="index.php?page=downloadcheck"]
       attribute: href
-    imdb:
+    imdbid:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
       filters:
         # javascript:popdetails('http://www.imdb.com/title/tt10209130');
-        - name: replace
+        - name: regexp
-          args: ["javascript:popdetails('", ""]
+          args: tt(\d+)
-        - name: replace
-          args: ["');", ""]
     size:
       selector: td:nth-last-child(1)
     leechers:

src/Jackett.Common/Definitions/firebit.yml

@@ -97,7 +97,7 @@ search:
       filters:
         - name: replace
           args: ["-", "0 B"]
-    date:
+    date_day:
       # Вчера, 08:01:41
       # 2 дня назад, 19:33:51
       selector: td:nth-child(5):contains(","), li.meta-date:contains(",")
@@ -108,7 +108,7 @@ search:
         - name: replace
           args: ["дня назад,", "days"]
         - name: fuzzytime
-    date:
+    date_year:
       # 16.08.2021 20:29:39
       selector: td:nth-child(5):not(:contains(",")), li.meta-date:not(:contains(","))
       optional: true
@@ -117,6 +117,8 @@ search:
           args: " +03:00" # MSK
         - name: dateparse
           args: "02.01.2006 15:04:05 -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.l1, li.meta-sead
     leechers:

src/Jackett.Common/Definitions/fouducinema.yml

@@ -256,7 +256,7 @@ search:
       selector: div.selection_unter_aa > b
     leechers:
       selector: div.selection_unter_aaa > b
-    date:
+    date_day:
       # Aujourd'hui à 06:26:25
       # Hier à 05:15:19
       selector: div.selection_unter_ab:not(:contains("."))
@@ -269,7 +269,7 @@ search:
         - name: append
           args: " +01:00" # CET
         - name: fuzzytime
-    date:
+    date_year:
       # Le 17.10.2020 à 04:39:44
       selector: div.selection_unter_ab:contains(".")
       optional: true
@@ -282,6 +282,8 @@ search:
           args: " +01:00" # CET
         - name: dateparse
           args: "02.01.2006 15:04:05 -07:00"
+    date:
+      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
     size:
       selector: div.selection_unter_ad
     grabs:

src/Jackett.Common/Definitions/frozenlayer.yml

@@ -90,7 +90,7 @@ search:
     category|noappend:
       optional: true
       selector: td.tit span
-    date:
+    date_day:
       # 1d
       # 2d 3h
       # 3 dias
@@ -101,7 +101,7 @@ search:
         - name: replace
           args: ["días", "days ago"]
         - name: timeago
-    date:
+    date_year:
       # 29 Oct 17
       optional: true
       selector: td.fecha:not(:contains("d")):not(:contains("h"))
@@ -110,6 +110,8 @@ search:
           args: " +01:00" # CET
         - name: dateparse
           args: "02 Jan 06 -07:00"
+    date:
+      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
     size:
       selector: td:nth-child(6)
     seeders:

src/Jackett.Common/Definitions/funkytorrents.yml

@@ -81,7 +81,6 @@ search:
 
   fields:
     description:
-      optional: true
       selector: td:nth-child(2) > font
     title:
       selector: td:nth-child(2)

src/Jackett.Common/Definitions/haidan.yml

@@ -101,7 +101,6 @@ search:
     search_mode: 0
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"
-    # supports search using imdbid, does not return imdb links in results
 
   rows:
     selector: div.group_content:has(a[href^="download.php?id="])
@@ -135,6 +134,9 @@ search:
     poster:
       selector: img#poster
       attribute: data-src
+    imdbid:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
     date:
       # time type: time elapsed (default)
       selector: div.time_col span[title]