3evils: new domain new cats ne engine resolves #4264

add MR and MST new freeleech detection
Jackett · Oct 21, 2020 · e1226f3 · e1226f3
1 parent 7d97c33
commit e1226f3
Showing 1 changed file with 58 additions and 35 deletions.
diff --git a/src/Jackett.Common/Definitions/3evils.yml b/src/Jackett.Common/Definitions/3evils.yml
@@ -6,25 +6,38 @@ language: en
 type: private
 encoding: UTF-8
 links:
+  - https://www.3evils.net/
+legacylinks:
   - https://www.3evils.com/
+  - https://the-unknown.xyz/
 
 caps:
   categorymappings:
-    - {id: 65, cat: Books, desc: "Books"}
-    - {id: 11, cat: Movies/UHD, desc: "Movies/Encodes 2160p"}
-    - {id: 12, cat: Movies/UHD, desc: "Movies/Remux 2160p"}
-    - {id: 13, cat: Movies/HD, desc: "Movies/Remux 1080p"}
+    - {id: 73, cat: PC, desc: "Appz/Linux"}
+    - {id: 42, cat: PC/Mac, desc: "Appz/Mac"}
+    - {id: 43, cat: PC/0day, desc: "Appz/Windows"}
+    - {id: 65, cat: Books/Ebook, desc: "Books"}
+    - {id: 80, cat: Console/NDS, desc: "Games/Nintendo"}
+    - {id: 78, cat: Console/PS4, desc: "Games/PS4"}
+    - {id: 77, cat: PC/Games, desc: "Games/Windows"}
+    - {id: 79, cat: Console/Xbox, desc: "Games/XBOX"}
+    - {id: 13, cat: Movies/3D, desc: "Movies/3D"}
+    - {id: 71, cat: Movies/UHD, desc: "Movies/4K"}
+    - {id: 72, cat: Movies/BluRay, desc: "Movies/Blu-Ray"}
+    - {id: 12, cat: Movies/DVD, desc: "Movies/DVD-R"}
     - {id: 14, cat: Movies, desc: "Movies/Packs"}
+    - {id: 70, cat: Movies/SD, desc: "Movies/Screeners & Cams"}
     - {id: 16, cat: Movies/HD, desc: "Movies/x264"}
     - {id: 17, cat: Movies/HD, desc: "Movies/X265"}
-    - {id: 33, cat: Audio, desc: "Music/Audio"}
+    - {id: 11, cat: Movies/SD, desc: "Movies/XVID"}
+    - {id: 74, cat: Audio/Lossless, desc: "Music/FLAC"}
+    - {id: 33, cat: Audio/MP3, desc: "Music/MP3"}
     - {id: 32, cat: Audio, desc: "Music/Packs"}
+    - {id: 75, cat: Audio/Video, desc: "Music/Videos"}
     - {id: 6, cat: TV, desc: "TV/Packs"}
     - {id: 3, cat: TV/HD, desc: "TV/x264"}
     - {id: 4, cat: TV/HD, desc: "TV/x265"}
     - {id: 8, cat: TV/SD, desc: "TV/Xvid"}
-    - {id: 43, cat: PC/0day, desc: "Appz/Windows"}
-    - {id: 42, cat: PC/Phone-Android, desc: "Appz/Android"}
 
   modes:
     search: [q]
@@ -47,27 +60,33 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "4"
+    default: 4
     options:
-      "4": "created"
-      "7": "seeders"
-      "5": "size"
-      "1": "title"
+      4: created
+      7: seeders
+      5: size
+      1: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile. The default is <i>15</i>.
 
 login:
-  path: takelogin.php
-  method: post
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
-    submitme: X
+    use_ssl: 1
+    perm_ssl: ""
   error:
     - selector: div.callout:contains("Login failed!")
   test:
@@ -76,8 +95,7 @@ login:
 
 search:
   paths:
-    # https://www.3evils.com/browse.php?search=black+lightning+s02e11&searchin=title&incldead=1
-    # https://www.3evils.com/browse.php?c3=1&c4=1&search=&searchin=title&incldead=1
+    # https://www.3evils.net/browse.php?c16=1&c17=1&c3=1&c4=1&search=&searchin=title&incldead=0&only_free=1
     - path: browse.php
   inputs:
     $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
@@ -91,31 +109,31 @@ search:
     type: "{{ .Config.type }}"
 
   rows:
-    selector: table.responsive-card-table tr:has(td[data-label])
+    selector: table.unstriped tbody tr:has(a[href^="download.php?torrent="])
     filters:
       - name: andmatch
 
   fields:
     category:
-      selector: td[data-label="Type"] a
+      selector: a[href^="browse.php?cat="]
       attribute: href
       filters:
         - name: querystring
           args: cat
     title:
-      selector: td[data-label="Name"] a[onmouseover]
+      selector: a[href^="details.php?id="]
       attribute: onmouseover
       filters:
         - name: regexp
           args: "Tip\\('<b>(.*?)</b>"
     details:
-      selector: td[data-label="Name"] a
+      selector: a[href^="details.php?id="]
       attribute: href
     download:
-      selector: td[data-label="Download"] a
+      selector: a[href^="download.php?torrent="]
       attribute: href
     banner:
-      selector: td[data-label="Name"] a[onmouseover]
+      selector: a[href^="details.php?id="]
       attribute: onmouseover
       optional: true
       filters:
@@ -125,15 +143,8 @@ search:
           args: "src=\\\\'(.+?)\\\\'"
         - name: replace
           args: ["./pic/noposter.png", ""]
-    size:
-      selector: td[data-label="Size"]
     files:
       selector: td[data-label="Files"]
-    grabs:
-      selector: td[data-label="Snatched"]
-      filters:
-        - name: regexp
-          args: (\d+)
     # 2 flavours of dates
     date:
       # Today<br> 10:20 AM
@@ -152,15 +163,27 @@ search:
           args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
           args: "Jan 2 2006 03:04 PM -07:00"
+    size:
+      selector: td[data-label="Size"]
+    grabs:
+      selector: td[data-label="Snatched"]
+      filters:
+        - name: regexp
+          args: (\d+)
     seeders:
       selector: td[data-label="Seeders"]
     leechers:
       selector: td[data-label="Leechers"]
     downloadvolumefactor:
       case:
-        img[src="./pic/freedownload.gif"]: 0
+        "a.info:contains(\"[FREE]\")": 0
         "*": 1
     uploadvolumefactor:
       case:
         "*": 1
-# U-232 V5
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# U-232 V5 (customised)