zooqle: rremove. gone. resolves #1185

README.md

@@ -171,7 +171,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * YourBittorrent
  * YTS.ag
  * zetorrents
- * Zooqle
 </details>
 
 <details> <summary> <b> Supported Semi-Private Trackers </b> </summary>

src/Jackett.Common/Definitions/zooqle.yml

@@ -1,155 +0,0 @@
----
-id: zooqle
-name: Zooqle
-description: "Zooqle is a Public torrent index providing a huge database of verified torrents"
-language: en-US
-type: public
-encoding: UTF-8
-followredirect: true
-links:
-  - https://zooqle.com/
-  - https://zooqle.unblockninja.com/
-  - https://zooqle.unblockit.blue/
-  - https://zooqle.nocensor.sbs/
-legacylinks:
-  - https://zooqle.unblocked.rest/
-  - https://zooqle.unblockit.buzz/
-  - https://zooqle.unblocked.monster/
-  - https://zooqle.unblockit.club/
-  - https://zooqle.unblockit.onl/
-  - https://zooqle.unblockit.li/
-  - https://zooqle.unblockit.uno/
-  - https://zooqle.unblockit.ch/
-  - https://zooqle.nocensor.space/
-  - https://zooqle.unblockit.ws/
-  - https://zooqle.nocensor.work/
-  - https://zooqle.unblockit.kim/
-  - https://zooqle.unblockit.bz/
-  - https://zooqle.unblockit.tv/
-  - https://zooqle.unblockit.how/
-  - https://zooqle.unblockit.cam/
-  - https://zooqle.nocensor.biz/
-  - https://zooqle.unblockit.day/
-  - https://zooqle.unblockit.llc/
-
-caps:
-  categorymappings:
-    - {id: anime, cat: TV/Anime, desc: Anime}
-    - {id: app, cat: PC, desc: App}
-    - {id: book, cat: Books, desc: Book}
-    - {id: files, cat: Other/Misc, desc: Files}
-    - {id: game, cat: PC/Games, desc: Game}
-    - {id: movies, cat: Movies, desc: Movies}
-    - {id: music, cat: Audio, desc: Music}
-    - {id: other, cat: Other, desc: Other}
-    - {id: tv, cat: TV, desc: TV}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: dt
-    options:
-      dt: created
-      ns: seeders
-      sz: size
-  - name: type
-    type: select
-    label: Order requested from site
-    default: d
-    options:
-      d: desc
-      a: asc
-
-search:
-  # includes only verified torrents
-  paths:
-    - path: "search?s={{ .Config.sort }}&v=t&sd={{ .Config.type }}&q={{ if .Keywords }}{{ .Keywords }}{{ else }} *{{ end }}{{ if .Categories }} category:{{ range .Categories }}{{.}},{{end}}{{ else }}{{ end }}"
-
-  rows:
-    selector: tr:has(td[class^="text-muted3"])
-    filters:
-      - name: andmatch
-
-  fields:
-    title:
-      selector: td:nth-child(2) a
-    category:
-      text: other
-    category|noappend:
-      # cat may be missing
-      optional: true
-      selector: td:nth-child(2) > i
-      attribute: class
-      filters:
-        # extract the second class
-        - name: split
-          args: [" ", 1]
-        # remove zqf- prefix
-        - name: replace
-          args: ["zqf-", ""]
-    details:
-      selector: td:nth-child(2) a
-      attribute: href
-    download:
-      # .torrent urls can be missing
-      optional: true
-      selector: a[title^="Generate .torrent"]
-      attribute: href
-    magnet:
-      # magnets urls can be missing
-      optional: true
-      selector: a[title^="Magnet link"]
-      attribute: href
-    date:
-      selector: td:nth-child(5)
-      filters:
-        # a date of 'long ago' causes the timeago filter to return '0m ago' which is contra
-        - name: replace
-          args: ["long ago", "99 years"]
-        # a date of 'yesterday' causes the timeago filter to return '0m ago' which is contra
-        - name: replace
-          args: ["yesterday", "1 day"]
-        - name: timeago
-    size:
-      selector: td:nth-child(4)
-      filters:
-        # a size of '– N/A –' causes Jackett to reject the row with an error
-        - name: replace
-          args: ["– N/A –", "0 Bytes"]
-    seeders_optional:
-      # seeders can be missing
-      optional: true
-      selector: td:nth-child(6) div
-      attribute: title
-      filters:
-        - name: split
-          args: [" ", 1]
-        - name: replace
-          args: [",", ""]
-    seeders:
-      text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}"
-    leechers_optional:
-      # leechers can be missing
-      optional: true
-      selector: td:nth-child(6) div
-      attribute: title
-      filters:
-        - name: split
-          args: [" ", 4]
-        - name: replace
-          args: [",", ""]
-    leechers:
-      text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a

