rus-media: add minutes date detection

This reverts commit 41d76d8325.

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,89 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+    paths:
+      - src/**/*.cs
+      - src/**/*.js
+      - '!src/Jackett.Common/Indexers/**'
+      - '!src/Jackett.IntegrationTests/**'
+      - '!src/Jackett.Test/**'
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+    paths:
+      - src/**/*.cs
+      - src/**/*.js
+      - '!src/Jackett.Common/Indexers/**'
+      - '!src/Jackett.IntegrationTests/**'
+      - '!src/Jackett.Test/**'
+  schedule:
+    - cron: '00 00 * * 5'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: windows-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'csharp', 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    - name: Set up dotnet
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '6.0.*'
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1
+      

README.md

@@ -66,6 +66,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * EZTV
  * FileListing
  * FireBit
+ * freshMeat
  * Frozen Layer
  * GamesTorrents
  * GkTorrent
@@ -132,7 +133,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Sexxi
  * Sexy-Pics
  * ShizaProject
- * shokweb
  * ShowRSS
  * Solid Torrents
  * sosulki
@@ -146,6 +146,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Torrent Downloads (TD)
  * Torrent Oyun indir
  * Torrent Paradise (ML)
+ * torrent.by
  * torrent-pirat
  * Torrent9
  * Torrent9 clone
@@ -182,6 +183,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 
  * AniDUB
  * Anime-Free
+ * AnimeLayer
  * ArenaBG
  * BaibaKo
  * BookTracker
