From 6f854d0d992cbeeb08c90a43ab479df64b6dbb1f Mon Sep 17 00:00:00 2001
From: Garfield69 <garfield69@outlook.com>
Date: Sat, 21 Mar 2020 18:27:03 +1300
Subject: [PATCH] add unblockit proxy for assorted public trackers.

---
 src/Jackett.Common/Definitions/btdb.yml            |  2 ++
 src/Jackett.Common/Definitions/demonoid.yml        |  2 ++
 src/Jackett.Common/Definitions/ettv.yml            |  4 +++-
 src/Jackett.Common/Definitions/eztv.yml            | 11 ++++++-----
 src/Jackett.Common/Definitions/kickasstorrent.yml  |  2 ++
 src/Jackett.Common/Definitions/limetorrents.yml    |  2 ++
 src/Jackett.Common/Definitions/magnetdl.yml        |  4 +++-
 src/Jackett.Common/Definitions/pirateiro.yml       |  4 +++-
 src/Jackett.Common/Definitions/torlock.yml         | 14 ++++++++------
 src/Jackett.Common/Definitions/torrentdownload.yml |  2 ++
 src/Jackett.Common/Definitions/torrentfunk.yml     |  4 +++-
 .../Definitions/torrentgalaxyorg.yml               |  4 +++-
 src/Jackett.Common/Definitions/torrentz2.yml       |  2 ++
 src/Jackett.Common/Definitions/zooqle.yml          |  8 +++++---
 14 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/src/Jackett.Common/Definitions/btdb.yml b/src/Jackett.Common/Definitions/btdb.yml
index 899656a63..86cc9994f 100644
--- a/src/Jackett.Common/Definitions/btdb.yml
+++ b/src/Jackett.Common/Definitions/btdb.yml
@@ -5,12 +5,14 @@
   language: en-us
   type: public
   encoding: UTF-8
+  followredirect: true
   links:
     -  https://btdb.io/
   legacylinks:
     -  https://btdb.to/
     -  https://btdb.unblocked.app/
     -  https://btdb.eu/
+    - https://btdb.unblockit.pro/
 
   caps:
     categorymappings:
diff --git a/src/Jackett.Common/Definitions/demonoid.yml b/src/Jackett.Common/Definitions/demonoid.yml
index c1f541dd9..c6624bb22 100644
--- a/src/Jackett.Common/Definitions/demonoid.yml
+++ b/src/Jackett.Common/Definitions/demonoid.yml
@@ -5,8 +5,10 @@
   language: en-us
   type: public
   encoding: UTF-8
+  followredirect: true
   links:
     - https://www.demonoid.is/
+    - https://demonoid.unblockit.pro/
   legacylinks:
     - https://www.dnoid.to/
 
diff --git a/src/Jackett.Common/Definitions/ettv.yml b/src/Jackett.Common/Definitions/ettv.yml
index bdb24f0f5..45d521268 100644
--- a/src/Jackett.Common/Definitions/ettv.yml
+++ b/src/Jackett.Common/Definitions/ettv.yml
@@ -5,8 +5,10 @@
   language: en-us
   type: public
   encoding: UTF-8
+  followredirect: true
   links:
     - https://www.ettv.to/
+    - https://ettv.unblockit.pro/
   legacylinks:
     - https://www.ettv.tv/
 
@@ -93,7 +95,7 @@
       options:
         "desc": "desc"
         "asc": "asc"
-  
+
   download:
     selector: a[href^="{{ .Config.downloadlink }}"]
     attribute: href
diff --git a/src/Jackett.Common/Definitions/eztv.yml b/src/Jackett.Common/Definitions/eztv.yml
index ea4683882..0e773d5f1 100644
--- a/src/Jackett.Common/Definitions/eztv.yml
+++ b/src/Jackett.Common/Definitions/eztv.yml
@@ -8,11 +8,12 @@
   followredirect: true
   links:
     - https://eztv.io/
+    - https://eztv.unblockit.pro/
   legacylinks:
-    - https://eztv.ag/ # redirects to .io 
-    - https://eztv.re/ # redirects to .io 
-    - https://eztv.it/ # redirects to .io 
-    - https://eztv.ch/ # redirects to .io 
+    - https://eztv.ag/ # redirects to .io
+    - https://eztv.re/ # redirects to .io
+    - https://eztv.it/ # redirects to .io
+    - https://eztv.ch/ # redirects to .io
 
   caps:
     categories:
@@ -26,7 +27,7 @@
   search:
     paths:
       - path: "{{ if .Keywords }}search/{{ .Keywords }}{{else}}/{{end}}"
-    keywordsfilters: 
+    keywordsfilters:
       - name: re_replace
         args: ["S[0-9]{2}([^E]|$)", ""] # remove season tag without episode (search doesn't support it)
     rows:
diff --git a/src/Jackett.Common/Definitions/kickasstorrent.yml b/src/Jackett.Common/Definitions/kickasstorrent.yml
index fbe4a4c30..000eeab1d 100644
--- a/src/Jackett.Common/Definitions/kickasstorrent.yml
+++ b/src/Jackett.Common/Definitions/kickasstorrent.yml
@@ -5,8 +5,10 @@
   language: en-us
   type: public
   encoding: UTF-8