src/Jackett.Updater/Program.cs

@@ -259,11 +259,12 @@ namespace Jackett.Updater
                 "Definitions/3evils.yml",
                 "Definitions/420files.yml",
                 "Definitions/7torrents.yml",
-                "Definitions/angietorrents.yml",
+                "Definitions/DasUnerwartete.yml",
                 "Definitions/academictorrents.yml",
-                "Definitions/alein.yml",
                 "Definitions/aither.yml", // switch to *-API #8682
+                "Definitions/alein.yml",
                 "Definitions/alexfilm.yml",
+                "Definitions/angietorrents.yml",
                 "Definitions/anidex.yml", // migrated to C#
                 "Definitions/animeitalia.yml",
                 "Definitions/animeworld.yml", // switch to *-API #8682
@@ -278,12 +279,12 @@ namespace Jackett.Updater
                 "Definitions/avg.yml",
                 "Definitions/awesomehd.yml", // migrated to C#
                 "Definitions/b2s-share.yml",
-                "Definitions/beyond-hd-oneurl.yml", // #12993
                 "Definitions/baibako.yml", // renamed rudub #5673
-                "Definitions/bithq.yml",
+                "Definitions/beyond-hd-oneurl.yml", // #12993
-                "Definitions/bit-titan.yml",
                 "Definitions/bigtorrent.yml", // merged with eStone #12352
                 "Definitions/bigtower.yml",
+                "Definitions/bit-titan.yml",
+                "Definitions/bithq.yml",
                 "Definitions/bitme.yml",
                 "Definitions/bittorrentam.yml",
                 "Definitions/blubits.yml",
@@ -309,10 +310,9 @@ namespace Jackett.Updater
                 "Definitions/crazyscorner.yml",
                 "Definitions/czteam.yml",
                 "Definitions/cztorrent.yml",
-                "Definitions/darmowetorenty.yml", // migrated to C#
                 "Definitions/danishbytes.yml", // migrated to C#
                 "Definitions/darktracker.yml",
-                "Definitions/DasUnerwartete.yml",
+                "Definitions/darmowetorenty.yml", // migrated to C#
                 "Definitions/datascene.yml", // switch to *-API #8682
                 "Definitions/demonsite.yml",
                 "Definitions/desireleasers.yml",
@@ -330,8 +330,8 @@ namespace Jackett.Updater
                 "Definitions/elitehd.yml",
                 "Definitions/elittracker.yml",
                 "Definitions/emtrek.yml",
-                "Definitions/epizod.yml",
                 "Definitions/eotforum.yml",
+                "Definitions/epizod.yml",
                 "Definitions/erzsebet.yml",
                 "Definitions/erzsebetpl.yml",
                 "Definitions/estrenosdtl.yml",
@@ -360,8 +360,8 @@ namespace Jackett.Updater
                 "Definitions/gormogon.yml",
                 "Definitions/greeklegends.yml",
                 "Definitions/gtorrent.yml",
-                "Definitions/hachede.yml",
                 "Definitions/hachede-c.yml",
+                "Definitions/hachede.yml",
                 "Definitions/hd4free.yml",
                 "Definitions/hdbc.yml", // renamed to hdbitscom
                 "Definitions/hdclub.yml",
@@ -371,8 +371,8 @@ namespace Jackett.Updater
                 "Definitions/hdplus.yml",
                 "Definitions/hdreactor.yml", // renamed to hdhouse
                 "Definitions/hdstreet.yml",
-                "Definitions/hon3yhd.yml",
                 "Definitions/hon3yhd-net.yml",
+                "Definitions/hon3yhd.yml",
                 "Definitions/horriblesubs.yml",
                 "Definitions/horrorsite.yml",
                 "Definitions/hush.yml",
@@ -387,8 +387,8 @@ namespace Jackett.Updater
                 "Definitions/kapaki.yml",
                 "Definitions/katcrs.yml",
                 "Definitions/kaztorka.yml",
-                "Definitions/kickasstorrent.yml",
                 "Definitions/kickasstorrent-kathow.yml", // renamed to kickasstorrents-ws
+                "Definitions/kickasstorrent.yml",
                 "Definitions/kikibt.yml",
                 "Definitions/kisssub.yml",
                 "Definitions/lapausetorrents.yml",
@@ -423,14 +423,14 @@ namespace Jackett.Updater
                 "Definitions/nordichd.yml",
                 "Definitions/nordicplus.yml",
                 "Definitions/nostalgic.yml", // renamed to vhstapes
