anthelion: removed. #7923

with the anthelion website having made changes to the browse page, this is a opportune time to remove the C# version of the indexer.
anthelion-api is the preferred indexer using apikey and yml.

README.md

@@ -46,8 +46,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * BT4G
  * BTDIGG
  * BTMET
- * BTmirror
  * BTSOW
+ * BullTorrent
  * Byrutor
  * CloudTorrents
  * comicat
@@ -101,7 +101,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * MyPornClub
  * Newstudio
  * Nipponsei
- * Nitro
  * NNTT
  * NoNaMe Club (NNM-Club)
  * Nyaa.si
@@ -224,12 +223,10 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Sharewood
  * SkTorrent
  * SkTorrent-org
- * SoundPark
  * themixingbowl (TMB)
  * Toloka.to
  * Torrent-Explosiv
  * Torrents-Local
- * Torrents-Town (T-T)
  * TribalMixes
  * Union Fansub
  * YggTorrent (YGG)
@@ -295,7 +292,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * BroadcasTheNet (BTN)
  * BroadCity
  * BrokenStones [![(invite needed)][inviteneeded]](#)
- * BreizhPeers
  * BrSociety
  * BTNext (BTNT) [![(invite needed)][inviteneeded]](#)
  * BTSCHOOL
@@ -322,7 +318,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * CrazyHD
  * CrazySpirits
  * CrnaBerza
- * CrypticHaven Comedy Club (CCC)
  * DANISH BYTES
  * Darius Tracker
  * Dark-Shadow
@@ -394,9 +389,10 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HDU
  * HDZone
  * Hebits
+ * HellasHut
  * HHanClub
  * House of Devil
- * HQSource (HQS)
+ * iHDBits
  * ImmortalSeed (iS)
  * Immortuos
  * Indietorrents [![(invite needed)][inviteneeded]](#)
@@ -447,6 +443,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Nebulance (NBL) (TransmiTheNet)
  * NetCosmo
  * NorBits
+ * Old Toons World
  * OpenCD [![(invite needed)][inviteneeded]](#)
  * Orpheus
  * OshenPT
@@ -456,7 +453,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Partis
  * PassThePopcorn (PTP)
  * Peeratiko
- * PeerJunkies
  * Peers.FM
  * PigNetwork
  * PirateTheNet (PTN)
@@ -481,7 +477,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * PuntoTorrent
  * PuroVicio
  * PuTao
- * Puur-Hollands
  * PWTorrents (PWT)
  * R3V WTF! [![(invite needed)][inviteneeded]](#)
  * Racing4Everyone (R4E)
@@ -505,7 +500,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * SiamBIT
  * SkipTheCommercials
  * SkipTheTrailers
- * slosoul
  * SnowPT (SSPT)
  * SoulVoice
  * SpeedApp (SceneFZ, XtreMeZone / MYXZ, ICE Torrent)
@@ -532,6 +526,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * The Geeks
  * The New Retro
  * The Occult [![(invite needed)][inviteneeded]](#)
+ * The Old School
  * The Place [![(invite needed)][inviteneeded]](#)
  * The Shinning (TsH)
  * The Show
@@ -555,7 +550,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TorrentBytes (TBy)
  * TorrentCCF (TCCF)
  * TorrentDay (TD)
- * TorrentDB
  * TorrentHeaven [![(invite needed)][inviteneeded]](#)
  * TorrentHR [![(invite needed)][inviteneeded]](#)
  * Torrenting (TT)
@@ -826,7 +820,7 @@ To use it, please just request a free API key on [OMDb](http://www.omdbapi.com/a
 
 -   `-d, --DataFolder`         Specify the location of the data folder (Must be an admin on Windows)
     - e.g. --DataFolder="D:\Your Data\Jackett\".
-    - Don't use this on Unix (mono) systems. On Unix just adjust the HOME directory of the user to the datadir or set the XDG_CONFIG_HOME environment variable.
+    - Don't use this on Unix (mono) systems. On Unix just adjust the HOME directory of the user to the data folder or set the XDG_CONFIG_HOME environment variable.
 
 -   `--NoRestart`              Don't restart after update
 

src/Jackett.Common/Content/index.html

@@ -8,6 +8,7 @@
     <meta name="apple-mobile-web-app-capable" content="yes" />
     <meta charset="utf-8" />
     <meta name="referrer" content="no-referrer" /> <!-- Don't send referrer when loading third party resources (E.g. Empornium poster images won't load) -->
+    <meta name="robots" content="noindex, nofollow"/>
     <link rel="apple-touch-icon" href="../apple-touch-icon.png" />
     <link rel="mask-icon" href="../jackett_medium.png" color="#35c5f4">
     <link rel="icon" type="image/ico" href="../favicon.ico" />

src/Jackett.Common/Content/login.html

@@ -3,6 +3,7 @@
 <html lang="en" xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta charset="utf-8" />
+    <meta name="robots" content="noindex, nofollow"/>
 
     <link rel='shortcut icon' type='image/x-icon' href='../favicon.ico' />
 

src/Jackett.Common/Definitions/1337x.yml

@@ -6,21 +6,18 @@ language: en-US
 type: public
 encoding: UTF-8
 followredirect: true
+requestDelay: 2
 links:
   - https://1337x.to/
   - https://1337x.st/
   - https://x1337x.ws/
   - https://x1337x.eu/
   - https://x1337x.se/
-  - https://1337x.unblockit.nz/
-  - https://1337x.nocensor.world/
+  - https://1337x.unblockit.page/
+  - https://1337x.nocensor.lol/
   - https://1337x.unblockninja.com/
 legacylinks:
-  - https://1337x.unblocked.monster/
-  - https://1337x.unblockit.uno/
   - https://1337x.is/
-  - https://1337x.unblockit.ch/
-  - https://1337x.nocensor.space/
   - https://1337x.unblockit.ws/
   - https://1337x.nocensor.work/
   - https://1337x.unblockit.kim/
@@ -38,6 +35,8 @@ legacylinks:
   - https://1337x.unblockit.ist/
   - https://1337x.unblockit.bet/
   - https://1337x.unblockit.cat/
+  - https://1337x.unblockit.nz/
+  - https://1337x.nocensor.world/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/3evils-api.yml

@@ -1,147 +0,0 @@
----
-id: 3evils-api
-name: 3Evils (API)
-description: "3Evils is a Private site for MOVIES / TV / MUSIC "
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://3evils.net/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Movies, desc: "Movies"}
-    - {id: 2, cat: TV, desc: "TV"}
-    - {id: 3, cat: Audio, desc: "Music"}
-    - {id: 4, cat: PC/Games, desc: "Game"}
-    - {id: 5, cat: PC/0day, desc: "Application"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
-    movie-search: [q, imdbid, tmdbid]
-    music-search: [q]
-
-settings:
-  - name: apikey
-    type: text
-    label: APIKey
-  - name: info_key
-    type: info
-    label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://3evils.net/\" target =_blank>3Evils</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: created_at
-    options:
-      created_at: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  path: /api/torrents
-  method: get
-  inputs:
-    api_token: "{{ .Config.apikey }}"
-  error:
-    - selector: a[href*="/login"]
-      message:
-        text: "The API key was not accepted by {{ .Config.sitelink }}."
-
-search:
-  paths:
-    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
-    - path: "/api/torrents/filter"
-      response:
-        type: json
-
-  inputs:
-  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
-    api_token: "{{ .Config.apikey }}"
-    name: "{{ .Keywords }}"
-    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
-    sortField: "{{ .Config.sort }}"
-    sortDirection: "{{ .Config.type }}"
-    perPage: 100
-    page: 1
-
-  keywordsfilters:
-    - name: re_replace
-      args: ["\\.", " "]
-
-  rows:
-    selector: data
-    attribute: attributes
-    count:
-      selector: meta.total
-
-  fields:
-    category:
-      selector: category_id
-    title:
-      selector: name
-    details:
-      selector: details_link
-    download:
-      selector: download_link
-    poster:
-      selector: poster
-      filters:
-        - name: replace
-          args: ["https://via.placeholder.com/90x135", ""]
-    imdbid:
-      selector: imdb_id
-    tmdbid:
-      selector: tmdb_id
-    tvdbid:
-      selector: tvdb_id
-    files:
-      selector: num_file
-    seeders:
-      selector: seeders
-    leechers:
-      selector: leechers
-    grabs:
-      selector: times_completed
-    date:
-      # 2021-10-18T00:34:50.000000Z"
-      selector: created_at
-    size:
-      selector: size
-    downloadvolumefactor:
-      # api returns 0%, 25%, 50%, 75%, 100%
-      selector: freeleech
-      case:
-        0%: 1 # not free
-        25%: 0.75
-        50%: 0.5
-        75%: 0.25
-        100%: 0 # freeleech
-        "*": 0 # catch errors
-    uploadvolumefactor:
-      # api returns 0=false, 1=true
-      selector: double_upload
-      case:
-        0: 1 # normal
-        1: 2 # double
-# global MR is 0.4 but torrents must be seeded for 7 days regardless of ratio
-#    minimumratio:
-#      text: 0.4
-#    minimumseedtime:
-#      # 2 days (as seconds = 2 x 24 x 60 x 60)
-#      text: 172800
-# json UNIT3D 6.3.0

src/Jackett.Common/Definitions/amigosshare.yml

@@ -5,6 +5,7 @@ description: "Amigos Share Club is a Brazilian Private site for TV / MOVIES / GE
 language: pt-BR
 type: private
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://cliente.amigos-share.club/
 legacylinks:

src/Jackett.Common/Definitions/anilibria.yml

@@ -51,8 +51,9 @@ search:
       selector: quality.string
     _series:
       selector: series.string
+      optional: true
     title:
-      text: "{{ .Result.title_ru }} / {{ .Result.title_en }}{{ if .Result.title_alternative }} / {{ .Result.title_alternative }}{{ else }}{{ end }} ({{ .Result.year }}) [{{ .Result._quality }}] - {{ .Result._series }}"
+      text: "{{ .Result.title_ru }} / {{ .Result.title_en }}{{ if .Result.title_alternative }} / {{ .Result.title_alternative }}{{ else }}{{ end }} ({{ .Result.year }}) [{{ .Result._quality }}]{{ if .Result._series }} - {{ .Result._series }}{{ else }}{{ end }}"
     _code:
       selector: ..code
     details:

src/Jackett.Common/Definitions/anisource.yml

@@ -5,6 +5,7 @@ description: "AniSource is a Public site for HD Anime raws."
 language: en-US
 type: public
 encoding: UTF-8
+requestDelay: 2
 certificates:
   - f400d50a4dac4dd6546c869ac75669846205a0d2 # expired 26 Aug 2022
 links:

src/Jackett.Common/Definitions/arenabg.yml

@@ -160,18 +160,18 @@ search:
       attribute: title
       optional: true
     title:
-      selector: td.filename a[href^="/en/torrents/"]
+      selector: td.filename a.title
       filters:
         - name: append
           args: "{{ if .Result._bulgarian }} {{ .Result._bulgarian }}{{ else }}{{ end }}{{ if .Result._english }} {{ .Result._english }}{{ else }}{{ end }}"
     details:
-      selector: td.filename a[href^="/en/torrents/"]
+      selector: td.filename a.title
       attribute: href
     download:
-      selector: td.filename a[href^="/en/torrents/"]
+      selector: td.filename a.title
       attribute: href
     poster:
-      selector: td.filename a[href^="/en/torrents/"]
+      selector: td.filename a.title
       attribute: onmouseover
       filters:
         - name: regexp

src/Jackett.Common/Definitions/audiobookbay.yml

@@ -5,13 +5,13 @@ description: "AudioBook Bay (ABB) is a public Torrent Tracker for AUDIOBOOKS"
 language: en-US
 type: public
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://audiobookbay.fi/
   - https://audiobookbay.se/
-  - https://audiobookbay.unblockit.nz/
+  - https://audiobookbay.unblockit.page/
 legacylinks:
   - https://audiobookbay.la/
-  - https://audiobookbay.unblockit.uno/
   - https://audiobookbay.unblockit.ch/
   - https://audiobookbay.unblockit.ws/
   - http://audiobookbay.net/
@@ -33,6 +33,7 @@ legacylinks:
   - https://audiobookbay.unblockit.ist/
   - https://audiobookbay.unblockit.bet/
   - https://audiobookbay.unblockit.cat/
+  - https://audiobookbay.unblockit.nz/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/badasstorrents.yml

@@ -5,13 +5,15 @@ description: "Badass Torrents is a Public torrent site for MOVIES / TV / GENERAL
 language: en-US
 type: public
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://badasstorrents.com/
-  - https://badasstorrents.nocensor.world/
+  - https://badasstorrents.nocensor.lol/
 legacylinks:
   - https://badasstorrents.nocensor.work/
   - https://badasstorrents.nocensor.biz/
   - https://badasstorrents.nocensor.sbs/
+  - https://badasstorrents.nocensor.world/
 
 caps:
   categories:

src/Jackett.Common/Definitions/beyond-hd.yml

@@ -22,7 +22,7 @@ settings:
   - name: info_oid
     type: info
     label: "About 2FA"
-    default: "If you want to enable 2FA then use the Beyond-HD (OneURL) indexer instead."
+    default: "If you want to enable 2FA then use the Beyond-HD (API) indexer instead."
   - name: username
     type: text
     label: Username

src/Jackett.Common/Definitions/bitbazis.yml

@@ -5,50 +5,49 @@ description: "Bit-Bázis is a HUNGARIAN Private Tracker for MOVIES / TV"
 language: hu-HU
 type: private
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://bitbazis.net/
 
 caps:
   categorymappings:
-    - {id: 85, cat: Movies/SD, desc: "Film/Cam/Hun"}
-    - {id: 86, cat: Movies/SD, desc: "Film/Cam/Eng"}
-    - {id: 15, cat: Movies/SD, desc: "Film/XviD/Hun"}
-    - {id: 16, cat: Movies/SD, desc: "Film/XviD/Eng"}
-    - {id: 34, cat: Movies/HD, desc: "Film/x264/Hun"}
-    - {id: 48, cat: Movies/HD, desc: "Film/x264/Eng"}
-    - {id: 83, cat: Movies/HD, desc: "Film/HD/Hun"}
-    - {id: 82, cat: Movies/HD, desc: "Film/HD/Eng"}
-    - {id: 94, cat: Movies/HD, desc: "Film/FHD/Hun"}
-    - {id: 95, cat: Movies/HD, desc: "Film/FHD/Eng"}
-    - {id: 92, cat: Movies/UHD, desc: "Film/UHD/Hun"}
-    - {id: 93, cat: Movies/UHD, desc: "Film/UHD/Eng"}
-    - {id: 22, cat: TV, desc: "Sorozat/Hun"}
-    - {id: 58, cat: TV, desc: "Sorozat/Eng"}
-    - {id: 69, cat: TV/Anime, desc: "Mese/SD"}
-    - {id: 68, cat: TV/Anime, desc: "Mese/DVD"}
-    - {id: 91, cat: TV/Anime, desc: "Mese/HD"}
-    - {id: 25, cat: Audio/MP3, desc: "Mp3/Hun"}
-    - {id: 26, cat: Audio/MP3, desc: "Mp3/Eng"}
-    - {id: 84, cat: Audio/Lossless, desc: "Lossless/Hun"}
-    - {id: 71, cat: Audio/Lossless, desc: "Lossless/Eng"}
-    - {id: 31, cat: PC/Games, desc: "Játék/PC"}
-    - {id: 54, cat: Console, desc: "Játék/Konzol"}
-    - {id: 81, cat: PC/0day, desc: "Program/PC"}
-    - {id: 49, cat: PC/0day, desc: "Program/Rip"}
-    - {id: 14, cat: PC, desc: "Program/Egyéb"}
-    - {id: 64, cat: Movies, desc: "Film/Pack"}
-    - {id: 70, cat: Audio/Audiobook, desc: "Hangoskönyv"}
-    - {id: 27, cat: Books/EBook, desc: "Könyv/Hun"}
-    - {id: 50, cat: Books/EBook, desc: "Könyv/Eng"}
-    - {id: 65, cat: Other, desc: "Egyéb"}
+    - {id: 85, cat: Movies/SD, desc: "Film/Cam/Hun", default: true}
+    - {id: 86, cat: Movies/SD, desc: "Film/Cam/Eng", default: true}
+    - {id: 15, cat: Movies/SD, desc: "Film/SD/Hun", default: true}
+    - {id: 16, cat: Movies/SD, desc: "Film/SD/Eng", default: true}
+    - {id: 17, cat: Movies/DVD, desc: "Film/DVD/Hun", default: true}
+    - {id: 19, cat: Movies/DVD, desc: "Film/DVD/Eng", default: true}
+    - {id: 83, cat: Movies/HD, desc: "Film/HD/Hun", default: true}
+    - {id: 82, cat: Movies/HD, desc: "Film/HD/Eng", default: true}
+    - {id: 94, cat: Movies/HD, desc: "Film/FHD/Hun", default: true}
+    - {id: 95, cat: Movies/HD, desc: "Film/FHD/Eng", default: true}
+    - {id: 92, cat: Movies/UHD, desc: "Film/UHD/Hun", default: true}
+    - {id: 93, cat: Movies/UHD, desc: "Film/UHD/Eng", default: true}
+    - {id: 64, cat: Movies, desc: "Film/Pack", default: true}
+    - {id: 24, cat: Audio/Video, desc: "Videóklip", default: true}
+    - {id: 22, cat: TV, desc: "Sorozat/Hun", default: true}
+    - {id: 58, cat: TV, desc: "Sorozat/Eng", default: true}
+    - {id: 69, cat: TV/Anime, desc: "Mese/SD", default: true}
+    - {id: 68, cat: TV/Anime, desc: "Mese/DVD", default: true}
+    - {id: 91, cat: TV/Anime, desc: "Mese/HD", default: true}
+    - {id: 25, cat: Audio/MP3, desc: "Mp3/Hun", default: true}
+    - {id: 26, cat: Audio/MP3, desc: "Mp3/Eng", default: true}
+    - {id: 84, cat: Audio/Lossless, desc: "Lossless/Hun", default: true}
+    - {id: 71, cat: Audio/Lossless, desc: "Lossless/Eng", default: true}
+    - {id: 31, cat: PC/Games, desc: "Játék/PC", default: true}
+    - {id: 81, cat: PC/0day, desc: "Program/PC", default: true}
+    - {id: 49, cat: PC/0day, desc: "Program/Rip", default: true}
+    - {id: 27, cat: Books/EBook, desc: "Könyv/Hun", default: true}
+    - {id: 50, cat: Books/EBook, desc: "Könyv/Eng", default: true}
+    - {id: 14, cat: PC, desc: "Program/Egyéb", default: true}
+    - {id: 65, cat: Other, desc: "Egyéb", default: true}
+    - {id: 33, cat: XXX/SD, desc: "SD/XXX", default: false}
+    - {id: 89, cat: XXX/x264, desc: "HD/XXX", default: false}
+    - {id: 66, cat: XXX/ImageSet, desc: "Képek/XXX", default: false}
     # the following are no longer in the cat list in the search page, but are still in the profile cat list
-    - {id: 67, cat: PC/Mobile-Android, desc: "Program/Android"}
-    - {id: 17, cat: Movies/DVD, desc: "Film/DVD/Hun"}
-    - {id: 19, cat: Movies/DVD, desc: "Film/DVD/Eng"}
-    - {id: 24, cat: Audio/Video, desc: "Videóklipp"}
-    - {id: 33, cat: XXX/SD, desc: "Film/SD/XXX"}
-    - {id: 89, cat: XXX/x264, desc: "Film/HD/XXX"}
-    - {id: 66, cat: XXX/ImageSet, desc: "Képek/XXX"}
+    - {id: 54, cat: Console, desc: "Játék/Konzol", default: true}
+    - {id: 67, cat: PC/Mobile-Android, desc: "Program/Mobil", default: true}
+    - {id: 70, cat: Audio/Audiobook, desc: "Hangoskönyv", default: true}
 
   modes:
     search: [q]
@@ -95,17 +94,17 @@ login:
     cookie: "{{ .Config.cookie }}"
   test:
     path: index.php
-    selector: span[onclick^="window.open('logout.php?k="]
+    selector: i[onclick^="window.open('logout.php?k="]
 
 search:
   paths:
     - path: browse.php
-      categories: ["!", 33, 66, 99]
+      categories: [85, 86, 15, 16, 17, 19, 83, 82, 94, 95, 92, 93, 64, 24, 22, 58, 69, 68, 91, 25, 26, 84, 71, 31, 81, 49, 27, 50, 14, 65, 54, 67, 70]
       inputs:
         # 0 all, 1 active, 2 deadonly, 3  myuploads, 4 zeroseed, 6 re-seeded
         incldead: 0
     - path: browse_xxx.php
-      categories: [33, 66, 99]
+      categories: [33, 66, 89]
       inputs:
         # 0 active, 1 all, 2 deadonly, 3  myuploads, 4 zeroseed, 6 re-seeded
         incldead: 1
@@ -121,12 +120,9 @@ search:
     selector: "table[width=\"100%\"][align=\"center\"]:first-child tbody tr:has(div.tooltip){{ if .Config.freeleech }}:has(i:contains(\"(Free)\")){{ else }}{{ end }}"
 
   fields:
-    category:
-      selector: a[href*=".php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
+    categorydesc:
+      selector: img[src^="pic/kategoria/"]
+      attribute: title
     genre:
       selector: span.tooltiptext
     description:

src/Jackett.Common/Definitions/bitsearch.yml

@@ -7,10 +7,11 @@ type: public
 encoding: UTF-8
 links:
   - https://bitsearch.to/
-  - https://bitsearch.nocensor.world/
+  - https://bitsearch.nocensor.lol/
 legacylinks:
   - https://bitsearch.nocensor.biz/
   - https://bitsearch.nocensor.sbs/
+  - https://bitsearch.nocensor.world/
 
 caps:
   categories:

src/Jackett.Common/Definitions/bitturk.yml

@@ -6,9 +6,10 @@ language: en-US
 type: private
 encoding: UTF-8
 links:
-  - http://bitturk.net/ # site does not support https ERR_CONNECTION_REFUSED
+  - https://bitturk.net/
 legacylinks:
   - http://www.bitturk.net/
+  - http://bitturk.net/
 
 caps:
   categorymappings:
@@ -25,6 +26,7 @@ caps:
     - {id: 79, cat: TV, desc: "BLUTV"}
     - {id: 90, cat: TV, desc: "Disney+"}
     - {id: 91, cat: TV, desc: "Prime Video"}
+    - {id: 93, cat: TV, desc: "Gain"}
     - {id: 58, cat: Movies, desc: "Film"}
     - {id: 72, cat: Movies, desc: "Belgesel"}
     - {id: 60, cat: Movies/3D, desc: "3D"}

src/Jackett.Common/Definitions/blutopia-api.yml

@@ -71,7 +71,7 @@ search:
   # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
     api_token: "{{ .Config.apikey }}"
     name: "{{ .Keywords }}"
-    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free[]=100{{ else }}{{ end }}"
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
@@ -155,4 +155,4 @@ search:
     minimumseedtime:
       # 7 day (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 6.4.0b
+# json UNIT3D 6.5.0b

src/Jackett.Common/Definitions/brsociety-api.yml

@@ -16,6 +16,7 @@ caps:
     - {id: 3, cat: Audio/Audiobook, desc: "Audiobooks"}
     - {id: 4, cat: Other, desc: "Arquivos de Auxilio"}
     - {id: 6, cat: Other, desc: "Graduação"}
+    - {id: 7, cat: TV/Documentary, desc: "Documentários"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/btmirror.yml

@@ -1,102 +0,0 @@
----
-id: btmirror
-name: BTmirror
-description: "BTmirror is a Public BitTorrent DHT search engine."
-language: en-US
-type: public
-encoding: UTF-8
-links:
-  - https://btsao.com/
-  - https://btmirror.unblockit.nz/
-legacylinks:
-  - https://btmirror.unblockit.blue/
-  - https://btmirror.unblockit.name/
-  - https://btmirror.unblockit.ist/
-  - https://btmirror.unblockit.bet/
-  - https://btmirror.unblockit.cat/
-
-caps:
-  categories:
-    Other: Other
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: info_8000
-    type: info
-    label: About BTmirror Categories
-    default: BTmirror does not return categories in its search results.</br>To add to your Apps' Torznab indexer, replace all categories with 8000(Other).
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: create_time
-    options:
-      relavance: relevance
-      create_time: created
-      length: size
-
-download:
-  infohash:
-    hash:
-      selector: p.magnet a
-      attribute: href
-      filters:
-        - name: regexp
-          args: ([A-F|a-f|0-9]{40})
-    title:
-      selector: p.magnet a
-      attribute: href
-      filters:
-        - name: regexp
-          args: "&dn=(.+?)$"
-        - name: validfilename
-
-search:
-  # https://btsao.com/en/search/2022/?c=&s=create_time
-  # returns 10 results per page
-  paths:
-    - path: "en/search/{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}/"
-    - path: "en/search/{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}/2"
-  inputs:
-    c: ""
-    s: "{{ .Config.sort }}"
-
-  rows:
-    selector: div.ssbox
-
-  fields:
-    category:
-      text: Other
-    title:
-      selector: h3
-    details:
-      selector: h3 a
-      attribute: href
-    download:
-      selector: h3 a
-      attribute: href
-    date:
-      selector: span:contains("date:") b
-      filters:
-        - name: dateparse
-          args: "2006-01-02"
-    size:
-      selector: span:contains("size:") b
-    files:
-      selector: span:contains("files:") b
-    grabs:
-      selector: span:contains("人气:") b
-    seeders:
-      text: 1
-    leechers:
-      text: 1
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine: n/a

src/Jackett.Common/Definitions/btsow.yml

@@ -7,11 +7,8 @@ type: public
 encoding: UTF-8
 # use https://tellme.pw/btsow to find the new domain
 links:
-  - https://btsow.sbs/
+  - https://btsow.beauty/
 legacylinks:
-  - https://btsow.website/
-  - https://btsow.online/
-  - https://btsow.work/
   - https://btsow.store/
   - https://btsow.surf/
   - https://btsow.com/
@@ -24,6 +21,9 @@ legacylinks:
   - https://btsow.bar/
   - https://btsow.click/
   - https://btsow.cfd/
+  - https://btsow.sbs/
+  - https://btsow.quest/
+  - https://btsow.autos/
 
 caps:
   categories:

src/Jackett.Common/Definitions/bulltorrent.yml

@@ -0,0 +1,120 @@
+---
+id: bulltorrent
+name: BullTorrent
+description: "BullTorrent (formerly TOROS) is a Public torrent index"
+language: en-US
+type: public
+encoding: UTF-8
+links:
+  - https://www.bulltorrent.com/
+  - https://toros.nocensor.lol/
+legacylinks:
+  - https://toros.nocensor.space/
+  - https://toros.nocensor.work/
+  - https://www.toros.co/
+  - https://toros.nocensor.biz/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: Movies}
+    - {id: 2, cat: Audio, desc: Music}
+    - {id: 3, cat: TV, desc: Television}
+    - {id: 4, cat: PC/Games, desc: Games}
+    - {id: 5, cat: PC, desc: Software}
+    - {id: 6, cat: TV/Anime, desc: Anime}
+    - {id: 7, cat: XXX, desc: Adult}
+    - {id: 8, cat: Books, desc: Ebooks}
+    - {id: 9, cat: TV/Anime, desc: Animation}
+    - {id: 10, cat: Other, desc: Other}
+    - {id: 0, cat: Other, desc: TBC}
+
+  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: added
+    options:
+      added: created
+      seeds: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+download:
+  selectors:
+    - selector: a[href^="magnet:?xt="]
+      attribute: href
+
+search:
+  paths:
+    # https://www.bulltorrent.com/all/torrents/2022.html?v=&i=100&sort=added&o=desc
+    - path: "{{ if .Keywords }}all/torrents/{{ .Keywords }}.html?v=&i=100&sort={{ .Config.sort }}&o={{ .Config.type }}{{ else }}trending.html{{ end }}"
+  keywordsfilters:
+    - name: re_replace
+      args: ["[\\s]+", "-"]
+    - name: tolower
+
+  rows:
+    selector: table.table-responsive tr:has(a[href^="/torrent/"])
+    filters:
+      - name: andmatch
+
+  fields:
+    category:
+      selector: td:nth-child(1)
+      attribute: class
+      filters:
+        - name: regexp
+          args: (\d+)
+    title:
+      selector: a[href^="/torrent/"]
+    details:
+      selector: a[href^="/torrent/"]
+      attribute: href
+    download:
+      selector: a[href^="/torrent/"]
+      attribute: href
+    date_day:
+      selector: td:nth-child(2):contains("day")
+      optional: true
+      filters:
+        - name: fuzzytime
+    date_ago:
+      selector: td:nth-child(2):contains("ago")
+      optional: true
+      filters:
+        - name: timeago
+    date_year:
+      selector: td:nth-child(2):not(:contains("ago")):not(:contains("day"))
+      optional: true
+      filters:
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "2 Jan -07:00"
+    date:
+      text: "{{ if or .Result.date_year .Result.date_ago .Result.date_day }}{{ or .Result.date_year  .Result.date_ago .Result.date_day }}{{ else }}now{{ end }}"
+    size:
+      selector: td:nth-child(3)
+    seeders:
+      selector: td:nth-child(4)
+    leechers:
+      selector: td:nth-child(5)
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/carphunter.yml

@@ -5,42 +5,43 @@ description: "Carp-Hunter is a HUNGARIAN Private Torrent Tracker for MOVIES / TV
 language: hu-HU
 type: private
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://carp-hunter.hu/
 
 caps:
   categorymappings:
-    - {id: 1, cat: Movies/SD, desc: "Film/Cam/Eng"}
-    - {id: 2, cat: Movies/SD, desc: "Film/Cam/Hun"}
-    - {id: 8, cat: Movies/DVD, desc: "Film/DVD/Eng"}
-    - {id: 7, cat: Movies/DVD, desc: "Film/DVD/Hun"}
-    - {id: 16, cat: Movies/HD, desc: "Film/HD1080P/Eng"}
-    - {id: 15, cat: Movies/HD, desc: "Film/HD1080P/Hun"}
-    - {id: 14, cat: Movies/HD, desc: "Film/HD720P/Eng"}
-    - {id: 13, cat: Movies/HD, desc: "Film/HD720P/Hun"}
-    - {id: 4, cat: Movies/SD, desc: "Film/SD/Eng"}
-    - {id: 3, cat: Movies/SD, desc: "Film/SD/Hun"}
-    - {id: 18, cat: Movies/UHD, desc: "Film/UHD/Eng"}
-    - {id: 17, cat: Movies/UHD, desc: "Film/UHD/Hun"}
-    - {id: 23, cat: Audio/Audiobook, desc: "Hangosköny"}
-    - {id: 19, cat: PC/Games, desc: "Játék/ISO"}
-    - {id: 20, cat: PC/Games, desc: "Játék/RIP"}
-    - {id: 24, cat: Other, desc: "Képek"}
-    - {id: 21, cat: Books, desc: "Könyv/Eng"}
-    - {id: 22, cat: Books, desc: "Könyv/Hun"}
-    - {id: 35, cat: TV/Anime, desc: "Mese/Eng"}
-    - {id: 36, cat: TV/Anime, desc: "Mese/Hun"}
-    - {id: 25, cat: PC/Mobile-Other, desc: "Mobil"}
-    - {id: 30, cat: PC/ISO, desc: "Programok/ISO"}
-    - {id: 31, cat: PC/0day, desc: "Programok/RIP"}
-    - {id: 33, cat: TV, desc: "Sorozat/Eng"}
-    - {id: 32, cat: TV, desc: "Sorozat/Hun"}
-    - {id: 29, cat: Audio/Lossless, desc: "Zene/FLAC/Eng"}
-    - {id: 28, cat: Audio/Lossless, desc: "Zene/FLAC/Hun"}
-    - {id: 27, cat: Audio/MP3, desc: "Zene/MP3/Eng"}
-    - {id: 26, cat: Audio/MP3, desc: "Zene/MP3/Hun"}
-    - {id: 34, cat: XXX, desc: "XXX/Filmek"}
-    - {id: 39, cat: XXX/ImageSet, desc: "XXX/Képek"}
+    - {id: 1, cat: Movies/SD, desc: "Film/Cam/Eng", default: true}
+    - {id: 2, cat: Movies/SD, desc: "Film/Cam/Hun", default: true}
+    - {id: 8, cat: Movies/DVD, desc: "Film/DVD/Eng", default: true}
+    - {id: 7, cat: Movies/DVD, desc: "Film/DVD/Hun", default: true}
+    - {id: 16, cat: Movies/HD, desc: "Film/HD1080P/Eng", default: true}
+    - {id: 15, cat: Movies/HD, desc: "Film/HD1080P/Hun", default: true}
+    - {id: 14, cat: Movies/HD, desc: "Film/HD720P/Eng", default: true}
+    - {id: 13, cat: Movies/HD, desc: "Film/HD720P/Hun", default: true}
+    - {id: 4, cat: Movies/SD, desc: "Film/SD/Eng", default: true}
+    - {id: 3, cat: Movies/SD, desc: "Film/SD/Hun", default: true}
+    - {id: 18, cat: Movies/UHD, desc: "Film/UHD/Eng", default: true}
+    - {id: 17, cat: Movies/UHD, desc: "Film/UHD/Hun", default: true}
+    - {id: 23, cat: Audio/Audiobook, desc: "Hangosköny", default: true}
+    - {id: 19, cat: PC/Games, desc: "Játék/ISO", default: true}
+    - {id: 20, cat: PC/Games, desc: "Játék/RIP", default: true}
+    - {id: 24, cat: Other, desc: "Képek", default: true}
+    - {id: 21, cat: Books, desc: "Könyv/Eng", default: true}
+    - {id: 22, cat: Books, desc: "Könyv/Hun", default: true}
+    - {id: 35, cat: TV/Anime, desc: "Mese/Eng", default: true}
+    - {id: 36, cat: TV/Anime, desc: "Mese/Hun", default: true}
+    - {id: 25, cat: PC/Mobile-Other, desc: "Mobil", default: true}
+    - {id: 30, cat: PC/ISO, desc: "Programok/ISO", default: true}
+    - {id: 31, cat: PC/0day, desc: "Programok/RIP", default: true}
+    - {id: 33, cat: TV, desc: "Sorozat/Eng", default: true}
+    - {id: 32, cat: TV, desc: "Sorozat/Hun", default: true}
+    - {id: 29, cat: Audio/Lossless, desc: "Zene/FLAC/Eng", default: true}
+    - {id: 28, cat: Audio/Lossless, desc: "Zene/FLAC/Hun", default: true}
+    - {id: 27, cat: Audio/MP3, desc: "Zene/MP3/Eng", default: true}
+    - {id: 26, cat: Audio/MP3, desc: "Zene/MP3/Hun", default: true}
+    - {id: 34, cat: XXX, desc: "XXX/Filmek", default: false}
+    - {id: 39, cat: XXX/ImageSet, desc: "XXX/Képek", default: false}
 
   modes:
     search: [q]
@@ -88,7 +89,7 @@ login:
 search:
   paths:
     - path: browse.php
-      categories: ["!", 34, 39]
+      categories: [1, 2, 8, 7, 16, 15, 14, 13, 4, 3, 18, 17, 23, 19, 20, 24, 21, 22, 35, 36, 25, 30, 31, 33, 32, 29, 28, 27, 26]
     - path: browse.php
       categories: [34, 39]
       inputs:
@@ -146,6 +147,8 @@ search:
     date:
       selector: td:nth-last-child(8)
       filters:
+        - name: regexp
+          args: (\d{4}-\d{2}-\d{2}.\d{2}:\d{2}:\d{2})
         - name: replace
           args: ["\u00a0", " "]
         - name: append

src/Jackett.Common/Definitions/comicat.yml

@@ -5,6 +5,7 @@ description: "comicat is a CHINESE Public tracker for Anime / Hentai / Manga"
 language: zh-CN
 type: public
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://www.comicat.org/
 

src/Jackett.Common/Definitions/crazyhd.yml

@@ -90,12 +90,20 @@ caps:
     book-search: [q]
 
 settings:
-  - name: username
+  - name: cookie
     type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
+    label: Cookie
+  - name: info
+    type: info
+    label: How to get the Cookie
+    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+  - name: useragent
+    type: text
+    label: User-Agent
+  - name: info_useragent
+    type: info
+    label: How to get the User-Agent
+    default: "<ol><li>From the same place you fetched the cookie,<li>Find <b>'user-agent:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole user-agent string <i>(everything after 'user-agent: ')</i> and <b>Paste</b> here.</ol>"
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -118,19 +126,16 @@ settings:
       1: asc
 
 login:
-  path: index.php
-  method: form
-  form: form[action="index.php?page=login"]
+  method: cookie
   inputs:
-    uid: "{{ .Config.username }}"
-    pwd: "{{ .Config.password }}"
-  error:
-    - selector: td.lista span[style="color:#FF0000;"]
+    cookie: "{{ .Config.cookie }}"
   test:
-    path: index.php
+    path: /
     selector: a[href="logout.php"]
 
 search:
+  headers:
+    User-Agent: ["{{ .Config.useragent }}"]
   paths:
     - path: index.php?page=searchlist
       method: post

src/Jackett.Common/Definitions/crnaberza.yml

@@ -26,6 +26,7 @@ caps:
     - {id: 61, cat: Movies/HD, desc: "HD Mesano"}
     - {id: 50, cat: PC/Games, desc: "Igre"}
     - {id: 44, cat: Books, desc: "Knjige"}
+    - {id: 80, cat: TV, desc: "Paketi"}
     - {id: 46, cat: Audio, desc: "Koncerti"}
     - {id: 58, cat: Audio/Lossless, desc: "Lossless/Domaće"}
     - {id: 59, cat: Audio/Lossless, desc: "Lossless/Strano"}

src/Jackett.Common/Definitions/cryptichaven.yml

@@ -1,186 +0,0 @@
----
-id: cryptichaven
-name: CrypticHaven
-description: "CrypticHaven Comedy Club (CCC) is a Private Torrent Tracker dedicated to sharing the joy of Comedy."
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - http://www.cryptichaven.org/ # https not supported ERR_CONNECTION_REFUSED
-
-caps:
-  categorymappings:
-    # Stand-up
-    - {id: 23, cat: TV, desc: "Stand-up DVD5/9"}
-    - {id: 24, cat: TV, desc: "Stand-up AVI"}
-    - {id: 25, cat: TV, desc: "Stand-up MKV"}
-    - {id: 63, cat: TV, desc: "Stand-up MP4"}
-    - {id: 72, cat: TV, desc: "Stand-up WMV"}
-    - {id: 73, cat: TV, desc: "Stand-up MPG"}
-    # TV Shows Seasons
-    - {id: 27, cat: TV, desc: "USA/Canadian DVD5/9"}
-    - {id: 28, cat: TV, desc: "USA/Canadian AVI"}
-    - {id: 29, cat: TV, desc: "USA/Canadian MKV"}
-    - {id: 66, cat: TV, desc: "USA/Canadian MP4"}
-    - {id: 30, cat: TV, desc: "UK/Europe DVD5/9"}
-    - {id: 31, cat: TV, desc: "UK/Europe AVI"}
-    - {id: 32, cat: TV, desc: "UK/Europe MKV"}
-    - {id: 67, cat: TV, desc: "UK/Europe MP4"}
-    - {id: 33, cat: TV, desc: "NZ/Aussie DVD5/9"}
-    - {id: 34, cat: TV, desc: "NZ/Aussie AVI"}
-    - {id: 35, cat: TV, desc: "NZ/Aussie MKV"}
-    - {id: 68, cat: TV, desc: "NZ/Aussie MP4"}
-    # TV Shows Episodes
-    - {id: 76, cat: TV, desc: "UK/Europe DVD"}
-    - {id: 37, cat: TV, desc: "USA/Canadian eps AVI"}
-    - {id: 38, cat: TV, desc: "USA/Canadian eps MKV"}
-    - {id: 69, cat: TV, desc: "USA/Canadian eps MP4"}
-    - {id: 39, cat: TV, desc: "UK/Europe eps AVI"}
-    - {id: 40, cat: TV, desc: "UK/Europe eps MKV"}
-    - {id: 70, cat: TV, desc: "UK/Europe eps MP4"}
-    - {id: 41, cat: TV, desc: "NZ/Aussie eps AVI"}
-    - {id: 42, cat: TV, desc: "NZ/Aussie eps MKV"}
-    - {id: 71, cat: TV, desc: "NZ/Aussie eps MP4"}
-    # Audio Comedy
-    - {id: 54, cat: Audio, desc: "Comedy Albums"}
-    - {id: 44, cat: Audio, desc: "Radio Shows"}
-    - {id: 45, cat: Audio, desc: "Audio Stand-up"}
-    - {id: 55, cat: Audio, desc: "Bootleg"}
-    - {id: 47, cat: Audio, desc: "Musical Comedy"}
-    - {id: 46, cat: Audio/Audiobook, desc: "Audiobooks"}
-    - {id: 56, cat: Audio, desc: "Prank Calls"}
-    - {id: 57, cat: Audio, desc: "Skit/Sketch"}
-    - {id: 58, cat: Audio, desc: "Compilations"}
-    - {id: 61, cat: Audio, desc: "PodCast"}
-    # Comics
-    - {id: 49, cat: Books/Comics, desc: "Comics"}
-    # Books
-    - {id: 51, cat: Books/EBook, desc: "Books"}
-    # Random Oddities
-    - {id: 53, cat: TV, desc: "Random Oddities"}
-    - {id: 59, cat: TV, desc: "Late Night Talkshows"}
-    - {id: 77, cat: TV, desc: "Non-English language"}
-    - {id: 78, cat: TV, desc: "Video Musical Comedy"}
-    - {id: 79, cat: TV, desc: "Video Podcasts"}
-    # BY REQUEST ONLY
-    - {id: 19, cat: Movies, desc: "Movie DVD5/9"}
-    - {id: 20, cat: Movies, desc: "Movie AVI"}
-    - {id: 21, cat: Movies, desc: "Movie MKV"}
-    - {id: 62, cat: Movies, desc: "Movie MP4"}
-    - {id: 74, cat: Movies, desc: "Movie Xvid"}
-    - {id: 75, cat: Movies, desc: "Movie Other"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - 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.
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: data
-    options:
-      data: created
-      seeds: seeders
-      size: size
-      filename: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: DESC
-    options:
-      DESC: desc
-      ASC: asc
-
-login:
-  path: index.php?page=login
-  method: form
-  form: form[action^="index.php?page=login"]
-  inputs:
-    uid: "{{ .Config.username }}"
-    pwd: "{{ .Config.password }}"
-  error:
-    - selector: span[style="color:#FF0000;"]
-  test:
-    path: index.php
-    selector: a[href="/logout.php"]
-
-search:
-  paths:
-    - path: index.php
-  inputs:
-    page: torrents
-    # 0 all, 1 activeonly, 2 deadonly
-    active: 0
-    search: "{{ .Keywords }}"
-    category: "{{ if .Categories }}{{ range .Categories }}{{.}};{{end}}{{ else }}0{{ end }}"
-    fl: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-    order: "{{ .Config.sort }}"
-    by: "{{ .Config.type }}"
-
-  rows:
-    selector: "table.lista > tbody > tr:has(a[href^=\"index.php?page=torrent-details\"])"
-
-  fields:
-    category:
-      selector: td a[href^="index.php?page=torrents&category="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: category
-    title:
-      selector: td a[href^="index.php?page=torrent-details"]
-    details:
-      selector: td a[href^="index.php?page=torrent-details"]
-      attribute: href
-    description:
-      selector: td a[href^="index.php?page=torrents&category="]
-      attribute: title
-    download:
-      selector: td a[href^="/download.php"]
-      attribute: href
-    date:
-      # 22/01/21 01:28
-      selector: td:nth-child(5)
-      filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile - doesn't adjust for DST
-        - name: dateparse
-          args: "02/01/2006 -07:00"
-    seeders:
-      selector: td:nth-child(6)
-    leechers:
-      selector: td:nth-child(7)
-    grabs:
-      selector: td:nth-child(8)
-    size:
-      selector: td:nth-child(10)
-    downloadvolumefactor:
-      case:
-        "strong:contains(\"FreeLeech\")": 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 14 days (as seconds = 14 x 24 x 60 x 60)
-      text: 1209600
-# xbtit

src/Jackett.Common/Definitions/demonoid.yml

@@ -12,13 +12,11 @@ links:
   - https://www.dnoid.pw/
   - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.onion.ws/
   - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.onion.pet/
-  - https://demonoid.unblockit.nz/
+  - https://demonoid.unblockit.page/
   - https://demonoid.torrentbay.to/
-  - https://demonoid.nocensor.world/
+  - https://demonoid.nocensor.lol/
 legacylinks:
   - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.onion.ly/
-  - https://demonoid.unblockit.uno/
-  - https://demonoid.unblockit.ch/
   - https://demonoid.nocensor.space/
   - https://demonoid.unblockit.ws/
   - https://demonoid.nocensor.work/
@@ -36,6 +34,8 @@ legacylinks:
   - https://demonoid.unblockit.ist/
   - https://demonoid.unblockit.bet/
   - https://demonoid.unblockit.cat/
+  - https://demonoid.unblockit.nz/
+  - https://demonoid.nocensor.world/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/digitalcore.yml

@@ -37,8 +37,11 @@ caps:
     - {id: 39, cat: Audio/Video, desc: Music/DVD}
     - {id: 40, cat: Audio/Video, desc: Music/Bluray}
     - {id: 25, cat: PC/Games, desc: Games/PC}
-    - {id: 26, cat: Console, desc: Games/NSW}
     - {id: 27, cat: PC/Mac, desc: Games/Mac}
+    - {id: 26, cat: Console, desc: Games/Consoles}
+    - {id: 43, cat: Console, desc: Games/ROMS}
+    - {id: 42, cat: XXX/Other, desc: Games/XXX}
+    - {id: 44, cat: Audio/Audiobook, desc: Audiobooks}
     - {id: 28, cat: Books/EBook, desc: Ebooks}
     - {id: 30, cat: XXX/SD, desc: XXX/SD}
     - {id: 31, cat: XXX, desc: XXX/HD}

src/Jackett.Common/Definitions/dreamtracker.yml

@@ -21,6 +21,7 @@ caps:
     - {id: 17, cat: Movies/Other, desc: "Cartoon Sub. Embed."}
     - {id: 31, cat: Movies/Other, desc: "Cartoon in Greek "}
     - {id: 107, cat: Movies/Other, desc: "Kids in Greek"}
+    - {id: 120, cat: Movies/Other, desc: "Cartoon Series"}
     - {id: 88, cat: Audio/Other, desc: "Music Kids"}
     # Movies Subs No Embed.
     - {id: 38, cat: Movies, desc: "Movies Subs No Embed."}
@@ -76,6 +77,7 @@ caps:
     - {id: 83, cat: Books/EBook, desc: "Ebooks"}
     - {id: 110, cat: Books/Mags, desc: "EMagazines"}
     - {id: 82, cat: Other, desc: "Pics & Images"}
+    - {id: 119, cat: Audio/Audiobook, desc: "Audio Books"}
     # Games
     - {id: 2, cat: PC/Games, desc: "Games"}
     - {id: 27, cat: PC/Games, desc: "PC"}
@@ -89,6 +91,7 @@ caps:
     - {id: 94, cat: Audio/Lossless, desc: "Foreign Flac"}
     - {id: 117, cat: Audio, desc: "Compact Disc Club"}
     - {id: 20, cat: Audio/Video, desc: "Music Videos"}
+    - {id: 118, cat: Audio, desc: "Dream Radio Music"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/ehentai.yml

@@ -5,6 +5,7 @@ description: "E-Hentai is a Public site for Hentai doujinshi, manga."
 language: en-US
 type: public
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://e-hentai.org/
 

src/Jackett.Common/Definitions/elitetorrent-biz.yml

@@ -5,14 +5,11 @@ description: "EliteTorrent.biz is a Public torrent site for TV, movies and docum
 language: es-ES
 type: public
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://www.elitetorrent.com/
-  - https://elitetorrent.nocensor.world/
+  - https://elitetorrent.nocensor.lol/
 legacylinks:
-  - https://www.elitetorrent.biz/
-  - https://www.elitetorrent.io/
-  - https://www.elitetorrent.one/
-  - https://www.elitetorrent.is/
   - https://www.elitetorrent.nu/
   - https://www.elitetorrent.tv/
   - https://www.elitetorrent.li/
@@ -32,6 +29,7 @@ legacylinks:
   - https://www.elitetorrent.wtf/
   - https://www.elitetorrent.dev/
   - https://elitetorrent.nocensor.sbs/
+  - https://elitetorrent.nocensor.world/
 
 caps:
   categories:

src/Jackett.Common/Definitions/extratorrent-st.yml

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 links:
   - https://extratorrent.st/
-  - https://extratorrent.unblockit.nz/
+  - https://extratorrent.unblockit.page/
   - https://extratorrent.nocensor.world/
 legacylinks:
   - https://extratorrent.nocensor.work/
@@ -25,6 +25,7 @@ legacylinks:
   - https://extratorrent.unblockit.ist/
   - https://extratorrent.unblockit.bet/
   - https://extratorrent.unblockit.cat/
+  - https://extratorrent.unblockit.nz/
 
 caps:
   categorymappings:
@@ -71,6 +72,7 @@ caps:
     - {id: Comics, cat: Books/Comics, desc: Books Comics}
     - {id: Ebooks, cat: Books/EBook, desc: Books Ebook}
     - {id: Other, cat: Other/Misc, desc: Other}
+    - {id: Other Applications, cat: PC, desc: Other Applications}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/exttorrents.yml

@@ -5,6 +5,7 @@ description: "EXT Torrents is a Public torrent site for MOVIES / TV / GENERAL"
 language: en-US
 type: public
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://ext.to/
   - https://site.extto.com/

src/Jackett.Common/Definitions/eztv.yml

@@ -13,19 +13,13 @@ links:
   - https://eztv.yt/
   - https://eztv1.xyz/
   - https://eztv.unblockninja.com/
-  - https://eztv.unblockit.nz/
-  - https://eztv.nocensor.world/
+  - https://eztv.unblockit.page/
+  - https://eztv.nocensor.lol/
 legacylinks:
   - https://eztv.ag/ # redirects to .re
   - https://eztv.it/ # redirects to .re
   - https://eztv.ch/ # redirects to .re
   - https://eztv.io/
-  - https://eztv.unblocked.monster/
-  - https://eztv.unblockit.uno/
-  - https://eztv.unblockit.ch/
-  - https://eztv.nocensor.space/
-  - https://eztv.unblockit.ws/
-  - https://eztv.nocensor.work/
   - https://eztv.unblockit.kim/
   - https://eztv.unblockit.bz/
   - https://eztv.unblockit.tv/
@@ -40,6 +34,8 @@ legacylinks:
   - https://eztv.unblockit.ist/
   - https://eztv.unblockit.bet/
   - https://eztv.unblockit.cat/
+  - https://eztv.unblockit.nz/
+  - https://eztv.nocensor.world/
 
 caps:
   categories:

src/Jackett.Common/Definitions/fantasticheaven.yml

@@ -10,53 +10,47 @@ links:
 
 caps:
   categorymappings:
+    - {id: 157, cat: TV/Documentary, desc: "Doku 1080p"}
+    - {id: 156, cat: TV/Documentary, desc: "Doku 720p"}
+    - {id: 155, cat: TV/Documentary, desc: "Doku SD x264/x265"}
     - {id: 152, cat: Books, desc: "E-Books"}
-    - {id: 141, cat: Movies/HD, desc: "Filme 1080p"}
-    - {id: 140, cat: Movies/UHD, desc: "Filme 2160p"}
-    - {id: 131, cat: Movies/3D, desc: "Filme 3D"}
-    - {id: 154, cat: Movies/HD, desc: "Filme 720p"}
-    - {id: 142, cat: Movies/BluRay, desc: "Filme Bluray"}
-    - {id: 120, cat: Movies/DVD, desc: "Filme DVD"}
-    - {id: 101, cat: Movies/Foreign, desc: "Filme International"}
-    - {id: 139, cat: Movies/HD, desc: "Filme Packs 1080p"}
-    - {id: 119, cat: Movies/UHD, desc: "Filme Packs 2160p"}
-    - {id: 106, cat: Movies/HD, desc: "Filme Packs 720p"}
-    - {id: 105, cat: Movies/SD, desc: "Filme Packs SD"}
-    - {id: 153, cat: Movies/SD, desc: "Filme SD"}
-    - {id: 104, cat: Movies/HD, desc: "Filmklassiker 1080p"}
-    - {id: 135, cat: Movies/UHD, desc: "Filmklassiker 2160p"}
-    - {id: 122, cat: Movies/3D, desc: "Filmklassiker 3D"}
-    - {id: 103, cat: Movies/HD, desc: "Filmklassiker 720p"}
-    - {id: 134, cat: Movies/BluRay, desc: "Filmklassiker Bluray"}
-    - {id: 130, cat: Movies/DVD, desc: "Filmklassiker DVD"}
-    - {id: 136, cat: Movies/Foreign, desc: "Filmklassiker International"}
-    - {id: 124, cat: Movies/HD, desc: "Filmklassiker Packs 1080p"}
-    - {id: 123, cat: Movies/UHD, desc: "Filmklassiker Packs 2160p"}
-    - {id: 121, cat: Movies/HD, desc: "Filmklassiker Packs 720p"}
-    - {id: 127, cat: Movies/SD, desc: "Filmklassiker Packs SD"}
-    - {id: 102, cat: Movies/SD, desc: "Filmklassiker SD"}
+    - {id: 141, cat: Movies/HD, desc: "Filme HD 1080p"}
+    - {id: 154, cat: Movies/HD, desc: "Filme HD 720p"}
+    - {id: 139, cat: Movies/HD, desc: "Filme Packs HD 1080p"}
+    - {id: 106, cat: Movies/HD, desc: "Filme Packs HD 720p"}
+    - {id: 105, cat: Movies/SD, desc: "Filme Packs SD x264/x265"}
+    - {id: 119, cat: Movies/UHD, desc: "Filme Packs UHD 2160p"}
+    - {id: 153, cat: Movies/SD, desc: "Filme SD x264/x265"}
+    - {id: 140, cat: Movies/UHD, desc: "Filme UHD 2160p"}
+    - {id: 104, cat: Movies/HD, desc: "Filmklassiker HD 1080p"}
+    - {id: 103, cat: Movies/HD, desc: "Filmklassiker HD 720p"}
+    - {id: 124, cat: Movies/HD, desc: "Filmklassiker Packs HD 1080p"}
+    - {id: 121, cat: Movies/HD, desc: "Filmklassiker Packs HD 720p"}
+    - {id: 123, cat: Movies/UHD, desc: "Filmklassiker Packs UHD 2160p"}
+    - {id: 127, cat: Movies/SD, desc: "Filmklassiker Packs  x264/x265"}
+    - {id: 102, cat: Movies/SD, desc: "Filmklassiker SD x264/x265"}
+    - {id: 135, cat: Movies/UHD, desc: "Filmklassiker UHD 2160p"}
     - {id: 118, cat: Audio/Audiobook, desc: "Hörbücher"}
     - {id: 109, cat: Audio/Lossless, desc: "Musik Flac"}
     - {id: 129, cat: Audio/MP3, desc: "Musik MP3"}
     - {id: 111, cat: Audio/Lossless, desc: "Musik Packs Flac"}
     - {id: 112, cat: Audio/MP3, desc: "Musik Packs MP3"}
-    - {id: 110, cat: Audio/Video, desc: "Musik Videos"}
-    - {id: 113, cat: TV/HD, desc: "Serie 1080p"}
-    - {id: 114, cat: TV/UHD, desc: "Serie 2160p"}
-    - {id: 125, cat: TV/HD, desc: "Serie 720p"}
+    - {id: 113, cat: TV/HD, desc: "Serie HD 1080p"}
+    - {id: 125, cat: TV/HD, desc: "Serie HD 720p"}
     - {id: 115, cat: TV/Foreign, desc: "Serie International"}
-    - {id: 138, cat: TV/HD, desc: "Serie Packs 1080p"}
-    - {id: 143, cat: TV/UHD, desc: "Serie Packs 2160p"}
-    - {id: 116, cat: TV/HD, desc: "Serie Packs 720p"}
+    - {id: 138, cat: TV/HD, desc: "Serie Packs HD 1080p"}
+    - {id: 116, cat: TV/HD, desc: "Serie Packs HD 720p"}
     - {id: 144, cat: TV/Foreign, desc: "Serie Packs International"}
-    - {id: 137, cat: TV/SD, desc: "Serie Packs SD"}
-    - {id: 133, cat: TV/SD, desc: "Serie SD"}
+    - {id: 137, cat: TV/SD, desc: "Serie Packs SD x264/x265"}
+    - {id: 143, cat: TV/UHD, desc: "Serie Packs UHD 2160p"}
+    - {id: 133, cat: TV/SD, desc: "Serie SD x264/x265"}
+    - {id: 114, cat: TV/UHD, desc: "Serie UHD 2160p"}
     - {id: 150, cat: PC/0day, desc: "Windows Apps"}
     - {id: 149, cat: PC/Games, desc: "Windows Spiele"}
-    - {id: 147, cat: XXX/x264, desc: "XXX 1080p"}
-    - {id: 146, cat: XXX/x264, desc: "XXX 720p"}
+    - {id: 147, cat: XXX/x264, desc: "XXX HD 1080p"}
+    - {id: 146, cat: XXX/x264, desc: "XXX HD 720p"}
     - {id: 148, cat: XXX/Pack, desc: "XXX Packs"}
-    - {id: 69, cat: XXX/SD, desc: "XXX SD"}
+    - {id: 69, cat: XXX/SD, desc: "XXX SD x264/x265"}
     - {id: 151, cat: Books/Mags, desc: "Zeitschriften"}
 
   modes:

src/Jackett.Common/Definitions/filelisting.yml

@@ -7,10 +7,11 @@ type: public
 encoding: UTF-8
 links:
   - https://filelisting.com/
-  - https://filelisting.nocensor.world/
+  - https://filelisting.nocensor.lol/
 legacylinks:
   - https://filelisting.nocensor.biz/
   - https://filelisting.nocensor.sbs/
+  - https://filelisting.nocensor.world/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/firebit.yml

@@ -5,6 +5,7 @@ description: "FireBit is an UKRAINIAN / RUSSIAN Public Torrent Tracker for MOVIE
 language: ru-RU
 type: public
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://firebit.net/
 legacylinks:
@@ -63,12 +64,10 @@ download:
       attribute: href
 
 search:
-  # http://firebit.net/index.php?do=search&type=simple&q=2019
-  # http://firebit.net/%D1%84%D0%B8%D0%BB%D1%8C%D0%BC/  # movies
-  # http://firebit.net/%D1%81%D0%B5%D1%80%D0%B8%D0%B0%D0%BB/ # tv
+  # http://firebit.net/index.php?do=search&type=simple&q=2022
   paths:
-    - path: "{{ if .Keywords }}index.php?do=search&type=simple&q={{ .Keywords }}{{ else }}%D1%84%D0%B8%D0%BB%D1%8C%D0%BC/{{ end }}"
-    - path: "{{ if .Keywords }}index.php?do=search&type=simple&q=abcd1234{{ else }}%D1%81%D0%B5%D1%80%D0%B8%D0%B0%D0%BB/{{ end }}"
+    - path: "{{ if .Keywords }}index.php?do=search&type=simple&q={{ .Keywords }}{{ else }}{{ end }}"
+    - path: "{{ if .Keywords }}index.php?do=search&type=simple&q={{ .Keywords }}&cstart=2{{ else }}%D1%81%D1%82%D1%80%D0%B0%D0%BD%D0%B8%D1%86%D0%B0/2/{{ end }}"
 
   rows:
     selector: "{{ if .Keywords }}table.torrents tbody tr:has(td.td-size){{ else }}div[id^=\"post-id-\"]:has(li.meta-size){{ end }}"
@@ -77,6 +76,9 @@ search:
 
   fields:
     category:
+      text: "-"
+    category|noappend:
+      optional: true
       selector: td:nth-child(1), div.article-indent div b
       filters:
         - name: replace

src/Jackett.Common/Definitions/frozenlayer.yml

@@ -5,6 +5,7 @@ description: "Frozen Layer is a SPANISH Public torrent site focused on ANIME"
 language: es-ES
 type: public
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://www.frozen-layer.com/
 

src/Jackett.Common/Definitions/fuzer.yml

@@ -13,7 +13,7 @@ legacylinks:
 caps:
   categorymappings:
     # Movies
-    - {id: 73, cat: Movies, desc: "סרטים"}
+    - {id: 73, cat: Movies, desc: "FuzePacks -סרטים"}
     - {id: 7, cat: Movies/SD, desc: "סרטים"}
     - {id: 60, cat: Movies/SD, desc: "סרטים ישראליים"}
     - {id: 9, cat: Movies/HD, desc: "סרטים HD"}
@@ -24,7 +24,7 @@ caps:
     - {id: 58, cat: Movies/DVD, desc: "סרטים DVD-R"}
     - {id: 83, cat: Movies/Other, desc: "סרטים מדובבים"}
     # TV
-    - {id: 76, cat: TV, desc: "סדרות"}
+    - {id: 76, cat: TV, desc: "FuzePacks - סדרות"}
     - {id: 8, cat: TV/SD, desc: "סדרות"}
     - {id: 62, cat: TV/SD, desc: "סדרות ישראליות"}
     - {id: 10, cat: TV/HD, desc: "Tסדרות HD"}
@@ -34,7 +34,7 @@ caps:
     - {id: 65, cat: TV/Anime, desc: "אנימה"}
     - {id: 64, cat: TV/Sport, desc: "ספורט"}
     # PC
-    - {id: 74, cat: PC, desc: "תוכנות"}
+    - {id: 74, cat: PC, desc: "FuzePacks - תוכנות"}
     - {id: 15, cat: PC/0day, desc: "תוכנות PC"}
     - {id: 11, cat: PC/Games, desc: "משחקים PC"}
     - {id: 13, cat: PC/Mobile-Android, desc: "אפליקציות לאנדרואיד"}
@@ -43,13 +43,13 @@ caps:
     # XXX
     - {id: 16, cat: XXX, desc: "למבוגרים בלבד"}
     # Games
-    - {id: 72, cat: Console, desc: "משחקים"}
+    - {id: 72, cat: Console, desc: "FuzePacks - משחקים"}
     - {id: 55, cat: Console/XBox, desc: "משחקים XBOX"}
     - {id: 12, cat: Console/PSP, desc: "משחקים PS"}
     - {id: 56, cat: Console/Wii, desc: "משחקים WII"}
     - {id: 57, cat: PC/Mobile-Other, desc: "משחקי קונסולות ניידות"}
     # Music
-    - {id: 75, cat: Audio, desc: "שירים"}
+    - {id: 75, cat: Audio, desc: "FuzePacks - שירים"}
     - {id: 14, cat: Audio, desc: "מוזיקה עולמית"}
     - {id: 66, cat: Audio, desc: "מוזיקה ישראלית"}
     - {id: 68, cat: Audio, desc: "פסקולים"}
@@ -116,17 +116,19 @@ search:
     $raw: "{{ range .Categories }}c[]={{.}}&{{end}}"
 
   rows:
-    selector: .box_torrent
+    # Others, Classic
+    selector: .box_torrent, table.tborder[align="center"][border="0"][cellpadding="0"][cellspacing="1"][class="tborder"][width="100%"] > tbody > tr:has(a[href^="/attachment.php?"])
 
   fields:
     category:
-      selector: a[href^="/browse.php?cat="]
+      # Others, Classic
+      selector: a[href^="/browse.php?cat="], a[href^="/browse.php?r3=1&cat="]
       attribute: href
       filters:
         - name: querystring
           args: cat
     title:
-      selector: .main_title
+      selector: a[href^="/showthread.php?t="]
     details:
       selector: a[href^="/showthread.php?t="]
       attribute: href
@@ -134,30 +136,30 @@ search:
       selector: a[href^="/attachment.php?attachmentid="]
       attribute: href
     imdbid:
-      selector: span.imdb-inline > a
+      selector: a[href*="imdb.com/title/tt"]
       attribute: href
     poster:
       selector: a[imgsrc]
       attribute: imgsrc
     size:
-      selector: td:nth-child(4)
+      selector: td:nth-last-child(4)
     grabs:
-      selector: td:nth-child(5)
+      selector: td:nth-last-child(3)
       filters:
         - name: replace
           args: [",", ""]
     seeders:
-      selector: td:nth-child(6)
+      selector: td:nth-last-child(2)
       filters:
         - name: replace
           args: [",", ""]
     leechers:
-      selector: td:nth-child(7)
+      selector: td:nth-last-child(1)
       filters:
         - name: replace
           args: [",", ""]
     date:
-      selector: .up_info2
+      selector: div[class^="up_info"]
       filters:
         - name: append
           args: " +02:00" # IST

src/Jackett.Common/Definitions/gamestorrents.yml

@@ -7,7 +7,6 @@ type: public
 encoding: UTF-8
 links:
   - https://www.gamestorrents.fm/
-  - https://gamestorrents.nocensor.world/
 legacylinks:
   - https://www.gamestorrents.com/
   - https://www.gamestorrents.tv/
@@ -16,6 +15,7 @@ legacylinks:
   - https://gamestorrents.nocensor.work/
   - https://gamestorrents.nocensor.biz/
   - https://gamestorrents.nocensor.sbs/
+  - https://gamestorrents.nocensor.world/
 
 caps:
   categorymappings:

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

@@ -5,6 +5,7 @@ description: "Gay-Torrents.net is a Private Torrent Tracker for GAY 3X"
 language: en-US
 type: semi-private
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://www.gay-torrents.net/
 

src/Jackett.Common/Definitions/girotorrent.yml

@@ -221,18 +221,18 @@ search:
         - name: regexp
           args: "src=(.+?) "
     date:
-      selector: td:nth-last-child(8)
+      selector: td:nth-last-child(9)
       filters:
         - name: append
           args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
           args: "02/01/2006 -07:00"
     seeders:
-      selector: td:nth-last-child(7)
+      selector: td:nth-last-child(8)
     leechers:
-      selector: td:nth-last-child(6)
+      selector: td:nth-last-child(7)
     grabs:
-      selector: td:nth-last-child(5)
+      selector: td:nth-last-child(6)
     size:
       selector: td:nth-last-child(4)
     downloadvolumefactor:

src/Jackett.Common/Definitions/gktorrent.yml

@@ -9,11 +9,8 @@ followredirect: true
 # to fetch current domain use https://www.protege-liens.com/gktorrent
 links:
   - https://www.gktorrents.cc/
-  - https://gktorrent.nocensor.world/
+  - https://gktorrent.nocensor.lol/
 legacylinks:
-  - http://www.gktorrent.co/
-  - https://www.gktorrent.co/
-  - https://www.gktorrent.ws/
   - https://www.gktorrent.org/
   - https://www.gktorrent.me/
   - https://www.rantop.org/
@@ -33,6 +30,7 @@ legacylinks:
   - https://gktorrent.nocensor.biz/
   - https://www.gktorrents.org/
   - https://gktorrent.nocensor.sbs/
+  - https://gktorrent.nocensor.world/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/glodls.yml

@@ -10,16 +10,12 @@ links:
   - https://glodls.to/
   - https://gtdb.cc/
   - https://www.gtdb.to/
-  - https://glotorrents.unblockit.nz/
-  - https://glotorrents.nocensor.world/
+  - https://glotorrents.unblockit.page/
+  - https://glotorrents.nocensor.lol/
   - https://glodls.unblockninja.com/
 legacylinks:
   - https://glodls.rocks/
   - https://gtdb.to/
-  - https://glodls.unblocked.monster/
-  - https://glotorrents.unblockit.uno/
-  - https://glotorrents.unblockit.ch/
-  - https://glotorrents.nocensor.space/
   - https://glotorrents.unblockit.ws/
   - https://glotorrents.nocensor.work/
   - https://glotorrents.unblockit.kim/
@@ -36,6 +32,8 @@ legacylinks:
   - https://glotorrents.unblockit.ist/
   - https://glotorrents.unblockit.bet/
   - https://glotorrents.unblockit.cat/
+  - https://glotorrents.unblockit.nz/
+  - https://glotorrents.nocensor.world/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/haitang.yml

@@ -5,20 +5,21 @@ description: "海棠PT (Hǎitáng PT) is a CHINESE Private Torrent Tracker for O
 language: zh-CN
 type: private
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://www.htpt.cc/
 
 caps:
   categorymappings:
-    - {id: 1, cat: Audio, desc: "相声 Crosstalk"}
-    - {id: 4091, cat: Audio, desc: "评书 Storytelling"}
-    - {id: 4097, cat: Audio, desc: "戏曲 Opera"}
-    - {id: 4098, cat: Audio, desc: "鼓/琴 Drum / Piano"}
-    - {id: 4099, cat: Audio, desc: "小曲 Small Song"}
-    - {id: 4101, cat: Audio, desc: "小品 Sketch"}
-    - {id: 4104, cat: Audio, desc: "二人转 Duets"}
-    - {id: 4105, cat: TV, desc: "小剧种 Puppet shows"}
-    - {id: 4103, cat: Audio/Audiobook, desc: "广播剧 Audiobooks"}
+    - {id: 1, cat: Audio, desc: "相声 Crosstalk", default: true}
+    - {id: 4091, cat: Audio, desc: "评书 Storytelling", default: true}
+    - {id: 4097, cat: Audio, desc: "戏曲 Opera", default: true}
+    - {id: 4098, cat: Audio, desc: "鼓/琴 Drum / Piano", default: true}
+    - {id: 4099, cat: Audio, desc: "小曲 Small Song", default: true}
+    - {id: 4101, cat: Audio, desc: "小品 Sketch", default: true}
+    - {id: 4104, cat: Audio, desc: "二人转 Duets", default: true}
+    - {id: 4105, cat: TV, desc: "小剧种 Puppet shows", default: true}
+    - {id: 4103, cat: Audio/Audiobook, desc: "广播剧 Audiobooks", default: false}
 
   modes:
     search: [q]
@@ -77,7 +78,7 @@ login:
 search:
   paths:
     - path: torrents.php
-      categories: ["!", 4103]
+      categories: [1, 4091, 4097, 4098, 4099, 4101, 4104, 4105]
     - path: live.php
       categories: [4103]
   inputs:

src/Jackett.Common/Definitions/hdturk.yml

@@ -105,6 +105,16 @@ login:
     path: index.php
     selector: a[href*="/logout.php?logouthash="]
 
+download:
+  before:
+    path: takethanks.php
+    method: post
+    inputs:
+      torrentid: "{{ .DownloadUri.Query.id }}"
+  selectors:
+    - selector: a[href*="download.php?id="]
+      attribute: href
+
 search:
   paths:
     - path: browse.php
@@ -150,7 +160,7 @@ search:
         - name: dateparse
           args: "02-01-2006 15:04 -07:00"
     download:
-      selector: a[href*="download.php?id="]
+      selector: div[id^="port-target-"] a
       attribute: href
     size:
       selector: td:nth-child(5)

src/Jackett.Common/Definitions/hellashut.yml

@@ -0,0 +1,188 @@
+---
+id: hellashut
+name: HellasHut
+description: "HellasHut is a GREEK Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: el-GR
+type: private
+encoding: UTF-8
+testlinktorrent: false
+links:
+  - https://hellashut.de/
+
+caps:
+  categorymappings:
+    - {id: 28, cat: TV/Anime, desc: "Anime/Cartoon HD"}
+    - {id: 47, cat: TV/Anime, desc: "Anime/Cartoon HDTV"}
+    - {id: 48, cat: TV/Anime, desc: "Anime/Cartoon SD"}
+    - {id: 50, cat: TV/Anime, desc: "Anime/Cartoon SD Emb"}
+    - {id: 51, cat: TV/Anime, desc: "Anime/Cartoon TV"}
+    - {id: 77, cat: PC, desc: "Applications DOS"}
+    - {id: 20, cat: PC, desc: "Applications Linux"}
+    - {id: 19, cat: PC/Mac, desc: "Applications MAC"}
+    - {id: 68, cat: PC, desc: "Applications OS2 WARP"}
+    - {id: 21, cat: PC, desc: "Applications Other"}
+    - {id: 18, cat: PC/0day, desc: "Applications Windows"}
+    - {id: 52, cat: Books, desc: "Books/Magazines All"}
+    - {id: 9, cat: TV/Documentary, desc: "Documentaries All"}
+    - {id: 53, cat: TV/Documentary, desc: "Documentaries Greek"}
+    - {id: 54, cat: TV/Documentary, desc: "Documentaries HD"}
+    - {id: 55, cat: Movies/DVD, desc: "DVD-R All"}
+    - {id: 17, cat: Console/Other, desc: "Games Other"}
+    - {id: 11, cat: Console/PS4, desc: "Games PSX"}
+    - {id: 10, cat: PC/Games, desc: "Games Windows"}
+    - {id: 13, cat: Console/XBox, desc: "Games Xbox"}
+    - {id: 56, cat: Other, desc: "Miscellaneous All"}
+    - {id: 57, cat: PC/Mobile-Other, desc: "Mobile All"}
+    - {id: 1, cat: Movies/3D, desc: "Movies 3D"}
+    - {id: 2, cat: Movies/UHD, desc: "Movies 4K"}
+    - {id: 42, cat: Movies/BluRay, desc: "Movies BluRay"}
+    - {id: 58, cat: Movies/DVD, desc: "Movies DVD"}
+    - {id: 4, cat: Movies/HD, desc: "Movies HD"}
+    - {id: 69, cat: Movies/HD, desc: "Movies HD Packs"}
+    - {id: 3, cat: Movies/SD, desc: "Movies SD"}
+    - {id: 67, cat: Movies/SD, desc: "Movies SD Packs"}
+    - {id: 71, cat: Audio, desc: "Music CDA"}
+    - {id: 59, cat: Audio, desc: "Music Discographies"}
+    - {id: 23, cat: Audio/Lossless, desc: "Music FLAC"}
+    - {id: 22, cat: Audio/MP3, desc: "Music MP3"}
+    - {id: 25, cat: Audio/Video, desc: "Music Video"}
+    - {id: 75, cat: Movies/HD, desc: "NO IN SUBS Movies HD"}
+    - {id: 76, cat: Movies/UHD, desc: "NO SUBS IN Movies 4K"}
+    - {id: 35, cat: TV/Sport, desc: "Sports HD"}
+    - {id: 34, cat: TV/Sport, desc: "Sports SD"}
+    - {id: 5, cat: TV, desc: "TV Greek Movies"}
+    - {id: 6, cat: TV, desc: "TV Greek Series"}
+    - {id: 7, cat: TV, desc: "TV Greek Series Packs"}
+    - {id: 60, cat: TV, desc: "TV Greek Shows"}
+    - {id: 41, cat: TV/HD, desc: "TV HD"}
+    - {id: 61, cat: TV, desc: "TV Series"}
+    - {id: 62, cat: TV, desc: "TV Series Emb"}
+    - {id: 63, cat: TV, desc: "TV Series Emb Packs"}
+    - {id: 64, cat: TV/HD, desc: "TV Series HD"}
+    - {id: 65, cat: TV/HD, desc: "TV Series HD Packs"}
+    - {id: 66, cat: TV, desc: "TV Series Packs"}
+    - {id: 73, cat: Movies/BluRay, desc: "UNTOUCHED BluRay"}
+    - {id: 72, cat: Movies/DVD, desc: "UNTOUCHED DVD"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: id
+    options:
+      id: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: account-login.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    returnto: /
+  error:
+    - selector: td.embedded:contains("Access Denied")
+  test:
+    path: /
+    selector: a[href="account-logout.php"]
+
+download:
+  selectors:
+    - selector: a[href^="download.php?id="]
+      attribute: href
+
+search:
+  paths:
+    # https://hellashut.de/torrents-search.php?c52=1&search=&cat=0&incldead=1&advanced=1&lang=0&blah=0&freeleech=0&sort=id&order=desc
+    - path: torrents-search.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    cat: 0
+    # 0 active, 1 incldead, 2 onlydead
+    incldead: 1
+    # 0 all, 1 notfree, 2 onlyfree
+    advanced: 1
+    # 0 all, 1 English, 2 French, 3 German, 4 Italian, 5 Japanese, 6 Spanish, 7 Russian, 8 Greek
+    lang: 0
+    # 0 name, 1 descr, 2 uploader
+    blah: "{{ if .Query.IMDBID }}1{{ else }}0{{ end }}"
+    freeleech: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    sort: "{{ .Config.sort }}"
+    order: "{{ .Config.type }}"
+    # does not return imdb link in results
+
+  keywordsfilters:
+    - name: re_replace
+      args: ["(\\w+)", " +$1"] # prepend + to each word
+
+  rows:
+    selector: table.ttable_headinner tr.t-row
+
+  fields:
+    category:
+      selector: a[href*="cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="torrents-details.php?id="]
+      attribute: title
+    details:
+      selector: a[href^="torrents-details.php?id="]
+      attribute: href
+      filters:
+        - name: replace
+          args: ["&hit=1", ""] # avoid redirect
+    download:
+      selector: a[href^="torrents-details.php?id="]
+      attribute: href
+      filters:
+        - name: replace
+          args: ["&hit=1", ""] # avoid redirect
+    size:
+      selector: td:nth-last-child(7)
+    date:
+      selector: td:nth-last-child(6)
+    grabs:
+      selector: td:nth-last-child(5)
+    seeders:
+      selector: td:nth-last-child(4)
+    leechers:
+      selector: td:nth-last-child(3)
+    downloadvolumefactor:
+      case:
+        img[src="pic/freedownload.gif"]: 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1.0
+# TorrentTrader v2-svn

src/Jackett.Common/Definitions/hqsource.yml

@@ -1,138 +0,0 @@
----
-id: hqsource
-name: HQSource
-description: "HQSource (HQS) is a POLISH Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: pl-PL
-type: private
-encoding: ISO-8859-2
-links:
-  - https://hqsource.org/
-legacylinks:
-  - http://hqsource.org/
-
-caps:
-  categorymappings:
-    - {id: 36, cat: Movies/3D, desc: "3D"}
-    - {id: 3, cat: Movies/UHD, desc: "4K/UHD"}
-    - {id: 2, cat: Movies/HD, desc: "BDRip"}
-    - {id: 1, cat: Movies/HD, desc: "BRRip"}
-    - {id: 49, cat: Movies/BluRay, desc: "BluRay"}
-    - {id: 8, cat: Movies/SD, desc: "DVD"}
-    - {id: 4, cat: TV/HD, desc: "HDTV"}
-    - {id: 7, cat: Movies/SD, desc: "HQDVDRip"}
-    - {id: 45, cat: Movies/HD, desc: "MKV"}
-    - {id: 11, cat: Audio, desc: "Music"}
-    - {id: 6, cat: Other, desc: "Special"}
-    - {id: 46, cat: PC, desc: "Tools"}
-    - {id: 9, cat: TV, desc: "TV-Series"}
-    - {id: 5, cat: Movies, desc: "WEB-DL"}
-    - {id: 35, cat: XXX, desc: "XXX"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: pin
-    type: text
-    label: Pin
-
-login:
-  path: takelogin.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    pin: "{{ .Config.pin }}"
-    returnto: /
-  error:
-    - selector: td.embedded:has(h2:contains("failed"))
-    - selector: td.embedded:has(h2:contains("Error"))
-  test:
-    selector: a[href^="logout.php"]
-    path: browse.php
-
-search:
-  paths:
-    - path: browse.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    incldead: 1
-    polish: 0
-    # 0 both, 1 name, 2 desc
-    blah: 1
-
-  rows:
-    selector: table#line > tbody > tr:has(a[href^="details.php?id="])
-
-  fields:
-    title:
-      selector: a[href^="details.php?id="]
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    category:
-      selector: a[href^="browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    download:
-      selector: a[href^="download.php/"]
-      attribute: href
-    _language:
-      optional: true
-      selector: img[src="pic/pl.png"]
-      filters:
-        - name: append
-          args: "Language: polish\n<br>"
-    _subbed:
-      optional: true
-      selector: img[src="pic/napisy.png"]
-      filters:
-        - name: append
-          args: "Subbed\n<br>"
-    description:
-      text: "{{ .Result._language }}{{ .Result._subbed }}"
-    imdbid:
-      selector: a[href*="imdb.com/title/tt"]
-    grabs:
-      selector: td:nth-child(6)
-    size:
-      selector: td:nth-child(5)
-    date:
-      selector: td:nth-child(2)
-      filters:
-        - name: regexp
-          args: (\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
-    seeders:
-      selector: td:nth-child(7)
-    leechers:
-      selector: td:nth-child(8)
-    downloadvolumefactor:
-      case:
-        "img[src=\"pic/download2.gif\"]": 0
-        "*": 1
-    uploadvolumefactor:
-      case:
-        "img[src=\"pic/double.png\"]": 2
-        "*": 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 3 days (as seconds = 3 x 24 x 60 x 60)
-      text: 259200
-# engine tbd

src/Jackett.Common/Definitions/idope.yml

@@ -5,6 +5,7 @@ description: "iDope is a Public torrent search engine presenting direct magnet l
 language: en-US
 type: public
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://idope.se/
 legacylinks:

src/Jackett.Common/Definitions/ihdbits.yml

@@ -0,0 +1,192 @@
+---
+id: ihdbits
+name: iHDBits
+description: "iHDBits is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
+language: zh-CN
+type: private
+encoding: UTF-8
+links:
+  - https://ihdbits.me/
+
+caps:
+  categorymappings:
+    - {id: 401, cat: Movies, desc: "Movies/电影"}
+    - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片"}
+    - {id: 405, cat: TV/Anime, desc: "Animations/动漫"}
+    - {id: 402, cat: TV, desc: "TV Series/连续剧"}
+    - {id: 403, cat: TV, desc: "TV Shows/综艺"}
+    - {id: 406, cat: Audio/Video, desc: "Music Videos/MV"}
+    - {id: 407, cat: TV/Sport, desc: "Sports/体育"}
+    - {id: 409, cat: Other, desc: "Misc/其他"}
+    - {id: 408, cat: Audio, desc: "Music/音乐"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, doubanid]
+    movie-search: [q, imdbid, doubanid]
+    music-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: 2facode
+    type: text
+    label: 2FA code
+  - name: info_2fa
+    type: info
+    label: "About 2FA code"
+    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the iHDBits Web Site. Otherwise just leave it empty."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      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.
+
+login:
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img[alt="CAPTCHA"]
+    input: imagestring
+  inputs:
+    secret: ""
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    two_step_code: "{{ .Config.2facode }}"
+    logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: yes
+  error:
+    - selector: td.embedded:has(h2:contains("失败"))
+    - selector: td.embedded:has(h2:contains("Failed"))
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: torrents.php
+  inputs:
+    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if .Query.DoubanID }}{{ .Query.DoubanID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 incldead, 1 active, 2 dead
+    incldead: 0
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdburl (not working)
+    search_area: "{{ if .Query.IMDBID }}1{{ else }}{{ end }}{{ if .Query.DoubanID }}1{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ else }}0{{ end }}"
+    # 0 AND, 1 OR, 2 exact
+    search_mode: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+
+  rows:
+    selector: table.torrents > tbody > tr:has(a[href^="details.php?id="])
+
+  fields:
+    category:
+      selector: a[href^="?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title_default:
+      selector: a[href^="details.php?id="]
+    title_optional:
+      optional: true
+      selector: a[title][href^="details.php?id="]
+      attribute: title
+    title:
+      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    imdbid:
+      # site currently only has a badge and rating, the id is not present. just in case a future update.
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    doubanid:
+      # site currently only has a badge and rating, the id is not present. just in case a future update.
+      selector: a[href*="movie.douban.com/subject/"]
+      attribute: href
+    date_elapsed:
+      # time type: time elapsed (default)
+      selector: td.rowfollow:nth-child(4) > span[title]
+      attribute: title
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "2006-01-02 15:04:05 -07:00"
+    date_added:
+      # time added
+      selector: td.rowfollow:nth-child(4):not(:has(span))
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "2006-01-0215:04:05 -07:00"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
+    size:
+      selector: td.rowfollow:nth-child(5)
+    seeders:
+      selector: td.rowfollow:nth-child(6)
+    leechers:
+      selector: td.rowfollow:nth-child(7)
+    grabs:
+      selector: td.rowfollow:nth-child(8)
+    downloadvolumefactor:
+      case:
+        img.pro_free: 0
+        img.pro_free2up: 0
+        img.pro_50pctdown: 0.5
+        img.pro_50pctdown2up: 0.5
+        img.pro_30pctdown: 0.3
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img.pro_50pctdown2up: 2
+        img.pro_free2up: 2
+        img.pro_2up: 2
+        "*": 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 5 day (as seconds = 5 x 24 x 60 x 60)
+      text: 432000
+    description:
+      selector: td.rowfollow:nth-child(2)
+      remove: a, img
+# NexusPHP 1.7.29 2022-10-13

src/Jackett.Common/Definitions/ilcorsaronero.yml

@@ -6,12 +6,13 @@ language: it-IT
 type: public
 encoding: Windows-1252
 followredirect: true
+requestDelay: 2
 links:
   - https://ilcorsaronero.link/
   - https://ilcorsaronero.fun/
   - https://ilcorsaronero.pro/
   - https://ilcorsaronero.torrentbay.to/
-  - https://ilcorsaronero.nocensor.world/
+  - https://ilcorsaronero.nocensor.lol/
 legacylinks:
   - https://ilcorsaronero.live/
   - https://ilcorsaronero.vip/
@@ -29,6 +30,7 @@ legacylinks:
   - https://ilcorsaronero.nocensor.work/
   - https://ilcorsaronero.nocensor.biz/
   - https://ilcorsaronero.nocensor.sbs/
+  - https://ilcorsaronero.nocensor.world/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/kickasstorrents-to.yml

@@ -5,6 +5,7 @@ description: "kickasstorrents.to is a Public KickAssTorrent clone for TV / MOVIE
 language: en-US
 type: public
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://kickasstorrents.to/
   - https://kickasstorrent.cr/

src/Jackett.Common/Definitions/kinozal.yml

@@ -6,11 +6,12 @@ language: ru-RU
 type: semi-private
 encoding: windows-1251
 links:
-  - http://kinozal.tv/ # site forces http, https is not supported
+  - https://kinozal.tv/
   - https://kinozal.guru/
   - https://kinozal-guru.appspot.com/
 legacylinks:
   - https://kinozal-tv.appspot.com/
+  - http://kinozal.tv/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/kufirc.yml

@@ -5,6 +5,8 @@ description: "Kufirc is a HUNGARIAN Private tracker for 3X"
 language: hu-HU
 type: private
 encoding: UTF-8
+certificates:
+  - 1a528cffb19a5306daa44f99e6cce5d2a3c657c1 # Expired 24 Oct 2022
 links:
   - https://kufirc.com/
 

src/Jackett.Common/Definitions/lastfiles.yml

@@ -6,6 +6,7 @@ language: ro-RO
 type: private
 encoding: utf-8
 followredirect: true
+requestDelay: 2
 links:
   - https://www.lastfiles.ro/
   - http://www.lastfiles.ro/
@@ -17,48 +18,48 @@ legacylinks:
 
 caps:
   categorymappings:
-    - {id: 31, cat: Movies/UHD, desc: "Movies: 4K"}
-    - {id: 5, cat: Movies/BluRay, desc: "Movies: BluRay"}
-    - {id: 9, cat: Movies/DVD, desc: "Movies: DVD"}
-    - {id: 11, cat: Movies/HD, desc: "Movies: HD"}
-    - {id: 58, cat: Movies/SD, desc: "Movies: Cam"}
-    - {id: 61, cat: Movies/3D, desc: "Movies: 3D"}
-    - {id: 24, cat: Movies/SD, desc: "Movies: XVID"}
-    - {id: 16, cat: Movies, desc: "Movies: Old"}
-    - {id: 54, cat: Movies/WEB-DL, desc: "Movies: WEB-DL"}
-    - {id: 56, cat: TV/Documentary, desc: "Documentary"}
-    - {id: 18, cat: Movies, desc: "Movies: Pack"}
-    - {id: 32, cat: Movies/UHD, desc: "Movies: 4KRO"}
-    - {id: 6, cat: Movies/BluRay, desc: "Movies: BluRay-Ro"}
-    - {id: 12, cat: Movies/HD, desc: "Movies: HD-Ro"}
-    - {id: 81, cat: Movies/HD, desc: "Movies: x265-Ro"}
-    - {id: 82, cat: Movies/HD, desc: "Movies: x265"}
-    - {id: 10, cat: Movies/DVD, desc: "Movies: DVD-Ro"}
-    - {id: 59, cat: Movies/SD, desc: "Movies: Cam-RO"}
-    - {id: 25, cat: Movies/SD, desc: "Movies: XVID-Ro"}
-    - {id: 17, cat: Movies, desc: "Movies: Old-Ro"}
-    - {id: 55, cat: Movies/WEB-DL, desc: "Movies: WEB-DL Ro"}
-    - {id: 57, cat: TV/Documentary, desc: "Documentary-Ro"}
-    - {id: 62, cat: Movies/3D, desc: "Movies: 3D-Ro"}
-    - {id: 19, cat: Movies, desc: "Movies: Pack-Ro"}
-    - {id: 20, cat: TV, desc: "TV Episodes"}
-    - {id: 21, cat: TV, desc: "TV Episodes-Ro"}
-    - {id: 13, cat: TV/HD, desc: "HDTV Episodes"}
-    - {id: 14, cat: TV/HD, desc: "HDTV Episodes-Ro"}
-    - {id: 28, cat: Audio, desc: "Music"}
-    - {id: 51, cat: PC/Mobile-Android, desc: "Android Apps"}
-    - {id: 26, cat: PC/0day, desc: "Software"}
-    - {id: 30, cat: PC/Games, desc: "Games: PC-ISO"}
-    - {id: 33, cat: PC/Games, desc: "Games: Packs"}
-    - {id: 1, cat: TV/Anime, desc: "Movies: Anime"}
-    - {id: 2, cat: TV/Anime, desc: "Movies: Anime-Ro"}
-    - {id: 42, cat: TV/Sport, desc: "Sport"}
-    - {id: 43, cat: Books, desc: "Documents"}
-    - {id: 44, cat: Other, desc: "Images"}
-    - {id: 49, cat: Other, desc: "Diverse"}
-    - {id: 22, cat: Other, desc: "RoContent"}
-    - {id: 60, cat: XXX/ImageSet, desc: "Images: XXX"}
-    - {id: 27, cat: XXX, desc: "Movies: XXX"}
+    - {id: 31, cat: Movies/UHD, desc: "Movies: 4K", default: true}
+    - {id: 5, cat: Movies/BluRay, desc: "Movies: BluRay", default: true}
+    - {id: 9, cat: Movies/DVD, desc: "Movies: DVD", default: true}
+    - {id: 11, cat: Movies/HD, desc: "Movies: HD", default: true}
+    - {id: 58, cat: Movies/SD, desc: "Movies: Cam", default: true}
+    - {id: 61, cat: Movies/3D, desc: "Movies: 3D", default: true}
+    - {id: 24, cat: Movies/SD, desc: "Movies: XVID", default: true}
+    - {id: 16, cat: Movies, desc: "Movies: Old", default: true}
+    - {id: 54, cat: Movies/WEB-DL, desc: "Movies: WEB-DL", default: true}
+    - {id: 56, cat: TV/Documentary, desc: "Documentary", default: true}
+    - {id: 18, cat: Movies, desc: "Movies: Pack", default: true}
+    - {id: 32, cat: Movies/UHD, desc: "Movies: 4KRO", default: true}
+    - {id: 6, cat: Movies/BluRay, desc: "Movies: BluRay-Ro", default: true}
+    - {id: 12, cat: Movies/HD, desc: "Movies: HD-Ro", default: true}
+    - {id: 81, cat: Movies/HD, desc: "Movies: x265-Ro", default: true}
+    - {id: 82, cat: Movies/HD, desc: "Movies: x265", default: true}
+    - {id: 10, cat: Movies/DVD, desc: "Movies: DVD-Ro", default: true}
+    - {id: 59, cat: Movies/SD, desc: "Movies: Cam-RO", default: true}
+    - {id: 25, cat: Movies/SD, desc: "Movies: XVID-Ro", default: true}
+    - {id: 17, cat: Movies, desc: "Movies: Old-Ro", default: true}
+    - {id: 55, cat: Movies/WEB-DL, desc: "Movies: WEB-DL Ro", default: true}
+    - {id: 57, cat: TV/Documentary, desc: "Documentary-Ro", default: true}
+    - {id: 62, cat: Movies/3D, desc: "Movies: 3D-Ro", default: true}
+    - {id: 19, cat: Movies, desc: "Movies: Pack-Ro", default: true}
+    - {id: 20, cat: TV, desc: "TV Episodes", default: true}
+    - {id: 21, cat: TV, desc: "TV Episodes-Ro", default: true}
+    - {id: 13, cat: TV/HD, desc: "HDTV Episodes", default: true}
+    - {id: 14, cat: TV/HD, desc: "HDTV Episodes-Ro", default: true}
+    - {id: 28, cat: Audio, desc: "Music", default: true}
+    - {id: 51, cat: PC/Mobile-Android, desc: "Android Apps", default: true}
+    - {id: 26, cat: PC/0day, desc: "Software", default: true}
+    - {id: 30, cat: PC/Games, desc: "Games: PC-ISO", default: true}
+    - {id: 33, cat: PC/Games, desc: "Games: Packs", default: true}
+    - {id: 1, cat: TV/Anime, desc: "Movies: Anime", default: true}
+    - {id: 2, cat: TV/Anime, desc: "Movies: Anime-Ro", default: true}
+    - {id: 42, cat: TV/Sport, desc: "Sport", default: true}
+    - {id: 43, cat: Books, desc: "Documents", default: true}
+    - {id: 44, cat: Other, desc: "Images", default: true}
+    - {id: 49, cat: Other, desc: "Diverse", default: true}
+    - {id: 22, cat: Other, desc: "RoContent", default: true}
+    - {id: 60, cat: XXX/ImageSet, desc: "Images: XXX", default: false}
+    - {id: 27, cat: XXX, desc: "Movies: XXX", default: false}
 
   modes:
     search: [q]
@@ -118,7 +119,7 @@ login:
 search:
   paths:
     - path: browse.php
-      categories: ["!", 60, 27]
+      categories: [31, 5, 9, 11, 58, 61, 24, 16, 54, 56, 18, 32, 6, 12, 81, 82, 10, 59, 25, 17, 55, 57, 62, 19, 20, 21, 13, 14, 28, 51, 26, 30, 33, 1, 2, 42, 43, 44, 49, 22]
     - path: browseadult.php
       categories: [60, 27]
 

src/Jackett.Common/Definitions/lat-team-api.yml

@@ -15,20 +15,16 @@ caps:
     - {id: 3, cat: Audio, desc: "Musica"}
     - {id: 4, cat: Console, desc: "Juegos"}
     - {id: 5, cat: TV/Anime, desc: "Anime"}
-    - {id: 6, cat: Movies/Other, desc: "Retro Pelicula"}
-    - {id: 7, cat: TV/Other, desc: "Retro Serie TV"}
-    - {id: 8, cat: TV/Foreign, desc: "Telenovelas y Teleseries"}
+    - {id: 8, cat: TV/Foreign, desc: "Telenovelas"}
     - {id: 9, cat: Audio/Video, desc: "Conciertos"}
-    - {id: 10, cat: TV/Documentary, desc: "Documentales"}
-    - {id: 11, cat: Other, desc: "Videotutoriales y Educativo"}
+    - {id: 11, cat: Audio/Audiobook, desc: "Audiolibros"}
     - {id: 12, cat: XXX, desc: "XXX"}
-    - {id: 16, cat: TV/Sport, desc: "Deportes"}
-    - {id: 17, cat: PC, desc: "Sistemas Operativos"}
+    - {id: 16, cat: TV/Sport, desc: "Eventos Deportivos"}
+    - {id: 17, cat: PC, desc: "Software & O.S."}
     - {id: 18, cat: Books, desc: "E-Books"}
-    - {id: 19, cat: Audio/Audiobook, desc: "Audiolibros"}
-    - {id: 20, cat: Movies/Other, desc: "Películas Oscars"}
-    - {id: 21, cat: Audio/Video, desc: "VideoMixes"}
+    - {id: 20, cat: TV/Foreign, desc: "Doramas & Turcas"}
     - {id: 22, cat: TV/Other, desc: "Playlist_Collection"}
+    - {id: 24, cat: Other, desc: "Cursos"}
 
   modes:
     search: [q]
@@ -97,8 +93,6 @@ search:
   keywordsfilters:
     - name: re_replace
       args: ["\\.", " "]
-    - name: re_replace
-      args: ["(?i)\\bS(\\d+)", "T$1"]
 
   rows:
     selector: data
@@ -113,24 +107,12 @@ search:
       selector: name:contains(VOSE)
       optional: true
       filters:
-        - name: re_replace
-          args: ["^ *\\[[^\\]]*\\] *", ""] # Remove prefix tags
-        - name: re_replace
-          args: ["(?i)\\bT(\\d+)", "S$1"]
-        - name: re_replace
-          args: ["UHDRip", "BDRip"] # Fix for Radarr
         - name: append
           args: " ENGLiSH"
     title_notvose:
       selector: name:not(:contains(VOSE))
       optional: true
       filters:
-        - name: re_replace
-          args: ["^ *\\[[^\\]]*\\] *", ""] # Remove prefix tags
-        - name: re_replace
-          args: ["(?i)\\bT(\\d+)", "S$1"]
-        - name: re_replace
-          args: ["UHDRip", "BDRip"] # Fix for Radarr
         - name: append
           args: " SPANiSH"
     title:
@@ -142,7 +124,7 @@ search:
     infohash:
       selector: info_hash
     poster:
-      selector: poster
+      selector: meta.poster
       filters:
         - name: replace
           args: ["https://via.placeholder.com/90x135", ""]
@@ -152,6 +134,17 @@ search:
       selector: tmdb_id
     tvdbid:
       selector: tvdb_id
+    genre:
+      selector: meta.genres
+      filters:
+        - name: re_replace
+          args: ["(?i)(Science Fiction)", "Science_Fiction"]
+        - name: re_replace
+          args: ["(?i)(TV Movie)", "TV_Movie"]
+        - name: replace
+          args: [" & ", "_&_"]
+    description:
+      text: "{{ .Result.genre }}"
     files:
       selector: num_file
     seeders:
@@ -181,9 +174,10 @@ search:
       case:
         0: 1 # normal
         1: 2 # double
-    minimumratio:
-      text: 1.0
+# global MR is 0.4 but torrents must be seeded for 2 days regardless of ratio
+#    minimumratio:
+#      text: 0.4
     minimumseedtime:
-      # 4 days (as seconds = 4 x 24 x 60 x 60)
-      text: 345600
-# json UNIT3D 6.3.0
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# json UNIT3D 6.4.1

src/Jackett.Common/Definitions/learnflakes.yml

@@ -5,6 +5,7 @@ description: "LearnFlakes is a Private Torrent Tracker for CERTIFICATE / TRAININ
 language: en-US
 type: private
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://learnflakes.net/
 

src/Jackett.Common/Definitions/limetorrents.yml

@@ -9,9 +9,9 @@ followredirect: true
 # changes to this indexer should also be made to limetorrentsclone
 links:
   - https://www.limetorrents.lol/
-  - https://limetorrents.unblockit.nz/
+  - https://limetorrents.unblockit.page/
   - https://limetorrents.unblockninja.com/
-  - https://limetorrents.nocensor.world/
+  - https://limetorrents.nocensor.lol/
 legacylinks:
   - https://www.limetorrents.io/
   - https://www.limetorrents.cc/
@@ -22,18 +22,7 @@ legacylinks:
   - https://www.limetorrents.co/
   - https://limetor.com/
   - https://www.limetor.pro/
-  - https://limetorrents.unblockit.uno/
-  - https://limetorrents.unblockit.ch/
-  - https://limetorrents.nocensor.space/
-  - https://limetorrents.unblockit.ws/
-  - https://limetorrents.nocensor.work/
-  - https://limetorrents.unblockit.kim/
-  - https://limetorrents.unblockit.bz/
-  - https://limetorrents.unblockit.tv/
-  - https://limetorrents.unblockit.how/
-  - https://limetorrents.unblockit.cam/
   - https://limetorrents.nocensor.biz/
-  - https://limetorrents.unblockit.day/
   - https://www.limetorrents.pro/
   - https://limetorrents.unblockit.llc/
   - https://limetorrents.unblockit.blue/
@@ -42,6 +31,8 @@ legacylinks:
   - https://limetorrents.unblockit.ist/
   - https://limetorrents.unblockit.bet/
   - https://limetorrents.unblockit.cat/
+  - https://limetorrents.unblockit.nz/
+  - https://limetorrents.nocensor.world/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/linuxtracker.yml

@@ -5,6 +5,7 @@ description: "LinuxTracker is a Public Linux ISO Torrent Repository"
 language: en-US
 type: public
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://linuxtracker.org/
 

src/Jackett.Common/Definitions/majomparade.yml

@@ -5,47 +5,48 @@ description: "Majomparádé (TurkDepo) is a HUNGARIAN Private Torrent Tracker fo
 language: hu-HU
 type: private
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://majomparade.eu/
 
 caps:
   categorymappings:
-    - {id: 4, cat: Movies/3D, desc: "3D/Magyar"}
-    - {id: 5, cat: Movies/3D, desc: "3D/Külföldi"}
-    - {id: 48, cat: Movies/HD, desc: "Film/BR-BDRIP/Külföldi"}
-    - {id: 50, cat: Movies/HD, desc: "Film/BR-BDRIP/Magyar"}
-    - {id: 75, cat: Movies/SD, desc: "Film/Cam/Külföldi"}
-    - {id: 76, cat: Movies/SD, desc: "Film/Cam/Magyar"}
-    - {id: 26, cat: Movies/DVD, desc: "Film/DVD/Külföldi"}
-    - {id: 25, cat: Movies/DVD, desc: "Film/DVD/Magyar"}
-    - {id: 58, cat: Movies/DVD, desc: "Film/DVD9/Külföld"}
-    - {id: 59, cat: Movies/DVD, desc: "Film/DVD9/Magyar"}
-    - {id: 42, cat: Movies/HD, desc: "Film/HD/Külföldi"}
-    - {id: 51, cat: Movies/HD, desc: "Film/HD/Magyar"}
-    - {id: 38, cat: Movies/SD, desc: "Film/XviD/Külföldi"}
-    - {id: 24, cat: Movies/SD, desc: "Film/XviD/Magyar"}
-    - {id: 85, cat: TV/Sport, desc: "Sport/Külföldi"}
-    - {id: 87, cat: TV/Sport, desc: "Sport/Magyar"}
-    - {id: 47, cat: TV/SD, desc: "Sorozat/Külföldi"}
-    - {id: 36, cat: TV/SD, desc: "Sorozat/Magyar"}
-    - {id: 6, cat: TV/HD, desc: "Sorozat/HD/Magyar"}
-    - {id: 7, cat: TV/HD, desc: "Sorozat/HD/Külföldi"}
-    - {id: 56, cat: Audio/Audiobook, desc: "Hangoskönyv"}
-    - {id: 33, cat: Books, desc: "Könyv/Külföldi"}
-    - {id: 44, cat: Books, desc: "Könyv/Magyar"}
-    - {id: 28, cat: PC/Games, desc: "Játék/ISO"}
-    - {id: 32, cat: Console, desc: "Játék/Konzol"}
-    - {id: 30, cat: PC/Games, desc: "Játék/RIP"}
-    - {id: 53, cat: Audio/Lossless, desc: "Lossless/Külföldi"}
-    - {id: 74, cat: Audio/Lossless, desc: "Lossless/Magyar"}
-    - {id: 40, cat: Audio/Other, desc: "Zene/Külföldi"}
-    - {id: 41, cat: Audio/Other, desc: "Zene/Magyar"}
-    - {id: 34, cat: PC/Mobile-Other, desc: "Mobil"}
-    - {id: 35, cat: PC/ISO, desc: "Programok/ISO"}
-    - {id: 46, cat: PC/0day, desc: "Programok/RIP"}
-    - {id: 70, cat: XXX/DVD, desc: "XXX/DVD"}
-    - {id: 39, cat: XXX/XviD, desc: "XXX/XviD"}
-    - {id: 57, cat: XXX, desc: "XXX/HD"}
+    - {id: 4, cat: Movies/3D, desc: "3D/Magyar", default: true}
+    - {id: 5, cat: Movies/3D, desc: "3D/Külföldi", default: true}
+    - {id: 48, cat: Movies/HD, desc: "Film/BR-BDRIP/Külföldi", default: true}
+    - {id: 50, cat: Movies/HD, desc: "Film/BR-BDRIP/Magyar", default: true}
+    - {id: 75, cat: Movies/SD, desc: "Film/Cam/Külföldi", default: true}
+    - {id: 76, cat: Movies/SD, desc: "Film/Cam/Magyar", default: true}
+    - {id: 26, cat: Movies/DVD, desc: "Film/DVD/Külföldi", default: true}
+    - {id: 25, cat: Movies/DVD, desc: "Film/DVD/Magyar", default: true}
+    - {id: 58, cat: Movies/DVD, desc: "Film/DVD9/Külföld", default: true}
+    - {id: 59, cat: Movies/DVD, desc: "Film/DVD9/Magyar", default: true}
+    - {id: 42, cat: Movies/HD, desc: "Film/HD/Külföldi", default: true}
+    - {id: 51, cat: Movies/HD, desc: "Film/HD/Magyar", default: true}
+    - {id: 38, cat: Movies/SD, desc: "Film/XviD/Külföldi", default: true}
+    - {id: 24, cat: Movies/SD, desc: "Film/XviD/Magyar", default: true}
+    - {id: 85, cat: TV/Sport, desc: "Sport/Külföldi", default: true}
+    - {id: 87, cat: TV/Sport, desc: "Sport/Magyar", default: true}
+    - {id: 47, cat: TV/SD, desc: "Sorozat/Külföldi", default: true}
+    - {id: 36, cat: TV/SD, desc: "Sorozat/Magyar", default: true}
+    - {id: 6, cat: TV/HD, desc: "Sorozat/HD/Magyar", default: true}
+    - {id: 7, cat: TV/HD, desc: "Sorozat/HD/Külföldi", default: true}
+    - {id: 56, cat: Audio/Audiobook, desc: "Hangoskönyv", default: true}
+    - {id: 33, cat: Books, desc: "Könyv/Külföldi", default: true}
+    - {id: 44, cat: Books, desc: "Könyv/Magyar", default: true}
+    - {id: 28, cat: PC/Games, desc: "Játék/ISO", default: true}
+    - {id: 32, cat: Console, desc: "Játék/Konzol", default: true}
+    - {id: 30, cat: PC/Games, desc: "Játék/RIP", default: true}
+    - {id: 53, cat: Audio/Lossless, desc: "Lossless/Külföldi", default: true}
+    - {id: 74, cat: Audio/Lossless, desc: "Lossless/Magyar", default: true}
+    - {id: 40, cat: Audio/Other, desc: "Zene/Külföldi", default: true}
+    - {id: 41, cat: Audio/Other, desc: "Zene/Magyar", default: true}
+    - {id: 34, cat: PC/Mobile-Other, desc: "Mobil", default: true}
+    - {id: 35, cat: PC/ISO, desc: "Programok/ISO", default: true}
+    - {id: 46, cat: PC/0day, desc: "Programok/RIP", default: true}
+    - {id: 70, cat: XXX/DVD, desc: "XXX/DVD", default: false}
+    - {id: 39, cat: XXX/XviD, desc: "XXX/XviD", default: false}
+    - {id: 57, cat: XXX, desc: "XXX/HD", default: false}
 
   modes:
     search: [q]
@@ -81,11 +82,11 @@ login:
 search:
   paths:
     - path: letoltes.php
-      categories: ["!", 70, 39, 57]
+      categories: [4, 5, 48, 50, 75, 76, 26, 25, 58, 59, 42, 51, 38, 24, 85, 87, 47, 36, 6, 7, 56, 33, 44, 28, 32, 30, 53, 74, 40, 41, 34, 35, 46]
       inputs:
         tipus: 1
     - path: letoltes.php
-      categories: ["!", 70, 39, 57]
+      categories: [4, 5, 48, 50, 75, 76, 26, 25, 58, 59, 42, 51, 38, 24, 85, 87, 47, 36, 6, 7, 56, 33, 44, 28, 32, 30, 53, 74, 40, 41, 34, 35, 46]
       inputs:
         tipus: 2
     - path: xxx.php

src/Jackett.Common/Definitions/mazepa.yml

@@ -21,52 +21,69 @@ caps:
     - {id: 6, cat: TV/Anime, desc: " |- Українські мультсеріали"}
     - {id: 39, cat: TV/Documentary, desc: "Українська документалістика HD, UHD"}
     - {id: 9, cat: TV/Documentary, desc: " |- Українська документалістика"}
-    - {id: 12, cat: Movies, desc: "Фільми HD, UHD"}
-    - {id: 13, cat: Movies, desc: " |- Фільми"}
-    - {id: 44, cat: TV, desc: "Серіали HD, UHD"}
-    - {id: 14, cat: TV, desc: " |- Серіали"}
-    - {id: 41, cat: TV/Anime, desc: "Мультфільми HD, UHD"}
-    - {id: 10, cat: TV/Anime, desc: " |- Мультфільми"}
-    - {id: 43, cat: TV/Anime, desc: "Мультсеріали HD, UHD"}
-    - {id: 11, cat: TV/Anime, desc: " |- Мультсеріали"}
+    - {id: 13, cat: Movies/SD, desc: " |- Фільми SD"}
+    - {id: 12, cat: Movies/HD, desc: " |- Фільми HD"}
+    - {id: 147, cat: Movies/UHD, desc: " |- Фільми UHD"}
+    - {id: 14, cat: TV/SD, desc: " |- Серіали SD"}
+    - {id: 44, cat: TV/HD, desc: " |- Серіали HD"}
+    - {id: 152, cat: TV/UHD, desc: " |- Серіали UHD"}
+    - {id: 10, cat: TV/Anime, desc: " |- Мультфільми SD"}
+    - {id: 41, cat: TV/Anime, desc: " |- Мультфільми HD"}
+    - {id: 155, cat: TV/Anime, desc: " |- Мультфільми UHD"}
+    - {id: 11, cat: TV/Anime, desc: " |- Мультсеріали SD"}
+    - {id: 43, cat: TV/Anime, desc: " |- Мультсеріали HD"}
     - {id: 16, cat: TV/Anime, desc: "Аніме"}
-    - {id: 42, cat: TV/Documentary, desc: "Документальне HD, UHD"}
-    - {id: 15, cat: TV/Documentary, desc: " |- Документальне"}
+    - {id: 15, cat: TV/Documentary, desc: " |- Документальне SD"}
+    - {id: 42, cat: TV/Documentary, desc: " |- Документальне HD"}
+    - {id: 157, cat: TV/Documentary, desc: " |- Документальне UHD"}
     - {id: 20, cat: TV/Sport, desc: " |- Формула 1 Сезон 2022"}
     - {id: 79, cat: TV/Sport, desc: " |- Формула 1 Сезони 2017-2021"}
     - {id: 21, cat: TV/Sport, desc: " |- Формула 1 Сезони 2007-2016"}
     - {id: 75, cat: TV/Sport, desc: " |- Формула 1 Сезони до 2006"}
     - {id: 77, cat: TV/Sport, desc: "Автоспорт"}
-    - {id: 18, cat: TV/Sport, desc: "Футбол"}
     - {id: 47, cat: TV/Sport, desc: " |- Чемпіонат та кубок України"}
     - {id: 46, cat: TV/Sport, desc: " |- Єврокубки"}
     - {id: 48, cat: TV/Sport, desc: " |- Чемпіонат Світу"}
     - {id: 49, cat: TV/Sport, desc: " |- Чемпіонат Європи"}
     - {id: 53, cat: TV/Sport, desc: " |- Закордонні чемпіонати"}
     - {id: 19, cat: TV/Sport, desc: "Бокс"}
-    - {id: 28, cat: Movies, desc: "Науково-популярні фільми"}
     - {id: 29, cat: Audio/Video, desc: "Концерти, відеокліпи"}
     - {id: 30, cat: TV, desc: "Теле-Шоу"}
-    - {id: 74, cat: Audio, desc: "Українське радіо"}
-    - {id: 76, cat: Audio/Audiobook, desc: "Аудіокниги"}
-    - {id: 65, cat: Audio, desc: "Rock"}
-    - {id: 63, cat: Audio, desc: "Pop, Disco, R'n'B"}
-    - {id: 67, cat: Audio, desc: "Electronic, Industrial, Techno"}
-    - {id: 64, cat: Audio, desc: "Rap"}
-    - {id: 61, cat: Audio, desc: "Jazz, Blues, Soul, Funk"}
-    - {id: 70, cat: Audio, desc: "Reggae, Dub, Ska"}
-    - {id: 66, cat: Audio, desc: "Folk, Ethno, Country"}
-    - {id: 68, cat: Audio, desc: "Modern Classical, Ambient, Experimental, Avantgarde"}
-    - {id: 60, cat: Audio, desc: "Classical, Chorus, Opera"}
-    - {id: 62, cat: Audio, desc: "Schlager, Chanson, Romance, Sung Poetry"}
-    - {id: 69, cat: Audio, desc: "Soundtracks, Musicles"}
-    - {id: 23, cat: Other, desc: "Архів"}
+    - {id: 65, cat: Audio, desc: " |- Рок"}
+    - {id: 63, cat: Audio, desc: " |- Поп, Диско"}
+    - {id: 66, cat: Audio, desc: " |- Фольк, Етно, Народна, Бардівська"}
+    - {id: 64, cat: Audio, desc: " |- Реп"}
+    - {id: 67, cat: Audio, desc: " |- Електронна"}
+    - {id: 61, cat: Audio, desc: " |- Джаз, Блюз"}
+    - {id: 60, cat: Audio, desc: " |- Класична, Інструментальна"}
+    - {id: 82, cat: Audio, desc: " |- Невидане"}
+    - {id: 160, cat: Audio, desc: " |- Rock, Alternative, Punk, Metal"}
+    - {id: 161, cat: Audio, desc: " |- Pop"}
+    - {id: 165, cat: Audio, desc: " |- Jazz, Blues, Soul"}
+    - {id: 163, cat: Audio, desc: " |- Rap, Hip-hop, RnB, Reggae"}
+    - {id: 166, cat: Audio, desc: " |- Country, Country pop, Bluegrass, Southern rock"}
+    - {id: 162, cat: Audio, desc: " |- Electronic"}
+    - {id: 164, cat: Audio, desc: " |- Other Styles"}
+    - {id: 93, cat: Books, desc: " |- Українська художня література [до 1991 р.]"}
+    - {id: 92, cat: Books, desc: " |- Українська художня література (після 1991 р.)"}
+    - {id: 91, cat: Books, desc: " |- Зарубіжна художня література"}
+    - {id: 90, cat: Books, desc: " |- Наукова література (гуманітарні дисципліни)"}
+    - {id: 89, cat: Books, desc: " |- Наукова література (природничі дисципліни)"}
+    - {id: 88, cat: Books, desc: " |- Навчальна та довідкова"}
+    - {id: 87, cat: Books, desc: " |- Періодика"}
+    - {id: 86, cat: Books, desc: " |- Батькам та малятам"}
+    - {id: 85, cat: Books, desc: " |- Графіка (комікси, манґа, BD та інше)"}
+    - {id: 96, cat: Books, desc: " |- Українська художня література"}
+    - {id: 95, cat: Books, desc: " |- Зарубіжна художня література"}
+    - {id: 94, cat: Books, desc: " |- Історія, біографістика, спогади"}
+    - {id: 23, cat: Movies, desc: "Архів"} # Archive - unlisted
 
   modes:
     search: [q]
     tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: username

src/Jackett.Common/Definitions/megapeer.yml

@@ -6,6 +6,8 @@ language: ru-RU
 type: public
 encoding: windows-1251
 links:
+  - https://megapeer.vip/
+legacylinks:
   - http://megapeer.ru/ # https is not supported
   - http://alt.megapeer.ru/
 

src/Jackett.Common/Definitions/mikan.yml

@@ -21,34 +21,46 @@ settings: []
 search:
   paths:
     # https://mikanani.me/Home/Search?searchstr=%E5%90%8D%E4%BE%A6%E6%8E%A2%E6%9F%AF%E5%8D%97
-    - path: "Home/Search?searchstr={{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
+    - path: "Home/{{ if .Keywords }}Search?searchstr={{ .Keywords }}{{ else }}Classic{{ end }}"
 
   rows:
-    selector: table.table-striped tbody tr.js-search-results-row
+    selector: table.table-striped tbody tr
 
   fields:
     category:
       text: 1
     title:
-      selector: a.magnet-link-wrap
+      selector: a[href^="/Home/Episode/"]
     details:
-      selector: a.magnet-link-wrap
+      selector: a[href^="/Home/Episode/"]
       attribute: href
     download:
       selector: a[href^="/Download/"]
       attribute: href
     magnet:
-      selector: a[data-clipboard-text^="magnet:?xt="]
+      selector: a[data-clipboard-text]
       attribute: data-clipboard-text
-    date:
-      selector: td:nth-child(3)
+    date_day:
+      selector: td:nth-child(1):contains("今天"), td:nth-child(1):contains("昨天")
+      optional: true
+      filters:
+        - name: replace
+          args: ["昨天", "Yesterday"]
+        - name: replace
+          args: ["今天", "Today"]
+        - name: fuzzytime
+    date_year:
+      selector: td:nth-child(3):not(:has(a))
+      optional: true
       filters:
         - name: append
           args: " +08:00" # CST
         - name: dateparse
           args: "2006/01/02 15:04 -07:00"
+    date:
+      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
     size:
-      selector: td:nth-child(2)
+      selector: td:has(a[data-clipboard-text]) ~ td
     seeders:
       text: 1
     leechers:

src/Jackett.Common/Definitions/movietorrent.yml

@@ -5,6 +5,7 @@ description: "MovieTorrent is a Public site for Bollywood, Hollywood, Hindi Dubb
 language: en-US
 type: public
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://movietorrent.co/
 

src/Jackett.Common/Definitions/mteamtp.yml

@@ -5,6 +5,7 @@ description: "M-Team TP (MTTP) is a CHINESE Private Torrent Tracker for HD MOVIE
 language: zh-CN
 type: private
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://kp.m-team.cc/
 legacylinks:
@@ -13,41 +14,41 @@ legacylinks:
 
 caps:
   categorymappings:
-    - {id: 401, cat: Movies/SD, desc: "Movie(電影)/SD"}
-    - {id: 419, cat: Movies/HD, desc: "Movie(電影)/HD"}
-    - {id: 420, cat: Movies/DVD, desc: "Movie(電影)/DVDiSo"}
-    - {id: 421, cat: Movies/BluRay, desc: "Movie(電影)/Blu-Ray"}
-    - {id: 439, cat: Movies/Other, desc: "Movie(電影)/Remux"}
-    - {id: 403, cat: TV/SD, desc: "TV Series(影劇/綜藝)/SD"}
-    - {id: 402, cat: TV/HD, desc: "TV Series(影劇/綜藝)/HD"}
-    - {id: 435, cat: TV/SD, desc: "TV Series(影劇/綜藝)/DVDiSo"}
-    - {id: 438, cat: TV/HD, desc: "TV Series(影劇/綜藝)/BD"}
-    - {id: 404, cat: TV/Documentary, desc: "紀錄教育"}
-    - {id: 405, cat: TV/Anime, desc: "Anime(動畫)"}
-    - {id: 407, cat: TV/Sport, desc: "Sports(運動)"}
-    - {id: 422, cat: PC/0day, desc: "Software(軟體)"}
-    - {id: 423, cat: PC/Games, desc: "PCGame(PC遊戲)"}
-    - {id: 427, cat: Books, desc: "eBook(電子書)"}
-    - {id: 409, cat: Other, desc: "Misc(其他)"}
+    - {id: 401, cat: Movies/SD, desc: "Movie(電影)/SD", default: true}
+    - {id: 419, cat: Movies/HD, desc: "Movie(電影)/HD", default: true}
+    - {id: 420, cat: Movies/DVD, desc: "Movie(電影)/DVDiSo", default: true}
+    - {id: 421, cat: Movies/BluRay, desc: "Movie(電影)/Blu-Ray", default: true}
+    - {id: 439, cat: Movies/Other, desc: "Movie(電影)/Remux", default: true}
+    - {id: 403, cat: TV/SD, desc: "TV Series(影劇/綜藝)/SD", default: true}
+    - {id: 402, cat: TV/HD, desc: "TV Series(影劇/綜藝)/HD", default: true}
+    - {id: 435, cat: TV/SD, desc: "TV Series(影劇/綜藝)/DVDiSo", default: true}
+    - {id: 438, cat: TV/HD, desc: "TV Series(影劇/綜藝)/BD", default: true}
+    - {id: 404, cat: TV/Documentary, desc: "紀錄教育", default: true}
+    - {id: 405, cat: TV/Anime, desc: "Anime(動畫)", default: true}
+    - {id: 407, cat: TV/Sport, desc: "Sports(運動)", default: true}
+    - {id: 422, cat: PC/0day, desc: "Software(軟體)", default: true}
+    - {id: 423, cat: PC/Games, desc: "PCGame(PC遊戲)", default: true}
+    - {id: 427, cat: Books, desc: "eBook(電子書)", default: true}
+    - {id: 409, cat: Other, desc: "Misc(其他)", default: true}
     # music
-    - {id: 406, cat: Audio/Video, desc: "MV(演唱)"}
-    - {id: 408, cat: Audio/Other, desc: "Music(AAC/ALAC)"}
-    - {id: 434, cat: Audio, desc: "Music(無損)"}
+    - {id: 406, cat: Audio/Video, desc: "MV(演唱)", default: true}
+    - {id: 408, cat: Audio/Other, desc: "Music(AAC/ALAC)", default: true}
+    - {id: 434, cat: Audio, desc: "Music(無損)", default: true}
     # adult
-    - {id: 410, cat: XXX, desc: "AV(有碼)/HD Censored"}
-    - {id: 429, cat: XXX, desc: "AV(無碼)/HD Uncensored"}
-    - {id: 424, cat: XXX, desc: "AV(有碼)/SD Censored"}
-    - {id: 430, cat: XXX, desc: "AV(無碼)/SD Uncensored"}
-    - {id: 426, cat: XXX, desc: "AV(無碼)/DVDiSo Uncensored"}
-    - {id: 437, cat: XXX, desc: "AV(有碼)/DVDiSo Censored"}
-    - {id: 431, cat: XXX, desc: "AV(有碼)/Blu-Ray Censored"}
-    - {id: 432, cat: XXX, desc: "AV(無碼)/Blu-Ray Uncensored"}
-    - {id: 436, cat: XXX, desc: "AV(網站)/0Day"}
-    - {id: 425, cat: XXX, desc: "IV(寫真影集)/Video Collection"}
-    - {id: 433, cat: XXX, desc: "IV(寫真圖集)/Picture Collection"}
-    - {id: 411, cat: XXX, desc: "H-Game(遊戲)"}
-    - {id: 412, cat: XXX, desc: "H-Anime(動畫)"}
-    - {id: 413, cat: XXX, desc: "H-Comic(漫畫)"}
+    - {id: 410, cat: XXX, desc: "AV(有碼)/HD Censored", default: false}
+    - {id: 429, cat: XXX, desc: "AV(無碼)/HD Uncensored", default: false}
+    - {id: 424, cat: XXX, desc: "AV(有碼)/SD Censored", default: false}
+    - {id: 430, cat: XXX, desc: "AV(無碼)/SD Uncensored", default: false}
+    - {id: 426, cat: XXX, desc: "AV(無碼)/DVDiSo Uncensored", default: false}
+    - {id: 437, cat: XXX, desc: "AV(有碼)/DVDiSo Censored", default: false}
+    - {id: 431, cat: XXX, desc: "AV(有碼)/Blu-Ray Censored", default: false}
+    - {id: 432, cat: XXX, desc: "AV(無碼)/Blu-Ray Uncensored", default: false}
+    - {id: 436, cat: XXX, desc: "AV(網站)/0Day", default: false}
+    - {id: 425, cat: XXX, desc: "IV(寫真影集)/Video Collection", default: false}
+    - {id: 433, cat: XXX, desc: "IV(寫真圖集)/Picture Collection", default: false}
+    - {id: 411, cat: XXX, desc: "H-Game(遊戲)", default: false}
+    - {id: 412, cat: XXX, desc: "H-Anime(動畫)", default: false}
+    - {id: 413, cat: XXX, desc: "H-Comic(漫畫)", default: false}
 
   modes:
     search: [q]
@@ -115,7 +116,7 @@ download:
 search:
   paths:
     - path: torrents.php
-      categories: ["!", 410, 429, 424, 430, 426, 437, 431, 432, 436, 425, 433, 411, 412, 413, 406, 408, 434]
+      categories: [401, 419, 420, 421, 439, 403, 402, 435, 438, 404, 405, 407, 422, 423, 427, 409]
     - path: adult.php
       categories: [410, 429, 424, 430, 426, 437, 431, 432, 436, 425, 433, 411, 412, 413]
     - path: music.php

src/Jackett.Common/Definitions/mteamtp2fa.yml

@@ -5,6 +5,7 @@ description: "this indexer uses a cookie login for MTeamTP for those that want t
 language: zh-CN
 type: private
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://kp.m-team.cc/
 legacylinks:
@@ -13,41 +14,41 @@ legacylinks:
 
 caps:
   categorymappings:
-    - {id: 401, cat: Movies/SD, desc: "Movie(電影)/SD"}
-    - {id: 419, cat: Movies/HD, desc: "Movie(電影)/HD"}
-    - {id: 420, cat: Movies/DVD, desc: "Movie(電影)/DVDiSo"}
-    - {id: 421, cat: Movies/BluRay, desc: "Movie(電影)/Blu-Ray"}
-    - {id: 439, cat: Movies/Other, desc: "Movie(電影)/Remux"}
-    - {id: 403, cat: TV/SD, desc: "TV Series(影劇/綜藝)/SD"}
-    - {id: 402, cat: TV/HD, desc: "TV Series(影劇/綜藝)/HD"}
-    - {id: 435, cat: TV/SD, desc: "TV Series(影劇/綜藝)/DVDiSo"}
-    - {id: 438, cat: TV/HD, desc: "TV Series(影劇/綜藝)/BD"}
-    - {id: 404, cat: TV/Documentary, desc: "紀錄教育"}
-    - {id: 405, cat: TV/Anime, desc: "Anime(動畫)"}
-    - {id: 407, cat: TV/Sport, desc: "Sports(運動)"}
-    - {id: 422, cat: PC/0day, desc: "Software(軟體)"}
-    - {id: 423, cat: PC/Games, desc: "PCGame(PC遊戲)"}
-    - {id: 427, cat: Books, desc: "eBook(電子書)"}
-    - {id: 409, cat: Other, desc: "Misc(其他)"}
+    - {id: 401, cat: Movies/SD, desc: "Movie(電影)/SD", default: true}
+    - {id: 419, cat: Movies/HD, desc: "Movie(電影)/HD", default: true}
+    - {id: 420, cat: Movies/DVD, desc: "Movie(電影)/DVDiSo", default: true}
+    - {id: 421, cat: Movies/BluRay, desc: "Movie(電影)/Blu-Ray", default: true}
+    - {id: 439, cat: Movies/Other, desc: "Movie(電影)/Remux", default: true}
+    - {id: 403, cat: TV/SD, desc: "TV Series(影劇/綜藝)/SD", default: true}
+    - {id: 402, cat: TV/HD, desc: "TV Series(影劇/綜藝)/HD", default: true}
+    - {id: 435, cat: TV/SD, desc: "TV Series(影劇/綜藝)/DVDiSo", default: true}
+    - {id: 438, cat: TV/HD, desc: "TV Series(影劇/綜藝)/BD", default: true}
+    - {id: 404, cat: TV/Documentary, desc: "紀錄教育", default: true}
+    - {id: 405, cat: TV/Anime, desc: "Anime(動畫)", default: true}
+    - {id: 407, cat: TV/Sport, desc: "Sports(運動)", default: true}
+    - {id: 422, cat: PC/0day, desc: "Software(軟體)", default: true}
+    - {id: 423, cat: PC/Games, desc: "PCGame(PC遊戲)", default: true}
+    - {id: 427, cat: Books, desc: "eBook(電子書)", default: true}
+    - {id: 409, cat: Other, desc: "Misc(其他)", default: true}
     # music
-    - {id: 406, cat: Audio/Video, desc: "MV(演唱)"}
-    - {id: 408, cat: Audio/Other, desc: "Music(AAC/ALAC)"}
-    - {id: 434, cat: Audio, desc: "Music(無損)"}
+    - {id: 406, cat: Audio/Video, desc: "MV(演唱)", default: true}
+    - {id: 408, cat: Audio/Other, desc: "Music(AAC/ALAC)", default: true}
+    - {id: 434, cat: Audio, desc: "Music(無損)", default: true}
     # adult
-    - {id: 410, cat: XXX, desc: "AV(有碼)/HD Censored"}
-    - {id: 429, cat: XXX, desc: "AV(無碼)/HD Uncensored"}
-    - {id: 424, cat: XXX, desc: "AV(有碼)/SD Censored"}
-    - {id: 430, cat: XXX, desc: "AV(無碼)/SD Uncensored"}
-    - {id: 426, cat: XXX, desc: "AV(無碼)/DVDiSo Uncensored"}
-    - {id: 437, cat: XXX, desc: "AV(有碼)/DVDiSo Censored"}
-    - {id: 431, cat: XXX, desc: "AV(有碼)/Blu-Ray Censored"}
-    - {id: 432, cat: XXX, desc: "AV(無碼)/Blu-Ray Uncensored"}
-    - {id: 436, cat: XXX, desc: "AV(網站)/0Day"}
-    - {id: 425, cat: XXX, desc: "IV(寫真影集)/Video Collection"}
-    - {id: 433, cat: XXX, desc: "IV(寫真圖集)/Picture Collection"}
-    - {id: 411, cat: XXX, desc: "H-Game(遊戲)"}
-    - {id: 412, cat: XXX, desc: "H-Anime(動畫)"}
-    - {id: 413, cat: XXX, desc: "H-Comic(漫畫)"}
+    - {id: 410, cat: XXX, desc: "AV(有碼)/HD Censored", default: false}
+    - {id: 429, cat: XXX, desc: "AV(無碼)/HD Uncensored", default: false}
+    - {id: 424, cat: XXX, desc: "AV(有碼)/SD Censored", default: false}
+    - {id: 430, cat: XXX, desc: "AV(無碼)/SD Uncensored", default: false}
+    - {id: 426, cat: XXX, desc: "AV(無碼)/DVDiSo Uncensored", default: false}
+    - {id: 437, cat: XXX, desc: "AV(有碼)/DVDiSo Censored", default: false}
+    - {id: 431, cat: XXX, desc: "AV(有碼)/Blu-Ray Censored", default: false}
+    - {id: 432, cat: XXX, desc: "AV(無碼)/Blu-Ray Uncensored", default: false}
+    - {id: 436, cat: XXX, desc: "AV(網站)/0Day", default: false}
+    - {id: 425, cat: XXX, desc: "IV(寫真影集)/Video Collection", default: false}
+    - {id: 433, cat: XXX, desc: "IV(寫真圖集)/Picture Collection", default: false}
+    - {id: 411, cat: XXX, desc: "H-Game(遊戲)", default: false}
+    - {id: 412, cat: XXX, desc: "H-Anime(動畫)", default: false}
+    - {id: 413, cat: XXX, desc: "H-Comic(漫畫)", default: false}
 
   modes:
     search: [q]
@@ -116,7 +117,7 @@ download:
 search:
   paths:
     - path: torrents.php
-      categories: ["!", 410, 429, 424, 430, 426, 437, 431, 432, 436, 425, 433, 411, 412, 413, 406, 408, 434]
+      categories: [401, 419, 420, 421, 439, 403, 402, 435, 438, 404, 405, 407, 422, 423, 427, 409]
     - path: adult.php
       categories: [410, 429, 424, 430, 426, 437, 431, 432, 436, 425, 433, 411, 412, 413]
     - path: music.php

src/Jackett.Common/Definitions/mvgroupforum.yml

@@ -5,6 +5,8 @@ description: "MVGroup is a Semi-Private site dedicated to UK TV and DOCUMENTARIE
 language: en-US
 type: semi-private
 encoding: UTF-8
+certificates:
+  - d2b71a2548cbc060a6d016eebe521927559ec4ae  # expired 11/15/2022
 links:
   - https://forums.mvgroup.org/
 legacylinks:

src/Jackett.Common/Definitions/mvgroupmain.yml

@@ -5,6 +5,8 @@ description: "MVGroup is a Semi-Private site dedicated to UK TV and DOCUMENTARIE
 language: en-US
 type: semi-private
 encoding: UTF-8
+certificates:
+  - d2b71a2548cbc060a6d016eebe521927559ec4ae  # expired 11/15/2022
 links:
   - https://forums.mvgroup.org/
 legacylinks:

src/Jackett.Common/Definitions/newstudio.yml

@@ -5,6 +5,7 @@ description: "Newstudio is a RUSSIAN Public site for TV"
 language: ru-RU
 type: public
 encoding: UTF-8
+requestDelay: 2
 links:
   - http://newstudio.tv/ # site does not support https ERR_CONNECTION_REFUSED
 

src/Jackett.Common/Definitions/newstudiol.yml

@@ -5,6 +5,7 @@ description: "this is the Newstudio indexer with Login enabled in the config."
 language: ru-RU
 type: semi-private
 encoding: UTF-8
+requestDelay: 2
 links:
   - http://newstudio.tv/ # site does not support https ERR_CONNECTION_REFUSED
 

src/Jackett.Common/Definitions/nitro.yml

@@ -1,114 +0,0 @@
----
-id: nitro
-name: Nitro
-description: "Nitro is a POLISH Public Torrent Tracker"
-language: pl-PL
-type: public
-encoding: UTF-8
-links:
-  - https://nitro.to/
-legacylinks:
-  - http://nitro.to/ # site is forcing https
-
-caps:
-  categorymappings:
-    - {id: 1, cat: TV, desc: "Seriale"}
-    - {id: 144, cat: Other, desc: "Nieposortowane"}
-    - {id: 2, cat: Movies, desc: "Filmy"}
-    - {id: 3, cat: Audio, desc: "Muzyka"}
-    - {id: 4, cat: PC/Games, desc: "Gry"}
-    - {id: 5, cat: TV/Anime, desc: "Anime"}
-    - {id: 6, cat: PC, desc: "Programy"}
-    - {id: 7, cat: Books, desc: "E-Booki/Książki"}
-    - {id: 8, cat: Audio/Audiobook, desc: "Audio Booki"}
-    - {id: 9, cat: PC/Mobile-Other, desc: "GSM/PDA"}
-    - {id: 10, cat: Other, desc: "Inne"}
-    - {id: 11, cat: XXX, desc: "XXX"}
-
-  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: data
-    options:
-      data: created
-      seeds: seeders
-      size: size
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-download:
-  infohash:
-    hash:
-      selector: script:contains("magnet:")
-      filters:
-        - name: regexp
-          args: ([A-F|a-f|0-9]{40})
-    title:
-      selector: script:contains("magnet:")
-      filters:
-        - name: regexp
-          args: ([A-F|a-f|0-9]{40})
-
-search:
-  paths:
-    - path: tags.php
-  inputs:
-    search: "{{ .Keywords }}"
-    # 0 poster, 1 list
-    where: 1
-    per: 50
-    # 0 all, 1 active, 2 dead
-    active: 1
-    order: "{{ .Config.sort }}"
-    by: "{{ .Config.type }}"
-
-  rows:
-    selector: table[width="100%"] > tbody > tr:has(a[onclick="getMagnet(this)"])
-
-  fields:
-    categorydesc:
-      selector: span.tag_list a
-    title:
-      selector: a[href^="/torrent/"]
-    details:
-      selector: a[href^="/torrent/"]
-      attribute: href
-    download:
-      selector: a[onclick="getMagnet(this)"]
-      attribute: title
-      filters:
-        - name: replace
-          args: ["/__DWNMAGNET__?", "download_magnet.php?"]
-        - name: prepend
-          args: "{{ .Config.sitelink }}"
-    date:
-      selector: td:nth-child(1)
-      filters:
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "02/01/2006 -07:00"
-    size:
-      selector: td:nth-child(4)
-    seeders:
-      selector: td:nth-child(6)
-    leechers:
-      selector: td:nth-child(7)
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a

src/Jackett.Common/Definitions/nyaasi.yml

@@ -5,10 +5,11 @@ description: "Nyaa is a Public torrent site focused on Eastern Asian media inclu
 language: en-US
 type: public
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://nyaa.si/
   - https://nyaa.iss.ink/
-  - https://nyaa.nocensor.world/ # for magnets only
+  - https://nyaa.nocensor.lol/ # for magnets only
 legacylinks:
   - https://nyaa.black-mirror.xyz/
   - https://nyaa.unblocked.casa/
@@ -18,8 +19,9 @@ legacylinks:
   - https://nyaa.unblocked.bar/
   - https://nyaa.proxyportal.pw/
   - https://nyaa.uk-unblock.pro/
-  - https://nyaa.root.yt/ # 402 Payment Required
+  - https://nyaa.root.yt/
   - https://nyaa.lol/ # dropped at request of owner
+  - https://nyaa.nocensor.world/
 
 settings:
   - name: filter-id

src/Jackett.Common/Definitions/oldtoonsworld.yml

@@ -0,0 +1,189 @@
+---
+id: oldtoonsworld
+name: Old Toons World
+description: "Old Toons World is a Private Torrent Tracker for Cartoon MOVIES / TV / GENERAL"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://oldtoons.world/
+
+caps:
+  categorymappings:
+    - {id: 401, cat: TV/Anime, desc: "Anime"}
+    - {id: 404, cat: TV, desc: "Cartoon"}
+    - {id: 405, cat: Audio, desc: "Audio"}
+    - {id: 402, cat: Books, desc: "Books"}
+    - {id: 403, cat: Movies, desc: "Shorts"}
+    - {id: 406, cat: TV, desc: "Adults"}
+    - {id: 407, cat: Movies, desc: "Family/Teen"}
+    - {id: 409, cat: Other, desc: "Misc"}
+    - {id: 408, cat: PC/Games, desc: "Games"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: 2facode
+    type: text
+    label: 2FA code
+  - name: info_2fa
+    type: info
+    label: "About 2FA code"
+    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the Old Toons World Web Site. Otherwise just leave it empty."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      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.
+
+login:
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img[alt="CAPTCHA"]
+    input: imagestring
+  inputs:
+    secret: ""
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    two_step_code: "{{ .Config.2facode }}"
+    logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: yes
+  error:
+    - selector: td.embedded:has(h2:contains("Login failed!"))
+    - selector: td.embedded:has(h2:contains("Failed"))
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: torrents.php
+  inputs:
+    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 incldead, 1 active, 2 dead
+    incldead: 0
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdburl
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    # 0 AND, 1 OR, 2 exact
+    search_mode: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+
+  rows:
+    selector: table.torrents > tbody > tr:has(a[href^="details.php?id="])
+
+  fields:
+    category:
+      selector: a[href^="?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title_default:
+      selector: a[href^="details.php?id="]
+    title_optional:
+      optional: true
+      selector: a[title][href^="details.php?id="]
+      attribute: title
+    title:
+      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    imdbid:
+      # site currently only has a badge and rating, the id is not present. just in case a future update.
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    date_elapsed:
+      # time type: time elapsed (default)
+      selector: td.rowfollow:nth-child(4) > span[title]
+      attribute: title
+      optional: true
+      filters:
+        - name: append
+          args: " +00:00" # GMT
+        - name: dateparse
+          args: "2006-01-02 15:04:05 -07:00"
+    date_added:
+      # time added
+      selector: td.rowfollow:nth-child(4):not(:has(span))
+      optional: true
+      filters:
+        - name: append
+          args: " +00:00" # GMT
+        - name: dateparse
+          args: "2006-01-0215:04:05 -07:00"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
+    size:
+      selector: td.rowfollow:nth-child(5)
+    seeders:
+      selector: td.rowfollow:nth-child(6)
+    leechers:
+      selector: td.rowfollow:nth-child(7)
+    grabs:
+      selector: td.rowfollow:nth-child(8)
+    downloadvolumefactor:
+      case:
+        img.pro_free: 0
+        img.pro_free2up: 0
+        img.pro_50pctdown: 0.5
+        img.pro_50pctdown2up: 0.5
+        img.pro_30pctdown: 0.3
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img.pro_50pctdown2up: 2
+        img.pro_free2up: 2
+        img.pro_2up: 2
+        "*": 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 2 day (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+    description:
+      selector: td.rowfollow:nth-child(2)
+      remove: a, img
+# NexusPHP 1.7.29 2022-10-13

src/Jackett.Common/Definitions/onejav.yml

@@ -5,6 +5,7 @@ description: "OneJAV is a Public tracker for Asian 3X (JAV)"
 language: en-US
 type: public
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://onejav.com/
 

src/Jackett.Common/Definitions/peeratiko.yml

@@ -35,6 +35,7 @@ caps:
     - {id: 21, cat: Movies/WEB-DL, desc: "Movies Greek DVD/BD/BR-rip"}
     - {id: 22, cat: Movies/Other, desc: "Movies Greek Other"}
     - {id: 10, cat: Movies/HD, desc: "Movies HD Packs"}
+    - {id: 64, cat: Movies/UHD, desc: "Movies 4K"}
     - {id: 13, cat: Movies/Other, desc: "Movies Other"}
     - {id: 14, cat: Movies, desc: "Movies Packs"}
     - {id: 23, cat: Audio, desc: "Music DJs Stuff"}
@@ -58,6 +59,8 @@ caps:
     - {id: 34, cat: TV, desc: "TV Series Greek"}
     - {id: 35, cat: TV, desc: "TV Series Greek Packs"}
     - {id: 30, cat: TV/Sport, desc: "TV Sports"}
+    - {id: 65, cat: TV/UHD, desc: "TV Series 4K"}
+    - {id: 66, cat: TV/UHD, desc: "TV Series Pack 4K"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/peerjunkies.yml

@@ -1,152 +0,0 @@
----
-id: peerjunkies
-name: PeerJunkies
-description: "PeerJunkies is a Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://www.peerjunkies.com/
-
-caps:
-  categorymappings:
-    - {id: 3, cat: PC, desc: "App/LINUX"}
-    - {id: 4, cat: PC/Mac, desc: "App/MAC"}
-    - {id: 2, cat: PC/Mobile-Other, desc: "App/Mobile"}
-    - {id: 5, cat: PC/0day, desc: "App/WIN"}
-    - {id: 6, cat: Audio/Audiobook, desc: "Books/Audio"}
-    - {id: 7, cat: Books/EBook, desc: "Books/Ebook"}
-    - {id: 8, cat: Books, desc: "Books/Tuts"}
-    - {id: 9, cat: Console/NDS, desc: "Game/NIN"}
-    - {id: 10, cat: Console/PS3, desc: "Game/PSX"}
-    - {id: 11, cat: PC/Games, desc: "Game/WIN"}
-    - {id: 12, cat: Console/XBox, desc: "Game/XBOX"}
-    - {id: 13, cat: Movies/3D, desc: "Movie/3D"}
-    - {id: 14, cat: Movies/UHD, desc: "Movie/4K"}
-    - {id: 15, cat: Movies/BluRay, desc: "Movie/Bluray"}
-    - {id: 16, cat: Movies/DVD, desc: "Movie/DVD"}
-    - {id: 17, cat: Movies, desc: "Movie/Packs"}
-    - {id: 18, cat: Movies/HD, desc: "Movie/x264"}
-    - {id: 19, cat: Movies/HD, desc: "Movie/x265"}
-    - {id: 20, cat: Movies/SD, desc: "Movie/XVID"}
-    - {id: 24, cat: TV, desc: "TV/Packs"}
-    - {id: 25, cat: TV/HD, desc: "TV/Rip/HD"}
-    - {id: 26, cat: TV/SD, desc: "TV/Rip/SD"}
-    - {id: 27, cat: TV/HD, desc: "TV/x264/HD"}
-    - {id: 28, cat: TV/SD, desc: "TV/x264/SD"}
-    - {id: 29, cat: TV/HD, desc: "TV/x265"}
-    - {id: 30, cat: TV/SD, desc: "TV/XviD"}
-    - {id: 1, cat: TV/Anime, desc: "Anime"}
-    - {id: 22, cat: Other, desc: "Misc"}
-    - {id: 21, cat: Audio, desc: "Music"}
-    - {id: 23, cat: TV/Sport, desc: "Sports"}
-    - {id: 40, cat: XXX/x264, desc: "XXX/HD"}
-    - {id: 41, cat: XXX/SD, desc: "XXX/SD"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - 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.
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 4
-    options:
-      4: created
-      7: seeders
-      5: size
-      1: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  path: takelogin.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: td.tdhd:contains("Login failed!")
-  test:
-    path: browse.php
-    selector: a[href="/logout.php"]
-
-search:
-  paths:
-    # https://www.peerjunkies.com/browse.php?search=perry+s03e07&cat=0&blah=0&incldead=1
-    - path: browse.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    # 0 title, 1 nfo, 2 filelist, 3 title+nfo
-    blah: 0
-    incldead: 1
-    search: "{{ .Keywords }}"
-    sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
-    # site does not support freeleech or imdbid searching and does not display imdb links in results.
-
-  rows:
-    selector: table.tortable tbody tr:has(a[href^="download.php"])
-
-  fields:
-    category:
-      selector: a[href^="browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title:
-      selector: a[href^="details.php?id="]
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php"]
-      attribute: href
-    size:
-      selector: td:nth-last-child(8)
-    date:
-      selector: td:nth-last-child(7)
-      filters:
-        - name: replace
-          args: ["\u00a0", " "]
-        - name: append
-          args: " -07:00" # PDT
-        - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
-    files:
-      selector: td:nth-last-child(6)
-    grabs:
-      selector: td:nth-last-child(4)
-    seeders:
-      selector: td:nth-last-child(3)
-    leechers:
-      selector: td:nth-last-child(2)
-    downloadvolumefactor:
-      case:
-        img[src="pic/freeleech.png"]: 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 0.4
-# engine n/a

src/Jackett.Common/Definitions/pignetwork.yml

@@ -5,6 +5,7 @@ description: "PigNetwork (猪猪网) is a CHINESE Private Torrent Tracker for HD
 language: zh-CN
 type: private
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://piggo.me/
 
@@ -19,6 +20,7 @@ caps:
     - {id: 407, cat: TV/Sport, desc: "Sports/体育", default: true}
     - {id: 409, cat: Other, desc: "Misc/其他", default: true}
     - {id: 408, cat: Audio, desc: "Music/音乐", default: true}
+    # kids zone
     - {id: 908, cat: TV, desc: "TV Series/剧集", default: true}
     - {id: 909, cat: Movies, desc: "Movies/电影", default: true}
     - {id: 905, cat: Audio/Video, desc: "MusicVideo/MV", default: true}

src/Jackett.Common/Definitions/pixelcove.yml

@@ -151,14 +151,27 @@ search:
           args: ["/static/common/noartwork/noimage.png", ""]
     files:
       selector: td:nth-child(3)
-    date:
-      selector: td:nth-child(5) > span
-      attribute: title
+    date_elapsed:
+      # <td class="nobr"><span class="time" alt="1 month ago" title="1 month ago">Oct 01 2022, 18:41</span></td>
+      selector: td:nth-child(5) > span:not(:contains("ago"))
+      optional: true
       filters:
         - name: append
           args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
           args: "Jan 02 2006, 15:04 -07:00"
+    date_added:
+    # <td class="nobr"><span class="time" alt="Nov 17 2022, 01:44" title="Nov 17 2022, 01:44">13 hours ago</span></td>
+      selector: td:nth-child(5) > span:contains("ago")
+      attribute: title
+      optional: true
+      filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
+        - name: dateparse
+          args: "Jan 02 2006, 15:04 -07:00"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
     size:
       selector: td:nth-child(6)
     grabs:

src/Jackett.Common/Definitions/pixelcove2fa.yml

@@ -0,0 +1,186 @@
+---
+id: pixelcove2fa
+name: PixelCove2FA
+description: "PixelCove2FA (Ultimate Gamer) is a Private Torrent Tracker for GAMES. Cookie Login for 2FA use."
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://www.pixelcove.me/
+
+caps:
+  categorymappings:
+    # Computer
+    - {id: 10, cat: PC/Games, desc: "Windows"}
+    - {id: 11, cat: PC/Mac, desc: "Macintosh"}
+    - {id: 47, cat: PC, desc: "Linux"}
+    - {id: 56, cat: PC, desc: "VR"}
+    # Microsoft
+    - {id: 14, cat: Console/XBox, desc: "Xbox"}
+    - {id: 61, cat: Console/XBox 360, desc: "Xbox 360"}
+    - {id: 62, cat: Console/XBox One, desc: "Xbox One"}
+    # Sony
+    - {id: 43, cat: Console/PS3, desc: "Playstation "}
+    - {id: 63, cat: Console/PS3, desc: "Playstation 2"}
+    - {id: 64, cat: Console/PS3, desc: "Playstation 3"}
+    - {id: 67, cat: Console/PS4, desc: "Playstation 4"}
+    - {id: 12, cat: Console/Other, desc: "PSN"}
+    # Nintendo
+    - {id: 57, cat: Console/Other, desc: "Gamecube"}
+    - {id: 44, cat: Console/Wii, desc: "Wii"}
+    - {id: 46, cat: Console/Wii, desc: "Wii U"}
+    - {id: 76, cat: Console/Other, desc: "Switch"}
+    # Handheld
+    - {id: 15, cat: Console/NDS, desc: "DS"}
+    - {id: 68, cat: Console/NDS, desc: "3DS"}
+    - {id: 69, cat: Console/PSP, desc: "PSP"}
+    - {id: 70, cat: Console/PS Vita, desc: "PSVita"}
+    # Mobile
+    - {id: 65, cat: PC/Mobile-iOS, desc: "iOS"}
+    - {id: 49, cat: PC/Mobile-Android, desc: "Android"}
+    - {id: 66, cat: PC/Mobile-Other, desc: "Windows Mobile"}
+    # Reading
+    - {id: 53, cat: Books, desc: "Books/Mags"}
+    - {id: 60, cat: Books, desc: "Comics"}
+    - {id: 17, cat: Books, desc: "Guides"}
+    # Media
+    - {id: 58, cat: Audio/Video, desc: "Gaming Videos"}
+    - {id: 52, cat: Audio, desc: "OST"}
+    - {id: 55, cat: Other, desc: "Time for a Break"}
+    - {id: 81, cat: Audio/Video, desc: "Videos"}
+    # Various
+    - {id: 59, cat: Other, desc: "Mods"}
+    - {id: 54, cat: Other, desc: "Updates/Fixes"}
+    - {id: 71, cat: PC/0day, desc: "Applications/Tools"}
+    - {id: 48, cat: Other, desc: "Retro"}
+    - {id: 72, cat: Other, desc: "Board Games"}
+    - {id: 75, cat: Other, desc: "Paper Crafting"}
+    - {id: 77, cat: Other, desc: "Arcade"}
+    - {id: 78, cat: Other, desc: "Other"}
+
+  modes:
+    search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: cookie
+    type: text
+    label: Cookie
+  - name: info_cookie
+    type: info
+    label: How to get the Cookie
+    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: time
+    options:
+      time: created
+      seeders: seeders
+      size: size
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  method: cookie
+  inputs:
+    cookie: "{{ .Config.cookie }}"
+  test:
+    path: torrents.php
+    selector: a.username
+
+search:
+  paths:
+    # https://www.pixelcove.me/torrents.php?order_by=time&order_way=desc&filter_freeleech=1&searchtext=&action=advanced&title=&sizeall=&sizetype=gb&sizerange=0.01&filelist=&taglist=&autocomplete_toggle=1
+    - path: torrents.php
+  inputs:
+    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
+    order_by: "{{ .Config.sort }}"
+    order_way: "{{ .Config.type }}"
+    action: advanced
+    filter_freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    searchtext: ""
+    title: "{{ .Keywords }}"
+    filelist: ""
+    taglist: ""
+
+  rows:
+    # exclude redbar torrents
+    selector: table#torrent_table > tbody > tr[class^="torrent row"]
+
+  fields:
+    download:
+      selector: a[href^="torrents.php?action=download&id="]
+      attribute: href
+    description:
+      selector: div.tags
+    title:
+      selector: a[href^="/torrents.php?id="]
+    category:
+      selector: a[href*="filter_cat"]
+      attribute: href
+      filters:
+        - name: regexp
+          args: "\\[(\\d+?)\\]"
+    details:
+      selector: a[href^="/torrents.php?id="]
+      attribute: href
+    poster:
+      selector: td:nth-child(2) > script
+      filters:
+        - name: regexp
+          args: "src=\\\\\"(.*?)\\\\\""
+        - name: re_replace
+          args: ["\\\\(.)", "$1"]
+        - name: replace
+          args: ["/static/common/noartwork/noimage.png", ""]
+    files:
+      selector: td:nth-child(3)
+    date_elapsed:
+      # <td class="nobr"><span class="time" alt="1 month ago" title="1 month ago">Oct 01 2022, 18:41</span></td>
+      selector: td:nth-child(5) > span:not(:contains("ago"))
+      optional: true
+      filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
+        - name: dateparse
+          args: "Jan 02 2006, 15:04 -07:00"
+    date_added:
+    # <td class="nobr"><span class="time" alt="Nov 17 2022, 01:44" title="Nov 17 2022, 01:44">13 hours ago</span></td>
+      selector: td:nth-child(5) > span:contains("ago")
+      attribute: title
+      optional: true
+      filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
+        - name: dateparse
+          args: "Jan 02 2006, 15:04 -07:00"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
+    size:
+      selector: td:nth-child(6)
+    grabs:
+      selector: td:nth-child(7)
+    seeders:
+      selector: td:nth-child(8)
+    leechers:
+      selector: td:nth-child(9)
+    downloadvolumefactor:
+      case:
+        img[src$="/freedownload.gif"]: 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 0.5
+# luminance

src/Jackett.Common/Definitions/polishsource.yml

@@ -39,11 +39,11 @@ settings:
     label: Password
   - name: multilang
     type: checkbox
-    label: Replace MULTI & PL by another language in release name
+    label: Replace MULTI by another language in release name
     default: false
   - name: multilanguage
     type: select
-    label: Replace MULTI & PL by this language
+    label: Replace MULTI by this language
     default: POLISH
     options:
       POLISH: POLISH

src/Jackett.Common/Definitions/polishtracker-api.yml

@@ -98,8 +98,6 @@ search:
       selector: id
     category:
       selector: category
-    _language:
-      selector: language
     title_phase1:
       selector: name
     title_multilang:
@@ -110,7 +108,7 @@ search:
         - name: re_replace
           args: ["(?i)(\\.pl\\.)", ".POLISH."]
     title:
-      text: "{{ if eq .Result._language \"pl\" }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
+      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
     details:
       text: "{{ .Config.sitelink }}torrents/{{ .Result._id }}"
     download:

src/Jackett.Common/Definitions/pterclub.yml

@@ -121,15 +121,15 @@ search:
         - name: querystring
           args: cat
     title_default:
-      selector: a[href^="details.php?id="]
+      selector: a[href^="details.php?id="], a[href^="detailsgame.php?"]
     title_optional:
       optional: true
-      selector: a[title][href^="details.php?id="],a[title][href^="detailsgame.php?id="]
+      selector: a[title][href^="details.php?id="], a[title][href^="detailsgame.php?id="]
       attribute: title
     title:
       text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
     details:
-      selector: a[href^="details.php?id="]
+      selector: a[href^="details.php?id="], a[href^="detailsgame.php?"]
       attribute: href
     download:
       selector: a[href^="download.php?id="]

src/Jackett.Common/Definitions/pttime.yml

@@ -5,37 +5,38 @@ description: "PTTime is a ratioless CHINESE Private Torrent Tracker for HD MOVIE
 language: zh-CN
 type: private
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://www.pttime.org/
 
 caps:
   categorymappings:
-    - {id: 401, cat: Movies, desc: "Movies(电影)"}
-    - {id: 402, cat: TV, desc: "TV Series(电视剧)"}
-    - {id: 403, cat: TV, desc: "TV Shows(综艺)"}
-    - {id: 404, cat: TV/Documentary, desc: "Documentaries(纪录片)"}
-    - {id: 405, cat: TV/Sport, desc: "Sport(体育、竞技、武术及相关)"}
-    - {id: 406, cat: PC/Games, desc: "Games(游戏及相关)"}
-    - {id: 408, cat: Audio, desc: "Music(音乐、专辑、MV、演唱会)"}
-    - {id: 409, cat: Other, desc: "Art(舞蹈、歌剧、戏曲、相声、评书等)"}
-    - {id: 411, cat: Other, desc: "Science(科学、知识、技能)"}
-    - {id: 412, cat: Other, desc: "School(应试、考级、初中以上教育)"}
-    - {id: 413, cat: Books, desc: "Book(书籍、有声书)"}
-    - {id: 420, cat: PC, desc: "Code(IT、编程、大数据、人工智能"}
-    - {id: 430, cat: TV/Anime, desc: "Animate(3D动画、2.5次元)"}
-    - {id: 431, cat: TV/Anime, desc: "ACGN(二次元)"}
-    - {id: 432, cat: TV/Other, desc: "Baby(婴幼、早教、小学及相关)"}
-    - {id: 440, cat: XXX, desc: "9kg-AV(步兵/无码)"}
-    - {id: 441, cat: XXX, desc: "9kg-Sex(骑兵/有码)"}
-    - {id: 442, cat: XXX, desc: "9kg-III(三级片、限制级电影)"}
-    - {id: 443, cat: XXX, desc: "9kg-H动漫"}
-    - {id: 444, cat: XXX, desc: "9kg-H游戏"}
-    - {id: 445, cat: XXX, desc: "9kg-H书籍(书籍、有声书)"}
-    - {id: 446, cat: XXX, desc: "9kg-H写真(图片、私拍、短视频）"}
-    - {id: 447, cat: XXX, desc: "9kg-H音频(ASMR、音乐、音频)"}
-    - {id: 450, cat: Other, desc: "Resource(资源、素材、模板)"}
-    - {id: 451, cat: PC, desc: "Software(软件、系统、 程序、APP等)"}
-    - {id: 490, cat: Other, desc: "Other(其它)"}
+    - {id: 401, cat: Movies, desc: "Movies(电影)", default: true}
+    - {id: 402, cat: TV, desc: "TV Series(电视剧)", default: true}
+    - {id: 403, cat: TV, desc: "TV Shows(综艺)", default: true}
+    - {id: 404, cat: TV/Documentary, desc: "Documentaries(纪录片)", default: true}
+    - {id: 405, cat: TV/Sport, desc: "Sport(体育、竞技、武术及相关)", default: true}
+    - {id: 406, cat: PC/Games, desc: "Games(游戏及相关)", default: true}
+    - {id: 408, cat: Audio, desc: "Music(音乐、专辑、MV、演唱会)", default: true}
+    - {id: 409, cat: Other, desc: "Art(舞蹈、歌剧、戏曲、相声、评书等)", default: true}
+    - {id: 411, cat: Other, desc: "Science(科学、知识、技能)", default: true}
+    - {id: 412, cat: Other, desc: "School(应试、考级、初中以上教育)", default: true}
+    - {id: 413, cat: Books, desc: "Book(书籍、有声书)", default: true}
+    - {id: 420, cat: PC, desc: "Code(IT、编程、大数据、人工智能", default: true}
+    - {id: 430, cat: TV/Anime, desc: "Animate(3D动画、2.5次元)", default: true}
+    - {id: 431, cat: TV/Anime, desc: "ACGN(二次元)", default: true}
+    - {id: 432, cat: TV/Other, desc: "Baby(婴幼、早教、小学及相关)", default: true}
+    - {id: 450, cat: Other, desc: "Resource(资源、素材、模板)", default: true}
+    - {id: 451, cat: PC, desc: "Software(软件、系统、 程序、APP等)", default: true}
+    - {id: 490, cat: Other, desc: "Other(其它)", default: true}
+    - {id: 440, cat: XXX, desc: "9kg-AV(步兵/无码)", default: false}
+    - {id: 441, cat: XXX, desc: "9kg-Sex(骑兵/有码)", default: false}
+    - {id: 442, cat: XXX, desc: "9kg-III(三级片、限制级电影)", default: false}
+    - {id: 443, cat: XXX, desc: "9kg-H动漫", default: false}
+    - {id: 444, cat: XXX, desc: "9kg-H游戏", default: false}
+    - {id: 445, cat: XXX, desc: "9kg-H书籍(书籍、有声书)", default: false}
+    - {id: 446, cat: XXX, desc: "9kg-H写真(图片、私拍、短视频）", default: false}
+    - {id: 447, cat: XXX, desc: "9kg-H音频(ASMR、音乐、音频)", default: false}
 
   modes:
     search: [q]
@@ -79,7 +80,7 @@ login:
 search:
   paths:
     - path: torrents.php
-      categories: ["!", 440, 441, 442, 443, 444, 445, 446, 447]
+      categories: [401, 402, 403, 404, 405, 406, 408, 409, 411, 412, 413, 420, 430, 431, 432, 450, 451, 490]
     - path: adults.php
       categories: [440, 441, 442, 443, 444, 445, 446, 447]
   inputs:

src/Jackett.Common/Definitions/puurhollands.yml

@@ -1,162 +0,0 @@
----
-id: puurhollands
-name: Puur-Hollands
-description: "Puur-Hollands is a DUTCH Private Torrent Tracker for MUSIC"
-language: nl-NL
-type: private
-encoding: UTF-8
-links:
-  - https://www.puur-hollands.org/
-
-caps:
-  categorymappings:
-    - {id: 2, cat: Audio, desc: "Nederlandse Albums"}
-    - {id: 3, cat: Audio, desc: "Nederlandse Verzamel"}
-    - {id: 4, cat: Audio, desc: "Nederlandse Piraten"}
-    - {id: 5, cat: Audio, desc: "Losse Mp3 Verzameling"}
-    - {id: 7, cat: Audio, desc: "Limburgse Muziek"}
-    - {id: 8, cat: Audio, desc: "Nederlandse Instrumentaal"}
-    - {id: 9, cat: Audio, desc: "Nederlandse Dvds"}
-
-  modes:
-    search: [q]
-    music-search: [q, artist]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use DDoS-Guard Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
-  - name: thankyou
-    type: text
-    label: Thank You Comment
-  - name: info_comment
-    type: info
-    label: Thank you comment
-    default: This site requires you to leave a Thank You comment before you can download. Enter your personalised comment above.
-
-login:
-  path: login.php
-  method: form
-  form: form[action="takelogin.php"]
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    returnto: "/"
-  error:
-    - selector: td.embedded:contains("fout")
-  test:
-    path: index.php
-    selector: a[href="logout.php"]
-
-download:
-  before:
-    # https://www.ebookparadijs.org/comment.php?action=add&tid=23079
-    path: comment.php
-    method: post
-    inputs:
-      action: add
-      tid: "{{ .DownloadUri.Query.id }}"
-      text: "{{ .Config.thankyou }}"
-  selectors:
-    - selector: a[href^="download.php?id="]
-      attribute: href
-
-search:
-  paths:
-    - path: browse.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ if .Query.Artist }}{{ .Query.Artist }}{{ else }}{{ .Keywords }}{{ end }}"
-    incldead: 1
-
-  rows:
-    selector: table.mainouter
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      selector: a[href^="browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title:
-      selector: a[href^="details.php?id="]
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    poster:
-      selector: div[id^="Style"] img
-      attribute: src
-    size:
-      selector: td:nth-child(4) table tr:nth-child(1) td:nth-child(2)
-      filters:
-        - name: regexp
-          args: "(.+?) in"
-    files:
-      selector: td:nth-child(4) table tr:nth-child(1) td:nth-child(2)
-      filters:
-        - name: regexp
-          args: "in (\\d+) bestan"
-    grabs:
-      selector: td:nth-child(4) table tr:nth-child(2) td:nth-child(1)
-    date:
-      selector: td:nth-child(4) table tr:nth-child(2) td:last-child
-      filters:
-        - name: replace
-          args: ["januari", "January"]
-        - name: replace
-          args: ["februari", "February"]
-        - name: replace
-          args: ["maart", "March"]
-        - name: replace
-          args: ["april", "April"]
-        - name: replace
-          args: ["mei", "May"]
-        - name: replace
-          args: ["juni", "June"]
-        - name: replace
-          args: ["juli", "July"]
-        - name: replace
-          args: ["augustus", "August"]
-        - name: replace
-          args: ["september", "September"]
-        - name: replace
-          args: ["oktober", "October"]
-        - name: replace
-          args: ["november", "November"]
-        - name: replace
-          args: ["december", "December"]
-        - name: re_replace
-          args: ["\\s*om\\s*", " "]
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "2 January 2006 15:04:05 -07:00"
-    seeders_optional:
-      optional: true
-      selector: td:nth-child(4) table tr:nth-child(3) td:nth-child(5) font b
-    seeders:
-      text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}"
-    leechers_optional:
-      optional: true
-      selector: td:nth-child(4) table tr:nth-child(3) td:nth-child(5) font font b
-    leechers:
-      text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# minimumratio: appears to be ratioless
-# engine n/a

src/Jackett.Common/Definitions/racingforme.yml

@@ -5,6 +5,7 @@ description: "Racing For Me (RFM) is a Private Torrent Tracker for RACING"
 language: en-US
 type: private
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://www.racingfor.me/
 

src/Jackett.Common/Definitions/redbits-api.yml

@@ -12,6 +12,7 @@ caps:
   categorymappings:
     - {id: 1, cat: Movies, desc: "Películas"}
     - {id: 2, cat: TV, desc: "Series"}
+    - {id: 10, cat: TV, desc: "Series Completas"}
     - {id: 6, cat: TV/Documentary, desc: "Documentales"}
     - {id: 7, cat: TV/Sport, desc: "Deportes"}
     - {id: 8, cat: Movies, desc: "Hagbard"}

src/Jackett.Common/Definitions/rutor.yml

@@ -9,7 +9,7 @@ links:
   - http://rutor.info/ # site does not support https ERR_CONNECTION_REFUSED
   - http://rutor.is/ # site does not support https ERR_CONNECTION_REFUSED
   - http://new-rutor.org/ # site does not support https ERR_CONNECTION_REFUSED
-  - https://rutor.nocensor.world/ # for magnet only
+  - https://rutor.nocensor.lol/ # for magnet only
 legacylinks:
   - http://live-rutor.org/ # domain expired 9 Feb 2020
   - https://rutor.black-mirror.xyz/
@@ -26,6 +26,7 @@ legacylinks:
   - https://rutor.nocensor.space/
   - https://rutor.nocensor.work/
   - http://6tor.org/
+  - https://rutor.nocensor.world/
 
 caps:
   # unfortunately RuTor does not display categories anywhere in its search results page :-(

src/Jackett.Common/Definitions/sexypics.yml

@@ -6,6 +6,7 @@ language: en-US
 type: public
 encoding: UTF-8
 followredirect: true
+requestDelay: 2
 links:
   - https://www.sexy-pics.us/
 

src/Jackett.Common/Definitions/siambit.yml

@@ -5,60 +5,61 @@ description: "SiamBIT is a THAI Private Torrent Tracker for GENERAL"
 language: th-TH
 type: private
 encoding: tis-620
+requestDelay: 2
 links:
   - https://www.siambit.me/
 
 caps:
   categorymappings:
-    - {id: 1, cat: Other, desc: "@ King"}
-    - {id: 75, cat: PC/0day, desc: "OS Windows / Office"}
-    - {id: 10, cat: TV, desc: "Cartoons / Animation"}
-    - {id: 9, cat: TV/Sport, desc: "Sports / Football"}
-    - {id: 110, cat: PC/Games, desc: "Mobile games"}
-    - {id: 7, cat: PC/Games, desc: "Games"}
-    - {id: 40, cat: Audio/Video, desc: "clips"}
-    - {id: 16, cat: Audio/Video, desc: "Concert"}
-    - {id: 3, cat: Audio/Other, desc: "Karaoke / MV"}
-    - {id: 70, cat: PC, desc: "software AntiVirus / Antispyware"}
-    - {id: 100, cat: PC/Mobile-Other, desc: "software Mobile / Theme / Ringtone / mv"}
-    - {id: 85, cat: PC/Mac, desc: "Mac software"}
-    - {id: 105, cat: PC, desc: "Linux software"}
-    - {id: 8, cat: PC, desc: "software"}
-    - {id: 56, cat: Other, desc: "Dictionary / map"}
-    - {id: 19, cat: TV, desc: "Talk show / comedy / radio"}
-    - {id: 20, cat: TV, desc: "general"}
-    - {id: 55, cat: PC/Mobile-iOS, desc: "Tablet / iPhone"}
-    - {id: 21, cat: TV, desc: "Dharma"}
-    - {id: 2, cat: Audio/MP3, desc: "Music"}
-    - {id: 130, cat: Audio/Audiobook, desc: "High quality music (Lossless)"}
-    - {id: 60, cat: Other, desc: "fonts / icons / clip art / templates"}
-    - {id: 90, cat: Movies/UHD, desc: "4K UHD movies"}
-    - {id: 91, cat: Movies/DVD, desc: "DVD movies"}
-    - {id: 92, cat: Movies/HD, desc: "Hi-Def movies"}
-    - {id: 89, cat: Movies/SD, desc: "VCD movies"}
-    - {id: 93, cat: TV, desc: "Mother and child @ / Learning materials for children"}
-    - {id: 4, cat: TV, desc: "TV shows / Variety / Game shows"}
-    - {id: 50, cat: Other, desc: "Images"}
-    - {id: 18, cat: Other, desc: "website"}
-    - {id: 17, cat: TV/Documentary, desc: "Documentary"}
-    - {id: 11, cat: Books/Technical, desc: "Learning materials / Books / Ebook"}
-    - {id: 5, cat: Movies, desc: "Movies / series [Korea]"}
-    - {id: 54, cat: Movies, desc: "Movies / Series [China]"}
-    - {id: 51, cat: Movies, desc: "Movie series / series [Japan]"}
-    - {id: 52, cat: Movies, desc: "Movies / Series [Western]"}
-    - {id: 57, cat: Movies, desc: "Movies / series [other]"}
-    - {id: 53, cat: Movies, desc: "Movie series / series / drama [Thai]"}
-    - {id: 901, cat: XXX, desc: "XXX-Anime"}
-    - {id: 902, cat: XXX, desc: "XXX-Game"}
-    - {id: 903, cat: XXX, desc: "XXX-Japan censored"}
-    - {id: 904, cat: XXX, desc: "XXX-Japan"}
-    - {id: 905, cat: XXX, desc: "XXX-Guava"}
-    - {id: 906, cat: XXX, desc: "XXX-Asia censored"}
-    - {id: 907, cat: XXX, desc: "XXX-Asia"}
-    - {id: 908, cat: XXX, desc: "XXX-Gay"}
-    - {id: 910, cat: XXX, desc: "XXX-clip"}
-    - {id: 911, cat: XXX, desc: "XXX-pictures"}
-    - {id: 912, cat: XXX, desc: "XXX-magazine"}
+    - {id: 1, cat: Other, desc: "@ King", default: true}
+    - {id: 75, cat: PC/0day, desc: "OS Windows / Office", default: true}
+    - {id: 10, cat: TV, desc: "Cartoons / Animation", default: true}
+    - {id: 9, cat: TV/Sport, desc: "Sports / Football", default: true}
+    - {id: 110, cat: PC/Games, desc: "Mobile games", default: true}
+    - {id: 7, cat: PC/Games, desc: "Games", default: true}
+    - {id: 40, cat: Audio/Video, desc: "clips", default: true}
+    - {id: 16, cat: Audio/Video, desc: "Concert", default: true}
+    - {id: 3, cat: Audio/Other, desc: "Karaoke / MV", default: true}
+    - {id: 70, cat: PC, desc: "software AntiVirus / Antispyware", default: true}
+    - {id: 100, cat: PC/Mobile-Other, desc: "software Mobile / Theme / Ringtone / mv", default: true}
+    - {id: 85, cat: PC/Mac, desc: "Mac software", default: true}
+    - {id: 105, cat: PC, desc: "Linux software", default: true}
+    - {id: 8, cat: PC, desc: "software", default: true}
+    - {id: 56, cat: Other, desc: "Dictionary / map", default: true}
+    - {id: 19, cat: TV, desc: "Talk show / comedy / radio", default: true}
+    - {id: 20, cat: TV, desc: "general", default: true}
+    - {id: 55, cat: PC/Mobile-iOS, desc: "Tablet / iPhone", default: true}
+    - {id: 21, cat: TV, desc: "Dharma", default: true}
+    - {id: 2, cat: Audio/MP3, desc: "Music", default: true}
+    - {id: 130, cat: Audio/Audiobook, desc: "High quality music (Lossless)", default: true}
+    - {id: 60, cat: Other, desc: "fonts / icons / clip art / templates", default: true}
+    - {id: 90, cat: Movies/UHD, desc: "4K UHD movies", default: true}
+    - {id: 91, cat: Movies/DVD, desc: "DVD movies", default: true}
+    - {id: 92, cat: Movies/HD, desc: "Hi-Def movies", default: true}
+    - {id: 89, cat: Movies/SD, desc: "VCD movies", default: true}
+    - {id: 93, cat: TV, desc: "Mother and child @ / Learning materials for children", default: true}
+    - {id: 4, cat: TV, desc: "TV shows / Variety / Game shows", default: true}
+    - {id: 50, cat: Other, desc: "Images", default: true}
+    - {id: 18, cat: Other, desc: "website", default: true}
+    - {id: 17, cat: TV/Documentary, desc: "Documentary", default: true}
+    - {id: 11, cat: Books/Technical, desc: "Learning materials / Books / Ebook", default: true}
+    - {id: 5, cat: Movies, desc: "Movies / series [Korea]", default: true}
+    - {id: 54, cat: Movies, desc: "Movies / Series [China]", default: true}
+    - {id: 51, cat: Movies, desc: "Movie series / series [Japan]", default: true}
+    - {id: 52, cat: Movies, desc: "Movies / Series [Western]", default: true}
+    - {id: 57, cat: Movies, desc: "Movies / series [other]", default: true}
+    - {id: 53, cat: Movies, desc: "Movie series / series / drama [Thai]", default: true}
+    - {id: 901, cat: XXX, desc: "XXX-Anime", default: false}
+    - {id: 902, cat: XXX, desc: "XXX-Game", default: false}
+    - {id: 903, cat: XXX, desc: "XXX-Japan censored", default: false}
+    - {id: 904, cat: XXX, desc: "XXX-Japan", default: false}
+    - {id: 905, cat: XXX, desc: "XXX-Guava", default: false}
+    - {id: 906, cat: XXX, desc: "XXX-Asia censored", default: false}
+    - {id: 907, cat: XXX, desc: "XXX-Asia", default: false}
+    - {id: 908, cat: XXX, desc: "XXX-Gay", default: false}
+    - {id: 910, cat: XXX, desc: "XXX-clip", default: false}
+    - {id: 911, cat: XXX, desc: "XXX-pictures", default: false}
+    - {id: 912, cat: XXX, desc: "XXX-magazine", default: false}
 
   modes:
     search: [q]
@@ -119,7 +120,7 @@ download:
 search:
   paths:
     - path: viewno18sb.php
-      categories: ["!", 901, 902, 903, 904, 905, 906, 907, 908, 910, 911, 912]
+      categories: [1, 75, 10, 9, 110, 7, 40, 16, 3, 70, 100, 85, 105, 8, 56, 19, 20, 55, 21, 2, 130, 60, 90, 91, 92, 89, 93, 4, 50, 18, 17, 11, 5, 54, 51, 52, 57, 53]
     - path: viewbrsb.php
       categories: [901, 902, 903, 904, 905, 906, 907, 908, 910, 911, 912]
   inputs:

src/Jackett.Common/Definitions/slosoul.yml

@@ -1,176 +0,0 @@
----
-id: slosoul
-name: slosoul
-description: "slosoul is a Slovanian  Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: en-US
-type: private
-encoding: UTF-8
-testlinktorrent: false
-links:
-  - https://slosoul.net/
-legacylinks:
-  - http://slosoul.net/
-
-caps:
-  categorymappings:
-    - {id: 5, cat: PC, desc: "Apps"}
-    - {id: 7, cat: Books/EBook, desc: "Ebooks"}
-    - {id: 6, cat: PC/Games, desc: "Games PC"}
-    - {id: 19, cat: Console/XBox 360, desc: "GAMES xbox360"}
-    - {id: 8, cat: Movies, desc: "Movies Packs"}
-    - {id: 1, cat: Movies/SD, desc: "Movies Divx/Xvid"}
-    - {id: 9, cat: Movies/DVD, desc: "Movies DVD-r"}
-    - {id: 17, cat: Movies/HD, desc: "Movies x.264"}
-    - {id: 11, cat: Movies/BluRay, desc: "Movies BluRay"}
-    - {id: 15, cat: Movies/HD, desc: "Movies HEVC"}
-    - {id: 14, cat: Audio/Lossless, desc: "Music FLAC"}
-    - {id: 3, cat: Audio/MP3, desc: "Music MP3"}
-    - {id: 13, cat: TV/Sport, desc: "TV Sport"}
-    - {id: 18, cat: TV, desc: "TV Packs"}
-    - {id: 10, cat: TV, desc: "TV Shows"}
-    - {id: 16, cat: TV/HD, desc: "TV Shows HEVC"}
-    - {id: 12, cat: Other, desc: "VIP"}
-    - {id: 4, cat: XXX, desc: "Porn"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Filter freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: added
-    options:
-      added: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  path: takelogin.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    logout: ""
-  error:
-    - selector: table:has(td.thead:contains("An error has occured!"))
-  test:
-    path: userdetails.php
-    selector: a[href*="logout.php?logouthash="]
-
-download:
-  before:
-    path: takethanks.php
-    method: post
-    inputs:
-      torrentid: "{{ re_replace  .DownloadUri.PathAndQuery \".*torrent-details-(\\d+).*\" \"$1\"}}"
-  selectors:
-    - selector: a[href*="download-torrent-"]
-      attribute: href
-
-search:
-  paths:
-    - path: browse.php
-  inputs:
-    do: search
-    # does not support multi categories so defaulting to ALL
-    category: 0
-    # yes incldead, no activeonly
-    include_dead_torrents: yes
-    keywords: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    # t_name, t_description, t_both, t_uploader, t_genre
-    search_type: "{{ if .Query.IMDBID }}t_genre{{ else }}t_name{{ end }}"
-    sort: "{{ .Config.sort }}"
-    order: "{{ .Config.type }}"
-    # does not return imdb link in results
-  keywordsfilters:
-    - name: re_replace # replace special characters with "%" (wildcard)
-      args: ["[^a-zA-Z0-9]+", "%"]
-
-  rows:
-    selector: "table#sortabletable tbody tr:has(a[href*=\"download-torrent-\"]){{ if .Config.freeleech }}:has(img[src$=\"/freedownload.gif\"]){{ else }}{{ end }}"
-
-  fields:
-    category:
-      selector: a[href*="torrent-category-"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: (\d+)
-    title_default:
-      # is often abbreviated
-      selector: a[href*="torrent-details-"]
-    title_optional:
-      # usually longer than details title
-      selector: div[id^="port-content-"] div
-      optional: true
-    title:
-      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
-    details:
-      selector: a[href*="torrent-details-"]
-      attribute: href
-    download:
-      selector: a[href*="torrent-details-"]
-      attribute: href
-    magnet:
-      selector: a[href^="magnet:?xt="]
-      attribute: href
-    poster:
-      selector: div[id^="port-content-"] img
-      attribute: src
-    date:
-      selector: td:nth-child(2) > div:last-child
-      filters:
-        - name: regexp
-          args: (\d{2}-\d{2}-\d{4} \d{2}:\d{2})
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: dateparse
-          args: "02-01-2006 15:04 -07:00"
-    size:
-      selector: td:nth-child(5)
-    grabs:
-      selector: td:nth-child(6)
-    seeders:
-      selector: td:nth-child(7)
-    leechers:
-      selector: td:nth-child(8)
-    downloadvolumefactor:
-      case:
-        img[src$="/external.gif"]: 0
-        img[src$="/freedownload.gif"]: 0
-        img[src$="/silverdownload.gif"]: 0.5
-        "*": 1
-    uploadvolumefactor:
-      case:
-        img[src$="/x2.gif"]: 2
-        "*": 1
-# TBD, Rules and FAQ do not cover this yet
-#    minimumratio:
-#      text: 1.0
-#    minimumseedtime:
-#      # 2 days (as seconds = 2 x 24 x 60 x 60)
-#      text: 172800
-#  TS Special Edition v.8.0

src/Jackett.Common/Definitions/soundpark.yml

@@ -1,91 +0,0 @@
----
-id: soundpark
-name: SoundPark
-description: "SoundPark is a Semi-Private  RUSSIAN site for MUSIC compilations and albums"
-language: ru-RU
-type: semi-private
-encoding: UTF-8
-testlinktorrent: false
-links:
-  - https://sound-park.world/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Audio, desc: "Music"}
-
-  modes:
-    search: [q]
-    music-search: [q, album, artist]
-
-settings:
-  - name: cookie
-    type: text
-    label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
-
-login:
-  method: cookie
-  inputs:
-    cookie: "{{ .Config.cookie }}"
-  test:
-    path: personal/
-
-download:
-  before:
-    pathselector:
-      selector: a.torrent_download
-      attribute: href
-  selectors:
-    - selector: p.attachment a
-      attribute: href
-      usebeforeresponse: true
-
-search:
-  paths:
-    # https://sound-park.world/filter/?sort_method=1&sorting_type=undefined&genres=&qualities=&country_keyword=&countries=&releases=&start_year=&end_year=&search_keyword=
-    - path: filter/
-  inputs:
-    sort_method: 1
-    sorting_type: undefined
-    genres: ""
-    qualities: ""
-    country_keyword: ""
-    countries: ""
-    releases: ""
-    start_year: ""
-    end_year: ""
-    search_keyword: "{{ if or (.Query.Artist) (.Query.Album) }}{{ or (.Query.Artist) (.Query.Album) }}{{ else }}{{ .Keywords }}{{ end }}"
-
-  rows:
-    selector: div.album
-
-  fields:
-    category:
-      text: 1
-    title:
-      selector: h3
-    details:
-      selector: h3 > a
-      attribute: href
-    download:
-      selector: h3 > a
-      attribute: href
-    poster:
-      selector: picture img
-      attribute: src
-    date:
-      text: now
-    size:
-      text: "128 MB"
-    seeders:
-      text: 1
-    leechers:
-      text: 1
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine wordpress 5.8

src/Jackett.Common/Definitions/spidertk.yml

@@ -57,6 +57,7 @@ caps:
     - {id: 447, cat: Books/Comics, desc: "Livres / Bande Dessinée"}
     - {id: 448, cat: Books/Comics, desc: "Livres / Comic"}
     - {id: 449, cat: Books/Comics, desc: "Livres / Manga"}
+    - {id: 468, cat: Books/Other, desc: "Livres / Divers"}
     - {id: 450, cat: PC/Games, desc: "Logiciels / Jeu PC"}
     - {id: 451, cat: PC/Games, desc: "Logiciels / Jeu Mac"}
     - {id: 452, cat: PC/Games, desc: "Logiciels / Jeu Linux"}

src/Jackett.Common/Definitions/swarmazon-api.yml

@@ -0,0 +1,111 @@
+---
+id: swarmazon-api
+name: Swarmazon (API)
+description: "Swarmazon is a Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://swarmazon.club/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Movies"}
+    - {id: 2, cat: TV, desc: "Television"}
+    - {id: 3, cat: Other, desc: "Video Courses"}
+    - {id: 4, cat: Audio, desc: "Music"}
+    - {id: 5, cat: PC/Games, desc: "Games"}
+    - {id: 6, cat: PC, desc: "Software"}
+    - {id: 7, cat: TV/Anime, desc: "Anime"}
+    - {id: 8, cat: Books/EBook, desc: "E-Books"}
+    - {id: 9, cat: Audio/Audiobook, desc: "Audio Books"}
+    - {id: 10, cat: Books/Comics, desc: "Comics"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: apikey
+    type: text
+    label: APIKey
+  - name: info_key
+    type: info
+    label: About your API key
+    default: "Find or Generate a new API Token by accessing the <a href=\"https://swarmazon.club/en/view/settings.php?section=token\" target =_blank>Token Setting</a> page."
+
+login:
+  path: api/search.php
+  method: get
+  inputs:
+    api_key: "{{ .Config.apikey }}"
+    limit: 1
+  error:
+    - selector: ":root:contains(\"Invalid API key\")"
+
+search:
+  paths:
+    - path: api/search.php
+      response:
+        type: json
+
+  inputs:
+    api_key: "{{ .Config.apikey }}"
+    filter: "{{ .Keywords }}"
+    $raw: "{{ if .Query.IMDBID }}&media_ref={{ .Query.IMDBID }}{{ else }}{{ end }}"
+    limit: 100
+
+  rows:
+    selector: data
+
+  fields:
+    category:
+      selector: categoryid
+    title:
+      selector: name
+    details:
+      selector: torrent
+    download:
+      selector: download
+    poster:
+      selector: media_poster
+      filters:
+        - name: replace
+          args: ["N\/A", ""]
+    genre:
+      selector: media_genre
+    description:
+      text: "{{ .Result.genre }}"
+    infohash:
+      selector: hash
+    imdbid:
+      selector: ref_id:contains(tt)
+    seeders:
+      selector: seeders
+    leechers:
+      selector: leechers
+    grabs:
+      selector: completed
+    date:
+      # 2022-11-16 22:49:25
+      selector: upload_timestamp
+      filters:
+        - name: append
+          args: " -07:00" # PDT
+        - name: dateparse
+          args: "2006-01-02 15:04:05 -07:00"
+    size:
+      selector: size
+    downloadvolumefactor:
+      selector: freeleech
+      case:
+        no: 1 # not free
+        "*": 0 # freeleech
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1.1
+# json v1.22.0620

src/Jackett.Common/Definitions/swarmazon.yml

@@ -85,6 +85,14 @@ search:
     download:
       selector: a[href^="/api/download.php?hash="]
       attribute: href
+    poster:
+      selector: a[onmouseover]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "src=(.+?) "
+        - name: replace
+          args: ["/images/no_poster.jpg", ""]
     size:
       selector: td:nth-last-child(6)
     date:
@@ -108,4 +116,4 @@ search:
       text: 1
     minimumratio:
       text: 1.1
-# Engine n/a
+# v1.22.0620

src/Jackett.Common/Definitions/teamctgame.yml

@@ -5,6 +5,7 @@ description: "Team CT Game (TCTG) is a FRENCH Private Torrent Tracker for MOVIES
 language: fr-FR
 type: private
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://tctg.pm/
 legacylinks:
@@ -15,51 +16,51 @@ legacylinks:
 
 caps:
   categorymappings:
-    - {id: 409, cat: Books/Comics, desc: "BD"}
-    - {id: 410, cat: Books/Mags, desc: "Ebooks - Presse"}
-    - {id: 411, cat: Audio/Audiobook, desc: "Ebooks - Audiobooks"}
-    - {id: 412, cat: Books/EBook, desc: "Ebooks - Ebooks"}
-    - {id: 413, cat: Movies/3D, desc: "Films - 3D"}
-    - {id: 414, cat: Movies/HD, desc: "Films - 4K"}
-    - {id: 415, cat: Movies/UHD, desc: "Films - 4K HDR"}
-    - {id: 416, cat: Movies/UHD, desc: "Films - 4K Light"}
-    - {id: 417, cat: Movies/UHD, desc: "Films - 4K Remux"}
-    - {id: 418, cat: Movies, desc: "Films - Animation"}
-    - {id: 419, cat: Movies/BluRay, desc: "Films - BDRip / BRRip"}
-    - {id: 420, cat: Movies/DVD, desc: "Films - DVD-R"}
-    - {id: 421, cat: Movies/DVD, desc: "Films - DVDRip"}
-    - {id: 422, cat: Movies/BluRay, desc: "Films - Full Bluray"}
-    - {id: 423, cat: Movies/HD, desc: "Films - HDTV"}
-    - {id: 424, cat: Movies/HD, desc: "Films - HD 1080p"}
-    - {id: 425, cat: Movies/HD, desc: "Films - HD 720p"}
-    - {id: 426, cat: Movies/HD, desc: "Films - HDLiGHT / M-HD"}
-    - {id: 427, cat: Movies/HD, desc: "Films - HDRiP"}
-    - {id: 428, cat: Movies, desc: "Films - Pack"}
-    - {id: 429, cat: Movies, desc: "Films - Remux"}
-    - {id: 430, cat: TV, desc: "Films - TVRip"}
-    - {id: 431, cat: Movies, desc: "Films - VO"}
-    - {id: 432, cat: Movies, desc: "Films - VOSTFR"}
-    - {id: 433, cat: Movies/WEB-DL, desc: "Films - Web"}
-    - {id: 434, cat: Movies/HD, desc: "Films - x265"}
-    - {id: 436, cat: Console, desc: "Jeux - Consoles"}
-    - {id: 437, cat: PC/Games, desc: "Jeux - PC"}
-    - {id: 438, cat: PC/0day, desc: "Logiciels -  Windows"}
-    - {id: 439, cat: Other, desc: "Logiciels - Graph / Wallpaper"}
-    - {id: 440, cat: TV/HD, desc: "Series - 4K HDR"}
-    - {id: 441, cat: TV/HD, desc: "Series TV - Pack HD"}
-    - {id: 442, cat: TV/HD, desc: "Series TV - Episode HD"}
-    - {id: 443, cat: TV/HD, desc: "Series TV - Pack HD VOSTFR"}
-    - {id: 444, cat: TV/HD, desc: "Series TV - Episode HD VOSTFR"}
-    - {id: 445, cat: TV/SD, desc: "Series TV - Pack SD"}
-    - {id: 446, cat: TV/SD, desc: "Series TV - Episode SD"}
-    - {id: 447, cat: TV/SD, desc: "Series TV - Pack SD VOSTFR"}
-    - {id: 448, cat: TV/SD, desc: "Series TV - Episode SD VOSTFR"}
-    - {id: 449, cat: TV/Anime, desc: "Series - Animés"}
-    - {id: 450, cat: TV, desc: "Spectacles - Tous"}
-    - {id: 451, cat: TV, desc: "TV - Emissions"}
-    - {id: 452, cat: TV/Documentary, desc: "TV - Documentaires"}
-    - {id: 453, cat: TV/Sport, desc: "TV - Sports"}
-    - {id: 435, cat: XXX, desc: "Films - XXX"}
+    - {id: 409, cat: Books/Comics, desc: "BD", default: true}
+    - {id: 410, cat: Books/Mags, desc: "Ebooks - Presse", default: true}
+    - {id: 411, cat: Audio/Audiobook, desc: "Ebooks - Audiobooks", default: true}
+    - {id: 412, cat: Books/EBook, desc: "Ebooks - Ebooks", default: true}
+    - {id: 413, cat: Movies/3D, desc: "Films - 3D", default: true}
+    - {id: 414, cat: Movies/HD, desc: "Films - 4K", default: true}
+    - {id: 415, cat: Movies/UHD, desc: "Films - 4K HDR", default: true}
+    - {id: 416, cat: Movies/UHD, desc: "Films - 4K Light", default: true}
+    - {id: 417, cat: Movies/UHD, desc: "Films - 4K Remux", default: true}
+    - {id: 418, cat: Movies, desc: "Films - Animation", default: true}
+    - {id: 419, cat: Movies/BluRay, desc: "Films - BDRip / BRRip", default: true}
+    - {id: 420, cat: Movies/DVD, desc: "Films - DVD-R", default: true}
+    - {id: 421, cat: Movies/DVD, desc: "Films - DVDRip", default: true}
+    - {id: 422, cat: Movies/BluRay, desc: "Films - Full Bluray", default: true}
+    - {id: 423, cat: Movies/HD, desc: "Films - HDTV", default: true}
+    - {id: 424, cat: Movies/HD, desc: "Films - HD 1080p", default: true}
+    - {id: 425, cat: Movies/HD, desc: "Films - HD 720p", default: true}
+    - {id: 426, cat: Movies/HD, desc: "Films - HDLiGHT / M-HD", default: true}
+    - {id: 427, cat: Movies/HD, desc: "Films - HDRiP", default: true}
+    - {id: 428, cat: Movies, desc: "Films - Pack", default: true}
+    - {id: 429, cat: Movies, desc: "Films - Remux", default: true}
+    - {id: 430, cat: TV, desc: "Films - TVRip", default: true}
+    - {id: 431, cat: Movies, desc: "Films - VO", default: true}
+    - {id: 432, cat: Movies, desc: "Films - VOSTFR", default: true}
+    - {id: 433, cat: Movies/WEB-DL, desc: "Films - Web", default: true}
+    - {id: 434, cat: Movies/HD, desc: "Films - x265", default: true}
+    - {id: 436, cat: Console, desc: "Jeux - Consoles", default: true}
+    - {id: 437, cat: PC/Games, desc: "Jeux - PC", default: true}
+    - {id: 438, cat: PC/0day, desc: "Logiciels -  Windows", default: true}
+    - {id: 439, cat: Other, desc: "Logiciels - Graph / Wallpaper", default: true}
+    - {id: 440, cat: TV/HD, desc: "Series - 4K HDR", default: true}
+    - {id: 441, cat: TV/HD, desc: "Series TV - Pack HD", default: true}
+    - {id: 442, cat: TV/HD, desc: "Series TV - Episode HD", default: true}
+    - {id: 443, cat: TV/HD, desc: "Series TV - Pack HD VOSTFR", default: true}
+    - {id: 444, cat: TV/HD, desc: "Series TV - Episode HD VOSTFR", default: true}
+    - {id: 445, cat: TV/SD, desc: "Series TV - Pack SD", default: true}
+    - {id: 446, cat: TV/SD, desc: "Series TV - Episode SD", default: true}
+    - {id: 447, cat: TV/SD, desc: "Series TV - Pack SD VOSTFR", default: true}
+    - {id: 448, cat: TV/SD, desc: "Series TV - Episode SD VOSTFR", default: true}
+    - {id: 449, cat: TV/Anime, desc: "Series - Animés", default: true}
+    - {id: 450, cat: TV, desc: "Spectacles - Tous", default: true}
+    - {id: 451, cat: TV, desc: "TV - Emissions", default: true}
+    - {id: 452, cat: TV/Documentary, desc: "TV - Documentaires", default: true}
+    - {id: 453, cat: TV/Sport, desc: "TV - Sports", default: true}
+    - {id: 435, cat: XXX, desc: "Films - XXX", default: false}
 
   modes:
     search: [q]
@@ -143,7 +144,7 @@ login:
 search:
   paths:
     - path: torrents.php
-      categories: ["!", 435]
+      categories: [409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453]
     - path: special.php
       categories: [435]
   inputs:
@@ -240,4 +241,4 @@ search:
         "*": 1
     minimumratio:
       text: 1.0
-# NexusPHP Standard v1.6 Beta 12
+# NexusPHP v1.7.30 2022-10-21

src/Jackett.Common/Definitions/teamos.yml

@@ -5,6 +5,7 @@ description: "Team OS is a Private Torrent Tracker for SOFTWARE"
 language: en-US
 type: private
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://www.teamos.xyz/
 legacylinks:

src/Jackett.Common/Definitions/theoldschool-api.yml

@@ -1,28 +1,32 @@
 ---
-id: breizhpeers
-name: BreizhPeers
-description: "BreizhPeers is a FRENCH Private Torrent Tracker for MOVIES / TV"
+id: theoldschool-api
+name: The Old School (API)
+description: "The Old School is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"
 language: fr-FR
 type: private
 encoding: UTF-8
 links:
-  - https://breizhpeers.tk/
+  - https://theoldschool.cc/
 
 caps:
   categorymappings:
     - {id: 1, cat: Movies, desc: "Films"}
-    - {id: 2, cat: TV, desc: "Séries"}
-    - {id: 3, cat: TV, desc: "TV"}
-    - {id: 4, cat: TV/Anime, desc: "Animes"}
-    - {id: 5, cat: Audio/Video, desc: "Concerts"}
-    - {id: 10, cat: PC, desc: "Applications"}
-    - {id: 9, cat: Console, desc: "Jeux"}
-    - {id: 6, cat: TV/Sport, desc: "Sport"}
+    - {id: 6, cat: Movies, desc: "Films VOSTFR"}
+    - {id: 2, cat: TV, desc: "Series"}
+    - {id: 7, cat: TV, desc: "Series VOSTFR"}
+    - {id: 8, cat: TV, desc: "Series Pack"}
+    - {id: 9, cat: TV, desc: "Series Pack vostfr"}
+    - {id: 3, cat: Books, desc: "Ebooks"}
+    - {id: 4, cat: Console, desc: "Jeux"}
+    - {id: 5, cat: PC, desc: "Logiciel"}
+    - {id: 10, cat: TV/Sport, desc: "Sports"}
 
   modes:
     search: [q]
     tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
+    music-search: [q]
+    book-search: [q]
 
 settings:
   - name: apikey
@@ -31,7 +35,7 @@ settings:
   - name: info_key
     type: info
     label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://breizhpeers.tk/\" target =_blank>BreizhPeers</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://theoldschool.cc/\" target =_blank>The Old School</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -186,6 +190,6 @@ search:
         0: 1 # normal
         1: 2 # double
     minimumseedtime:
-      # 7 days (as seconds = 7 x 24 x 60 x 60)
-      text: 604800
-# json UNIT3D 6.3.0 (custom)
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# json UNIT3D 6.4.1 custom

src/Jackett.Common/Definitions/tokyotosho.yml

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 links:
   - https://www.tokyotosho.info/
-  - https://tokyotosho.nocensor.world/
+  - https://tokyotosho.nocensor.lol/
 legacylinks:
   - https://tokyotosho.black-mirror.xyz/
   - https://tokyotosho.unblocked.casa/
@@ -23,6 +23,7 @@ legacylinks:
   - https://tokyotosho.nocensor.work/
   - https://tokyotosho.nocensor.biz/
   - https://tokyotosho.nocensor.sbs/
+  - https://tokyotosho.nocensor.world/
 
 settings:
   - name: cat

src/Jackett.Common/Definitions/torlock.yml

@@ -6,16 +6,14 @@ language: en-US
 type: public
 encoding: UTF-8
 followredirect: true
+requestDelay: 2
 links:
   - https://www.torlock2.com/
   - https://www.torlock.com/
-  - https://torlock.unblockit.nz/
-  - https://torlock.nocensor.world/
+  - https://torlock.unblockit.page/
+  - https://torlock.nocensor.lol/
 legacylinks:
   - https://torlock.com/
-  - https://torlock.unblockit.uno/
-  - https://torlock.unblockit.ch/
-  - https://torlock.nocensor.space/
   - https://torlock.unblockit.ws/
   - https://torlock.nocensor.work/
   - https://torlock.unblockit.kim/
@@ -33,6 +31,8 @@ legacylinks:
   - https://torlock.unblockit.ist/
   - https://torlock.unblockit.bet/
   - https://torlock.unblockit.cat/
+  - https://torlock.unblockit.nz/
+  - https://torlock.nocensor.world/
 
 caps:
   # dont forget to update the search fields category case block

src/Jackett.Common/Definitions/torlook.yml

@@ -9,10 +9,10 @@ certificates:
   - aeca58c91a901bf1b6449a97828e379e61bdf4ff # expired 21 Oct 2022
 links:
   - https://gw1.torlook.info/
-  - https://torlook.nocensor.world/
 legacylinks:
   - https://torlook.nocensor.biz/
   - https://torlook.nocensor.sbs/
+  - https://torlook.nocensor.world/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrent-explosiv.yml

@@ -47,7 +47,7 @@ caps:
     - {id: 176, cat: Console/Wii, desc: "Game Wii - Switch"}
     - {id: 222, cat: Console/NDS, desc: "Game NDS-3DS"}
     - {id: 177, cat: Console, desc: "Game Wimmelbild"}
-    - {id: 178, cat: Console/Other, desc: "Game Sonstieges"}
+    - {id: 178, cat: Console/Other, desc: "Game Sonstiges"}
     # Musik
     - {id: 187, cat: Audio, desc: "Musik Alben"}
     - {id: 188, cat: Audio, desc: "Musik Sampler"}