Build script: Use Kestrel web server on Mono

Copy of 0d6830b0aa

README.md

@@ -43,7 +43,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * LimeTorrents
  * MagnetDL
  * MejorTorrent <!-- maintained by ivandelabeldad -->
- * NextTorrent
  * Newpct (aka: tvsinpagar, descargas2020, torrentlocura, torrentrapid, etc)
  * Nyaa.si
  * Nyaa-Pantsu
@@ -148,7 +147,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Elit Tracker
  * Elite-Tracker
  * Empornium
- * EoT-Forum
  * eStone
  * Ethor.net (Thor's Land)
  * FANO.IN
@@ -291,7 +289,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * xBytesV2
  * XSpeeds
  * Xthor
- * Your Exotic Torrents
+ * ExoticaZ (Your Exotic Torrents)
  * Zamunda.net
  * Zelka.org
 

appveyor.yml

@@ -1,4 +1,4 @@
-version: 0.9.{build}
+version: 0.10.{build}
 skip_tags: true
 image: Visual Studio 2017
 configuration: Release

build.cake

@@ -45,17 +45,12 @@ Task("Clean")
 		Information("Clean completed");
 	});
 
-Task("Restore-NuGet-Packages")
+Task("Build-Kestrel-Full-Framework")
 	.IsDependentOn("Clean")
 	.Does(() =>
 	{
 		NuGetRestore("./src/Jackett.sln");
-	});
 
-Task("Build")
-	.IsDependentOn("Restore-NuGet-Packages")
-	.Does(() =>
-	{
 		var buildSettings = new MSBuildSettings()
                 .SetConfiguration(configuration)
                 .UseToolVersion(MSBuildToolVersion.VS2017);
@@ -64,7 +59,7 @@ Task("Build")
 	});
 
 Task("Run-Unit-Tests")
-	.IsDependentOn("Build")
+	.IsDependentOn("Build-Kestrel-Full-Framework")
 	.Does(() =>
 	{
 		CreateDirectory("./" + testResultsDirName);
@@ -81,29 +76,8 @@ Task("Run-Unit-Tests")
 		}
 	});
 
-Task("Copy-Files-Full-Framework")
-	.IsDependentOn("Run-Unit-Tests")
-	.Does(() =>
-	{
-		var windowsOutput = windowsBuildFullFramework + "/Jackett";
-
-		CopyDirectory("./src/Jackett.Console/bin/" + configuration, windowsOutput);
-		CopyFiles("./src/Jackett.Updater/bin/" + configuration + "/net452" + "/JackettUpdater.*", windowsOutput);  //builds against multiple frameworks
-		CopyFiles("./Upstart.config", windowsOutput);
-		CopyFiles("./LICENSE", windowsOutput);
-		CopyFiles("./README.md", windowsOutput);
-
-		var monoOutput = monoBuildFullFramework + "/Jackett";
-
-		CopyDirectory(windowsBuildFullFramework, monoBuildFullFramework);
-		DeleteFiles(monoOutput + "/JackettService.*");
-		DeleteFiles(monoOutput + "/JackettTray.*");
-
-		Information("Full framework file copy completed");
-	});
-
 Task("Check-Packaging-Platform")
-	.IsDependentOn("Copy-Files-Full-Framework")
+	.IsDependentOn("Run-Unit-Tests")
 	.Does(() =>
 	{
 		if (IsRunningOnWindows())
@@ -117,39 +91,8 @@ Task("Check-Packaging-Platform")
 		}
 	});
 
-Task("Package-Files-Full-Framework-Mono")
-	.IsDependentOn("Check-Packaging-Platform")
-	.Does(() =>
-	{
-		Gzip(monoBuildFullFramework, $"./{artifactsDirName}", "Jackett", "Jackett.Binaries.Mono.tar.gz");
-		Information(@"Full Framework Mono Binaries Gzip Completed");
-	});
-
-Task("Package-Full-Framework")
-	.IsDependentOn("Package-Files-Full-Framework-Mono")
-	.Does(() =>
-	{
-		Information("Full Framework Packaging Completed");
-	});
-
-Task("Kestrel-Full-Framework")
-	.IsDependentOn("Package-Full-Framework")
-	.Does(() =>
-	{
-		CleanDirectories("./src/**/obj");
-		CleanDirectories("./src/**/bin");
-
-		NuGetRestore("./src/Jackett.sln");
-
-		var buildSettings = new MSBuildSettings()
-                .SetConfiguration(configuration)
-                .UseToolVersion(MSBuildToolVersion.VS2017);
-		
-		MSBuild("./src/Jackett.sln", buildSettings);
-	});
-
 Task("Experimental-Kestrel-Windows-Full-Framework")
