Merge branch 'master' of https://github.com/Jackett/Jackett

README.md

@@ -461,7 +461,7 @@ All contributions are welcome just send a pull request.  Jackett's framework all
 
 ### Windows
 * Install the .NET Core [SDK](https://www.microsoft.com/net/download/windows)
-* Open the Jackett solution in Visual Studio 2017 (version 15.7 or above)
+* Open the Jackett solution in Visual Studio 2017 (version 15.8 or above)
 * Right click on the Jackett solution and click 'Rebuild Solution' to restore nuget packages
 * Select Jackett.Server as startup project
 * In the drop down menu of the run button select "Jackett.Server" instead of "IIS Express"

src/Jackett.Common/Definitions/shareisland.yml

@@ -80,6 +80,42 @@
   search:
     paths:
       - path: /index.php
+        inputs:
+          pages: 1
+      - path: /index.php
+        inputs:
+          pages: 2
+      - path: /index.php
+        inputs:
+          pages: 3
+      - path: /index.php
+        inputs:
+          pages: 4
+      - path: /index.php
+        inputs:
+          pages: 5
+      - path: /index.php
+        inputs:
+          pages: 6
+      - path: /index.php
+        inputs:
+          pages: 7
+      - path: /index.php
+        inputs:
+          pages: 8
+      - path: /index.php
+        inputs:
+          pages: 9
+      - path: /index.php
+        inputs:
+          pages: 10
+    inputs:
+      search: "{{ .Keywords }}"
+      category: "{{range .Categories}}{{.}};{{end}}"
+      page: torrents
+      active: 0
+      order: 3
+      by: 2
     keywordsfilters:
       - name: diacritics
         args: replace
@@ -87,11 +123,6 @@
         args: ["(?i)\\bS0*(\\d+)\\b", "$1"]
       - name: re_replace # S01E01 to 1 1
         args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "$1 $2"]
-    inputs:
-      search: "{{ .Keywords }}"
-      category: "{{range .Categories}}{{.}};{{end}}"
-      page: torrents
-      active: 0
     rows:
       selector: div.b-content > table > tbody > tr > td > table.lista > tbody > tr:has(a[href^="index.php?page=torrents&category="])
       filters:

src/Jackett.Common/Definitions/torrent9clone.yml

@@ -6,9 +6,10 @@
   type: public
   encoding: UTF-8
   links:
-    - https://www.torrent9.ch/
+    - https://www1.torrent9.ch/
   legacylinks:
     - https://www.torrents9.pw/
+    - https://www.torrent9.ch/
 
   caps:
     categorymappings:

src/Jackett.Common/Definitions/yggtorrent.yml

@@ -131,6 +131,10 @@
       type: checkbox
       label: Replace VOSTFR with ENGLISH
       default:  false
+    - name: enhancedAnime
+      type: checkbox
+      label: Enhance sonarr compatibility with anime by renaming episode (xxx to exxx). Works only if episode is at the end of the query. Can disturb movies search. (back to the future 3 -> back to the future e3)
+      default: false
   login:
     method: form
     path: /
@@ -147,8 +151,8 @@
 
   search:
     paths:
-      - path: "/engine/search?category={{ .Config.category }}&name={{ .Keywords }}&description=&file=&uploader=&sub_category=&do=search&order=desc&sort=publish_date"
-      - path: "/engine/search?category={{ .Config.category }}&name={{ .Keywords }}&description=&file=&uploader=&sub_category=&do=search&order=desc&sort=publish_date&page=50"
+      - path: "/engine/search?category={{ .Config.category }}&name={{if .Config.enhancedAnime}}{{ re_replace .Keywords \"([\\.\\s\\[\\-])(\\d+)$\" \"$1e$2\" }}{{else}}{{ .Keywords }}{{end}}&description=&file=&uploader=&sub_category=&do=search&order=desc&sort=publish_date"
+      - path: "/engine/search?category={{ .Config.category }}&name={{if .Config.enhancedAnime}}{{ re_replace .Keywords \"([\\.\\s\\[\\-])(\\d+)$\" \"$1e$2\" }}{{else}}{{ .Keywords }}{{end}}&description=&file=&uploader=&sub_category=&do=search&order=desc&sort=publish_date&page=50"
 
     rows:
       selector: "table.table > tbody > tr"

src/Jackett.Common/Indexers/EliteTracker.cs

@@ -236,7 +236,7 @@ namespace Jackett.Common.Indexers
                             banner.Remove();
                         }
 
-                        tooltip.QuerySelector("div:contains(\"Total Hits : \")").Remove();
+                        tooltip.QuerySelector("div:contains(\"Total Hits\")").Remove();
 
                         var longtitle = tooltip.QuerySelectorAll("div").First();
                         release.Title = longtitle.TextContent;