@@ -287,6 +289,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * BiTTuRK
  * BJ-Share (BJ)
  * BlueBird [![(invite needed)][inviteneeded]](#)
+ * Blues-Brothers
  * Blutopia (BLU)
  * Borgzelle  [![(invite needed)][inviteneeded]](#)
  * Boxing Torrents
@@ -387,6 +390,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HDCity [![(invite needed)][inviteneeded]](#)
  * HDHome (HDBigger) [![(invite needed)][inviteneeded]](#)
  * HDME
+ * HDMonkey
  * HDRoute [![(invite needed)][inviteneeded]](#)
  * HDSky [![(invite needed)][inviteneeded]](#)
  * HDTime
@@ -408,6 +412,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * JPTV
  * Karagarga
  * Keep Friends [![(invite needed)][inviteneeded]](#)
+ * KrazyZone
  * LastFiles
  * Lat-Team [![(invite needed)][inviteneeded]](#)
  * Le Saloon
@@ -435,6 +440,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Mononoké-BT [![(invite needed)][inviteneeded]](#)
  * MoreThanTV (MTV)
  * MouseBits
+ * Movie-Torrentz
  * Moviesite
  * MyAnonamouse (MAM)
  * MySpleen [![(invite needed)][inviteneeded]](#)
@@ -455,6 +461,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * P2PElite
  * Partis [![(invite needed)][inviteneeded]](#)
  * PassThePopcorn (PTP)
+ * Peeratiko
  * PeerJunkies
  * Peers.FM
  * Pirata Digital

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

@@ -13,7 +13,7 @@ links:
   - https://x1337x.ws/
   - https://x1337x.eu/
   - https://x1337x.se/
-  - https://1337x.unblockit.bz/
+  - https://1337x.unblockit.tv/
   - https://1337x.nocensor.biz/
 legacylinks:
   - https://1337x.unblocked.earth/
@@ -52,6 +52,7 @@ legacylinks:
   - https://1337x.unblockit.ws/
   - https://1337x.nocensor.work/
   - https://1337x.unblockit.kim/
+  - https://1337x.unblockit.bz/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/24rolika.yml

@@ -10,7 +10,54 @@ links:
 
 caps:
   categorymappings:
-    - {id: xxx, cat: XXX, desc: xxx}
+    # only subcategories of Порно фильмы (Movies) have torrents
+    - {id: 94, cat: XXX, desc: "4K порно фильмы", default: true}
+    - {id: 76, cat: XXX, desc: "Японские порно фильмы", default: true}
+    - {id: 81, cat: XXX, desc: "Бразильские порно фильмы", default: true}
+    - {id: 41, cat: XXX, desc: "Итальянские порно фильмы", default: true}
+    - {id: 42, cat: XXX, desc: "Американские порно фильмы", default: true}
+    - {id: 43, cat: XXX, desc: "Немецкие порно фильмы", default: true}
+    - {id: 44, cat: XXX, desc: "Французские порно фильмы", default: true}
+    - {id: 45, cat: XXX, desc: "Русские порно фильмы", default: true}
+    - {id: 47, cat: XXX, desc: "Порно фильмы 2018 года", default: true}
+    - {id: 75, cat: XXX, desc: "Порно фильмы 2019 года", default: true}
+    - {id: 92, cat: XXX, desc: "Порно фильмы 2020 года", default: true}
+    - {id: 93, cat: XXX, desc: "Порно фильмы 2021 года", default: true}
+    - {id: 48, cat: XXX, desc: "Ретро / Классика", default: true}
+    - {id: 49, cat: XXX, desc: "С русским переводом", default: true}
+    - {id: 82, cat: XXX, desc: "С сюжетом", default: true}
+    - {id: 91, cat: XXX, desc: "Пародии", default: true}
+    - {id: 51, cat: XXX, desc: "Brazzers", default: true}
+    - {id: 52, cat: XXX, desc: "BangBros", default: true}
+    - {id: 53, cat: XXX, desc: "Marc Dorcel", default: true}
+    - {id: 54, cat: XXX, desc: "Evil Angel", default: true}
+    - {id: 55, cat: XXX, desc: "Tushy", default: true}
+    - {id: 56, cat: XXX, desc: "Blacked", default: true}
+    - {id: 57, cat: XXX, desc: "Evil Playgrounds", default: true}
+    - {id: 58, cat: XXX, desc: "Reality Kings", default: true}
+    - {id: 59, cat: XXX, desc: "New Sensations", default: true}
+    - {id: 60, cat: XXX, desc: "Wicked Pictures", default: true}
+    - {id: 61, cat: XXX, desc: "21Sextury", default: true}
+    - {id: 62, cat: XXX, desc: "PornPros", default: true}
+    - {id: 63, cat: XXX, desc: "Private", default: true}
+    - {id: 64, cat: XXX, desc: "DD Busty", default: true}
+    - {id: 65, cat: XXX, desc: "Naughty America", default: true}
+    - {id: 66, cat: XXX, desc: "Third Degree Films", default: true}
+    - {id: 67, cat: XXX, desc: "Hustler", default: true}
+    - {id: 68, cat: XXX, desc: "Blacks on Blondes", default: true}
+    - {id: 69, cat: XXX, desc: "Team Skeet", default: true}
+    - {id: 70, cat: XXX, desc: "Mofos", default: true}
+    - {id: 71, cat: XXX, desc: "Vixen", default: true}
+    - {id: 72, cat: XXX, desc: "Jules Jordan", default: true}
+    - {id: 73, cat: XXX, desc: "Nubile Films", default: true}
+    - {id: 74, cat: XXX, desc: "Digital Playground", default: true}
+    - {id: 83, cat: XXX, desc: "Zero Tolerance", default: true}
+    - {id: 84, cat: XXX, desc: "Pure Taboo", default: true}
+    - {id: 85, cat: XXX, desc: "Devil's Film", default: true}
+    - {id: 86, cat: XXX, desc: "Sweet Sinner", default: true}
+    - {id: 87, cat: XXX, desc: "Penthouse", default: true}
+    - {id: 88, cat: XXX, desc: "Elegant Angel", default: true}
+    - {id: 89, cat: XXX, desc: "Digital Sin", default: true}
 
   modes:
     search: [q]
@@ -41,26 +88,28 @@ search:
   paths:
     - path: index.php
   inputs:
+    $raw: "{{ range .Categories }}catlist[]={{.}}&{{end}}"
     do: search
     subaction: search
     search_start: 0
     full_search: 1
     result_from: 1
-    story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}%D0%9F%D0%BE%D0%B8%D1%81%D0%BA{{ end }}"
+    story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
     # 0 in article 1 in comments 2 in static pages 3 in article titles
     titleonly: 3
     sortby: "{{ .Config.sort }}"
     resorder: "{{ .Config.type }}"
     showposts: 0
-    # does not have categories in results so there is little point in providing a full category map or multi-cat search support
-    catlist[]: 0
+
+  headers:
+    Referer: ["{{ .Config.sitelink }}"]
 
   rows:
     selector: article.shortstory
 
   fields:
     category:
-      text: xxx
+      text: 94
     title:
       selector: h2.short_title a
     details:

src/Jackett.Common/Definitions/animelayer.yml

@@ -0,0 +1,201 @@
+---
+id: animelayer
+name: AnimeLayer
+description: "AnimeLayer is a RUSSIAN Semi-Private Torrent Tracker for ANIME"
+language: ru-RU
+type: semi-private
+encoding: UTF-8
+links:
+  - https://www.animelayer.ru/
+
+caps:
+  categorymappings:
+    - {id: аниме, cat: TV/Anime, desc: Аниме}
+    - {id: музыка, cat: Audio, desc: Музыка}
+    - {id: манга, cat: Books, desc: Манга}
+    - {id: дорама, cat: TV, desc: Дорама}
+
+  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: category-id
+    type: select
+    label: Category
+    default: anime
+    options:
+      anime: Аниме
+      music: Музыка
+      manga: Манга
+      dorama: Дорама
+
+login:
+  path: login.php
+  method: form
+  form: form#loginForm
+  inputs:
+    login: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: div.error
+  test:
+    path: /
+    selector: a[href^="/auth/logout/"]
+
+search:
+  paths:
+    - path: "torrents/{{ .Config.category-id }}/"
+  inputs:
+    q: "{{ .Keywords }}"
+
+  rows:
+    selector: ul.torrents-list li.torrent-item:has(a[href^="/torrent/"])
+
+  fields:
+    category:
+      selector: label.category
+    resolution:
+      selector: div.description
+      filters:
+        - name: regexp
+          args: "Разрешение:\\s+\\d{3,4}\\D(\\d{3,4})"
+    title:
+      selector: img
+      attribute: alt
+      filters:
+        - name: append
+          args: "{{ if .Result.resolution }} [{{ .Result.resolution }}p]{{ else }}{{ end }}"
+    details:
+      selector: a[href^="/torrent/"]
+      attribute: href
+    download:
+      selector: a[href^="/torrent/"]
+      attribute: href
+      filters:
+        - name: append
+          args: download/
+    poster:
+      selector: img
+      attribute: data-original
+    size:
+      selector: div.info
+      filters:
+        - name: split
+          args: ["|", 2]
+    date_noyear:
+      # <span class="gray">Добавлен:</span>&nbsp;18 августа в&nbsp;21:39
+      selector: div.info
+      filters:
+        - name: regexp
+          args: "н:\\s(\\d{1,2} \\D{3,8} в\\s\\d{1,2}:\\d{2})"
+        - name: replace
+          args: ["\xA0", " "]
+        - name: replace
+          args: ["Обновлён:", ""]
+        - name: replace
+          args: ["Добавлен:", ""]
+        - name: replace
+          args: [" в ", " "]
+        - name: replace
+          args: ["января", "January {{ .Today.Year }}"]
+        - name: replace
+          args: ["февраля", "February {{ .Today.Year }}"]
+        - name: replace
+          args: ["марта", "March {{ .Today.Year }}"]
+        - name: replace
+          args: ["апреля", "April {{ .Today.Year }}"]
+        - name: replace
+          args: ["мая", "May {{ .Today.Year }}"]
+        - name: replace
+          args: ["июня", "June {{ .Today.Year }}"]
+        - name: replace
+          args: ["июля", "July {{ .Today.Year }}"]
+        - name: replace
+          args: ["августа", "August {{ .Today.Year }}"]
+        - name: replace
+          args: ["сентября", "September {{ .Today.Year }}"]
+        - name: replace
+          args: ["октября", "October {{ .Today.Year }}"]
+        - name: replace
+          args: ["ноября", "November {{ .Today.Year }}"]
+        - name: replace
+          args: ["декабря", "December {{ .Today.Year }}"]
+        - name: re_replace
+          args: ["\\s(\\d\\:)", " 0$1"]
+    date_year:
+      # <span class="gray">Обновлён:</span>&nbsp;3 октября 2019 в&nbsp;6:02
+      selector: div.info
+      filters:
+        - name: regexp
+          args: "н:\\s(\\d{1,2} \\D{3,8} \\d{4} в\\s\\d{1,2}:\\d{2})"
+        - name: replace
+          args: ["\xA0", " "]
+        - name: replace
+          args: ["Обновлён:", ""]
+        - name: replace
+          args: ["Добавлен:", ""]
+        - name: replace
+          args: [" в ", " "]
+        - name: replace
+          args: ["января", "January"]
+        - name: replace
+          args: ["февраля", "February"]
+        - name: replace
+          args: ["марта", "March"]
+        - name: replace
+          args: ["апреля", "April"]
+        - name: replace
+          args: ["мая", "May"]
+        - name: replace
+          args: ["июня", "June"]
+        - name: replace
+          args: ["июля", "July"]
+        - name: replace
+          args: ["августа", "August"]
+        - name: replace
+          args: ["сентября", "September"]
+        - name: replace
+          args: ["октября", "October"]
+        - name: replace
+          args: ["ноября", "November"]
+        - name: replace
+          args: ["декабря", "December"]
+        - name: re_replace
+          args: ["\\s(\\d\\:)", " 0$1"]
+    date:
+      text: "{{ if or .Result.date_year .Result.date_noyear }}{{ or .Result.date_year .Result.date_noyear }}{{ else }}now{{ end }}"
+    seeders:
+      selector: div.info
+      filters:
+        - name: split
+          args: ["|", 0]
+    leechers:
+      selector: div.info
+      filters:
+        - name: split
+          args: ["|", 1]
+    subtitles:
+      filters:
+        - name: regexp
+          args: "Субтитры:(.+?)\\n"
+    language:
+      filters:
+        - name: regexp
+          args: "Язык:(.+?)\\n"
+    description:
+      text: "{{ if .Result.subtitles }}Субтитры: {{ .Result.subtitles }}{{ else }}{{ end }} - {{ if .Result.language }}Язык: {{ .Result.language }}{{ else }}{{ end }}"
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/audiobookbay.yml

@@ -9,7 +9,7 @@ links:
   - http://audiobookbay.nl/ # site forces http, does not support https
   - http://audiobookbay.ws/
   - http://audiobookbayabb.com/
-  - https://audiobookbay.unblockit.bz/
+  - https://audiobookbay.unblockit.tv/
 legacylinks:
   - https://audiobookbay.la/
   - https://audiobookbay.unblockit.lat/
@@ -26,6 +26,7 @@ legacylinks:
   - https://audiobookbay.unblockit.ws/
   - http://audiobookbay.net/
   - https://audiobookbay.unblockit.kim/
+  - https://audiobookbay.unblockit.bz/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/bitsearch.yml

@@ -20,6 +20,7 @@ caps:
     "Music/Album": Audio
     "Music/mp3": Audio/MP3
     "Music/Lossless": Audio/Lossless
+    "Music/Video": Audio/Video
     Other: Other
     "Other/Android": PC/Mobile-Android
     "Other/Archive": Other
@@ -62,23 +63,6 @@ settings:
       desc: desc
       asc: asc
 
-download:
-  # the magnet URI on this site exceeds 2048 bytes which some interfaces will reject. So we use the infohash and build our own.
-  infohash:
-    hash:
-      selector: a[href^="magnet:?xt"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: ([A-F|a-f|0-9]{40})
-    title:
-      selector: a[href^="magnet:?xt"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: "&dn=(.+?)$"
-        - name: validfilename
-
 search:
   paths:
      # https://bitsearch.to/search?q=&sort=date&order=desc
@@ -100,8 +84,14 @@ search:
       selector: h5 a
       attribute: href
     download:
-      selector: h5 a
+      selector: a[class="dl-torrent"]
       attribute: href
+    infohash:
+      selector: a[href^="magnet:?xt"]
+      attribute: href
+      filters:
+        - name: regexp
+          args: ([A-F|a-f|0-9]{40})
     grabs:
       selector: div.stats div:has(img[alt="Download"])
       filters:

src/Jackett.Common/Definitions/bluesbrothers.yml

@@ -0,0 +1,185 @@
+---
+id: bluesbrothers
+name: Blues-Brothers
+description: "Blues-Brothers is a Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://blues-brothers.biz/
+
+caps:
+  categorymappings:
+    - {id: 9, cat: TV/Anime, desc: "Anime"}
+    - {id: 1, cat: PC/0day, desc: "Apps"}
+    - {id: 17, cat: Audio/Audiobook, desc: "AudioBooks"}
+    - {id: 16, cat: Books/EBook, desc: "Ebooks"}
+    - {id: 12, cat: PC/Games, desc: "Games PC"}
+    - {id: 7, cat: Console/PS3, desc: "Games PS3"}
+    - {id: 19, cat: Console/Wii, desc: "Games Wii"}
+    - {id: 8, cat: Console/XBox 360, desc: "Games XBOX360"}
+    - {id: 18, cat: PC/Mac, desc: "MAC"}
+    - {id: 41, cat: PC/Mobile-Android, desc: "Mobile"}
+    - {id: 26, cat: Movies, desc: "Movie BDRip"}
+    - {id: 29, cat: Movies/HD, desc: "Movie BluRay 1080p"}
+    - {id: 28, cat: Movies/HD, desc: "Movie BluRay 720p"}
+    - {id: 27, cat: Movies/SD, desc: "Movie BRRip"}
+    - {id: 24, cat: Movies/SD, desc: "Movie CAM/TS"}
+    - {id: 23, cat: Movies/DVD, desc: "Movie DVD-R"}
+    - {id: 11, cat: Movies/SD, desc: "Movie DVDRip"}
+    - {id: 25, cat: Movies/SD, desc: "Movie DVDSCR/R5"}
+    - {id: 30, cat: Movies, desc: "Movie Packs"}
+    - {id: 10, cat: Movies/HD, desc: "Movie XviD x264"}
+    - {id: 6, cat: XXX, desc: "Movie XXX"}
+    - {id: 22, cat: Audio/Lossless, desc: "Music Flac"}
+    - {id: 21, cat: Audio/MP3, desc: "Music MP3"}
+    - {id: 14, cat: Audio, desc: "Music Packs"}
+    - {id: 20, cat: Audio/Video, desc: "Music Videos"}
+    - {id: 34, cat: TV, desc: "TV Packs"}
+    - {id: 36, cat: TV/HD, desc: "TV X264 HD"}
+    - {id: 37, cat: TV/SD, desc: "TV X264 SD"}
+    - {id: 35, cat: TV/SD, desc: "TV XviD"}
+    - {id: 38, cat: Other, desc: "VIP"}
+    - {id: 40, cat: Other, desc: "VIP ONLY"}
+
+  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: 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"]
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    use_ssl: 1
+    perm_ssl: ""
+    returnto: /
+  error:
+    - selector: table.main:contains("Login failed!")
+      message:
+        selector: table tr td.colhead2
+  test:
+    path: /
+    selector: a[href*="logout.php?hash_please="]
+
+search:
+  paths:
+    # https://blues-brothers.biz/browse.php?c27=1&c28=1&c29=1&search=&searchin=title&incldead=1&sort=4&type=desc
+    - path: browse.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    # title, descr, genre, all
+    searchin: title
+    # 0 active, 1 incldead, 2 onlydead
+    incldead: 1
+    only_free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+  keywordsfilters:
+    - name: re_replace
+      args: ["(\\w+)", " +$1"] # prepend + to each word
+
+  rows:
+    selector: table.table-bordered tr:has(a[href^="download.php?torrent="])
+
+  fields:
+    category:
+      selector: a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "Tip\\('<b>(.+?)</b>"
+    download:
+      selector: a[href^="download.php?torrent="]
+      attribute: href
+    poster:
+      selector: a[href^="details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: src=\\'(.+?)\\'
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    files:
+      selector: td:nth-child(5)
+    date_day:
+      selector: td:nth-child(7):contains("day")
+      optional: true
+      filters:
+        - name: fuzzytime
+    date_year:
+      selector: td:nth-child(7):not(:contains("day"))
+      optional: true
+      filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
+        - name: dateparse
+          args: "Jan 2 2006 03:04 PM -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(8)
+    grabs:
+      selector: td:nth-child(9)
+    seeders:
+      selector: td:nth-child(10)
+    leechers:
+      selector: td:nth-child(11)
+    downloadvolumefactor:
+      case:
+        "a.info:contains(\"[FREE]\")": 0
+        "a.info:contains(\"[SILVER]\")": 0.5
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# U-232 V5

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

@@ -59,6 +59,10 @@ search:
         type: json
         attribute: attributes
 
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+
   rows:
     selector: data
     count:
@@ -105,11 +109,15 @@ search:
     size:
       selector: size
     downloadvolumefactor:
-      # api returns 0=false, 1=true
+      # api returns 0%, 25%, 50%, 75%, 100%
       selector: freeleech
       case:
-        0: 1 # not free
-        1: 0 # freeleech
+        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

src/Jackett.Common/Definitions/blutopia.yml

@@ -90,6 +90,10 @@ search:
     page: 1
     free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
 
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+
   rows:
     selector: table > tbody > tr
 
@@ -165,19 +169,22 @@ search:
         - name: timeago
     downloadvolumefactor:
       case:
-        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
-        i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
-        i[class*="fa-star text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-globe text-blue"]: 0 # Global Freeleech
-        i[class*="fa-star text-gold"]: 0 # Freeleech
-        i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
+        span.torrent-listings-global-freeleech: 0
+        span.torrent-listings-personal-freeleech: 0
+        span.torrent-listings-freeleech-token: 0
+        span.torrent-listings-featured: 0
+        span.torrent-listings-freeleech[data-original-title*="25%"]: 0.75
+        span.torrent-listings-freeleech[data-original-title*="50%"]: 0.5
+        span.torrent-listings-freeleech[data-original-title*="75%"]: 0.25
+        span.torrent-listings-freeleech[data-original-title*="100%"]: 0
+        span.torrent-listings-special-freeleech: 0
         "*": 1
     uploadvolumefactor:
       case:
-        i[class*="fa-gem text-green"]: 2 # Single Torrent Double Upload
-        i[class*="fa-globe text-green"]: 2 # Global Double Upload
-        i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
+        span.torrent-listings-global-double-upload: 2
+        span.torrent-listings-double-upload: 2
+        span.torrent-listings-featured: 2
+        span.torrent-listings-special-double-upload: 2
         "*": 1
 # global MR is 0.4 but torrents must be seeded for 7 days regardless of ratio
 #    minimumratio:

src/Jackett.Common/Definitions/brsociety.yml

@@ -101,9 +101,6 @@ search:
       filters:
         - name: replace
           args: ["download_check", "download"]
-    magnet:
-      selector: a[href^="magnet:?"]
-      attribute: href
     details:
       selector: a.view-torrent
       attribute: href

src/Jackett.Common/Definitions/crazyhd.yml

@@ -144,6 +144,10 @@ search:
     category: "{{ if .Categories }}{{ range .Categories }}{{.}};{{end}}{{ else }}0{{ end }}"
     search: "{{ .Keywords }}"
 
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+
   rows:
     selector: div.inf-table-row
 

src/Jackett.Common/Definitions/demonoid.yml

@@ -11,7 +11,7 @@ links:
   - https://www.dnoid.to/
   - https://www.dnoid.pw/
   - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.onion.ly/
-  - https://demonoid.unblockit.bz/
+  - https://demonoid.unblockit.tv/
   - https://demonoid.torrentbay.to/
   - https://demonoid.nocensor.biz/
 legacylinks:
@@ -42,6 +42,7 @@ legacylinks:
   - https://demonoid.unblockit.ws/
   - https://demonoid.nocensor.work/
   - https://demonoid.unblockit.kim/
+  - https://demonoid.unblockit.bz/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/ettv.yml

@@ -9,7 +9,7 @@ followredirect: true
 links:
   - https://www.ettvcentral.com/
   - https://ettv.unblockninja.com/
-  - https://ettv.unblockit.bz/
+  - https://ettv.unblockit.tv/
   - https://ettv.nocensor.biz/
 legacylinks:
   - https://www.ettv.tv/
@@ -49,6 +49,7 @@ legacylinks:
   - https://ettv.unblockit.ws/
   - https://ettv.nocensor.work/
   - https://ettv.unblockit.kim/
+  - https://ettv.unblockit.bz/
 
 caps:
   categorymappings:

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

@@ -7,11 +7,12 @@ type: public
 encoding: UTF-8
 links:
   - https://extratorrent.st/
-  - https://extratorrent.unblockit.bz/
+  - https://extratorrent.unblockit.tv/
   - https://extratorrent.nocensor.biz/
 legacylinks:
   - https://extratorrent.nocensor.work/
   - https://extratorrent.unblockit.kim/
+  - https://extratorrent.unblockit.bz/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/eztv.yml

@@ -12,7 +12,7 @@ links:
   - https://eztv.tf/
   - https://eztv.yt/
   - https://eztv.unblockninja.com/
-  - https://eztv.unblockit.bz/
+  - https://eztv.unblockit.tv/
   - https://eztv.nocensor.biz/
 legacylinks:
   - https://eztv.ag/ # redirects to .re
@@ -52,6 +52,7 @@ legacylinks:
   - https://eztv.unblockit.ws/
   - https://eztv.nocensor.work/
   - https://eztv.unblockit.kim/
+  - https://eztv.unblockit.bz/
 
 caps:
   categories:

src/Jackett.Common/Definitions/filelisting.yml

@@ -32,6 +32,8 @@ search:
   paths:
     # https://filelisting.com/result?q=bad+batch
     - path: "result{{ if .Keywords }}?q={{ .Keywords }}+in:title{{ else }}{{ end }}"
+  keywordsfilters:
+    - name: tolower
 
   rows:
     selector: table > tbody > tr:has(td.dn-title)

src/Jackett.Common/Definitions/freshmeat.yml

@@ -0,0 +1,73 @@
+---
+id: freshmeat
+name: freshMeat
+description: "freshMeat is a Public torrent meta-search engine"
+language: en-US
+type: public
+encoding: UTF-8
+links:
+  - https://freshmeat.io/
+
+caps:
+  # unfortunately freshMeat does not display categories anywhere in its search results page :-(
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Movies"}
+    - {id: 2, cat: TV, desc: "TV"}
+    - {id: 3, cat: Other, desc: "Other"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+
+settings:
+  - name: info_8000
+    type: info
+    label: About freshMeat Categories
+    default: freshMeat does not return categories in its search results.</br>To add to your Apps' Torznab indexer, replace all categories with 8000(Other).
+
+download:
+  selectors:
+    - selector: a[href^="magnet:?xt="]
+      attribute: href
+
+search:
+  paths:
+    - path: "{{ if .Keywords }}s?q={{ .Keywords }}{{ else }}{{ end }}"
+
+  rows:
+    selector: table.torrent-list > tbody > tr
+    filters:
+      - name: andmatch
+
+  fields:
+    category:
+      text: 3
+    title:
+      selector: td:nth-child(2)
+    details:
+      selector: td:nth-child(2) a
+      attribute: href
+    download:
+      selector: td:nth-child(2) a
+      attribute: href
+    date:
+      selector: td:nth-child(1)
+      attribute: data-sort-value
+      filters:
+        - name: dateparse
+          args: "2006-01-02 15:04:05"
+    description:
+      selector: td:nth-child(3) img
+      attribute: title
+    size:
+      selector: td:nth-child(4)
+    seeders:
+      selector: td:nth-child(5)
+    leechers:
+      text: 0
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/gktorrent.yml

@@ -78,9 +78,10 @@ settings:
 
 download:
   selectors:
-    - selector: a[href*="magnet:?xt="]
-      attribute: href
-
+    - selector: script:contains("magnet:?")
+      filters:
+        - name: regexp
+          args: "\\s'(magnet:\\?.+?)';"
 search:
   paths:
     - path: "{{ if .Keywords }}recherche/{{ .Keywords }}{{ else }}{{ end }}"

src/Jackett.Common/Definitions/glodls.yml

@@ -8,7 +8,8 @@ encoding: UTF-8
 followredirect: true
 links:
   - https://glodls.to/
-  - https://glotorrents.unblockit.bz/
+  - https://www.gtdb.to/
+  - https://glotorrents.unblockit.tv/
   - https://glotorrents.nocensor.biz/
 legacylinks:
   - https://glodls.rocks/
@@ -45,7 +46,7 @@ legacylinks:
   - https://glotorrents.unblockit.ws/
   - https://glotorrents.nocensor.work/
   - https://glotorrents.unblockit.kim/
-  - https://www.gtdb.to/
+  - https://glotorrents.unblockit.bz/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/hdmonkey.yml

@@ -0,0 +1,164 @@
+---
+id: hdmonkey
+name: HDMonkey
+description: "HDMonkey is a ROMANIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: ro-RO
+type: private
+encoding: UTF-8
+links:
+  - https://hdmonkey.org/
+
+caps:
+  categorymappings:
+    - {id: 6, cat: PC/0day, desc: "Apps: Windows"}
+    - {id: 7, cat: PC/Mac, desc: "Apps: Mac"}
+    - {id: 8, cat: PC, desc: "Apps: Linux"}
+    - {id: 75, cat: Movies/DVD, desc: "Movies: DVD"}
+    - {id: 26, cat: Movies/BluRay, desc: "Movies: Blu-Ray"}
+    - {id: 42, cat: Movies/HD, desc: "Movies: FHD-HD"}
+    - {id: 50, cat: Movies/WEB-DL, desc: "Movies: Web-Dl"}
+    - {id: 74, cat: Movies/SD, desc: "Movies: SD"}
+    - {id: 49, cat: Movies/UHD, desc: "Movies: 4k"}
+    - {id: 46, cat: Movies/3D, desc: "Movies: 3D"}
+    - {id: 24, cat: Movies, desc: "Movies: Packs"}
+    - {id: 28, cat: Movies, desc: "Movies: Cartoons"}
+    - {id: 47, cat: XXX, desc: "Movies: XXX"}
+    - {id: 41, cat: TV/HD, desc: "TV: HD"}
+    - {id: 52, cat: TV/WEB-DL, desc: "TV: WEB-DL"}
+    - {id: 48, cat: TV, desc: "TV: Packs"}
+    - {id: 9, cat: TV/Documentary, desc: "TV: Documentaries"}
+    - {id: 22, cat: Audio/MP3, desc: "Music: MP3"}
+    - {id: 23, cat: Audio/Lossless, desc: "Music: FLAC"}
+    - {id: 25, cat: Audio/Video, desc: "Music: Video"}
+    - {id: 27, cat: Audio, desc: "Music: Pack"}
+    - {id: 53, cat: PC/Games, desc: "Games: Pc"}
+    - {id: 54, cat: Console, desc: "Games: PsP"}
+
+  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
+  - name: info_results
+    type: info
+    label: Search results
+    default: "If you are not getting results, then access the site with your browser and mark as read all PMs."
+
+login:
+  path: account-login.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: div.myBlock:contains("Access Denied")
+  test:
+    path: index.php
+    selector: a[href^="account-logout.php"]
+
+search:
+  paths:
+    - path: torrents-search.php
+  inputs:
+    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
+    # 0 both 1 local 2 external
+    inclexternal: 0
+    # 0 only active 1 incl dead 2 only dead
+    incldead: 1
+    # 0 all 1 not freeleech 2 only freeleech
+    freeleech: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 all 1 english 2 french 3 german 4 italian 5 japanese 6 spanish 7 russian 8 other
+    sort: "{{ .Config.sort }}"
+    order: "{{ .Config.type }}"
+
+  rows:
+    selector: table.ttable_headinner > tbody > tr
+
+  fields:
+    category:
+      selector: a[href^="torrents.php?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
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    poster:
+      selector: a[href^="torrents-details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: src=([^\s]+)
+    imdbid:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    size:
+      selector: td:nth-child(4)
+    date:
+      # 19.Jul<br>2021<br>06:57
+      selector: td:nth-child(5)
+      filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
+        - name: dateparse
+          args: "2.Jan200615:04 -07:00"
+    grabs:
+      selector: td:nth-child(7)
+    seeders:
+      selector: td:nth-child(8)
+    leechers:
+      selector: td:nth-child(9)
+    description:
+      case:
+        img[src="images/t_extern.png"]: External
+        "*": Local
+    downloadvolumefactor:
+      case:
+        img[src="images/t_extern.png"]: 0
+        img[src="images/free.png"]: 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 1 day (as seconds = 24 x 60 x 60)
+      text: 86400
+# engine n/a

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

@@ -66,6 +66,8 @@ search:
 
   rows:
     selector: table.data tr.odd:has(a[class="cellMainLink"]), table.data tr.even:has(a[class="cellMainLink"])
+    filters:
+      - name: andmatch
 
   fields:
     category:

src/Jackett.Common/Definitions/krazyzone.yml

@@ -0,0 +1,241 @@
+---
+id: krazyzone
+name: KrazyZone
+description: "KrazyZone is a Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - http://krazyzone.net/ # does not support https, CA expired Dec 2016
+
+caps:
+  categorymappings:
+    - {id: 3, cat: Audio, desc: "Mastermix"}
+    - {id: 4, cat: Audio, desc: "Mastermix Classic"}
+    - {id: 5, cat: Audio, desc: "Mastermix DJ Beats"}
+    - {id: 6, cat: Audio, desc: "Mastermix Extended"}
+    - {id: 7, cat: Audio, desc: "Mastermix- Grandmaster"}
+    - {id: 8, cat: Audio, desc: "Mastermix- Mastermix Other"}
+    - {id: 9, cat: Audio, desc: "Mastermix- Mastermix Packs"}
+    - {id: 10, cat: Audio, desc: "Mastermix Monthly Issue"}
+    - {id: 11, cat: Audio, desc: "Mastermix Pro Dance / Disc"}
+    - {id: 12, cat: Audio, desc: "Mastermix Professional"}
+    - {id: 13, cat: Audio, desc: "DMC"}
+    - {id: 83, cat: Audio, desc: "DMC Bootlegs"}
+    - {id: 84, cat: Audio, desc: "DMC Classic"}
+    - {id: 85, cat: Audio, desc: "DMC Commercial"}
+    - {id: 86, cat: Audio, desc: "DMC Complete"}
+    - {id: 87, cat: Audio, desc: "DMC Dance Mixes"}
+    - {id: 88, cat: Audio, desc: "DMC Essential"}
+    - {id: 89, cat: Audio, desc: "DMC Guide"}
+    - {id: 90, cat: Audio, desc: "DMC Monsterjam"}
+    - {id: 91, cat: Audio, desc: "DMC Other DMC and Packs"}
+    - {id: 92, cat: Audio, desc: "DMC Promo"}
+    - {id: 14, cat: Audio, desc: "MUSIC Albums"}
+    - {id: 110, cat: Audio, desc: "MUSIC Album / Music Packs and other MP3"}
+    - {id: 76, cat: Audio, desc: "MUSIC Artist Albums "}
+    - {id: 77, cat: Audio, desc: "MUSIC Compilations "}
+    - {id: 109, cat: Audio, desc: "MUSIC Discographys , Collection"}
+    - {id: 80, cat: Audio, desc: "MUSIC Flac / Lossy / DTS Packs "}
+    - {id: 81, cat: Audio/Lossless, desc: "MUSIC FLAC 24bit Hi-Res "}
+    - {id: 115, cat: Audio, desc: "MUSIC Singles , Maxi CD and Vinyl"}
+    - {id: 15, cat: Audio, desc: "DJ Only"}
+    - {id: 74, cat: Audio, desc: "DJ Other DJ Music  Including Select Mix , Promo Only"}
+    - {id: 75, cat: Audio, desc: "DJ UK Top 40 / Other Top 20 / 40"}
+    - {id: 82, cat: Audio, desc: "DJ Ultramix , Ultrasound , UltraTraxx , Xmix "}
+    - {id: 16, cat: Audio, desc: "ONLY KZN Packs / Albums"}
+    - {id: 73, cat: Audio, desc: "ONLY KZN  KZN Packs / Albums Exclusive VIP only"}
+    - {id: 69, cat: Audio, desc: "ONLY KZN Album / Music Packs"}
+    - {id: 72, cat: Audio, desc: "ONLY KZN MP3 Weekly"}
+    - {id: 17, cat: Audio, desc: "Karaoke"}
+    - {id: 67, cat: Audio, desc: "Karaoke All Karaoke "}
+    - {id: 68, cat: Audio, desc: "Karaoke All Karaoke Packs "}
+    - {id: 95, cat: Audio, desc: "KZN Mixed Albums / KZN Mixed Videos "}
+    - {id: 96, cat: Audio, desc: "KZN Mixed Albums / KZN Mixed Videos"}
+    - {id: 112, cat: Audio, desc: "KZN MP3 Weekly"}
+    - {id: 18, cat: Audio/Video, desc: "Music Videos"}
+    - {id: 66, cat: Audio/Video, desc: "Music Videos Singles Video"}
+    - {id: 65, cat: Audio/Video, desc: "Music Videos Video Packs and Live Video Concerts"}
+    - {id: 19, cat: Movies, desc: "Movie Packs"}
+    - {id: 62, cat: Movies, desc: "Movie Packs Kids Movie Packs"}
+    - {id: 63, cat: Movies, desc: "Movie Packs Movie Packs"}
+    - {id: 64, cat: Movies, desc: "Movie Packs Pre 90 Movie Packs"}
+    - {id: 21, cat: PC, desc: "Applications"}
+    - {id: 50, cat: PC/Mobile-Android, desc: "Applications Android"}
+    - {id: 51, cat: PC/Mac, desc: "Applications Misc , Linux , Mac "}
+    - {id: 52, cat: PC/0day, desc: "Applications Windows"}
+    - {id: 22, cat: Books, desc: "Ebooks/Mags"}
+    - {id: 48, cat: Audio/Audiobook, desc: "Ebooks Audiobooks"}
+    - {id: 49, cat: Books/EBook, desc: "Ebooks Ebooks / Mags"}
+    - {id: 23, cat: PC/Games, desc: "Games"}
+    - {id: 45, cat: PC/Games, desc: "Games PC / ISO"}
+    - {id: 105, cat: Console/PS4, desc: "Games PS2 / PS3 / PS4 "}
+    - {id: 46, cat: Console/NDS, desc: "Games Wii+ Nds"}
+    - {id: 47, cat: Console/XBox 360, desc: "Games Xbox360"}
+    - {id: 20, cat: Movies, desc: "Movies"}
+    - {id: 113, cat: Movies, desc: "Movies 2021 Movies"}
+    - {id: 116, cat: Movies/UHD, desc: "Movies 4K Movies"}
+    - {id: 53, cat: Movies, desc: "Movies Anime / Kids"}
+    - {id: 54, cat: Movies/BluRay, desc: "Movies Bluray,HDRip,BDRip,Webrip,HEVC"}
+    - {id: 55, cat: Movies/SD, desc: "Movies Cam / TS / Screener"}
+    - {id: 56, cat: Movies, desc: "Movies Classic Movies Pre 90s to 2000"}
+    - {id: 57, cat: Movies/DVD, desc: "Movies DVDR ,NTSCPAL ,ISO"}
+    - {id: 58, cat: Movies/WEB-DL, desc: "Movies DVDRip,AVI,XVID,BRRip"}
+    - {id: 59, cat: Movies/Foreign, desc: "Movies Foreign"}
+    - {id: 107, cat: Movies/HD, desc: "Movies Mp4  Movies"}
+    - {id: 60, cat: Movies, desc: "Movies Netflix"}
+    - {id: 61, cat: Movies/3D, desc: "Movies Remux , 3D"}
+    - {id: 24, cat: TV, desc: "TV"}
+    - {id: 39, cat: TV/Documentary, desc: "TV Discovery /  Geographics / Documentary"}
+    - {id: 41, cat: TV, desc: "TV Episodes"}
+    - {id: 42, cat: TV/Anime, desc: "TV Kids / Anime"}
+    - {id: 43, cat: TV/Sport, desc: "TV Sport"}
+    - {id: 44, cat: TV/Sport, desc: "TV Sport Packs"}
+    - {id: 26, cat: Books/Comics, desc: "Comics"}
+    - {id: 37, cat: Books/Comics, desc: "Comics Comics"}
+    - {id: 25, cat: TV, desc: "TV Packs/Full Seasons"}
+    - {id: 38, cat: TV, desc: "TV Packs Full Seasons"}
+    - {id: 40, cat: TV, desc: "TV Packs Kids / Anime Full Seasons"}
+    - {id: 94, cat: TV, desc: "TV Packs Pre 90`s TV series"}
+    - {id: 27, cat: Other, desc: "Wallpapers"}
+    - {id: 36, cat: Other, desc: "Wallpapers PC Wallpapers"}
+    - {id: 1, cat: Other/Misc, desc: "Unsorted"}
+    - {id: 2, cat: Other/Misc, desc: "Unsorted To Be Edited"}
+    - {id: 30, cat: Other, desc: "Exclusive VIP"}
+    - {id: 33, cat: Other, desc: "Exclusive VIP Exclusive VIP Not To Be Uploaded Anywhere"}
+    - {id: 31, cat: Other, desc: "VIP"}
+    - {id: 32, cat: Other, desc: "VIP VIP Not To Be Uploaded Anywhere"}
+    - {id: 99, cat: Other, desc: "Christmas Albums"}
+    - {id: 101, cat: Other, desc: "Christmas Albums Packs"}
+    - {id: 103, cat: Other, desc: "All Christmas Movies and Packs"}
+
+  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 }}"
+  error:
+    - selector: table:contains("error has occured")
+    - selector: a[href*="/login.php?error="]
+      message:
+        text: Wrong username or password.
+  test:
+    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
+  keywordsfilters:
+    - name: re_replace
+      args: ["[\\s]+", "%"]
+  inputs:
+    do: search
+    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 }}"
+    # does not support multi category searching so defaulting to all.
+    category: 0
+    include_dead_torrents: yes
+    sort: "{{ if .Config.freeleech }}free{{ else }}{{ .Config.sort }}{{ end }}"
+    order: "{{ if .Config.freeleech }}asc{{ else }}{{ .Config.type }}{{ end }}"
+
+  rows:
+    selector: "table.sortable tr:has(a[href*=\"/download.php?id=\"]){{ if .Config.freeleech }}:has(img[src$=\"/freedownload.gif\"]){{ else }}{{ end }}"
+
+  fields:
+    category:
+      selector: a[href*="/browse.php?category="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: category
+    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: img[src*="/torrents/images/"]
+      attribute: src
+    date:
+      selector: td:nth-child(2)
+      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-last-child(5)
+    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$="/freedownload.gif"]: 0
+        img[src$="/silverdownload.gif"]: 0.5
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img[src$="/x2.gif"]: 2
+        "*": 1
+    minimumratio:
+      text: 0.5
+    minimumseedtime:
+      # 12 hours (as seconds = 12 x 60 x 60)
+      text: 43200
+# TS Special Edition v.7.4

src/Jackett.Common/Definitions/limetorrents.yml

@@ -9,7 +9,7 @@ followredirect: true
 # changes to this indexer should also be made to limetorrentsclone
 links:
   - https://www.limetorrents.pro/
-  - https://limetorrents.unblockit.bz/
+  - https://limetorrents.unblockit.tv/
   - https://limetorrents.unblockninja.com/
   - https://limetorrents.nocensor.biz/
 legacylinks:
@@ -52,6 +52,7 @@ legacylinks:
   - https://limetorrents.unblockit.ws/
   - https://limetorrents.nocensor.work/
   - https://limetorrents.unblockit.kim/
+  - https://limetorrents.unblockit.bz/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/movietorrent.yml

@@ -58,7 +58,7 @@ settings: []
 download:
   infohash:
     hash:
-      selector: a[href^="magnet:?xt="]
+      selector: a[href^="magnet:"]
       attribute: href
       filters:
         - name: regexp

src/Jackett.Common/Definitions/movietorrentz.yml

@@ -0,0 +1,136 @@
+---
+id: movietorrentz
+name: Movie-Torrentz
+description: "Movie-Torrentz is a Private Torrent Tracker for MOVIES / TV"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://m2g.link/
+
+caps:
+  categorymappings:
+    - {id: 106, cat: Movies, desc: "m2g: m2g"}
+    - {id: 102, cat: PC, desc: "Misc: Programs"}
+    - {id: 107, cat: Movies/SD, desc: "Movies: Xvid"}
+    - {id: 108, cat: Movies/DVD, desc: "Movies: DVDR"}
+    - {id: 109, cat: Movies, desc: "Movies: Packs"}
+    - {id: 110, cat: Movies/HD, desc: "Movies: MP4"}
+    - {id: 112, cat: Movies/SD, desc: "Movies: 480p"}
+    - {id: 113, cat: Movies/BluRay, desc: "Movies: BluRay / x264"}
+    - {id: 126, cat: Movies/HD, desc: "Movies: x265"}
+    - {id: 127, cat: Movies/UHD, desc: "Movies: 4K"}
+    - {id: 114, cat: TV/SD, desc: "TV: XviD"}
+    - {id: 115, cat: TV/HD, desc: "TV: X264"}
+    - {id: 116, cat: TV, desc: "TV: Packs"}
+    - {id: 128, cat: TV/HD, desc: "TV: x265"}
+    - {id: 103, cat: Movies, desc: "ViP3R: ViP3R"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-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 }}"
+    remember: yes
+  error:
+    - selector: div.myBlock:contains("Access Denied")
+  test:
+    path: index.php
+    selector: a[href="account-logout.php"]
+
+search:
+  paths:
+    - path: torrents-search.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    # 0 active, 1 dead, 2 onlydead
+    incldead: 1
+    # 0 any, 1 english, etc
+    lang: 0
+    # 0 any, 1 notfree, 2 onlyfree
+    freeleech: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    sort: "{{ .Config.sort }}"
+    order: "{{ .Config.type }}"
+    # does not support imdbid searching
+
+  rows:
+    selector: tr.t-row
+
+  fields:
+    category:
+      selector: a[href^="torrents.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="torrents-details.php?id="]
+    details:
+      selector: a[href^="torrents-details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    poster:
+      selector: a[href^="torrents-details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "src=(.+?) width"
+        - name: replace
+          args: ["images/nocover.jpg", ""]
+    imdbid:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    date:
+      text: now
+    size:
+      selector: td:nth-last-child(5)
+    seeders:
+      selector: td:nth-last-child(4)
+    leechers:
+      selector: td:nth-last-child(3)
+    downloadvolumefactor:
+      case:
+        img[src="images/free.gif"]: 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 0.5
+# TorrentTrader

src/Jackett.Common/Definitions/mypornclub.yml

@@ -33,7 +33,7 @@ download:
 
 search:
   paths:
-    - path: "{{ if .Keywords }}search/{{ re_replace .Keywords \"\\s+\" \"-\" }}{{ else }}ts{{ end }}"
+    - path: "{{ if .Keywords }}s/{{ re_replace .Keywords \"\\s+\" \"-\" }}{{ else }}ts{{ end }}"
 
   rows:
     selector: div.torrents_list > div.torrent_element

src/Jackett.Common/Definitions/noname-club.yml

@@ -47,13 +47,16 @@ caps:
     - {id: 729, cat: TV, desc: " |- Развивающее Видео для детей"}
     - {id: 731, cat: TV, desc: " |- Отечественные Фильмы для детей"}
     - {id: 733, cat: TV, desc: " |- Зарубежные Фильмы для детей"}
-    - {id: 730, cat: TV, desc: " |- Отечественные Мультфильмы для детей"}
-    - {id: 732, cat: TV, desc: " |- Зарубежные Мультфильмы для детей"}
-    - {id: 230, cat: TV, desc: " |- Отечественные Мультфильмы (HD*Rip/LQ, DVDRip, SATRip,..."}
-    - {id: 659, cat: TV, desc: " |- Отечественные Мультфильмы (HD, UHD, UHD-LQ, DVD, Сборники)"}
-    - {id: 658, cat: TV, desc: " |- Отечественные Мультсериалы"}
+    - {id: 1329, cat: TV, desc: " |- Отечественные Мультфильмы 20-го века SD"}
+    - {id: 1330, cat: TV, desc: " |- Отечественные Мультфильмы 20-го века HD, FHD, UHD"}
     - {id: 1331, cat: TV, desc: " |- Отечественные мультфильмы 21-го века (SD)"}
     - {id: 1332, cat: TV, desc: " |- Отечественные мультфильмы 21-го века (HD, FHD, UHD, 3D)"}
+    - {id: 658, cat: TV, desc: " |- Отечественные Мультсериалы"}
+    - {id: 1336, cat: TV, desc: " |- Зарубежные Мультфильмы 20-го века SD"}
+    - {id: 1337, cat: TV, desc: " |- Зарубежные Мультфильмы 20-го века HD, FHD, UHD"}
+    - {id: 1338, cat: TV, desc: " |- Зарубежные Мультфильмы 21-го века SD"}
+    - {id: 1339, cat: TV, desc: " |- Зарубежные Мультфильмы 21-го века HD, FHD, UHD"}
+    - {id: 732, cat: TV, desc: " |- Зарубежные Мультфильмы для детей"}
     - {id: 231, cat: TV, desc: " |- Зарубежные Мультфильмы (HD*Rip/LQ, DVDRip, SATRip, VHSRip)"}
     - {id: 660, cat: TV, desc: " |- Зарубежные Мультфильмы (DVD, Сборники)"}
     - {id: 661, cat: TV, desc: " |- Зарубежные Мультфильмы (HD, UHD, UHD-LQ)"}

src/Jackett.Common/Definitions/noname-clubl.yml

@@ -57,13 +57,16 @@ caps:
     - {id: 729, cat: TV, desc: " |- Развивающее Видео для детей"}
     - {id: 731, cat: TV, desc: " |- Отечественные Фильмы для детей"}
     - {id: 733, cat: TV, desc: " |- Зарубежные Фильмы для детей"}
-    - {id: 730, cat: TV, desc: " |- Отечественные Мультфильмы для детей"}
-    - {id: 732, cat: TV, desc: " |- Зарубежные Мультфильмы для детей"}
-    - {id: 230, cat: TV, desc: " |- Отечественные Мультфильмы (HD*Rip/LQ, DVDRip, SATRip,..."}
-    - {id: 659, cat: TV, desc: " |- Отечественные Мультфильмы (HD, UHD, UHD-LQ, DVD, Сборники)"}
-    - {id: 658, cat: TV, desc: " |- Отечественные Мультсериалы"}
+    - {id: 1329, cat: TV, desc: " |- Отечественные Мультфильмы 20-го века SD"}
+    - {id: 1330, cat: TV, desc: " |- Отечественные Мультфильмы 20-го века HD, FHD, UHD"}
     - {id: 1331, cat: TV, desc: " |- Отечественные мультфильмы 21-го века (SD)"}
     - {id: 1332, cat: TV, desc: " |- Отечественные мультфильмы 21-го века (HD, FHD, UHD, 3D)"}
+    - {id: 658, cat: TV, desc: " |- Отечественные Мультсериалы"}
+    - {id: 1336, cat: TV, desc: " |- Зарубежные Мультфильмы 20-го века SD"}
+    - {id: 1337, cat: TV, desc: " |- Зарубежные Мультфильмы 20-го века HD, FHD, UHD"}
+    - {id: 1338, cat: TV, desc: " |- Зарубежные Мультфильмы 21-го века SD"}
+    - {id: 1339, cat: TV, desc: " |- Зарубежные Мультфильмы 21-го века HD, FHD, UHD"}
+    - {id: 732, cat: TV, desc: " |- Зарубежные Мультфильмы для детей"}
     - {id: 231, cat: TV, desc: " |- Зарубежные Мультфильмы (HD*Rip/LQ, DVDRip, SATRip, VHSRip)"}
     - {id: 660, cat: TV, desc: " |- Зарубежные Мультфильмы (DVD, Сборники)"}
     - {id: 661, cat: TV, desc: " |- Зарубежные Мультфильмы (HD, UHD, UHD-LQ)"}

src/Jackett.Common/Definitions/opensharing.yml

@@ -49,6 +49,7 @@ caps:
     - {id: 425, cat: XXX, desc: "Movies XXX: С Русским переводом!"}
     - {id: 1195, cat: XXX, desc: "Movies XXX: LegalPorno"}
     - {id: 1200, cat: XXX, desc: "Movies XXX: Solo & Masturbation"}
+    - {id: 1250, cat: XXX, desc: "Movies XXX: Movie Scenes"}
     - {id: 7000, cat: XXX, desc: "Movies XXX: -= XXX =-"}
 
   modes:
@@ -110,7 +111,7 @@ search:
     leechers:
       selector: td:nth-child(7)
     downloadvolumefactor:
-      text: 1
+      text: 0
     uploadvolumefactor:
       text: 1
 # engine n/a

src/Jackett.Common/Definitions/oxtorrent.yml

@@ -7,8 +7,8 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://www.oxtorrent.vc/
-  - https://oxtorrent.unblockit.bz/
+  - https://www.oxtorrent.be/
+  - https://oxtorrent.unblockit.tv/
   - https://oxtorrent.nocensor.biz/
 legacylinks:
   - https://wwv.oxtorrent.com/
@@ -45,6 +45,8 @@ legacylinks:
   - https://oxtorrent.unblockit.kim/
   - https://www.oxtorrent.sh/
   - https://www.oxtorrent.pl/
+  - https://oxtorrent.unblockit.bz/
+  - https://www.oxtorrent.vc/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/peeratiko.yml

@@ -0,0 +1,202 @@
+---
+id: peeratiko
+name: Peeratiko
+description: "Peeratiko is a GREEK Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: el-GR
+type: private
+encoding: UTF-8
+links:
+  - https://peeratiko.org/
+
+caps:
+  categorymappings:
+    - {id: 58, cat: PC, desc: "Applications Linux"}
+    - {id: 4, cat: PC/Mac, desc: "Applications Mac"}
+    - {id: 54, cat: PC/Mobile-Other, desc: "Applications Mobiles"}
+    - {id: 2, cat: PC, desc: "Applications Other"}
+    - {id: 3, cat: PC/0day, desc: "Applications Windows"}
+    - {id: 39, cat: Books/EBook, desc: "Books Books"}
+    - {id: 56, cat: Books/Comics, desc: "Books Comics"}
+    - {id: 47, cat: Books/Mags, desc: "Books Magazines"}
+    - {id: 57, cat: PC/Mobile-Other, desc: "Games Mobiles"}
+    - {id: 5, cat: Console/Other, desc: "Games Other"}
+    - {id: 8, cat: Console/PS3, desc: "Games PSP/PS2/PS3"}
+    - {id: 6, cat: PC/Games, desc: "Games Windows"}
+    - {id: 7, cat: Console/XBox, desc: "Games XBOX"}
+    - {id: 60, cat: Movies/3D, desc: "Movies 3D"}
+    - {id: 1, cat: Movies, desc: "Movies Anime/Cartoons"}
+    - {id: 9, cat: Movies/BluRay, desc: "Movies BluRay x264"}
+    - {id: 62, cat: Movies/DVD, desc: "Movies DVD-R"}
+    - {id: 15, cat: Movies/WEB-DL, desc: "DVD/BD/BR-rip x264"}
+    - {id: 16, cat: Movies/WEB-DL, desc: "Movies Gr. Subs DVD/BD/BR-rip"}
+    - {id: 18, cat: Movies, desc: "Movies Gr. Subs Embeddeed"}
+    - {id: 19, cat: Movies/Other, desc: "Movies Gr. Subs Other"}
+    - {id: 17, cat: Movies/DVD, desc: "Movies Greek DVD-R"}
+    - {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: 13, cat: Movies/Other, desc: "Movies Other"}
+    - {id: 14, cat: Movies, desc: "Movies Packs"}
+    - {id: 23, cat: Audio, desc: "Music DJs Stuff"}
+    - {id: 26, cat: Audio, desc: "Music English/Discographies"}
+    - {id: 24, cat: Audio, desc: "Music English/Foreign"}
+    - {id: 25, cat: Audio/Lossless, desc: "Music English/Foreign FLAC"}
+    - {id: 27, cat: Audio, desc: "Music Greek"}
+    - {id: 28, cat: Audio/Lossless, desc: "Music Greek FLAC"}
+    - {id: 29, cat: Audio, desc: "Music Greek/Discographies"}
+    - {id: 36, cat: Audio/Video, desc: "Music Video Clips"}
+    - {id: 61, cat: Other, desc: "Other Packs"}
+    - {id: 40, cat: Other/Misc, desc: "Other Misc"}
+    - {id: 59, cat: Other, desc: "Other Pictures"}
+    - {id: 11, cat: TV/Documentary, desc: "TV Documentaries"}
+    - {id: 12, cat: TV/HD, desc: "TV HD Series"}
+    - {id: 63, cat: TV/HD, desc: "TV HD Series Packs"}
+    - {id: 53, cat: TV/Other, desc: "TV Other"}
+    - {id: 31, cat: TV, desc: "TV Series Gr. Subs"}
+    - {id: 32, cat: TV, desc: "TV Series Gr. Subs Embedded"}
+    - {id: 33, cat: TV, desc: "TV Series Gr. Subs Packs"}
+    - {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"}
+
+  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 <i>Personal Options</i> from the <i>Personal Settings</i> menu on the Peeratiko webpage.
+  - 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
+
+login:
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    use_ssl: 1
+    keeplogged: 1
+  error:
+    - selector: h2
+      message:
+        selector: table tr td.text
+  test:
+    path: index.php
+    selector: a[href^="/logout.php?auth="]
+
+search:
+  paths:
+    # https://peeratiko.org/browse.php?cats2[]=39&cats5[]=28&cats5[]=29&cats5[]=36&search=&searchin=title&incldead=1
+    - path: browse.php
+  inputs:
+    # note: site uses the catsX[]=nn method which cardigann does not support.
+    search: "{{ .Keywords }}"
+    # title, descr, filelist, genre, tags, all
+    searchin: title
+    # 0 active, 1 incldead, 2 onlydead
+    incldead: 1
+    only_free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+    # does not support searching imdbid and does not return imdb links
+
+  rows:
+    selector: table[width="90%"] tbody tr:has(a[href^="download.php?torrent="])
+
+  fields:
+    category:
+      selector: a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: ">(.+?)<"
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?torrent="]
+      attribute: href
+    poster:
+      selector: a[href^="details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "src=..(https.+).. width"
+    files:
+      selector: td:nth-last-child(8)
+    date_day:
+      # Today<br>08:10 AM
+      # Yesterday<br>06:44 PM
+      optional: true
+      selector: td:nth-last-child(6):contains("day")
+      filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
+    date_year:
+      # Dec 4 2021<br>10:20 AM
+      optional: true
+      selector: td:nth-last-child(6):not(:contains("day"))
+      filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
+        - name: dateparse
+          args: "Jan 2 2006 03:04 PM -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-last-child(5)
+    grabs:
+      selector: td:nth-last-child(4)
+    seeders:
+      selector: td:nth-last-child(3)
+    leechers:
+      selector: td:nth-last-child(2)
+    downloadvolumefactor:
+      case:
+        "b:contains(\"[FREE]\")": 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 7 day (as seconds = 7 x 24 x 60 x 60)
+      text: 604800
+# U-232 V3

src/Jackett.Common/Definitions/pirateiro.yml

@@ -9,7 +9,7 @@ followredirect: true
 links:
   - https://pirateiro.com/
   - https://pirateiro.eu/
-  - https://pirateiro.unblockit.bz/
+  - https://pirateiro.unblockit.tv/
 legacylinks:
   - http://pirateiro.com/
   - https://pirateiro.unblockit.pro/
@@ -32,6 +32,7 @@ legacylinks:
   - https://pirateiro.unblockit.ch/
   - https://pirateiro.unblockit.ws/
   - https://pirateiro.unblockit.kim/
+  - https://pirateiro.unblockit.bz/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/pornotorrent.yml

@@ -2,7 +2,7 @@
 id: pornotorrent
 name: PornoTorrent
 description: "PornoTorrent is a SPANISH Public Torrent Tracker for 3X"
-language: es-ES
+language: en-US
 type: public
 encoding: UTF-8
 links:

src/Jackett.Common/Definitions/potuk.yml

@@ -121,6 +121,10 @@ search:
     - path: "index.php?torrents/&freeleech={{ if .Config.freeleech }}1{{ else }}{{ end }}&filename={{ .Keywords }}"
     # imdb and tmdb not supported
 
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+
   rows:
     selector: table.dataList-table > tbody.normal-torrents > tr
 

src/Jackett.Common/Definitions/reelflix.yml

@@ -166,19 +166,22 @@ search:
         - name: timeago
     downloadvolumefactor:
       case:
-        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
-        i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
-        i[class*="fa-star text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-globe text-blue"]: 0 # Global Freeleech
-        i[class*="fa-star text-gold"]: 0 # Freeleech
-        i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
+        span.torrent-listings-global-freeleech: 0
+        span.torrent-listings-personal-freeleech: 0
+        span.torrent-listings-freeleech-token: 0
+        span.torrent-listings-featured: 0
+        span.torrent-listings-freeleech i[data-original-title*="25%"]: 0.75
+        span.torrent-listings-freeleech i[data-original-title*="50%"]: 0.5
+        span.torrent-listings-freeleech i[data-original-title*="75%"]: 0.25
+        span.torrent-listings-freeleech i[data-original-title*="100%"]: 0
+        span.torrent-listings-special-freeleech: 0
         "*": 1
     uploadvolumefactor:
       case:
-        i[class*="fa-gem text-green"]: 2 # Single Torrent Double Upload
-        i[class*="fa-globe text-green"]: 2 # Global Double Upload
-        i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
+        span.torrent-listings-global-double-upload: 2
+        span.torrent-listings-double-upload: 2
+        span.torrent-listings-featured: 2
+        span.torrent-listings-special-double-upload: 2
         "*": 1
     minimumratio:
       text: 0.4

src/Jackett.Common/Definitions/rus-media.yml

@@ -357,6 +357,14 @@ search:
       optional: true
     leechers:
       text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"
+    date_minutes:
+      # 55 минут назад
+      selector: td:nth-of-type(6) p:nth-of-type(1):contains("минут")
+      optional: true
+      filters:
+        - name: replace
+          args: ["минут назад", "minutes ago"]
+        - name: timeago
     date_day:
       # Сегодня, 03:04
       # Вчера, 22:47
@@ -369,7 +377,7 @@ search:
           args: ["Вчера", "Yesterday"]
     date_year:
       # 12 янв 2019, 12:47
-      selector: td:nth-of-type(6) p:nth-of-type(1):not(:contains("Сегодня")):not(:contains("Вчера"))
+      selector: td:nth-of-type(6) p:nth-of-type(1):not(:contains("Сегодня")):not(:contains("Вчера")):not(:contains("минут"))
       optional: true
       filters:
         # replace month abbreviations
@@ -404,7 +412,7 @@ search:
         - name: dateparse
           args: "02 Jan 2006 15:04 -07:00"
     date:
-      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
+      text: "{{ if or .Result.date_year .Result.date_day .Result.date_minutes }}{{ or .Result.date_year .Result.date_day .Result.date_minutes }}{{ else }}now{{ end }}"
     downloadvolumefactor:
       text: 0
     uploadvolumefactor:

src/Jackett.Common/Definitions/shokweb.yml

@@ -1,80 +0,0 @@
----
-id: shokweb
-name: shokweb
-description: "shokweb is a CHINESE Public tracker"
-language: zh-CN
-type: public
-encoding: UTF-8
-links:
-  - https://shokweb.com/
-certificates:
-  - ba7fb6290a9d7d821e73efb0eac4ed95a7fd2d11 # expired
-
-settings: []
-
-caps:
-  categorymappings:
-    - {id: "影视", cat: Movies, desc: "影视(Movie)"}
-    - {id: "安装包", cat: PC/ISO, desc: "安装包(Installation Package)"}
-    - {id: "其他", cat: Other, desc: "其他(Other)"}
-    - {id: "音乐", cat: Audio, desc: "音乐(Music)"}
-    - {id: "文档书籍", cat: Books, desc: "文档书籍(Documents Book)"}
-    - {id: "压缩文件", cat: PC, desc: "压缩文件(Compressed Files)"}
-    - {id: "图像", cat: Other/Misc, desc: "图像(Image)"}
-
-  modes:
-    search: [q]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-search:
-  paths:
-    # https://shokweb.com/ (latest)
-    # https://shokweb.com/search/supergirl%20s04e01 (search)
-    - path: "{{ if .Keywords }}/search/{{ .Keywords }}{{ else }}{{ end }}"
-
-  rows:
-    selector: div:has(a[href^="magnet:?"])
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      selector: p:has(img) span:nth-last-child(4)
-    title:
-      selector: a[href^="/post/"]
-    details:
-      selector: a[href^="/post/"]
-      attribute: href
-    download:
-      selector: a[href^="magnet:?"]
-      attribute: href
-    size:
-      selector: p:has(img) span:nth-last-child(2)
-    grabs:
-      selector: p:has(img) span:nth-last-child(5)
-    date:
-      selector: p:has(img) span:nth-last-child(1)
-      filters:
-        - name: replace
-          args: ["时", " hours"]
-        - name: replace
-          args: ["分", " minutes"]
-        - name: replace
-          args: ["天", " days"]
-        - name: replace
-          args: ["年", " year"]
-        - name: replace
-          args: ["月", " months"]
-        - name: replace
-          args: ["前", " ago"]
-    seeders:
-      text: 1
-    leechers:
-      text: 1
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a

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

@@ -11,8 +11,7 @@ links:
 caps:
   # dont forget to update the case block in the search fields category
   categorymappings:
-    - {id: 15, cat: TV, desc: "TV Show"}
-    - {id: 16, cat: Movies, desc: "TV Movie"}
+    - {id: 2, cat: TV, desc: "TV Show"}
 
   modes:
     search: [q]
@@ -57,6 +56,10 @@ search:
         type: json
         attribute: attributes
 
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+
   rows:
     selector: data
     count:
@@ -66,8 +69,7 @@ search:
     category:
       selector: category
       case:
-        "TV Show": 15
-        "TV Movie": 16
+        "TV Show": 2
     title:
       selector: name
     details:

src/Jackett.Common/Definitions/skipthecommercials.yml

@@ -10,8 +10,7 @@ links:
 
 caps:
   categorymappings:
-    - {id: 15, cat: TV, desc: "TV Show"}
-    - {id: 16, cat: Movies, desc: "TV Movie"}
+    - {id: 2, cat: TV, desc: "TV Show"}
 
   modes:
     search: [q]
@@ -88,6 +87,10 @@ search:
     page: 1
     free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
 
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+
   rows:
     selector: table > tbody > tr
 

src/Jackett.Common/Definitions/slosoul.yml

@@ -16,15 +16,21 @@ caps:
     - {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: 3, cat: Audio, desc: "Music"}
-    - {id: 4, cat: XXX, desc: "Porn"}
+    - {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]

src/Jackett.Common/Definitions/solidtorrents.yml

@@ -9,18 +9,34 @@ links:
   - https://solidtorrents.net/
 
 caps:
-  # dont forget to update the case block in the search fields category
-  categorymappings:
-    - {id: 1, cat: Other, desc: Unknown}
-    - {id: 2, cat: Movies, desc: Movies}
-    - {id: 3, cat: TV, desc: TV}
-    - {id: 4, cat: TV/Anime, desc: Anime}
-    - {id: 5, cat: PC/0day, desc: Program}
-    - {id: 6, cat: Console, desc: Games}
-    - {id: 7, cat: Audio, desc: Music}
-    - {id: 8, cat: Audio/Audiobook, desc: Audiobook}
-    - {id: 9, cat: Books/EBook, desc: eBook}
-    - {id: 10, cat: XXX, desc: XXX}
+  categories:
+    eBook: Books/EBook
+    "Ebook/Course": Books/EBook
+    Games: PC/Games
+    "Games/PC": PC/Games
+    Movies: Movies
+    Music: Audio
+    "Music/Album": Audio
+    "Music/mp3": Audio/MP3
+    "Music/Lossless": Audio/Lossless
+    "Music/Video": Audio/Video
+    Other: Other
+    "Other/Android": PC/Mobile-Android
+    "Other/Archive": Other
+    "Other/Audio": Audio
+    "Other/Database": PC
+    "Other/DiskImage": PC/ISO
+    "Other/Document": Books/Comics
+    "Other/Image": Other/Misc
+    "Other/Program": PC/0day
+    "Other/Sourcecode": PC
+    "Other/Source Code": PC
+    "Other/Video": TV
+    Softwares: PC/0day
+    "Softwares/Windows": PC/0day
+    TV: TV
+    Unknown: Other
+    XXX: XXX
 
   modes:
     search: [q]
@@ -30,10 +46,6 @@ caps:
     book-search: [q]
 
 settings:
-  - name: filter-verified
-    type: checkbox
-    label: "Only include verifed content in results"
-    default: false
   - name: sort
     type: select
     label: Sort requested from site
@@ -42,81 +54,79 @@ settings:
       date: created
       seeders: seeders
       size: size
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
 
 search:
   paths:
-    - path: api/v1/search
-      response:
-        type: json
-    - path: api/v1/search
-      response:
-        type: json
-      inputs:
-        skip: 20
-    - path: api/v1/search
-      response:
-        type: json
-      inputs:
-        skip: 40
-
+    # https://solidtorrents.net/search?q=&sort=date&order=desc
+    - path: search
   inputs:
     q: "{{ .Keywords }}"
-    category: "{{ if .Categories }}{{ join .Categories \",\" }}{{ else }}all{{ end }}"
     sort: "{{ .Config.sort }}"
-    fuv: "{{ if .Config.filter-verified }}yes{{ else }}no{{ end }}"
+    order: "{{ .Config.type }}"
 
   rows:
-    selector: results
-    count:
-      selector: hits.value
+    selector: div.search-result
 
   fields:
     category:
-      selector: category
-      case:
-        1: 1 # other
-        Archive: 1
-        Image: 1
-        Unknown: 1
-        2: 2 # movies
-        Sourcecode: 2
-        Database: 2
-        Video: 2
-        3: 3 # tv
-        4: 4 # anime , hentai
-        5: 5 # software
-        Android: 5
-        Diskimage: 5
-        Program: 5
-        6: 6 # games
-        7: 7 # music
-        Audio: 7
-        8: 8 # audiobook
-        9: 9 # books
-        Document: 9
-        eBook: 9
-        10: 10 # 3x
+      selector: a.category
     title:
-      selector: title
-    id:
-      selector: _id
+      selector: h5
     details:
-      text: "{{ .Config.sitelink }}view/{{ .Result.id }}"
-    magnet:
-      selector: magnet
-    size:
-      selector: size
-    seeders:
-      selector: swarm.seeders
-    leechers:
-      selector: swarm.leechers
+      selector: h5 a
+      attribute: href
+    download:
+      selector: a[class="dl-torrent"]
+      attribute: href
+    infohash:
+      selector: a[href^="magnet:?xt"]
+      attribute: href
+      filters:
+        - name: regexp
+          args: ([A-F|a-f|0-9]{40})
     grabs:
-      selector: swarm.downloads
+      selector: div.stats div:has(img[alt="Download"])
+      filters:
+        - name: replace
+          args: [".", ""]
+        - name: replace
+          args: ["K", "00"]
+        - name: replace
+          args: ["M", "00000"]
+    size:
+      selector: div.stats div:has(img[alt="Size"])
+    seeders:
+      selector: div.stats div:has(img[alt="Seeder"])
+      filters:
+        - name: replace
+          args: [".", ""]
+        - name: replace
+          args: ["K", "00"]
+        - name: replace
+          args: ["M", "00000"]
+    leechers:
+      selector: div.stats div:has(img[alt="Leecher"])
+      filters:
+        - name: replace
+          args: [".", ""]
+        - name: replace
+          args: ["K", "00"]
+        - name: replace
+          args: ["M", "00000"]
     date:
-      # 2021-09-24T00:12:29.918Z
-      selector: imported
+      selector: div.stats div:has(img[alt="Date"])
+      filters:
+        - name: dateparse
+          args: "Jan 2, 2006"
     downloadvolumefactor:
       text: 0
     uploadvolumefactor:
       text: 1
-# json api v1
+# engine n/a

src/Jackett.Common/Definitions/the-devils-lounge.yml

@@ -144,15 +144,26 @@ search:
           args: cat
     title:
       selector: td a[href^="torrents-details.php?id="]
-      attribute: title
     details:
       selector: td a[href^="torrents-details.php?id="]
       attribute: href
     download:
       selector: td a[href^="torrents-details.php?id="]
       attribute: href
+    poster:
+      selector: td a[href^="torrents-details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "img\\ssrc=\\\\'(http.+?)\\\\'"
     date:
-      text: now
+      selector: td a[href^="torrents-details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "Date\\sAdded\\s:(\\d{2}-\\d{2}-\\d{4})"
+        - name: dateparse
+          args: "02-01-2006"
     size:
       selector: td:nth-child(6)
     seeders:
@@ -166,16 +177,12 @@ search:
         - name: replace
           args: [",", ""]
     description:
-      selector: td:last-of-type:contains("E")
-      filters:
-        - name: replace
-          args: ["E", "External"]
-        - name: replace
-          args: ["L", "Local"]
+      selector: td:last-of-type img
+      attribute: title
     downloadvolumefactor:
       case:
         img[src$="/images/free.gif"]: 0
-        "td:last-of-type:contains(\"E\")": 0 # all external torrents are free
+        td:last-of-type img[title="Extern"]: 0 # all external torrents are free
         "*": 1
     uploadvolumefactor:
       text: 1

src/Jackett.Common/Definitions/theleachzone.yml

@@ -128,6 +128,12 @@ search:
     download:
       selector: a[href^="download.php?torrent="]
       attribute: href
+    poster:
+      selector: a[href^="details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: src=\\'(.+?)\\'
     details:
       selector: a[href^="details.php?id="]
       attribute: href

src/Jackett.Common/Definitions/torlock.yml

@@ -10,7 +10,7 @@ links:
   - https://www.torlock.com/
   - https://www.torlock2.com/
   - https://www.torlock.icu/
-  - https://torlock.unblockit.bz/
+  - https://torlock.unblockit.tv/
   - https://torlock.nocensor.biz/
 legacylinks:
   - https://torlock.com/
@@ -36,6 +36,7 @@ legacylinks:
   - https://torlock.unblockit.ws/
   - https://torlock.nocensor.work/
   - https://torlock.unblockit.kim/
+  - https://torlock.unblockit.bz/
 
 caps:
   # dont forget to update the search fields category case block

src/Jackett.Common/Definitions/torrent9.yml

@@ -96,10 +96,6 @@ settings:
       ".html,trie-poid-a": size asc
       ".html,trie-nom-d": title desc
       ".html,trie-nom-a": title asc
-  - name: info_131681
-    type: info
-    label: About Torrent9 Categories
-    default: Torrent9 only returns category <b>Movies</b> in its <i>Keywordless</i> search results page.</br>To pass your apps' indexer TEST you will need to include the 131681(Movies) category.
 
 download:
   selectors:
@@ -108,7 +104,7 @@ download:
 
 search:
   paths:
-    - path: "{{ if .Keywords }}/search_torrent/{{ .Keywords }}{{ .Config.sort }}{{ else }}/top_torrent.html{{ end }}"
+    - path: "{{ if .Keywords }}/search_torrent/{{ .Keywords }}{{ .Config.sort }}{{ else }}{{ end }}"
   keywordsfilters:
     # if searching for season packs with S01 to saison 1 #9712
     - name: re_replace

src/Jackett.Common/Definitions/torrent9clone.yml

@@ -7,12 +7,8 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://www.torrent9.pw/
+  - https://www.torrent9.si/
   - https://torrent9.nocensor.biz/
-legacylinks:
-  - https://torrent9.nocensor.space/
-  - https://torrent9.nocensor.work/
-
 legacylinks:
   - https://www.torrents9.pw/
   - https://www.torrent9.ch/
@@ -58,6 +54,9 @@ legacylinks:
   - https://torrent9.unblocked.monster/
   - https://www.torrent9.la/
   - https://www.torrent9.ninja/
+  - https://torrent9.nocensor.space/
+  - https://torrent9.nocensor.work/
+  - https://www.torrent9.pw/
 
 caps:
   categorymappings:
@@ -101,19 +100,17 @@ settings:
     type: checkbox
     label: Replace VOSTFR with ENGLISH
     default: false
-  - name: info_145469
-    type: info
-    label: About Torrent9clone Categories
-    default: Torrent9clone only returns category <b>Movies</b> in its <i>Keywordless</i> search results page.</br>To pass your apps' indexer TEST you will need to include the 145469(Movies) category.
 
 download:
   selectors:
-    - selector: a[href^="magnet:?"]
-      attribute: href
+    - selector: script:contains("magnet:?")
+      filters:
+        - name: regexp
+          args: "\\s'(magnet:\\?.+?)';"
 
 search:
   paths:
-    - path: "{{ if .Keywords }}/recherche/{{ .Keywords }}{{ else }}/top{{ end }}"
+    - path: "{{ if .Keywords }}/recherche/{{ .Keywords }}{{ else }}{{ end }}"
   keywordsfilters:
     # if searching for season packs swith S01 to saison 1 #9712
     - name: re_replace

src/Jackett.Common/Definitions/torrentby.yml

@@ -0,0 +1,85 @@
+---
+id: torrentby
+name: torrent.by
+description: "torrent.by is a BELARUSIAN public Torrent Tracker"
+language: ru-RU
+type: public
+encoding: UTF-8
+links:
+  - https://torrent.by/
+certificates:
+  - 7536f57e6640c3fce3784736994be95585a85dfb
+
+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 torrent.by Categories
+    default: torrent.by does not return categories in its search results.</br>To add to your Apps' Torznab indexer, replace all categories with 8000(Other).
+
+search:
+  paths:
+    - path: "{{ if .Keywords }}search/?search={{ .Keywords }}&cat=0&search_in=0{{ else }}today{{ end }}"
+
+  rows:
+    selector: tr[class^="ttable_col"]
+
+  fields:
+    category:
+      text: other
+    title:
+      selector: td:nth-child(3) a
+      filters:
+        - name: re_replace
+          args: ["(?i)S*(\\d{2,3})[xх](\\d{2,3})", "S$1E$2"]
+        - name: re_replace
+          args: ["(?i)E*(\\d{2,3})-(\\d{2,3})\\s*из\\s*(\\d{2,3})", "E$1-$2 из $3"]
+    details:
+      selector: td:nth-child(3) a
+      attribute: href
+    download:
+      selector: a[href^="/d.php?id="]
+      attribute: href
+    magnet:
+      selector: a[href^="magnet:?xt="]
+      attribute: href
+    size:
+      selector: td:nth-child(5)
+    seeders:
+      selector: td font[color="green"]
+    leechers:
+      selector: td font[color="red"]
+    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(1):contains("-")
+      optional: true
+      filters:
+        - name: append
+          args: " +03:00" # MSK
+        - name: dateparse
+          args: "2006-01-02 -07:00"
+    date:
+      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/torrentdownload.yml

@@ -8,7 +8,7 @@ encoding: UTF-8
 followredirect: true
 links:
   - https://www.torrentdownload.info/
-  - https://torrentdownload.unblockit.bz/
+  - https://torrentdownload.unblockit.tv/
   - https://torrentdownload.nocensor.biz/
 legacylinks:
   - https://torrentdownload.unblockit.pro/
@@ -43,6 +43,7 @@ legacylinks:
   - https://torrentdownload.unblockit.ws/
   - https://torrentdownload.nocensor.work/
   - https://torrentdownload.unblockit.kim/
+  - https://torrentdownload.unblockit.bz/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentdownloads.yml

@@ -9,7 +9,7 @@ followredirect: true
 links:
   - https://www.torrentdownloads.info/
   - https://www.torrentdownloads.pro/
-  - https://torrentdownloads.unblockit.bz/
+  - https://torrentdownloads.unblockit.tv/
   - https://torrentdownloads.nocensor.biz/
 legacylinks:
   - https://torrentdownloads.unblockit.pro/
@@ -45,6 +45,7 @@ legacylinks:
   - https://torrentdownloads.unblockit.ws/
   - https://torrentdownloads.nocensor.work/
   - https://torrentdownloads.unblockit.kim/
+  - https://torrentdownloads.unblockit.bz/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentfunk.yml

@@ -9,7 +9,7 @@ followredirect: true
 links:
   - https://www.torrentfunk.com/
   - https://www.torrentfunk2.com/
-  - https://torrentfunk.unblockit.bz/
+  - https://torrentfunk.unblockit.tv/
   - https://torrentfunk.nocensor.biz/
 legacylinks:
   - https://torrentfunk.unblockit.pro/
@@ -34,6 +34,7 @@ legacylinks:
   - https://torrentfunk.unblockit.ws/
   - https://torrentfunk.nocensor.work/
   - https://torrentfunk.unblockit.kim/
+  - https://torrentfunk.unblockit.bz/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentgalaxy.yml

@@ -11,7 +11,7 @@ links:
   - https://torrentgalaxy.mx/
   - https://torrentgalaxy.su/
   - https://torrentgalaxy.unblockninja.com/
-  - https://torrentgalaxy.unblockit.bz/
+  - https://torrentgalaxy.unblockit.tv/
   - https://torrentgalaxy.nocensor.biz/
 legacylinks:
   - https://torrentgalaxy.org/ # redirects to *.to
@@ -49,6 +49,7 @@ legacylinks:
   - https://torrentgalaxy.unblockit.ws/
   - https://torrentgalaxy.nocensor.work/
   - https://torrentgalaxy.unblockit.kim/
+  - https://torrentgalaxy.unblockit.bz/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentkitty.yml

@@ -33,7 +33,7 @@ settings:
 
 search:
   paths:
-    - path: "search/{{ if .Keywords }}{{ .Keywords}}{{ else }}{{ .Today.Year }}{{ end }}"
+    - path: "search/{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
 
   rows:
     selector: table#archiveResult tbody tr:has(a[href^="magnet:?xt="])

src/Jackett.Common/Definitions/torrentmax.yml

@@ -58,15 +58,8 @@ download:
 search:
   paths:
     # https://torrentmax2.net/search?srows=10&gr_id=&sfl=wr_subject%7C%7Cwr_content&stx=2021&sop=and
-    - path: search
-  inputs:
-    srows: 100
-    gr_id: ""
-    # wr_subject||wr_content, wr_subject, wr_content, mb_id, wr_name
-    sfl: wr_subject
-    stx: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
-    # or, and
-    sop: and
+    - path: "search?srows=50&sfl=wr_subject&sop=and&gr_id={{ if .Keywords }}&stx={{ .Keywords }}{{ else }}tv&stx={{ .Today.Year }}{{ end }}"
+    - path: "search?srows=50&sfl=wr_subject&sop=and&gr_id={{ if .Keywords }}&stx={{ .Keywords }}&page=2{{ else }}movie&stx={{ .Today.Year }}{{ end }}"
 
   rows:
     selector: div.search-media div.media:not(:has(a[href*="/max/PHOTO/"])):not(:has(a[href*="/max/GIRL/"])):not(:has(a[href*="/max/CAM/"])):not(:has(a[href*="/max/notice/"])):not(:has(a[href*="/max/humor/"]))

src/Jackett.Common/Definitions/torrentparadise.yml

@@ -210,11 +210,9 @@ download:
       attribute: href
 
 search:
-  # https://torrentparadise.org/search.php?f=monday+night
-  # https://torrentparadise.org/recent # returns 404 as at 8 Nov 2021 #6385
-  # https://torrentparadise.cc/top100
+  # https://torrentparadise.org/searchA.php?f=monday+night
   paths:
-    - path: "{{ if .Keywords }}search.php?f={{ .Keywords }}{{ else }}top100{{ end }}"
+    - path: "searchA.php?f={{ if .Keywords }}{{ .Keywords }}{{ else }}%{{ end }}"
 
   rows:
     selector: table.table-bordered > tbody > tr.table-default

src/Jackett.Common/Definitions/torrentqq.yml

@@ -7,9 +7,8 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://torrentqq119.com/
+  - https://torrentqq121.com/
 legacylinks:
-  - https://torrentqq100.com/
   - https://torrentqq101.com/
   - https://torrentqq102.com/
   - https://torrentqq103.com/
@@ -27,6 +26,8 @@ legacylinks:
   - https://torrentqq115.com/
   - https://torrentqq117.com/
   - https://torrentqq118.com/
+  - https://torrentqq119.com/
+  - https://torrentqq120.com/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentsir.yml

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://torrentsir43.com/
+  - https://torrentsir44.com/
 legacylinks:
   - https://torrentsir31.com/
   - https://torrentsir33.com/
@@ -20,6 +20,7 @@ legacylinks:
   - https://torrentsir40.com/
   - https://torrentsir41.com/
   - https://torrentsir42.com/
+  - https://torrentsir43.com/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentview.yml

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://torrentview46.com/
+  - https://torrentview47.com/
 legacylinks:
   - https://torrentview.net/
   - https://torrentview26.com/
@@ -29,6 +29,7 @@ legacylinks:
   - https://torrentview42.com/
   - https://torrentview44.com/
   - https://torrentview45.com/
+  - https://torrentview46.com/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentwhiz.yml

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://torrentwiz34.com/
+  - https://torrentwiz35.com/
 legacylinks:
   - https://torrentwiz22.me/
   - https://torrentwiz23.me/
@@ -21,6 +21,7 @@ legacylinks:
   - https://torrentwiz31.com/
   - https://torrentwiz32.com/
   - https://torrentwiz33.com/
+  - https://torrentwiz34.com/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/uhdbits.yml

@@ -81,7 +81,10 @@ search:
     order_way: "{{ .Config.type }}"
     action: advanced
     searchsubmit: 1
+
   keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
     # if searching for season packs switch S01 to season 1 #10423
     - name: re_replace
       args: ["(?i)(S)(\\d{1,3})$", "season $2"]

src/Jackett.Common/Definitions/yggcookie.yml

@@ -7,7 +7,7 @@ type: semi-private
 encoding: UTF-8
 followredirect: true
 links:
-  - https://www3.yggtorrent.nz/
+  - https://www3.yggtorrent.re/
 legacylinks:
   - https://yggtorrent.com/
   - https://ww1.yggtorrent.com/
@@ -40,6 +40,7 @@ legacylinks:
   - https://www2.yggtorrent.si/
   - https://www.yggtorrent.li/
   - https://www4.yggtorrent.li/
+  - https://www3.yggtorrent.nz/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/yggtorrent.yml

@@ -7,7 +7,7 @@ type: semi-private
 encoding: UTF-8
 followredirect: true
 links:
-  - https://www3.yggtorrent.nz/
+  - https://www3.yggtorrent.re/
 legacylinks:
   - https://yggtorrent.com/
   - https://ww1.yggtorrent.com/
@@ -40,6 +40,7 @@ legacylinks:
   - https://www2.yggtorrent.si/
   - https://www.yggtorrent.li/
   - https://www4.yggtorrent.li/
+  - https://www3.yggtorrent.nz/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/yts.yml

@@ -9,7 +9,7 @@ requestDelay: 2.5 # 2.5 requests per second (2 causes problems)
 links:
   # dont forget to update the details, download and poster replace args
   - https://yts.mx/
-  - https://yts.unblockit.bz/
+  - https://yts.unblockit.tv/
   - https://yts.unblockninja.com/
   - https://yts.nocensor.biz/
 legacylinks:
@@ -30,6 +30,7 @@ legacylinks:
   - https://yts.nocensor.space/
   - https://yts.nocensor.work/
   - https://yts.unblockit.kim/
+  - https://yts.unblockit.bz/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/zetorrents.yml

@@ -54,8 +54,10 @@ settings:
 
 download:
   selectors:
-    - selector: a[href^="magnet:?xt="]
-      attribute: href
+    - selector: script:contains("magnet:?")
+      filters:
+        - name: regexp
+          args: "\\s'(magnet:\\?.+?)';"
 
 search:
   paths:

src/Jackett.Common/Definitions/zooqle.yml

@@ -9,7 +9,7 @@ followredirect: true
 links:
   - https://zooqle.com/
   - https://zooqle.unblockninja.com/
-  - https://zooqle.unblockit.bz/
+  - https://zooqle.unblockit.tv/
   - https://zooqle.nocensor.biz/
 legacylinks:
   - https://zooqle.unblockit.pro/
@@ -44,6 +44,7 @@ legacylinks:
   - https://zooqle.unblockit.ws/
   - https://zooqle.nocensor.work/
   - https://zooqle.unblockit.kim/
+  - https://zooqle.unblockit.bz/
 
 caps:
   categorymappings:

src/Jackett.Common/Indexers/AlphaRatio.cs

@@ -72,16 +72,8 @@ namespace Jackett.Common.Indexers
             AddCategoryMapping(30, TorznabCatType.Other, "Misc");
         }
 
-        protected override string GetSearchTerm(TorznabQuery query)
-        {
-            // Ignore season search without episode. Alpharatio doesn't support it.
-            var searchTerm = string.IsNullOrWhiteSpace(query.Episode)
-                ? query.SanitizedSearchTerm
-                : query.GetQueryString();
-
-            // Alpharatio can't handle dots in the searchstr
-            return searchTerm.Replace(".", " ");
-        }
+        // Alpharatio can't handle dots in the searchstr
+        protected override string GetSearchTerm(TorznabQuery query) => query.GetQueryString().Replace(".", " ");
 
         protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {

src/Jackett.Common/Indexers/BB.cs

@@ -145,7 +145,8 @@ namespace Jackett.Common.Indexers
                     queryCollection.Add("filter_cat[" + cat + "]", "1");
                 }
 
-                request_urls.Add(SearchUrl + queryCollection.GetQueryString());
+                // remove . as not used in titles 
+                request_urls.Add(SearchUrl + queryCollection.GetQueryString().Replace(".", " "));
             }
 
             var downloadTasksQuery = from url in request_urls select RequestWithCookiesAndRetryAsync(url);

src/Jackett.Common/Indexers/Cinecalidad.cs

@@ -22,8 +22,10 @@ namespace Jackett.Common.Indexers
     {
         private const int MaxItemsPerPage = 15;
         private const int MaxSearchPageLimit = 6; // 15 items per page * 6 pages = 90
+        private string _language;
 
         public override string[] LegacySiteLinks { get; protected set; } = {
+            "https://cinecalidad.website/",
             "https://www.cinecalidad.to/",
             "https://www.cinecalidad.im/", // working but outdated, maybe copycat
             "https://www.cinecalidad.is/",
@@ -39,8 +41,8 @@ namespace Jackett.Common.Indexers
             ICacheService cs)
             : base(id: "cinecalidad",
                    name: "Cinecalidad",
-                   description: "Películas Full HD en Latino y Inglés Dual.",
-                   link: "https://cinecalidad.website/",
+                   description: "Películas Full HD en Castellano y Latino Dual.",
+                   link: "https://www.cinecalidad.lat/",
                    caps: new TorznabCapabilities
                    {
                        MovieSearchParams = new List<MovieSearchParam> { MovieSearchParam.Q }
@@ -56,9 +58,29 @@ namespace Jackett.Common.Indexers
             Language = "es-ES";
             Type = "public";
 
+            var language = new ConfigurationData.SingleSelectConfigurationItem(
+                "Select language", new Dictionary<string, string>
+                {
+                    {"castellano", "Castilian Spanish"},
+                    {"latino", "Latin American Spanish"}
+                })
+            {
+                Value = "castellano"
+            };
+            configData.AddDynamic("language", language);
+
             AddCategoryMapping(1, TorznabCatType.MoviesHD);
         }
 
+        public override void LoadValuesFromJson(JToken jsonConfig, bool useProtectionService = false)
+        {
+            {
+                base.LoadValuesFromJson(jsonConfig, useProtectionService);
+                var language = (ConfigurationData.SingleSelectConfigurationItem)configData.GetDynamic("language");
+                _language = language?.Value ?? "castellano";
+            }
+        }
+
         public override async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
         {
             LoadValuesFromJson(configJson);
@@ -75,6 +97,8 @@ namespace Jackett.Common.Indexers
             var releases = new List<ReleaseInfo>();
 
             var templateUrl = SiteLink;
+            if (_language.Equals("castellano"))
+                templateUrl += "espana/";
             templateUrl += "{0}?s="; // placeholder for page
 
             var maxPages = 2; // we scrape only 2 pages for recent torrents
@@ -115,7 +139,12 @@ namespace Jackett.Common.Indexers
             {
                 var parser = new HtmlParser();
                 var dom = parser.ParseDocument(results.ContentString);
-                var protectedLink = dom.QuerySelector("li:contains('Torrent')").ParentElement.GetAttribute("href");
+                var linkParent = dom.QuerySelector("li:contains('Torrent')").ParentElement;
+                var protectedLink = linkParent.GetAttribute("data-res");
+                if (protectedLink != null)
+                    protectedLink = "protect/v.php?i=" + protectedLink;
+                else
+                    protectedLink = linkParent.GetAttribute("href");
                 if (protectedLink.Contains("/ouo.io/"))
                 {
                     // protected link =>
@@ -156,9 +185,10 @@ namespace Jackett.Common.Indexers
                     var title = qImg.GetAttribute("title");
                     if (!CheckTitleMatchWords(query.GetQueryString(), title))
                         continue; // skip if it doesn't contain all words
-                    title += " MULTi LATiN SPANiSH 1080p BDRip x264";
+                    title += _language.Equals("castellano") ? " MULTi/SPANiSH" : " MULTi/LATiN SPANiSH";
+                    title += " 1080p BDRip x264";
 
-                    var poster = new Uri(GetAbsoluteUrl(qImg.GetAttribute("data-large")));
+                    var poster = new Uri(GetAbsoluteUrl(qImg.GetAttribute("data-src")));
                     var link = new Uri(row.QuerySelector("a.postItem__back-link").GetAttribute("href"));
 
                     var release = new ReleaseInfo

src/Jackett.Common/Indexers/DivxTotal.cs

@@ -54,6 +54,7 @@ namespace Jackett.Common.Indexers
             "https://www.divxtotal.ch/",
             "https://www.divxtotal.nz/",
             "https://www.divxtotal.li/",
+            "https://www.divxtotal.nu/",
             "https://www.divxtotal.se/"
         };
 
@@ -62,7 +63,7 @@ namespace Jackett.Common.Indexers
             : base(id: "divxtotal",
                    name: "DivxTotal",
                    description: "DivxTotal is a SPANISH site for Movies, TV series and Software",
-                   link: "https://www.divxtotal.nu/",
+                   link: "https://www.divxtotal.nl/",
                    caps: new TorznabCapabilities
                    {
                        TvSearchParams = new List<TvSearchParam>

src/Jackett.Common/Indexers/EpubLibre.cs

@@ -45,7 +45,7 @@ namespace Jackett.Common.Indexers
 
         public override string[] AlternativeSiteLinks { get; protected set; } = {
             "https://www.epublibre.org/",
-            "https://epublibre.unblockit.bz/"
+            "https://epublibre.unblockit.tv/"
         };
 
         public override string[] LegacySiteLinks { get; protected set; } = {
@@ -62,7 +62,8 @@ namespace Jackett.Common.Indexers
             "https://epublibre.unblockit.ch/",
             "https://epublibre.unblockit.ws/",
             "https://epublibre.unblockit.li/",
-            "https://epublibre.unblockit.kim/"
+            "https://epublibre.unblockit.kim/",
+            "https://epublibre.unblockit.bz/"
         };
 
         public EpubLibre(IIndexerConfigurationService configService, WebClient wc, Logger l, IProtectionService ps,

src/Jackett.Common/Indexers/HDTorrents.cs

@@ -146,8 +146,8 @@ namespace Jackett.Common.Indexers
                 {"options", "0"}
             };
 
-            // manually url encode parenthesis to prevent "hacking" detection
-            searchUrl += queryCollection.GetQueryString().Replace("(", "%28").Replace(")", "%29");
+            // manually url encode parenthesis to prevent "hacking" detection, remove . as not used in titles
+            searchUrl += queryCollection.GetQueryString().Replace("(", "%28").Replace(")", "%29").Replace(".", " ");
 
             var results = await RequestWithCookiesAndRetryAsync(searchUrl);
             try

src/Jackett.Common/Indexers/MejorTorrent.cs

@@ -37,7 +37,8 @@ namespace Jackett.Common.Indexers
 
         public override string[] AlternativeSiteLinks { get; protected set; } = {
             "https://www.mejortorrentes.net/",
-            "https://mejortorrent.nocensor.biz/"
+            "https://mejortorrent.nocensor.biz/",
+            "https://mejortorrent.unblockit.tv/"
         };
 
         public override string[] LegacySiteLinks { get; protected set; } = {

src/Jackett.Common/Indexers/NewPCT.cs

@@ -100,7 +100,7 @@ namespace Jackett.Common.Indexers
 
         public override string[] AlternativeSiteLinks { get; protected set; } = {
             "https://atomixhq.one/",
-            "https://pctmix1.unblockit.bz/"
+            "https://pctmix1.unblockit.tv/"
         };
 
         public override string[] LegacySiteLinks { get; protected set; } = {
@@ -124,7 +124,8 @@ namespace Jackett.Common.Indexers
             "https://pctreload1.com/",
             "https://maxitorrent.com",
             "https://pctmix1.unblockit.kim/",
-            "https://atomixhq.com/"
+            "https://atomixhq.com/",
+            "https://pctmix1.unblockit.bz/"
         };
 
         public NewPCT(IIndexerConfigurationService configService, WebClient wc, Logger l, IProtectionService ps,

src/Jackett.Updater/Program.cs

@@ -433,6 +433,7 @@ namespace Jackett.Updater
                 "Definitions/shareuniversity.yml",
                 "Definitions/sharingue.yml",
                 "Definitions/shellife.yml",
+                "Definitions/shokweb.yml",
                 "Definitions/skytorrents.yml",
                 "Definitions/skytorrents-lol.yml",
                 "Definitions/skytorrents-to.yml",