-	.IsDependentOn("Kestrel-Full-Framework")
+	.IsDependentOn("Check-Packaging-Platform")
 	.Does(() =>
 	{
 		string serverProjectPath = "./src/Jackett.Server/Jackett.Server.csproj";
@@ -179,7 +122,7 @@ Task("Experimental-Kestrel-Windows-Full-Framework")
 	});
 
 Task("Experimental-Kestrel-Mono-Full-Framework")
-	.IsDependentOn("Kestrel-Full-Framework")
+	.IsDependentOn("Check-Packaging-Platform")
 	.Does(() =>
 	{
 		string serverProjectPath = "./src/Jackett.Server/Jackett.Server.csproj";
@@ -199,11 +142,11 @@ Task("Experimental-Kestrel-Mono-Full-Framework")
 		var configFile = File(buildOutputPath + "/JackettConsole.exe.config");
 		XmlPoke(configFile, "configuration/runtime/*[name()='assemblyBinding']/*[name()='dependentAssembly']/*[name()='assemblyIdentity'][@name='System.Net.Http']/../*[name()='bindingRedirect']/@newVersion", "4.0.0.0");
 
-		Gzip("./BuildOutput/Experimental/net461/linux-x64", $"./{artifactsDirName}", "Jackett", "Experimental.Jackett.Binaries.Mono.tar.gz");
+		Gzip("./BuildOutput/Experimental/net461/linux-x64", $"./{artifactsDirName}", "Jackett", "Jackett.Binaries.Mono.tar.gz");
 	});
 	
 Task("Experimental-DotNetCore")
-	.IsDependentOn("Kestrel-Full-Framework")
+	.IsDependentOn("Check-Packaging-Platform")
 	.Does(() =>
 	{
 		string serverProjectPath = "./src/Jackett.Server/Jackett.Server.csproj";
@@ -227,7 +170,6 @@ Task("Experimental")
 	});
 
 Task("Appveyor-Push-Artifacts")
-	.IsDependentOn("Package-Full-Framework")
 	.IsDependentOn("Experimental")
 	.Does(() =>
 	{

src/Jackett.Common/Content/custom.js

@@ -738,9 +738,9 @@ function updateReleasesRow(row)
         if (DownloadVolumeFactor == 0) {
             labels.append('\n<span class="label label-success">FREELEECH</span>');
         } else if (DownloadVolumeFactor < 1) {
-            labels.append('\n<span class="label label-primary">' + DownloadVolumeFactor * 100 + '%DL</span>');
+            labels.append('\n<span class="label label-primary">' + (DownloadVolumeFactor * 100).toFixed(0) + '%DL</span>');
         } else if (DownloadVolumeFactor > 1) {
-            labels.append('\n<span class="label label-danger">' + DownloadVolumeFactor * 100 + '%DL</span>');
+            labels.append('\n<span class="label label-danger">' + (DownloadVolumeFactor * 100).toFixed(0) + '%DL</span>');
         }
     }
 
@@ -748,7 +748,7 @@ function updateReleasesRow(row)
         if (UploadVolumeFactor == 0) {
             labels.append('\n<span class="label label-warning">NO UPLOAD</span>');
         } else if (UploadVolumeFactor != 1) {
-            labels.append('\n<span class="label label-info">' + UploadVolumeFactor * 100 + '%UL</span>');
+            labels.append('\n<span class="label label-info">' + (UploadVolumeFactor * 100).toFixed(0) + '%UL</span>');
         }
     }
 }

src/Jackett.Common/Content/index.html

@@ -663,6 +663,6 @@
     </script>
 
     <script type="text/javascript" src="../libs/api.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../custom.js?changed=20180709"></script>
+    <script type="text/javascript" src="../custom.js?changed=20180710"></script>
 </body>
 </html>

src/Jackett.Common/Definitions/ast4u.yml

@@ -92,7 +92,7 @@
         selector: a[href^="details.php"]
         attribute: href
       download:
-        selector: a[href^=" /gettorrent/ssl/"]
+        selector: a[href^=" /gettorrent/"]
         attribute: href
       files:
         selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(1) > b:nth-child(2), a[href*="&filelist=1"]

src/Jackett.Common/Definitions/cinematik.yml

@@ -1,6 +1,6 @@
 ---
   # Update by LA5T based on the orignial 'cinematik.yml'
-  # 27.07.2018 13:00 UTC+2
+  # 29.07.2018 22:53 UTC+2
   #
   site: cinematik
   name: Cinematik
@@ -75,7 +75,7 @@
     inputs:
       $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
       search: "{{ .Query.Keywords }}"
