matrix. new selectors. resolves #15888

now has search freeleech
now sort keys are text
new logout test
poster is gone
files is gone
titles are abbreviated ;-(
new DLVF and ULVF flags
users will need to edit the config to pick up the new config options (which they are likely to do since the password needs resetting anyways)

src/Jackett.Common/Definitions/matrix.yml

@@ -59,17 +59,17 @@ settings:
     label: Password
   - name: freeleech
     type: checkbox
-    label: Filter freeleech only
+    label: Search freeleech only
     default: false
   - name: sort
     type: select
     label: Sort requested from site
-    default: 0
+    default: ctime
     options:
-      0: created
-      1: title
-      4: size
-      6: seeders
+      ctime: created
+      name: title
+      size: size
+      seeders: seeders
   - name: type
     type: select
     label: Order requested from site
@@ -97,7 +97,7 @@ login:
     - selector: td.embedded:contains("Hiba")
   test:
     path: /
-    selector: a[href$="logout.php"]
+    selector: a[href*="logout.php?logout="]
 
 search:
   paths:
@@ -105,69 +105,51 @@ search:
   inputs:
     $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    # 0 active only, 1 include dead, 2 only dead
-    incldead: 1
+    # 0 active only, 1 include dead, 2 only dead, 3 free, 4 double
+    incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"
 
   rows:
-    selector: "table.mainouter > tbody > tr > td > table tr:has(a[href^=\"download.php?id=\"]){{ if .Config.freeleech }}:has(img[src$=\"/pic/ingyentorrent.gif\"]){{ else }}{{ end }}"
+    selector: table.table-center > tbody > tr:has(a[href*="details.php?id="])
 
   fields:
-    category:
-      selector: a[href^="browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
+    categorydesc:
+      selector: img[src^="/pic/categories"]
+      attribute: title
     title:
-      # titles can be abbreviated so using the name from DL
-      selector: a[href^="download.php?id="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: name
-        - name: replace
-          args: [".torrent", ""]
+      selector: td:nth-child(2) > div > a
     details:
-      selector: a[href^="details.php?id="]
+      selector: a[href*="details.php?id="]
       attribute: href
       filters:
         - name: re_replace
           args: ["&hit=1.+", ""]
     download:
-      selector: a[href^="download.php?id="]
-      attribute: href
-    poster:
-      selector: a.torrent-link
-      attribute: data-cover
+      text: "{{ .Result.details }}"
+      filters:
+        - name: replace
+          args: ["details.php", "download.php"]
     imdbid:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
-    files:
-      selector: td:nth-child(5) a
     date:
-      selector: td:contains("Feltöltve:")
+      selector: td:nth-child(3)
       filters:
-        - name: regexp
-          args: "Feltöltve: (.+?)(\\(|$)"
         - name: append
           args: " +01:00" # CET
         - name: dateparse
-          args: "yyyy-MM-dd HH:mm:ss zzz"
-    grabs:
-      selector: td:nth-child(7) b
+          args: "yyyy-MM-ddHH:mm:ss zzz"
     size:
-      selector: td:nth-child(7)
-      filters:
-        - name: regexp
-          args: "(.+?B)"
+      selector: td:nth-child(4)
+    grabs:
+      selector: td:nth-child(5)
     seeders:
-      selector: td:nth-child(8)
+      selector: td:nth-child(6)
     leechers:
-      selector: td:nth-child(9)
+      selector: td:nth-child(7)
     genre:
-      selector: td:nth-child(2) > div > i > i
+      selector: td:nth-child(2) > div > i.small
       filters:
         - name: regexp
           args: "\\((.+)\\)"
@@ -175,11 +157,11 @@ search:
       text: "{{ .Result.genre }}"
     downloadvolumefactor:
       case:
-        img[src$="/pic/ingyentorrent.gif"]: 0
+        span.text-red:contains("[x0]"): 0
         "*": 1
     uploadvolumefactor:
       case:
-        img[src$="/pic/x2.gif"]: 2
+        span.text-blue:contains("[x2]"): 2
         "*": 1
     minimumratio:
       text: 1.0