+  followredirect: true
   links:
     - https://katcr.co/
+    - https://kat.unblockit.pro/
 
   caps:
     categorymappings:
diff --git a/src/Jackett.Common/Definitions/limetorrents.yml b/src/Jackett.Common/Definitions/limetorrents.yml
index 0da446106..9b88d28fb 100644
--- a/src/Jackett.Common/Definitions/limetorrents.yml
+++ b/src/Jackett.Common/Definitions/limetorrents.yml
@@ -5,12 +5,14 @@
   language: en-us
   type: public
   encoding: UTF-8
+  followredirect: true
   links:
     - https://www.limetorrents.info/
     - https://www.limetorrents.asia/
     - https://www.limetorrents.co/
     - https://limetor.com/
     - https://www.limetor.pro/
+    - https://limetorrents.unblockit.pro/
   legacylinks:
     - https://www.limetorrents.io/
     - https://www.limetorrents.cc/
diff --git a/src/Jackett.Common/Definitions/magnetdl.yml b/src/Jackett.Common/Definitions/magnetdl.yml
index 0de2827bf..4a21cb47c 100644
--- a/src/Jackett.Common/Definitions/magnetdl.yml
+++ b/src/Jackett.Common/Definitions/magnetdl.yml
@@ -5,9 +5,11 @@
   language: en-us
   type: public
   encoding: UTF-8
+    followredirect: true
   links:
     - https://www.magnetdl.com/
     - https://magnetdl.unblockninja.com/
+    - https://magnetdl.unblockit.pro/
   legacylinks:
     - http://www.magnetdl.com/
     - https://www.magnetdl.me/ # fake
@@ -56,7 +58,7 @@
     paths:
       # return movie results if there are no search parms supplied (for use with the TEST button)
       # http://www.magnetdl.com/m/midnight-texas-s01e10/
-      - path: "{{ if .Keywords }}{{ re_replace .Keywords \"(.).*\" \"$1\" }}/{{ .Keywords }}/{{else}}download/movies/{{end}}{{ .Config.sort }}/{{ .Config.type }}/"     
+      - path: "{{ if .Keywords }}{{ re_replace .Keywords \"(.).*\" \"$1\" }}/{{ .Keywords }}/{{else}}download/movies/{{end}}{{ .Config.sort }}/{{ .Config.type }}/"
 
     rows:
       selector: tr:has(td.m)
diff --git a/src/Jackett.Common/Definitions/pirateiro.yml b/src/Jackett.Common/Definitions/pirateiro.yml
index 8520bfdf8..b77079d28 100644
--- a/src/Jackett.Common/Definitions/pirateiro.yml
+++ b/src/Jackett.Common/Definitions/pirateiro.yml
@@ -5,8 +5,10 @@
   language: en-us
   type: public
   encoding: UTF-8
+  followredirect: true
   links:
     - https://pirateiro.com/
+    - https://pirateiro.unblockit.pro/
   legacylinks:
     - http://pirateiro.com/
 
@@ -60,7 +62,7 @@
         selector: td:nth-child(1) a:nth-child(2)
         attribute: href
       download:
-        # .torrent urls can be missing 
+        # .torrent urls can be missing
         optional: true
         selector: a[href$="/download"]
         attribute: href
diff --git a/src/Jackett.Common/Definitions/torlock.yml b/src/Jackett.Common/Definitions/torlock.yml
index f40e86845..60966251a 100644
--- a/src/Jackett.Common/Definitions/torlock.yml
+++ b/src/Jackett.Common/Definitions/torlock.yml
@@ -5,9 +5,11 @@
   language: en-us
   type: public
   encoding: UTF-8
+  followredirect: true
   links:
     - https://www.torlock.com/
     - https://www.torlock2.com/
+    - https://torlock.unblockit.pro/
   legacylinks:
     - https://torlock.com/
 
@@ -24,12 +26,12 @@
       - {id: ADULT, cat: XXX, desc: "Adult"}
       - {id: AUDIOBOOK, cat: Audio/Audiobook, desc: "Audiobook"}
       - {id: IMAGES, cat: Other/Misc, desc: "Images"}
-      
+
     modes:
       search: [q]
       tv-search: [q, season, ep]
       movie-search: [q]
-  
+
   settings:
     - name: sort
       type: select
@@ -46,7 +48,7 @@
       options:
         "desc": "desc"
         "asc": "asc"
-  
+
   search:
     paths:
       - path: "{{if .Keywords}}/all/torrents/{{ .Keywords }}.html?sort={{ .Config.sort }}&order={{ .Config.type }}{{else}}/fresh.html{{end}}"
@@ -95,18 +97,18 @@
       date:
         selector: td:nth-child(2):contains("/")
         optional: true
-        filters: 
+        filters:
           - name: dateparse
             args: "1/2/2006"
       date:
         selector: td:nth-child(2):contains("Today"), td:nth-child(2):contains("Yesterday")
         optional: true