-      incldead:	"{{ .Config.incldead }}"
+      incldead: "{{ .Config.incldead }}"
       srchdtls: "{{ if .Config.srchdtls }}1{{ else }}0{{ end }}"
     rows:
       selector: table[border="1"] tr:not(:first-child)
@@ -97,7 +97,7 @@
         selector: td:nth-child(8)
         filters:
           - name: regexp
-            args: (\d+)
+            args: ([\d,]+)
       files:
         selector: td:nth-child(5)
       size:
@@ -110,11 +110,11 @@
         selector: td:nth-child(11) div.addedtor
       downloadvolumefactor:
         case:
-          "img[title=\"Golden Torrent: No Download Stats are Recorded\"]": "0"
-          "img[title=\"Silver Torrent: Download Stats are 25% Recorded\"]": "0.25"
-          "img[title=\"Platinum Torrent: No Download Stats are Recorded, Upload Stats are Doubled!\"]": "0"
-          "*": "1"
+          "img[title=\"Golden Torrent: No Download Stats are Recorded\"]": 0
+          "img[title=\"Silver Torrent: Download Stats are 25% Recorded\"]": 0.25
+          "img[title=\"Platinum Torrent: No Download Stats are Recorded, Upload Stats are Doubled!\"]": 0
+          "*": 1
       uploadvolumefactor:
         case:
-          "img[title=\"Platinum Torrent: No Download Stats are Recorded, Upload Stats are Doubled!\"]": "2"
-          "*": "1"
+          "img[title=\"Platinum Torrent: No Download Stats are Recorded, Upload Stats are Doubled!\"]": 2
+          "*": 1

src/Jackett.Common/Definitions/eotforum.yml

