From f6988694387ea21ae9e5faf7687cd00327ab6e3d Mon Sep 17 00:00:00 2001
From: Garfield69 <garfield69@outlook.com>
Date: Wed, 18 Dec 2019 09:23:45 +1300
Subject: [PATCH] newstudio: add config sort options

---
 src/Jackett.Common/Definitions/newstudio.yml  | 42 +++++++++++++---
 src/Jackett.Common/Definitions/newstudiol.yml | 50 ++++++++++++++++---
 2 files changed, 76 insertions(+), 16 deletions(-)

diff --git a/src/Jackett.Common/Definitions/newstudio.yml b/src/Jackett.Common/Definitions/newstudio.yml
index fd2255e93..6567e0bb3 100644
--- a/src/Jackett.Common/Definitions/newstudio.yml
+++ b/src/Jackett.Common/Definitions/newstudio.yml
@@ -16,18 +16,40 @@
       search: [q]
       tv-search: [q, season, ep]
 
-  settings: []
+  settings:
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "1"
+      options:
+        "1": "created"
+        "10": "seeders"
+        "7": "size"
+        "2": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "2"
+      options:
+        "2": "desc"
+        "1": "asc"
 
   search:
     paths:
-      - path: "tracker.php?nm={{ .Keywords}}"
-      - path: "tracker.php?nm={{ .Keywords}}&start=50"
-      - path: "tracker.php?nm={{ .Keywords}}&start=100"
-      - path: "tracker.php?nm={{ .Keywords}}&start=150"
+      - path: tracker.php
+      - path: tracker.php
+        inputs:
+          start: 50
+    inputs:
+      nm: "{{.Keywords}}"
+      o: "{{ .Config.sort }}"
+      s: "{{ .Config.type }}"
+
     rows:
       selector: table.well > tbody > tr:has(a[href^="./viewtopic.php?t="])
       filters:
         - name: andmatch
+
     fields:
       title:
         selector: a[href^="./viewtopic.php?t="] > b
@@ -99,9 +121,13 @@
             args: ":00 +05:00"
           - name: dateparse
             args: "2 Jan 06 15:04:05 -07:00"
+      seeders:
+        text: 1
+      leechers:
+        text: 1
       downloadvolumefactor:
         case:
-          img[src="images/tor_gold.gif"]: "0"
-          "*": "1"
+          img[src="images/tor_gold.gif"]: 0
+          "*": 1
       uploadvolumefactor:
-        text: "1"
\ No newline at end of file
+        text: 1
diff --git a/src/Jackett.Common/Definitions/newstudiol.yml b/src/Jackett.Common/Definitions/newstudiol.yml
index 2f4ab7be3..fced6ea18 100644
--- a/src/Jackett.Common/Definitions/newstudiol.yml
+++ b/src/Jackett.Common/Definitions/newstudiol.yml
@@ -16,6 +16,30 @@
       search: [q]
       tv-search: [q, season, ep]
 
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "1"
+      options:
+        "1": "created"
+        "10": "seeders"
+        "7": "size"
+        "2": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "2"
+      options:
+        "2": "desc"
+        "1": "asc"
+
   login:
     path: login.php
     method: post
@@ -26,19 +50,25 @@
     error:
       - selector: div.alert-error
     test:
-      path: "/"
+      path: /
       selector: a[href="/login.php?logout=1"]
 
   search:
     paths:
-      - path: "tracker.php?nm={{ .Keywords}}"
-      - path: "tracker.php?nm={{ .Keywords}}&start=50"
-      - path: "tracker.php?nm={{ .Keywords}}&start=100"
-      - path: "tracker.php?nm={{ .Keywords}}&start=150"
+      - path: tracker.php
+      - path: tracker.php
+        inputs:
+          start: 50
+    inputs:
+      nm: "{{.Keywords}}"
+      o: "{{ .Config.sort }}"
+      s: "{{ .Config.type }}"
+
     rows:
       selector: table.well > tbody > tr:has(a[href^="./viewtopic.php?t="])
       filters:
         - name: andmatch
+
     fields:
       title:
         selector: a[href^="./viewtopic.php?t="] > b
@@ -110,9 +140,13 @@
             args: ":00 +05:00"
           - name: dateparse
             args: "2 Jan 06 15:04:05 -07:00"
+      seeders:
+        text: 1
+      leechers:
+        text: 1
       downloadvolumefactor:
         case:
-          img[src="images/tor_gold.gif"]: "0"
-          "*": "1"
+          img[src="images/tor_gold.gif"]: 0
+          "*": 1
       uploadvolumefactor:
-        text: "1"
\ No newline at end of file
+        text: 1