idope: use infohash

code tidy

src/Jackett.Common/Definitions/idope.yml

@@ -20,16 +20,16 @@ legacylinks:
 
 caps:
   categorymappings:
-    - {id: 0, cat: Other, desc: "Others"}
-    - {id: 1, cat: Movies, desc: "Movies"}
-    - {id: 2, cat: Other, desc: "Video"}
-    - {id: 3, cat: TV, desc: "TV"}
-    - {id: 4, cat: TV/Anime, desc: "Anime"}
-    - {id: 5, cat: XXX, desc: "XXX"}
-    - {id: 6, cat: Audio, desc: "Music"}
-    - {id: 7, cat: PC/Games, desc: "Games"}
-    - {id: 8, cat: PC, desc: "Apps"}
-    - {id: 9, cat: Books, desc: "Books"}
+    - {id: 0, cat: Other, desc: Others}
+    - {id: 1, cat: Movies, desc: Movies}
+    - {id: 2, cat: Other, desc: Video}
+    - {id: 3, cat: TV, desc: TV}
+    - {id: 4, cat: TV/Anime, desc: Anime}
+    - {id: 5, cat: XXX, desc: XXX}
+    - {id: 6, cat: Audio, desc: Music}
+    - {id: 7, cat: PC/Games, desc: Games}
+    - {id: 8, cat: PC, desc: Apps}
+    - {id: 9, cat: Books, desc: Books}
 
   modes:
     search: [q]
@@ -50,28 +50,26 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site (Applies only to search with Keywords)
-    default: "-3"
+    default: -3
     options:
-      "-3": "created desc"
-      "-1": "seeders desc"
-      "-2": "size desc"
-      "3": "created asc"
-      "1": "seeders asc"
-      "2": "size asc"
+      -3: "created desc"
+      -1: "seeders desc"
+      -2: "size desc"
+      3: "created asc"
+      1: "seeders asc"
+      2: "size asc"
 
 search:
   paths:
     # present trending results if there are no search parms supplied
     # sort torrent-list by age in descending order
-    - path: "{{ if .Keywords }}torrent-list/{{ .Keywords }}?o={{ .Config.sort }}&c={{ range .Categories }}{{.}}{{end}}{{else}}browse.html{{end}}"
-    - path: "{{ if .Keywords }}torrent-list/{{ .Keywords }}?p=2&o={{ .Config.sort }}&c={{ range .Categories }}{{.}}{{end}}{{else}}browse.html?&p=2{{end}}"
+    - path: "{{ if .Keywords }}torrent-list/{{ .Keywords }}?o={{ .Config.sort }}&c={{ range .Categories }}{{.}}{{end}}{{ else }}browse.html{{ end }}"
+    - path: "{{ if .Keywords }}torrent-list/{{ .Keywords }}?p=2&o={{ .Config.sort }}&c={{ range .Categories }}{{.}}{{end}}{{ else }}browse.html?&p=2{{ end }}"
 
   rows:
     selector: div.resultdiv
 
   fields:
-    title:
-      selector: div.resultdivtop a div.resultdivtopname
     category:
       text: 0
     category|noappend:
@@ -88,6 +86,8 @@ search:
         ":contains(\"Games\")": 7
         ":contains(\"Apps\")": 8
         ":contains(\"Books\")": 9
+    title:
+      selector: div.resultdivtop a div.resultdivtopname
     details:
       selector: div.resultdivtop a
       attribute: href
@@ -100,33 +100,21 @@ search:
         - name: append
           args: ".torrent"
     download:
-      text: "{{if .Config.itorrents-links}}{{ .Result.download-itorrents }}{{else}}{{end}}"
-    magfile:
-      text: "{{ .Result.title }}"
-      filters:
-        - name: validfilename
-        - name: urlencode
-    magnet:
+      text: "{{if .Config.itorrents-links}}{{ .Result.download-itorrents }}{{ else }}{{ end }}"
+    infohash:
       selector: div.resultdivbotton div.hideinfohash
-      filters:
-        - name: prepend
-          args: "magnet:?xt=urn:btih:"
-        - name: append
-          args: "&dn={{ .Result.magfile }}.torrent"
-        - name: append
-          args: "&tr=http://tracker.trackerfix.com:80/announce&tr=udp://9.rarbg.com:2710/announce&tr=udp://9.rarbg.me:2710/announce&tr=udp://9.rarbg.to:2710/announce&tr=udp://coppersurfer.tk:6969/announce&tr=udp://eddie4.nl:6969/announce&tr=udp://exodus.desync.com:6969&tr=udp://glotorrents.pw:6969/announce&tr=udp://open.demonii.com:1337&tr=udp://p4p.arenabg.ch:1337/announce&tr=udp://p4p.arenabg.com:1337&tr=udp://torrent.gresille.org:80/announce&tr=udp://tracker.aletorrenty.pl:2710/announce&tr=udp://tracker.coppersurfer.tk:6969/announce&tr=udp://tracker.glotorrents.com:6969/announce&tr=udp://tracker.internetwarriors.net:1337&tr=udp://tracker.leechers-paradise.org:6969/announce&tr=udp://tracker.openbittorrent.com:80/announce&tr=udp://tracker.opentrackr.org:1337/announce&tr=udp://zer0day.ch:1337/announce"
     date:
       selector: div.resultdivbotton div.resulttime div.resultdivbottontime
       filters:
         - name: timeago
     size:
       selector: div.resultdivbotton div.resultlength div.resultdivbottonlength
+    files:
+      selector: div.resultdivbotton div.resultfile div.resultdivbottonfiles
     seeders:
       selector: div.resultdivbotton div.resultseed div.resultdivbottonseed
     leechers:
       text: 0
-    files:
-      selector: div.resultdivbotton div.resultfile div.resultdivbottonfiles
     downloadvolumefactor:
       text: 0
     uploadvolumefactor: