xtremezone: new layout et.al. resolves #7520

also add missing cats
add config sort options
add imdb support #4859

src/Jackett.Common/Definitions/xtremezone.yml

@@ -9,18 +9,20 @@
     - https://myxz.eu/
   legacylinks:
     - https://www.myxz.eu/
-# not yet enabled (legitimacy concerns, see #2821)
+    - https://www.myxz.org/
-#    - https://www.myxz.org/
 
   caps:
     categorymappings:
+      - {id: 62, cat: TV, desc: "Cartoons"}
       - {id: 3, cat: TV/Anime, desc: "Anime/Hentai"}
       - {id: 1, cat: PC/0day, desc: "Appz"}
       - {id: 9, cat: TV/Documentary, desc: "Documentary"}
+      - {id: 63, cat: TV/Documentary, desc: "Documentary-RO"}
       - {id: 6, cat: Books, desc: "eBooks"}
       - {id: 52, cat: Console, desc: "Games-Console"}
       - {id: 11, cat: PC/Games, desc: "Games-PC"}
       - {id: 18, cat: Other, desc: "Images"}
+      - {id: 65, cat: Other, desc: "Tutorial"}
       - {id: 14, cat: PC, desc: "Linux"}
       - {id: 37, cat: PC/Mac, desc: "Mac"}
       - {id: 19, cat: PC/Phone-Other, desc: "Mobile"}
@@ -30,31 +32,58 @@
       - {id: 2, cat: Movies/DVD, desc: "Movies-DVD-RO"}
       - {id: 8, cat: Movies/HD, desc: "Movies-HD"}
       - {id: 29, cat: Movies/HD, desc: "Movies-HD-RO"}
+      - {id: 59, cat: Movies/Foreign, desc: "Movies-RO"}
       - {id: 57, cat: Movies/UHD, desc: "Movies-UHD-RO"}
+      - {id: 61, cat: Movies/UHD, desc: "Movies-UHD"}
       - {id: 38, cat: Movies, desc: "Movies-Packs"}
       - {id: 10, cat: Movies/SD, desc: "Movies-SD"}
       - {id: 35, cat: Movies/SD, desc: "Movies-SD-RO"}
       - {id: 5, cat: Audio, desc: "Music"}
+      - {id: 64, cat: Audio/Video, desc: "Music Videos"}
       - {id: 22, cat: TV/Sport, desc: "Sport"}
+      - {id: 58, cat: TV/Sport, desc: "Sports-RO"}
       - {id: 43, cat: TV/HD, desc: "TV-HD"}
       - {id: 44, cat: TV/HD, desc: "TV-HD-RO"}
       - {id: 41, cat: TV, desc: "TV-Packs"}
       - {id: 45, cat: TV/SD, desc: "TV-SD"}
       - {id: 46, cat: TV/SD, desc: "TV-SD-RO"}
+      - {id: 60, cat: TV/FOREIGN, desc: "TV-RO"}
+      - {id: 66, cat: TV/FOREIGN, desc: "TV-Packs-RO"}
       - {id: 15, cat: XXX, desc: "XXX"}
       - {id: 47, cat: XXX, desc: "XXX-DVD"}
       - {id: 48, cat: XXX, desc: "XXX-HD"}
       - {id: 49, cat: XXX/Imageset, desc: "XXX-IMGSet"}
       - {id: 50, cat: XXX, desc: "XXX-Packs"}
       - {id: 51, cat: XXX, desc: "XXX-SD"}
-      - {id: 60, cat: TV/FOREIGN, desc: "TV-RO"}
-      - {id: 66, cat: TV/FOREIGN, desc: "TV-Packs-RO"}
 
     modes:
       search: [q]
       tv-search: [q, season, ep]
       movie-search: [q]
 
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "torrent.refreshAt"
+      options:
+        "torrent.refreshAt": "created"
+        "torrent.seeders": "seeders"
+        "torrent.size": "size"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"
+
   login:
     path: login
     method: form
@@ -65,6 +94,7 @@
       _remember_me: on
     error:
       - selector: td.embedded:has(center > h2:contains(failed))
+      - selector: span:contains("Error")
     test:
       path: browse
 
@@ -76,61 +106,59 @@
     paths:
       - path: browse
     inputs:
-      $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
+      $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-      search: "{{ .Keywords }}"
+      search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+      sort: "{{ .Config.sort }}"
+      direction: "{{ .Config.type }}"
+
     rows:
-      selector: div[class="kt-container  kt-grid__item"] > div:not(#top10-wrapper) div[class^="row mr-0"]
+      selector: div.kt-portlet--mobile > div.kt-portlet__body--fit > div.mr-0
+
     fields:
-      title:
-        selector: a[href^="/browse/"]
-      details:
-        selector: a[href^="/browse/"]
-        attribute: href
       category:
         selector: a[href^="/browse?categories"]
         attribute: href
         filters:
           - name: regexp
             args: (\d+)$
-      download:
+      title:
-        selector: a[href^="/dwn.php"]
+        selector: a[href^="/browse/"]
+      details:
+        selector: a[href^="/browse/"]
+        attribute: href
+      download:
+        selector: a[href^="/torrents/"]
         attribute: href
-      size:
-        selector: div[data-toggle="kt-tooltip"] + div + div
       date:
         selector: div[data-toggle="kt-tooltip"]
         attribute: title
         filters:
           - name: dateparse
-            args: "Jan 02, 2006, 03:04:05 PM"
+            args: "Jan 2, 2006, 03:04:05 PM"
+      size:
+        selector: div[data-toggle="kt-tooltip"] + div + div
       grabs:
         selector: div[data-toggle="kt-tooltip"] + div
         filters:
           - name: regexp
-            args: ([\d\.]+)
+            args: (\d+)
       seeders:
         selector: div[data-toggle="kt-tooltip"] + div + div + div > div div:nth-child(1)
         filters:
           - name: regexp
-            args: ([\d\.]+)
+            args: (\d+)
       leechers:
         selector: div[data-toggle="kt-tooltip"] + div + div + div > div div:nth-child(2)
         filters:
           - name: regexp
-            args: ([\d\.]+)
+            args: (\d+)
-      banner:
-        selector: a[onmouseover][href^="details.php?id="]
-        attribute: onmouseover
-        optional: true
-        filters:
-          - name: regexp
-            args: src=([^\s]+)
       downloadvolumefactor:
         case:
-          "img[title^=\"FreeLech: \"]": "0"
+          "span.kt-badge--success:contains(\"free\")": 0
-          "img[title^=\"HALF: \"]": "0.5"
+          "span.kt-badge--dark:contains(\"half\")": 0.5
-          "*": "1"
+          "*": 1
       uploadvolumefactor:
         case:
-          "img[title^=\"2xUP: \"]": "2"
+          "span.kt-badge--info:contains(\"double\")": 2
-          "*": "1"
+          "*": 1
+# engine n/a