@@ -1,177 +0,0 @@
----
-  site: eotforum
-  name: EoT-Forum
-  description: "A German gerneral tracker"
-  language: de-de
-  type: private
-  encoding: windows-1252
-  links:
-    - https://eot-forum.net
-
-  caps:
-    categorymappings:
-      # Filme
-      - {id: 14, cat: Movies/SD, desc: "SD XviD"}
-      - {id: 15, cat: Movies/SD, desc: "SD x264"}
-      - {id: 16, cat: Movies/HD, desc: "HD"}
-      - {id: 68, cat: Movies/HD, desc: "UHD"}
-      - {id: 17, cat: Movies/3D, desc: "3D"}
-      - {id: 18, cat: Movies/DVD, desc: "DVD-R"}
-      - {id: 19, cat: Movies, desc: "Pack"}
-      - {id: 20, cat: Movies, desc: "International"}
-      - {id: 21, cat: XXX, desc: "XXX"}
-
-      # Serien/TV
-      - {id: 23, cat: TV/SD, desc: "SD XviD"}
-      - {id: 24, cat: TV/SD, desc: "SD x264"}
-      - {id: 25, cat: TV/HD, desc: "HD"}
-      - {id: 26, cat: TV/SD, desc: "DVD-R"}
-      - {id: 27, cat: TV, desc: "Pack"}
-      - {id: 28, cat: TV, desc: "International"}
-      - {id: 29, cat: TV/Sport, desc: "Sport"}
-
-      # Dokus
-      - {id: 31, cat: TV/Documentary, desc: "SD XviD"}
-      - {id: 32, cat: TV/Documentary, desc: "SD x264"}
-      - {id: 33, cat: TV/Documentary, desc: "HD"}
-      - {id: 34, cat: TV/Documentary, desc: "3D"}
-      - {id: 35, cat: TV/Documentary, desc: "Pack"}
-      - {id: 67, cat: TV/Documentary, desc: "DVD-R"}
-      - {id: 36, cat: TV/Documentary, desc: "International"}
-
-      # Audio
-      - {id: 38, cat: Audio, desc: "Charts"}
-      - {id: 39, cat: Audio/MP3, desc: "MP3"}
-      - {id: 40, cat: Audio/Lossless, desc: "Flac"}
-      - {id: 41, cat: Audio, desc: "Pack"}
-      - {id: 42, cat: Audio/Video, desc: "MusikVideo"}
-      - {id: 43, cat: Audio/Audiobook, desc: "Hörbücher"}
-
-      # Spiele
-      - {id: 45, cat: PC/Games, desc: "Windows"}
-      - {id: 46, cat: PC/Mac, desc: "MacOS"}
-      - {id: 47, cat: Console/PS4, desc: "Sony PS"}
-      - {id: 48, cat: Console/Xbox , desc: "Microsoft XBox"}
-      - {id: 49, cat: Console/NDS, desc: "Nintendo"}
-      - {id: 50, cat: PC/Games, desc: "Linux"}
-      - {id: 51, cat: Console, desc: "Andere"}
-
-      # Software
-      - {id: 53, cat: PC, desc: "Windows"}
-      - {id: 54, cat: PC/Mac, desc: "MacOS"}
-      - {id: 55, cat: PC, desc: "Linux"}
-      - {id: 56, cat: PC/Phone-Android, desc: "Android"}
-      - {id: 57, cat: PC/Phone-IOS, desc: "Apple IOS"}
-      - {id: 58, cat: PC/Phone-Other, desc: "Andere"}
-
-      # Sonstiges
-      - {id: 60, cat: Books, desc: "EBooks"}
-      - {id: 61, cat: Other, desc: "Bilder"}
-      - {id: 62, cat: TV/Anime, desc: "Anime"}
-      - {id: 63, cat: Other, desc: "MISC"}
-      - {id: 64, cat: XXX, desc: "XXX-Bilder/EBooks/Audio"}
-
-      # EOT-Specials
-      - {id: 66, cat: Other, desc: "Special"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: index.php?page=login
-    method: post
-    inputs:
-      uid: "{{ .Config.username }}"
-      pwd: "{{ .Config.password }}"
-      rememberme: "forever"
-      submit: "Login"
-    error:
-    - selector: td.lista[align="center"][colspan="2"] > span
-    test:
-      path: index.php
-      selector: a[href^="logout.php"]
-
-  search:
-    paths:
-      - path: index.php
-    inputs:
-      page: "torrents"
-      search: "{{ .Query.Keywords }}"
-      options: "0"
-      active: "0"
-      gold: "0"
-    rows:
-      selector: table.lista > tbody > tr:has(a[href^="index.php?page=torrent-details&id="])
-      dateheaders:
-        selector: ":has(td.header > b)"
-        filters:
-          - name: replace
-            args: ["Torrents vom ", ""]
-          - name: replace
-            args: ["Januar", "January"]
-          - name: replace
-            args: ["Februar", "February"]
-          - name: replace
-            args: ["März", "March"]
-          - name: replace
-            args: ["Mai", "May"]
-          - name: replace
-            args: ["Juni", "June"]
-          - name: replace
-            args: ["Juli", "July"]
-          - name: replace
-            args: ["Oktober", "October"]
-          - name: replace
-            args: ["Dezember", "December"]
-          - name: dateparse
-            args: "02.January.2006"
-    fields:
-      download:
-        selector: a[href^="download.php?id="]
-        attribute: href
-      title:
-        selector: a[href^="index.php?page=torrent-details&id="]
-        attribute: title
-        filters:
-          - name: replace
-            args: ["Details anzeigen: ", ""]
-      category:
-        selector: a[href^="index.php?page=torrents&category="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: category
-      comments:
-        selector: a[href*="#comments"]
-        attribute: href
-      size:
-        selector: td:nth-child(3)
-      grabs:
-        selector: td:nth-child(5)
-        filters:
-          - name: split
-            args: ["♦", 2]
-          - name: replace
-            args: ["---", "0"]
-      seeders:
-        selector: td:nth-child(5) > a:nth-child(1)
-      leechers:
-        selector: td:nth-child(5) > a:nth-child(2)
-      downloadvolumefactor:
-        case:
-          img[alt="gold"]: "0"
-          img[alt="silver"]: "0.5"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          img[alt="2x Upload Multiplier"]: "2"
-          img[alt="3x Upload Multiplier"]: "3"
-          img[alt="4x Upload Multiplier"]: "4"
-          img[alt="5x Upload Multiplier"]: "5"
-          img[alt="6x Upload Multiplier"]: "6"
-          img[alt="7x Upload Multiplier"]: "7"
-          img[alt="8x Upload Multiplier"]: "8"
-          img[alt="9x Upload Multiplier"]: "9"
-          img[alt="10x Upload Multiplier"]: "10"
-          "*": "1"

src/Jackett.Common/Definitions/gay-torrentsorg.yml

@@ -1,11 +1,11 @@
 ---
-  # By LA5T for https://gay-torrents.org (27.07.2018 13:00 UTC+2)
+  # By LA5T for https://gay-torrents.org (29.07.2018 22:55 UTC+2)
   #
   site: gay-torrentsorg
   name: gay-torrents.org
   description: "Tracker for GAY XXX, movies, TV, books and PC."
   language: en-us
-  type: private
+  type: semi-private
   encoding: UTF-8
   links:
     - https://gay-torrents.org
@@ -108,6 +108,17 @@
       details:
         selector: a[href^="details.php?id="]
         attribute: href
+      banner:
+        optional: true
+        selector: a.screenshot
+        attribute: rel  
+      grabs:
+        selector: div.downloadTimes
+        filters:
+          - name: replace
+            args: ["No downloads yet", "0"]
+          - name: regexp
+            args: ([\d,]+)
       comments:
         selector: a[href^="details.php?id="]
         attribute: href
@@ -115,20 +126,20 @@
         selector: a[href^="download.php?id="]
         attribute: href
       size:
-        selector: div:nth-child(3) > div:nth-child(3) > div
+        selector: div.size
       seeders:
-        selector: div:nth-child(3) > div:nth-child(3) > div:nth-child(2) > div:nth-child(1) > a
+        selector: div.downloadPeers div:nth-child(1) > a
       leechers:
-        selector: div:nth-child(3) > div:nth-child(3) > div:nth-child(2) > div:nth-child(2) > a
+        selector: div.downloadPeers > div:nth-child(2) > a
       date:
-        selector: div:nth-child(4) > div:nth-child(3) > div
+        selector: div.date
         filters:
           - name: re_replace
             args: ["on (\\d{2}:\\d{2}) (\\d{2})-([a-zA-Z]{3})-(\\d{4})", "$2 $3 $4 $1"]
           - name: append
             args: " +01:00"
           - name: dateparse
-            args: "02 Jan 06 15:14 -07:00"
+            args: "02 Jan 2006 15:04 -07:00"
       downloadvolumefactor:
         case:
           "div:nth-child(2) > div:nth-child(3) > a:contains(\"FREE!\")": 0

src/Jackett.Common/Definitions/gaytorrentru.yml

@@ -1,6 +1,6 @@
 ---
   # Update by LA5T based on the orignial 'gaytorrentru.yml'
-  # 27.07.2018 13:00 UTC+2
+  # 29.07.2018 23:02 UTC+2
   #
   site: gaytorrentru
   name: GAYtorrent.ru
@@ -117,7 +117,7 @@
         selector: .tfiles
         filters:
           - name: regexp
-            args: (\d+)
+            args: ([\d,]+)
       size:
         selector: .tsize
       seeders:
@@ -130,11 +130,9 @@
         selector: .tadded
         filters:
           - name: re_replace
-            args: ["(\\d{4}-\\d{2}-\\d{2})(\\d{2}:\\d{2}:\\d{2})(?:.*)", "$1 $2"]
-          - name: append
-            args: " +01:00"
+            args: ["(\\d{4}-\\d{2}-\\d{2})(\\d{2}:\\d{2}:\\d{2}).*", "$1 $2"]
           - name: dateparse
-            args: "2006-01-02 15:04:05 -07:00"
+            args: "2006-01-02 15:04:05"
       downloadvolumefactor:
         case:
           "td:nth-child(3) > div > nobr > font[color=\"yellow\"]": 0

src/Jackett.Common/Definitions/ilcorsaroblu.yml

@@ -145,18 +145,18 @@
           - name: regexp
             args: "src=(.+?) "
       size:
-        selector: td:nth-child(9)
+        selector: td:nth-child(10)
       date:
-        selector: td:nth-child(5)
+        selector: td:nth-child(6)
         filters:
           - name: dateparse
             args: "02/01/2006"
       grabs:
-        selector: td:nth-child(8)
+        selector: td:nth-child(9)
         filters:
           - name: replace
             args: ["---", "0"]
       seeders:
-        selector: td:nth-child(6)
-      leechers:
         selector: td:nth-child(7)
+      leechers:
+        selector: td:nth-child(8)

src/Jackett.Common/Definitions/karagarga.yml

@@ -1,6 +1,6 @@
 ---
   # Update by LA5T based on the orignial 'karagarga.yml'
-  # 27.07.2018 13:00 UTC+2
+  # 29.07.2018 23:15 UTC+2
   #
   site: karagarga
   name: Karagarga
@@ -127,7 +127,7 @@
         selector: td:nth-child(12)
         filters:
           - name: regexp
-            args: (\d+)
+            args: ([\d,]+)
       files:
         selector: td:nth-child(10)
       size:
@@ -141,14 +141,14 @@
         filters:
           - name: re_replace
             args: ["([a-zA-Z]+)\\s+(\\d{1,2})\\s+'(\\d{2})", "$2 $1 $3"]
-          - name: append
-            args: " +01:00"
           - name: dateparse
-            args: "02 Jan 06 -07:00"
+            args: "02 Jan 06"
       downloadvolumefactor:
         case:
-          "*": "1"
+          "*": 1
       uploadvolumefactor:
         case:
-          "td:nth-child(1) > div:nth-child(1) > a:nth-child(1) > div:nth-child(2) > img[title^=CURRENT]": 0.5
-          "*": "0.1"
+          ":has(img[title^=HD]):has(img[title^=CURRENT])": 1.8
+          "img[title^=CURRENT]": 1.6
+          "img[title^=HD]": 1.3
+          "*": 1.1

src/Jackett.Common/Definitions/nexttorrent.yml

@@ -1,90 +0,0 @@
----
-  site: nexttorrent
-  name: NextTorrent
-  description: "NextTorrent is a FRENCH Public site for TV / MOVIES / GENERAL"
-  language: fr-fr
-  type: public
-  encoding: UTF-8
-  links:
-    - http://www.nextorrent.tv/
-  legacylinks:
-    - https://www.nextorrent.site/
-    - http://www.nextorrent.site/
-    - http://www.nextorrent.bz/
-    - http://www.nextorrent.pro/
-    - https://www.nextorrent.cc/
-    - https://www.nextorrent.org/
-    - https://www.nextorrent.tv/
-
-  caps:
-    categorymappings:
-      - {id: Films, cat: Movies, desc: "Movies"}
-      - {id: Séries, cat: TV, desc: "TV"}
-      - {id: Jeux-PC, cat: PC/Games, desc: "Games PC"}
-      - {id: Jeux-Consoles, cat: Console, desc: "Games Console"}
-      - {id: Musique, cat: Audio, desc: "Music"}
-      - {id: Ebook, cat: Books, desc: "EBooks"}
-      - {id: Logiciels, cat: PC, desc: "Software"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-      movie-search: [q]
-
-  settings: []
-
-  download:
-    selector: a[href^="/get_torrent/"]
-
-  search:
-    paths:
-      - path: "recherche/{{ .Query.Keywords }}"
-    rows:
-      selector: div.listing-torrent > table tbody tr:has(a)
-    fields:
-      site_date:
-        selector: td:nth-child(1) a
-        filters:
-          # date is at the end of the title, so we get it and name it site_date
-          - name: regexp
-            args: "(\\w+)$"
-      title:
-        selector: td:nth-child(1) a
-        filters:
-          # now we put the date at the right place according scene naming rules using .Result.site_date
-          - name: replace
-            args: ["FRENCH", "{{ .Result.site_date }} FRENCH"]
-          - name: replace
-            args: ["TRUEFRENCH", "{{ .Result.site_date }} TRUEFRENCH"]
-          - name: replace
-            args: ["VOSTFR", "{{ .Result.site_date }} VOSTFR"]
-          # and we delete it at the end
-          - name: re_replace
-            args: ["(\\w+)$", ""]
-      details:
-        selector: td:nth-child(1) a
-        attribute: href
-      download:
-        selector: td:nth-child(1) a
-        attribute: href
-      category:
-        selector: td:nth-child(1) i
-        attribute: class
-      size:
-        selector: td:nth-child(2)
-      date:
-        text: now
-      seeders:
-        text: 0
-      seeders:
-        optional: true
-        selector: td:nth-child(3)
-      leechers:
-        text: 0
-      leechers:
-        optional: true
-        selector: td:nth-child(4)
-      downloadvolumefactor:
-        text: "0"
-      uploadvolumefactor:
-        text: "1"

src/Jackett.Common/Definitions/rgu.yml

@@ -6,6 +6,8 @@
   type: private
   encoding: UTF-8
   links:
+    - https://v2.rgut.uk/
+  legacylinks:
     - https://rgu.rgt.life/
 
   caps:
@@ -65,8 +67,7 @@
     inputs:
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
-      submitme: "X"
-      submitme: "X" # two submitme needed?!? shouldn't make a difference
+      use_ssl: "1"
     error:
       - selector: h2:contains("Login failed!")
         message:

src/Jackett.Common/Definitions/yourexotic.yml

@@ -1,102 +1,80 @@
 ---
   site: yourexotic
-  name: Your Exotic Torrents
+  name: ExoticaZ
   description: "a porn tracker"
   language: en-us
   type: private
   encoding: UTF-8
   links:
+    - https://exoticaz.to/
+  legacylinks:
     - https://torrents.yourexotic.com/
 
   caps:
     categorymappings:
-      - {id: 11, cat: XXX, desc: "DVDRip"}
-      - {id: 2, cat: XXX, desc: "DVDRip Censored"}
-      - {id: 1, cat: XXX, desc: "Video Clip"}
-      - {id: 20, cat: XXX, desc: "Censored Clips"}
-      - {id: 14, cat: XXX, desc: "Hentai"}
-      - {id: 19, cat: XXX, desc: "Full DVD"}
-      - {id: 16, cat: XXX, desc: "HD 720p"}
-      - {id: 17, cat: XXX, desc: "HD 1080p"}
-      - {id: 18, cat: XXX, desc: "HD Censored"}
-      - {id: 15, cat: XXX, desc: "SVCD/VCD"}
-      - {id: 13, cat: XXX, desc: "Softcore"}
-      - {id: 3, cat: XXX, desc: "Pictures"}
-      - {id: 21, cat: XXX, desc: "Mixed Videos"}
+      - {id: 1, cat: XXX, desc: "DVDRip"}
     modes:
       search: [q]
       tv-search: [q]
       movie-search: [q]
 
   login:
-    path: /index.php?page=login
-    method: post
+    path: /login
+    method: form
     inputs:
-      uid: "{{ .Config.username }}"
-      pwd: "{{ .Config.password }}"
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      remember: "on"
     error:
-      - selector: .lista>span
+      - selector: div.invalid-feedback
     test:
-      path: index.php
-      selector: form[name="jump1"]
+      selector: div.ratio-bar
 
   search:
-    path: index.php
+    path: /torrents
     inputs:
-      $raw: "&category={{range .Categories}}{{.}};{{end}}"
-      page: "torrents"
-      active: "0"
-      search: "{{ .Query.Keywords }}"
+      in: 1
+      search: "{{ .Keywords }}"
+      category: 0
     rows:
-      selector: table.lista > tbody > tr:has(a[href^="index.php?page=torrent-details&id="])
+      selector: div.table-responsive > table > tbody > tr
     fields:
       category:
-        selector:  td:nth-child(1) a
-        attribute: href
-        filters:
-          - name: querystring
-            args: category
+        text: 1
       title:
-        selector: a[href^="index.php?page=torrent-details&id="]
+        selector: a.torrent-link
         attribute: title
-        filters:
-          - name: replace
-            args: ["View details: ", ""]
       details:
-        selector: a[href^="index.php?page=torrent-details&id="]
+        selector: a.torrent-link
         attribute: href
+      banner:
+        selector: span.screen-image
+        attribute: data-screens
+        filters:
+          - name: split
+            args: ["|", 0]
       size:
-        selector: td:nth-child(7)
+        selector: td:nth-child(5)
       seeders:
-        selector: td:nth-child(9)
-      leechers:
-        selector: td:nth-child(10)
-      grabs:
-        selector: td:nth-child(11)
-        filters:
-          - name: replace
-            args: ["---", "0"]
-      date:
         selector: td:nth-child(6)
+      leechers:
+        selector: td:nth-child(7)
+      grabs:
+        selector: td:nth-child(8)
+      date:
+        selector: td:nth-child(3)
         filters:
-          - name: dateparse
-            args: "02/01/2006"
+          - name: append
+            args: " ago"
       download:
-        selector: a[href^="download.php"]
+        selector: a[href*="/download/"]
         attribute: href
       downloadvolumefactor: 
         case:
-          img[src$="freeleech.gif"]: "0"
-          img[src$="silver.gif"]: "0.5"
+          i[title="Free Download"]: "0"
+          i[title="Half Download"]: "0.5"
           "*": "1"
       uploadvolumefactor: 
           case:
-            img[src$="2x.gif"]: "2"
-            img[src$="3x.gif"]: "3"
-            img[src$="4x.gif"]: "4"
-            img[src$="5x.gif"]: "5"
-            img[src$="6x.gif"]: "6"
-            img[src$="7x.gif"]: "7"
-            img[src$="8x.gif"]: "8"
-            img[src$="9x.gif"]: "9"
+            i.fa-gem: "2"
             "*": "1"

src/Jackett.Common/Indexers/Abstract/GazelleTracker.cs

@@ -318,7 +318,7 @@ namespace Jackett.Common.Indexers.Abstract
         {
             var content = await base.Download(link);
 
-            // Check if we're out of FL tokens
+            // Check if we're out of FL tokens/torrent is to large
             // most gazelle trackers will simply return the torrent anyway but e.g. redacted will return an error
             var requestLink = link.ToString();
             if (content.Length >= 1
@@ -326,7 +326,8 @@ namespace Jackett.Common.Indexers.Abstract
                 && requestLink.Contains("usetoken=1"))
             {
                 var html = Encoding.GetString(content);
-                if (html.Contains("You do not have any freeleech tokens left."))
+                if (html.Contains("You do not have any freeleech tokens left.")
+                    || html.Contains("This torrent is too large."))
                 {
                     // download again with usetoken=0
                     var requestLinkNew = requestLink.Replace("usetoken=1", "usetoken=0");

src/Jackett.Common/Indexers/BaseIndexer.cs

@@ -752,26 +752,22 @@ namespace Jackett.Common.Indexers
 
         protected ICollection<int> MapTrackerCatToNewznab(string input)
         {
-            var cats = new List<int>();
-            if (null != input)
-            {
-                var mapping = categoryMapping.Where(m => m.TrackerCategory != null && m.TrackerCategory.ToLowerInvariant() == input.ToLowerInvariant()).FirstOrDefault();
-                if (mapping != null)
-                {
-                    cats.Add(mapping.NewzNabCategory);
-                }
+            if (input == null)
+                return new List<int>();
 
-                // 1:1 category mapping
-                try
-                {
-                    var trackerCategoryInt = int.Parse(input);
-                    cats.Add(trackerCategoryInt + 100000);
-                }
-                catch (FormatException)
-                {
-                    // input is not an integer, continue
-                }
+            var cats = categoryMapping.Where(m => m.TrackerCategory != null && m.TrackerCategory.ToLowerInvariant() == input.ToLowerInvariant()).Select(c => c.NewzNabCategory).ToList();
+
+            // 1:1 category mapping
+            try
+            {
+                var trackerCategoryInt = int.Parse(input);
+                cats.Add(trackerCategoryInt + 100000);
             }
+            catch (FormatException)
+            {
+                // input is not an integer, continue
+            }
+
             return cats;
         }
 

src/Jackett.Common/Models/DTO/ApiSearch.cs

@@ -44,20 +44,23 @@ namespace Jackett.Common.Models.DTO
             stringQuery.ExpandCatsToSubCats();
 
             // try to build an IMDB Query
-            var imdbID = ParseUtil.GetFullImdbID(stringQuery.SanitizedSearchTerm);
-            TorznabQuery imdbQuery = null;
-            if (imdbID != null)
+            if (stringQuery.SanitizedSearchTerm.StartsWith("tt") && stringQuery.SanitizedSearchTerm.Length <= 9)
             {
-                imdbQuery = new TorznabQuery()
+                var imdbID = ParseUtil.GetFullImdbID(stringQuery.SanitizedSearchTerm);
+                TorznabQuery imdbQuery = null;
+                if (imdbID != null)
                 {
-                    ImdbID = imdbID,
-                    Categories = stringQuery.Categories,
-                    Season = stringQuery.Season,
-                    Episode = stringQuery.Episode,
-                };
-                imdbQuery.ExpandCatsToSubCats();
+                    imdbQuery = new TorznabQuery()
+                    {
+                        ImdbID = imdbID,
+                        Categories = stringQuery.Categories,
+                        Season = stringQuery.Season,
+                        Episode = stringQuery.Episode,
+                    };
+                    imdbQuery.ExpandCatsToSubCats();
 
-                return imdbQuery;
+                    return imdbQuery;
+                }
             }
 
             return stringQuery;

src/Jackett.Server/Controllers/ResultsController.cs

@@ -202,6 +202,7 @@ namespace Jackett.Server.Controllers
                 if (t.Key == "Category[]")
                 {
                     request.Category = t.Value.ToString().Split(',').Select(Int32.Parse).ToArray();
+                    CurrentQuery.Categories = request.Category;
                 }
 
                 if (t.Key == "query")
@@ -339,11 +340,13 @@ namespace Jackett.Server.Controllers
 
             if (CurrentQuery.ImdbID != null)
             {
+                /* We should allow this (helpful in case of aggregate indexers)
                 if (!string.IsNullOrEmpty(CurrentQuery.SearchTerm))
                 {
                     logger.Warn($"A search request from {Request.HttpContext.Connection.RemoteIpAddress} was made containing q and imdbid.");
                     return GetErrorXML(201, "Incorrect parameter: please specify either imdbid or q");
                 }
+                */
 
                 CurrentQuery.ImdbID = ParseUtil.GetFullImdbID(CurrentQuery.ImdbID); // normalize ImdbID
                 if (CurrentQuery.ImdbID == null)

src/Jackett.Updater/Program.cs

@@ -231,6 +231,8 @@ namespace Jackett.Updater
                 "Definitions/oxtorrent.yml",
                 "Definitions/tehconnection.yml",
                 "Definitions/torrentwtf.yml",
+                "Definitions/eotforum.yml",
+                "Definitions/nexttorrent.yml",
             };
 
             foreach (var oldFile in oldFiles)

src/Jackett/Controllers/ResultsController.cs

@@ -289,11 +289,13 @@ namespace Jackett.Controllers
 
             if (CurrentQuery.ImdbID != null)
             {
+                /* We should allow this (helpful in case of aggregate idnexers)
                 if (!string.IsNullOrEmpty(CurrentQuery.SearchTerm))
                 {
                     logger.Warn($"A search request from {Request.GetOwinContext().Request.RemoteIpAddress} was made containing q and imdbid.");
                     return GetErrorXML(201, "Incorrect parameter: please specify either imdbid or q");
                 }
+                */
 
                 CurrentQuery.ImdbID = ParseUtil.GetFullImdbID(CurrentQuery.ImdbID); // normalize ImdbID
                 if (CurrentQuery.ImdbID == null)