jpopsuki: support for lidarr artist/album

also add freeleech and sort configs
add MR

README.md

@@ -409,7 +409,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Insane Tracker
  * IPTorrents (IPT)
  * JME-REUNIT3D
- * JPopsuki [![(invite needed)][inviteneeded]](#)
+ * JPopsuki
  * JPTV
  * Karagarga
  * Keep Friends [![(invite needed)][inviteneeded]](#)

src/Jackett.Common/Definitions/jpopsuki.yml

@@ -25,7 +25,35 @@ caps:
     search: [q]
     tv-search: [q, season, ep]
     movie-search: [q]
-    music-search: [q, artist]
+    music-search: [q, album, artist]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: s3
+    options:
+      s3: created
+      s6: seeders
+      s4: size
+      s1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
 
 login:
   path: login.php
@@ -34,22 +62,23 @@ login:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
     keeplogged: 1
-    login: "Log in"
+    login: "Log In!"
   error:
     - selector: form#loginform > span.warning, font[color="red"]
   test:
     path: torrents.php
 
 search:
+    # https://jpopsuki.eu/ajax.php?section=torrents&artistname=&action=advanced&torrentname=snow+man&remastertitle=&filelist=&bitrate=&format=&media=&year=&freeleech=&remastered=&searchtags=&tags_type=0&order_by=s3&order_way=desc&enablegrouping=1
   paths:
     - path: ajax.php
   inputs:
-    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}{{ if or .Query.Artist .Keywords }}{{ else }}searchtags=japanese&tags_type=0&{{ end }}"
-    searchstr: "{{ if .Query.Artist }}{{ .Query.Artist }}{{ else }}{{ .Keywords }}{{ end }}"
-    # s1 name, s2 year, s3 added, s4 size, s5 snatched, s6 seeders, s7 leechers
-    order_by: s3
-    # desc, asc
-    order_way: desc
+    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}{{ if or .Query.Album .Query.Artist .Keywords }}action=advanced{{ else }}searchtags=japanese&tags_type=0{{ end }}"
+    artistname: "{{ if .Query.Artist }}{{ .Query.Artist }}{{ else }}{{ end }}"
+    torrentname: "{{ if .Query.Album }}{{ .Query.Album }}{{ else }}{{ .Keywords }}{{ end }}"
+    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    order_by: "{{ .Config.sort }}"
+    order_way: "{{ .Config.type }}"
     disablegrouping: 1
     section: torrents
 
@@ -108,4 +137,6 @@ search:
         "*": 1
     uploadvolumefactor:
       text: 1
+    minimumratio:
+      text: 0.6
 # engine n/a