-        filters: 
+        filters:
           - name: fuzzytime
       date:
         selector: td:nth-child(2):not(:contains("Today")):not(:contains("Yesterday")):not(:contains("/"))
         optional: true
-        filters: 
+        filters:
           - name: re_replace
             args: ["(min|mins)", "minutes"]
           - name: timeago
diff --git a/src/Jackett.Common/Definitions/torrentdownload.yml b/src/Jackett.Common/Definitions/torrentdownload.yml
index 24d3cd878..90d55eee6 100644
--- a/src/Jackett.Common/Definitions/torrentdownload.yml
+++ b/src/Jackett.Common/Definitions/torrentdownload.yml
@@ -5,8 +5,10 @@
   language: en-us
   type: public
   encoding: UTF-8
+  followredirect: true
   links:
     - https://www.torrentdownload.info/
+    - https://torrentdownload.unblockit.pro/
 
   caps:
     categories:
diff --git a/src/Jackett.Common/Definitions/torrentfunk.yml b/src/Jackett.Common/Definitions/torrentfunk.yml
index ae6f74c70..ac4826f7a 100644
--- a/src/Jackett.Common/Definitions/torrentfunk.yml
+++ b/src/Jackett.Common/Definitions/torrentfunk.yml
@@ -5,9 +5,11 @@
   language: en-us
   type: public
   encoding: UTF-8
+  followredirect: true
   links:
     - https://www.torrentfunk.com/
     - https://www.torrentfunk2.com/
+    - https://torrentfunk.unblockit.pro/
 
   caps:
     categories:
@@ -87,7 +89,7 @@
       seeders:
         selector: td:nth-child(4)
       leechers:
-        selector: td:nth-child(5) 
+        selector: td:nth-child(5)
       downloadvolumefactor:
         text: 0
       uploadvolumefactor:
diff --git a/src/Jackett.Common/Definitions/torrentgalaxyorg.yml b/src/Jackett.Common/Definitions/torrentgalaxyorg.yml
index e741d6f42..cd3713b5e 100644
--- a/src/Jackett.Common/Definitions/torrentgalaxyorg.yml
+++ b/src/Jackett.Common/Definitions/torrentgalaxyorg.yml
@@ -5,8 +5,10 @@
   language: en-us
   type: public
   encoding: UTF-8
+  followredirect: true
   links:
     - https://torrentgalaxy.to/
+    - https://torrentgalaxy.unblockit.pro/
   legacylinks:
     - https://torrentgalaxy.org/
     - https://torrentgalaxy.pw/
@@ -134,7 +136,7 @@
         optional: true
         selector: div.tgxtablecell:last-of-type small:contains(":")
         filters:
-          - name: dateparse 
+          - name: dateparse
             args: "02/01/06 15:04"
       downloadvolumefactor:
         text: 0
diff --git a/src/Jackett.Common/Definitions/torrentz2.yml b/src/Jackett.Common/Definitions/torrentz2.yml
index 2148110bc..c45a16529 100644
--- a/src/Jackett.Common/Definitions/torrentz2.yml
+++ b/src/Jackett.Common/Definitions/torrentz2.yml
@@ -5,8 +5,10 @@
   language: en-us
   type: public
   encoding: UTF-8
+  followredirect: true
   links:
     - https://torrentz2.eu/
+    - https://torrentz.unblockit.pro/
 
   caps:
     categories:
diff --git a/src/Jackett.Common/Definitions/zooqle.yml b/src/Jackett.Common/Definitions/zooqle.yml
index 25e9bbb86..83e201686 100644
--- a/src/Jackett.Common/Definitions/zooqle.yml
+++ b/src/Jackett.Common/Definitions/zooqle.yml
@@ -5,8 +5,10 @@
   language: en-us
   type: public
   encoding: UTF-8
+  followredirect: true
   links:
     - https://zooqle.com/
+    - https://zooqle.unblockit.pro/
 
   caps:
     categories:
@@ -46,7 +48,7 @@
     # includes only verified torrents
     paths:
       - path: "search?{{ if .Keywords }}s={{ .Config.sort }}&v=t&sd={{ .Config.type }}&q={{ .Keywords }}{{else}}s={{ .Config.sort }}&v=t&sd={{ .Config.type }}&q= *{{end}}{{ if .Categories }} category:{{ range .Categories }}{{.}},{{end}}{{else}}{{end}}"
-      
+
     rows:
       selector: tr:has(td[class^="text-muted3"])
       filters:
@@ -69,7 +71,7 @@
         selector: td:nth-child(2) a
         attribute: href
       download:
-        # .torrent urls can be missing 
+        # .torrent urls can be missing
         optional: true
         selector: a[title^="Generate .torrent"]
         attribute: href
@@ -107,7 +109,7 @@
       leechers:
         # leechers can be missing
         optional: true
-        selector: td:nth-child(6) div 
+        selector: td:nth-child(6) div
         attribute: title
         filters:
           - name: split