-                "Definitions/nyaa.yml",
                 "Definitions/nyaa-pantsu.yml",
+                "Definitions/nyaa.yml",
                 "Definitions/nyoo.yml",
                 "Definitions/oasis.yml",
-                "Definitions/onlineselfeducation.yml",
-                "Definitions/onlyscene.yml",
                 "Definitions/obscure.yml",
                 "Definitions/oncesearch.yml",
+                "Definitions/onlineselfeducation.yml",
+                "Definitions/onlyscene.yml",
                 "Definitions/passionetorrent.yml",
                 "Definitions/pirateiro.yml",
                 "Definitions/pleasuredome.yml",
@@ -439,9 +439,9 @@ namespace Jackett.Updater
                 "Definitions/pt99.yml",
                 "Definitions/qctorrent.yml",
                 "Definitions/qxr.yml",
+                "Definitions/racing4everyone.yml", // switch to *-API #12870 #8682
                 "Definitions/rapidetracker.yml",
                 "Definitions/rarbg.yml", // migrated to C#
-                "Definitions/racing4everyone.yml", // switch to *-API #12870 #8682
                 "Definitions/redbits.yml", // switch to *-API #11540 #8682
                 "Definitions/redtopia.yml",
                 "Definitions/reelflix.yml", // switch to *-API #8682
@@ -469,10 +469,9 @@ namespace Jackett.Updater
                 "Definitions/shellife.yml",
                 "Definitions/shokweb.yml",
                 "Definitions/skipthecommercials.yml", // switch to *-API #8682
-                "Definitions/torrentland.yml", // switch to *-API #13006 #8682
-                "Definitions/skytorrents.yml",
                 "Definitions/skytorrents-lol.yml",
                 "Definitions/skytorrents-to.yml",
+                "Definitions/skytorrents.yml",
                 "Definitions/skytorrentsclone.yml", // renamed to skytorrents-lol
                 "Definitions/skytorrentsclone2.yml", // renamed to skytorrents-to
                 "Definitions/spacetorrent.yml",
@@ -482,10 +481,10 @@ namespace Jackett.Updater
                 "Definitions/t411v2.yml",
                 "Definitions/takeabyte.yml",
                 "Definitions/tazmaniaden.yml",
-                "Definitions/tenyardtracker.yml", // to be migrated to c#, #795
                 "Definitions/tbplus.yml",
                 "Definitions/tehconnection.yml",
                 "Definitions/tellytorrent.yml", // switch to *-API #8682
+                "Definitions/tenyardtracker.yml", // to be migrated to c#, #795
                 "Definitions/tfile.yml",
                 "Definitions/the-devils-lounge.yml",
                 "Definitions/the-madhouse.yml",
@@ -508,6 +507,7 @@ namespace Jackett.Updater
                 "Definitions/torrentgalaxyorg.yml", // renamed to torrentgalaxy
                 "Definitions/torrenthane.yml",
                 "Definitions/torrentkim.yml",
+                "Definitions/torrentland.yml", // switch to *-API #13006 #8682
                 "Definitions/torrentmax.yml",
                 "Definitions/torrentproject.yml",
                 "Definitions/torrentquest.yml",
@@ -522,8 +522,8 @@ namespace Jackett.Updater
                 "Definitions/torrentz2k.yml",
                 "Definitions/torrof.yml",
                 "Definitions/torviet.yml",
-                "Definitions/trackeros.yml", // switch to *-API #12807
                 "Definitions/trackeros-api.yml",
+                "Definitions/trackeros.yml", // switch to *-API #12807
                 "Definitions/tspate.yml",
                 "Definitions/ttobogo.yml",
                 "Definitions/turknova.yml",
@@ -536,6 +536,7 @@ namespace Jackett.Updater
                 "Definitions/vanila.yml",
                 "Definitions/vhstapes.yml",
                 "Definitions/waffles.yml",
+                "Definitions/witchhunter.yml",
                 "Definitions/world-of-tomorrow.yml", // #9213
                 "Definitions/worldofp2p.yml",
                 "Definitions/worldwidetorrents.yml",
@@ -545,7 +546,7 @@ namespace Jackett.Updater
                 "Definitions/xtremezone.yml", // migrated to C# XtremeZone base tracker
                 "Definitions/yingk.yml",
                 "Definitions/yourexotic.yml", // renamed to exoticaz
-                "Definitions/witchhunter.yml",
+                "Definitions/zooqle.yml",
                 "Microsoft.Owin.dll",
                 "Microsoft.Owin.FileSystems.dll",
                 "Microsoft.Owin.Host.HttpListener.dll",