concen: use direct magnet URI. resolves #8914

https://www.magnetdl.com/o/of/age/desc/ - 404
change to - https://www.magnetdl.com/2/2020/age/desc/ (or any year up to 2999)

Tested, working

README.md

@@ -42,7 +42,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * BTDIGG
  * BTeye
  * BTSOW
- * Cili180
  * ConCen
  * Corsaro.red
  * cpasbien
@@ -76,6 +75,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * KickAssTorrent (KATcr)
  * Legit Torrents
  * LePorno
+ * LIAORENCILI (Cili180)
  * LimeTorrents
  * LinuxTracker
  * MacTorrents
@@ -90,7 +90,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Newstudio
  * Nitro
  * NNTT
- * NoName Club (NNM-Club)
+ * NoNaMe Club (NNM-Club)
  * Nyaa-Pantsu
  * Nyaa.si
  * OneJAV
@@ -99,6 +99,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * PC-torrent
  * PiratBit
  * Pirateiro
+ * Pornforall
  * PornLeech
  * PornoLive
  * PornoRip
@@ -168,6 +169,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * DimeADozen (EzTorrent)
  * EniaHD
  * Erzsebet
+ * Erzsebet.pl
  * ExKinoRay
  * ExtremlymTorrents
  * FilmsClub
@@ -223,6 +225,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Abnormal
  * Acid Lounge (A-L)
  * Aftershock
+ * Aither
  * AlphaRatio (AR)
  * AmigosShareClub
  * AnimeBytes (AB)
@@ -234,7 +237,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * AsianCinema
  * AudioNews (AN)
  * Audiobook Torrents (ABT + RNS)
- * Avistaz (AsiaTorrents)
+ * AvistaZ (AsiaTorrents)
  * Awesome-HD (AHD)
  * BIGTorrent
  * BIT-HDTV
@@ -262,7 +265,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Boxing Torrents
  * Brasil Tracker
  * BroadCity
- * BroadcastTheNet (BTN)
+ * BroadcasTheNet (BTN)
  * BrokenStones
  * BWTorrents
  * CCFBits
@@ -310,6 +313,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * eStone (XiDER, BeLoad)
  * Ethor.net (Thor's Land)
  * ExoticaZ (YourExotic)
+ * ExtremeBits
  * ExtremeTorrents
  * FANO.IN
  * Fantastic Heaven
@@ -346,6 +350,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * HDBits
  * HDCenter
  * HDChina (HDWing)
+ * HDC (HDCiTY)
  * HDCity
  * HDDisk (HDD)
  * HDHome (HDBigger)
@@ -374,6 +379,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * JPopsuki
  * Kapaki
  * Karagarga
+ * Keep Friends
  * LastFiles
  * Le Saloon
  * LeChaudron
@@ -406,6 +412,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * NORDiCHD
  * notwhat.cd
  * OnlineSelfEducation
+ * ONLYscene
  * Orpheus
  * OshenPT
  * Ourbits (HDPter)
@@ -444,7 +451,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * RetroFlix
  * RevolutionTT
  * RoDVD (Cinefiles)
- * Romanian Metal Torrent (RMT)
+ * Romanian Metal Torrents (RMT)
  * SDBits
  * SceneFZ
  * SceneHD
@@ -494,7 +501,8 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * The Vault
  * TheAudioScene
  * TheEmpire (TE)
- * ToTheGlory
+ * TJUPT
+ * ToTheGlory (TTG)
  * Torrent Network (TN)
  * Torrent Sector Crew (TSC)
  * Torrent-Syndikat
@@ -539,6 +547,8 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Xthor
  * XtreMeZone (MYXZ)
  * XtremeFile
+ * YDYPT
+ * YingK
  * Zamunda.net
  * Zelka.org
 </details>

azure-pipelines.yml

@@ -260,7 +260,8 @@ stages:
     displayName: Code Style Compliance
     dependsOn: []
     jobs:
-      - job: Linting
+      - job: Linting_Dotnet
+        displayName: Linting Dotnet
         pool:
           vmImage: ubuntu-latest
         workspace:
@@ -298,6 +299,26 @@ stages:
                 dotnet-format --dry-run --check --verbosity diagnostic --folder ./src/Jackett.Tray
                 dotnet-format --dry-run --check --verbosity diagnostic --folder ./src/Jackett.Updater
 
+      - job: Linting_YAML
+        displayName: Linting YAML
+        pool:
+          vmImage: ubuntu-latest
+        workspace:
+          clean: all
+        steps:
+          - checkout: self
+
+          - task: UsePythonVersion@0
+            displayName: Install Python
+            inputs:
+              versionSpec: '3.8'
+
+          - script: pip install yamllint
+            displayName: Install yamllint
+
+          - script: yamllint -c ./yamllint.yml ./src/Jackett.Common/Definitions/
+            displayName: Lint YAML
+
   - stage: UnitTestJackett
     displayName: Unit Tests
     dependsOn: CodeStyle
@@ -399,7 +420,9 @@ stages:
 
   - stage: Integration
     displayName: Integration Tests
-    dependsOn: BuildJackett
+    dependsOn:
+      - BuildJackett
+      - CodeStyle
     jobs:
       - job: Selenium
         workspace:

jackett_launcher.sh

@@ -6,13 +6,13 @@
 # Get full Jackett root path
 JACKETT_DIR="$(dirname "$(readlink -f "$0")")"
 
-# Launch Jackett
-"${JACKETT_DIR}/jackett" --NoRestart
+# Launch Jackett (with CLI parameters)
+"${JACKETT_DIR}/jackett" --NoRestart "$@"
 
 # Get user running the service
 JACKETT_USER=$(whoami)
 
 # Wait until the updater ends
 while pgrep -u "${JACKETT_USER}" JackettUpdater > /dev/null; do
-     sleep 1
+    sleep 1
 done

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

@@ -32,14 +32,14 @@ legacylinks:
 
 caps:
   categorymappings:
-    #Anime
+    # Anime
     - {id: 28, cat: TV/Anime, desc: "Anime/Anime"}
     - {id: 78, cat: TV/Anime, desc: "Anime/Dual Audio"}
     - {id: 79, cat: TV/Anime, desc: "Anime/Dubbed"}
     - {id: 80, cat: TV/Anime, desc: "Anime/Subbed"}
     - {id: 81, cat: TV/Anime, desc: "Anime/Raw"}
 
-    #Audio
+    # Audio
     - {id: 22, cat: Audio/MP3, desc: "Music/MP3"}
     - {id: 23, cat: Audio/Lossless, desc: "Music/Lossless"}
     - {id: 24, cat: Audio, desc: "Music/DVD"}
@@ -53,7 +53,7 @@ caps:
     - {id: 68, cat: Audio, desc: "Music/Concerts"}
     - {id: 69, cat: Audio, desc: "Music/AAC"}
 
-    #Movies
+    # Movies
     - {id: 1, cat: Movies/DVD, desc: "Movies/DVD"}
     - {id: 2, cat: Movies/SD, desc: "Movies/Divx/Xvid"}
     - {id: 3, cat: Movies, desc: "Movies/SVCD/VCD"}
@@ -66,7 +66,7 @@ caps:
     - {id: 73, cat: Movies, desc: "Movies/Bollywood"}
     - {id: 76, cat: Movies/UHD, desc: "Movies/UHD"}
 
-    #TV
+    # TV
     - {id: 5, cat: TV, desc: "TV/DVD"}
     - {id: 6, cat: TV, desc: "TV/Divx/Xvid"}
     - {id: 7, cat: TV, desc: "TV/SVCD/VCD"}
@@ -76,7 +76,7 @@ caps:
     - {id: 75, cat: TV/SD, desc: "TV/SD"}
     - {id: 9, cat: TV/Documentary, desc: "TV/Documentary"}
 
-    #Apps
+    # Apps
     - {id: 18, cat: PC, desc: "Apps/PC Software"}
     - {id: 19, cat: PC/Mac, desc: "Apps/Mac"}
     - {id: 20, cat: PC, desc: "Apps/Linux"}
@@ -84,7 +84,7 @@ caps:
     - {id: 56, cat: PC/Phone-Android, desc: "Apps/Android"}
     - {id: 57, cat: PC/Phone-IOS, desc: "Apps/iOS"}
 
-    #Games
+    # Games
     - {id: 10, cat: PC/Games, desc: "Games/PC Game"}
     - {id: 11, cat: Console/Other, desc: "Games/PS2"}
     - {id: 12, cat: Console/PSP, desc: "Games/PSP"}
@@ -101,14 +101,14 @@ caps:
     - {id: 77, cat: Console/PS4, desc: "Games/PS4"}
     - {id: 82, cat: Console/Other, desc: "Games/Switch"}
 
-    #XXX
+    # XXX
     - {id: 48, cat: XXX/DVD, desc: "XXX/Video"}
     - {id: 49, cat: XXX/Imageset, desc: "XXX/Picture"}
     - {id: 50, cat: XXX, desc: "XXX/Magazine"}
     - {id: 51, cat: XXX, desc: "XXX/Hentai"}
     - {id: 67, cat: XXX, desc: "XXX/Games"}
 
-    #Other
+    # Other
     - {id: 33, cat: Other, desc: "Other/Emulation"}
     - {id: 34, cat: Books, desc: "Other/Tutorial"}
     - {id: 35, cat: Other, desc: "Other/Sounds"}

src/Jackett.Common/Definitions/32pages.yml

@@ -77,7 +77,7 @@ login:
 search:
   paths:
     - path: torrents.php
-    #site displays just 25 results per page, no profile options found to change this, so we attempt to fetch 4 pages
+    # site displays just 25 results per page, no profile options found to change this, so we attempt to fetch 4 pages
     - path: torrents.php
       inputs:
         page: 2
@@ -109,7 +109,7 @@ search:
         - name: prepend
           args: "{{.Result._grouptitle}} - "
         - name: replace
-          args: ["/  /", "/"] #removes slash left after freeleech images
+          args: ["/  /", "/"] # removes slash left after freeleech images
         - name: append
           args: "{{if .Result._language}} [{{.Result._language}}]{{else}}{{end}}"
     category:

src/Jackett.Common/Definitions/3changtrai.yml

@@ -51,6 +51,10 @@ settings:
     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

src/Jackett.Common/Definitions/52pt.yml

@@ -50,6 +50,10 @@ settings:
     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
@@ -62,9 +66,12 @@ login:
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
+    logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: yes
   error:
     - selector: td.embedded:has(h2:contains("失败"))
-    - selector: td.embedded:has(h2:contains("登录失败"))
   test:
     path: index.php
     selector: a[href*="logout.php"]

src/Jackett.Common/Definitions/Bittorrentfiles.yml

@@ -86,7 +86,7 @@ caps:
     - {id: 47, cat: Other, desc: "Sonstiges Line"}
     - {id: 9, cat: Other, desc: "Sonstiges Andere"}
 
-    #XXX
+    # XXX
     - {id: 58, cat: Books/Comics, desc: "XXX HD"}
     - {id: 46, cat: XXX, desc: "XXX Hentai"}
     - {id: 35, cat: XXX/Other, desc: "XXX Andere"}
@@ -150,7 +150,7 @@ search:
     sort: "{{ .Config.type }}"
 
   rows:
-    selector: table.tableinborder > tbody > tr:has(a[href^="details.php"])
+    selector: table.tableinborder > tbody > tr:has(a[href^="/download.php"])
 
   fields:
     title:

src/Jackett.Common/Definitions/aither.yml

@@ -0,0 +1,194 @@
+---
+id: aither
+name: Aither
+description: "Aither is a Private Torrent Tracker for HD MOVIES / TV"
+language: en-us
+type: private
+encoding: UTF-8
+links:
+  - https://aither.cc/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Movies"}
+    - {id: 15, cat: Movies, desc: "Movie Packs"}
+    - {id: 7, cat: TV/Documentary, desc: "Documentary"}
+    - {id: 9, cat: TV/Sport, desc: "Sports"}
+    - {id: 12, cat: TV/Anime, desc: "Anime Movies"}
+    - {id: 2, cat: TV, desc: "TV"}
+    - {id: 13, cat: TV/Anime, desc: "Anime TV"}
+    - {id: 3, cat: Audio, desc: "Music"}
+    - {id: 4, cat: Console, desc: "Games"}
+    - {id: 10, cat: PC, desc: "Apps"}
+    - {id: 11, cat: Books, desc: "Ebooks & Magazines"}
+    - {id: 14, cat: Audio/Audiobook, desc: "Audiobooks"}
+    - {id: 8, cat: Other, desc: "Unrated"}
+    - {id: 6, cat: XXX, desc: "XXX"}
+    - {id: 5, cat: Other, desc: "Test"}
+
+  modes:
+    search: [q, imdbid]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: "created_at"
+    options:
+      "created_at": "created"
+      "seeders": "seeders"
+      "size": "size"
+      "name": "title"
+  - name: type
+    type: select
+    label: Order requested from site
+    default: "desc"
+    options:
+      "desc": "desc"
+      "asc": "asc"
+
+login:
+  path: login
+  method: form
+  form: form[action$="/login"]
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    remember: on
+  selectorinputs:
+    _token:
+      selector: input[name="_token"]
+      attribute: value
+  error:
+    - selector: div#ERROR_COPY
+#    test:
+#      path: /
+#      selector: a[href$="/logout"]
+
+ratio:
+  path: /
+  selector: li:has(i.fa-sync-alt)
+  filters:
+    - name: regexp
+      args: "Ratio : (\\d+)"
+
+search:
+  paths:
+    - path: torrents/filter
+  inputs:
+    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+    description: ""
+    uploader: ""
+    imdb: "{{ .Query.IMDBIDShort }}"
+    tvdb: ""
+    tmdb: ""
+    mal: ""
+    igdb: ""
+    sorting: "{{ .Config.sort }}"
+    sort: "{{ .Config.sort }}"
+    direction: "{{ .Config.type }}"
+    qty: 100
+
+  rows:
+    selector: table > tbody > tr
+
+  fields:
+    category:
+      selector: a[href*="/categories/"]
+      attribute: href
+      filters:
+        - name: regexp
+          args: "/categories/(\\d+)"
+    title:
+      selector: a.view-torrent
+    download:
+      selector: a[href*="/download/"]
+      attribute: href
+    details:
+      selector: a.view-torrent
+      attribute: href
+    banner:
+      optional: true
+      selector: div.torrent-poster img
+      attribute: src
+      filters:
+        - name: replace
+          args: ["https://via.placeholder.com/600x900", ""]
+    comments:
+      selector: a[href*="#comments"]
+      attribute: href
+    size:
+      selector: td:nth-last-child(4)
+    seeders:
+      selector: td:nth-last-child(3)
+    leechers:
+      selector: td:nth-last-child(2)
+    grabs:
+      selector: td:nth-last-child(1)
+      filters:
+        - name: regexp
+          args: (\d+)
+    imdb:
+      optional: true
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    date:
+      selector: time
+      filters:
+        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese
+        - name: re_replace
+          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前)", " ago"]
+        - name: re_replace
+          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
+        - name: re_replace
+          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟)", " minute"]
+        - name: re_replace
+          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden)", "hours"]
+        - name: re_replace
+          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时)", " hour"]
+        - name: re_replace
+          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen)", "days"]
+        - name: re_replace
+          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天)", " day"]
+        - name: re_replace
+          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken)", "weeks"]
+        - name: re_replace
+          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周)", " week"]
+        - name: re_replace
+          args: ["(?i) (ay)", "month"]
+        - name: re_replace
+          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
+        - name: re_replace
+          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月)", " month"]
+        - name: re_replace
+          args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
+        - name: re_replace
+          args: ["(?i)(yil|aasta|år|anno|rok|ano|год|año|Jahr|година|jaar|年)", " year"]
+        - name: re_replace
+          args: ["(?i) (an)", "year"]
+    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
+        "*": 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
+        "*": 1
+# UNIT3D 2.2.7

src/Jackett.Common/Definitions/asgaard.yml

@@ -158,11 +158,6 @@ search:
     download:
       selector: a[href*="download.php?torrent="]
       attribute: href
-    date:
-      selector: td:nth-child(2) > div > div:last-of-type
-      filters:
-        - name: dateparse
-          args: "2 Jan 2006 15:04:05"
     files:
       # remember #5754 advanced users have additional last TD so dont go using nth-last-child ;-)
       selector: td:nth-child(5)
@@ -174,6 +169,24 @@ search:
       selector: td:nth-child(9)
     leechers:
       selector: td:nth-child(10)
+    date:
+      # 26 May 20 14:05:06
+      selector: td:nth-child(2) > div > div:last-of-type:not(:contains("day"))
+      optional: true
+      # drop New!
+      remove: span
+      filters:
+        - name: dateparse
+          args: "2 Jan 2006 15:04:05"
+    date:
+      # Today, 20:26:23
+      # Yesterday, 13:50:05
+      selector: td:nth-child(2) > div > div:last-of-type:contains("day")
+      optional: true
+      # drop New!
+      remove: span
+      filters:
+        - name: fuzzytime
     downloadvolumefactor:
       case:
         img[src="./images/gold.png"]: 0

src/Jackett.Common/Definitions/asiancinema.yml

@@ -128,7 +128,7 @@ search:
           args: (\d+)
     imdb:
       optional: true
-      selector: a[href*="www.imdb.com/title/tt"]
+      selector: a[href*="imdb.com/title/tt"]
       attribute: href
     date:
       selector: time

src/Jackett.Common/Definitions/audiobookbay.yml

@@ -89,11 +89,11 @@ search:
     # with just 7 results per page, try to grab up to 35 results
     # http://audiobookbay.nl/?s=teeth
     # http://audiobookbay.nl/page/2/?s=teeth
-    - path: "{{ if .Keywords }}/?s={{ .Keywords }}{{else}}/{{end}}"
-    - path: "{{ if .Keywords }}/page/2/?s={{ .Keywords }}{{else}}{{end}}"
-    - path: "{{ if .Keywords }}/page/3/?s={{ .Keywords }}{{else}}{{end}}"
-    - path: "{{ if .Keywords }}/page/4/?s={{ .Keywords }}{{else}}{{end}}"
-    - path: "{{ if .Keywords }}/page/5/?s={{ .Keywords }}{{else}}{{end}}"
+    - path: "{{ if .Keywords }}?s={{ .Keywords }}{{ else }}{{ end }}"
+    - path: "page/2/{{ if .Keywords }}?s={{ .Keywords }}{{ else }}{{ end }}"
+    - path: "page/3/{{ if .Keywords }}?s={{ .Keywords }}{{ else }}{{ end }}"
+    - path: "page/4/{{ if .Keywords }}?s={{ .Keywords }}{{ else }}{{ end }}"
+    - path: "page/5/{{ if .Keywords }}?s={{ .Keywords }}{{ else }}{{ end }}"
 
   rows:
     selector: div.post:has(div[class="postTitle"])

src/Jackett.Common/Definitions/beitai.yml

@@ -49,6 +49,10 @@ settings:
     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: takelogin.php
@@ -56,8 +60,12 @@ login:
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
+    logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: yes
   error:
-    - selector: td.embedded:has(h2:contains("登录失败"))
+    - selector: td.embedded:has(h2:contains("失败"))
   test:
     path: index.php
     selector: a[href="logout.php"]

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

@@ -103,7 +103,7 @@ search:
       selector: a[href$="/history"]
     imdb:
       optional: true
-      selector: a[href*="www.imdb.com/title/tt"]
+      selector: a[href*="imdb.com/title/tt"]
       attribute: href
     downloadvolumefactor:
       case:

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

@@ -123,7 +123,7 @@ search:
       selector: a[href$="/history"]
     imdb:
       optional: true
-      selector: a[href*="www.imdb.com/title/tt"]
+      selector: a[href*="imdb.com/title/tt"]
       attribute: href
     downloadvolumefactor:
       case:

src/Jackett.Common/Definitions/bigfangroup.yml

@@ -90,7 +90,6 @@ settings:
 
 search:
   # https://bigfangroup.org/browse.php?search=black+lightning&cat=0&incldead=0&year=0&format=0
-  #
   paths:
     - path: browse.php
   inputs:

src/Jackett.Common/Definitions/bit-titan.yml

@@ -225,6 +225,6 @@ search:
         "font.mu:contains(\"2x\")": 2
         "font.mu:contains(\"5x\")": 5
         "font.mu:contains(\"10x\")": 10
-        font.fl: 0  # freeleech neither dl or ul is counted
+        font.fl: 0 # freeleech neither dl or ul is counted
         "*": 1
 # engine n/a

src/Jackett.Common/Definitions/bithorlo.yml

@@ -67,7 +67,8 @@ settings:
   - name: info
     type: info
     label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+
   - name: sort
     type: select
     label: Sort requested from site

src/Jackett.Common/Definitions/bithumen.yml

@@ -94,7 +94,7 @@ search:
       selector: a[href^="details.php?id="]
       attribute: href
     imdb:
-      selector: a[href*="www.imdb.com/title/tt"]
+      selector: a[href*="imdb.com/title/tt"]
       attribute: href
     banner:
       selector: a[onmouseover^="bithumen.UI.images.coverShow"]

src/Jackett.Common/Definitions/bluebird.yml

@@ -35,16 +35,22 @@ login:
     - selector: div.error
   test:
     path: browse.php
+    selector: a[href="logout.php"]
 
 search:
   paths:
     - path: browse.php
   inputs:
-    $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-    search: "{{ .Query.Keywords }}"
-    incldead: "1"
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    # 0 active, 1 incldead, 2 onlydead 3 gold, 4 without seeders, 5 diamond
+    incldead: 1
+    # or, and
+    stype: and
+
   rows:
-    selector: table > tbody > tr:has(a[href^="details.php?id="])
+    selector: table[class="embedded"][cellspacing="0"][cellpadding="5"][width="100%"] > tbody > tr:has(a[href^="details.php?id="])
+
   fields:
     title:
       selector: a[href^="details.php?id="]
@@ -82,12 +88,13 @@ search:
           args: src=([^\s]+)
     downloadvolumefactor:
       case:
-        img[src="pic/diamond.png"]: "0"
-        img[src="pic/freedownload.gif"]: "0"
-        img[src="pic/silver.gif"]: "0.5"
-        img[src="pic/bronze.gif"]: "0.75"
-        "*": "1"
+        img[src="pic/diamond.png"]: 0
+        img[src="pic/freedownload.gif"]: 0
+        img[src="pic/silver.gif"]: 0.5
+        img[src="pic/bronze.gif"]: 0.75
+        "*": 1
     uploadvolumefactor:
       case:
-        img[src="pic/diamond.png"]: "2"
-        "*": "1"
+        img[src="pic/diamond.png"]: 2
+        "*": 1
+# engine n/a

src/Jackett.Common/Definitions/blutopia.yml

@@ -129,12 +129,12 @@ search:
           args: (\d+)
     imdb:
       optional: true
-      selector: a[href*="www.imdb.com/title/tt"]
+      selector: a[href*="imdb.com/title/tt"]
       attribute: href
     date:
       selector: time
       filters:
-         # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese
+        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese
         - name: re_replace
           args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前)", " ago"]
         - name: re_replace

src/Jackett.Common/Definitions/broadcity.yml

@@ -2,13 +2,13 @@
 id: broadcity
 name: BroadCity
 description: "BroadCity is a TURKISH Private Torrent Tracker for MOVIES and TV"
-language: tr
+language: tr-TR
 type: private
 encoding: UTF-8
 links:
-  - https://broadcity.in/
+  - http://broadcity.in/ # site is forcing to http
 legacylinks:
-  - http://broadcity.in/
+  - https://broadcity.in/
 
 caps:
   categorymappings:
@@ -65,8 +65,7 @@ login:
     selector: img#regimage
     input: imagestring
   error:
-    - selector: table:contains("Bir Hata oluştu!")
-    - selector: table:contains("Bir Hata Oluştu!")
+    - selector: table:contains("Hata")
     - selector: table:contains("Login Giriş Kilitlendi!")
   test:
     path: index.php
@@ -145,3 +144,4 @@ search:
       case:
         img[src$="/x2.gif"]: 2
         "*": 1
+# TS Special Edition v.7.5

src/Jackett.Common/Definitions/brobits.yml

@@ -26,7 +26,8 @@ settings:
   - name: info
     type: info
     label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+
   - name: sort
     type: select
     label: Sort requested from site
@@ -43,6 +44,10 @@ settings:
     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:
   method: cookie

src/Jackett.Common/Definitions/btdb.yml

@@ -7,12 +7,10 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://btdb.io/
-  - https://btdb.unblockit.me/
+  - https://btdb.eu/
 legacylinks:
   - https://btdb.to/
   - https://btdb.unblocked.app/
-  - https://btdb.eu/
   - https://btdb.unblockit.pro/
   - https://btdb.unblockit.one/
   - https://btdb.black-mirror.xyz/
@@ -20,9 +18,11 @@ legacylinks:
   - https://btdb.proxyportal.fun/
   - https://btdb.uk-unblock.xyz/
   - https://btdb.ind-unblock.xyz/
-  - https://btdb.unblocked.bar/ # search broken by Cloudflare DDoS protection in browser and Jackett
-  - https://btdb.proxyportal.pw/ # search broken by Cloudflare DDoS protection in browser and Jackett
-  - https://btdb.uk-unblock.pro/ # search broken by Cloudflare DDoS protection in browser and Jackett
+  - https://btdb.unblocked.bar/ # redirects to .eu
+  - https://btdb.proxyportal.pw/ # redirects to .eu
+  - https://btdb.uk-unblock.pro/ # redirects to .eu
+  - https://btdb.unblockit.me/ # redirects to .eu
+  - https://btdb.io/ # ERR_NAME_NOT_RESOLVED
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/btgigs.yml

@@ -79,7 +79,7 @@ search:
   rows:
     selector: table[border="1"][cellpadding=5] > tbody > tr:has(a[href^="details.php?id="])
   fields:
-    is_polish: #Workaround: https://github.com/Jackett/Jackett/issues/8068#issuecomment-610222414
+    is_polish: # Workaround: https://github.com/Jackett/Jackett/issues/8068#issuecomment-610222414
       text: ""
     is_polish:
       optional: true
@@ -117,7 +117,7 @@ search:
           args: "{{ .Result.description }}"
     imdb:
       optional: true
-      selector: a[href*="www.imdb.com/title/tt"]
+      selector: a[href*="imdb.com/title/tt"]
     date:
       selector: td:nth-child(5)
       filters:

src/Jackett.Common/Definitions/btschool.yml

@@ -35,7 +35,12 @@ settings:
   - name: info
     type: info
     label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+
+  - name: 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:
   method: cookie

src/Jackett.Common/Definitions/btsow.yml

@@ -6,10 +6,11 @@ language: en-us
 type: public
 encoding: UTF-8
 links:
-  - https://btsow.club/
+  - https://bteve.com/
 legacylinks:
   - https://btos.pw/
   - https://btio.pw/
+  - https://btsow.club/
 
 caps:
   categories:

src/Jackett.Common/Definitions/carpathians.yml

@@ -114,7 +114,7 @@ search:
       selector: a[id][href^="details.php?"]
       attribute: href
     imdb:
-      selector: a[href*="www.imdb.com/title/tt"]
+      selector: a[href*="imdb.com/title/tt"]
       optional: true
       attribute: href
     banner:

src/Jackett.Common/Definitions/cartoonchaos.yml

@@ -109,7 +109,7 @@ search:
       attribute: href
     imdb:
       optional: true
-      selector: a[href*="www.imdb.com/title/tt"]
+      selector: a[href*="imdb.com/title/tt"]
       attribute: href
       filters:
         # http://anonym.to?javascript:popdetails('http://www.imdb.com/title/tt0086817');

src/Jackett.Common/Definitions/casstudiotv.yml

@@ -269,7 +269,7 @@ login:
 
 search:
   paths:
-    #https://casstudio.tv/search.php?tracker_search=torrent&keywords=star&terms=all&author=&sc=1&sf=titleonly&sr=topics&sk=t&sd=d&st=0&ch=300&t=0&submit=Search
+    # https://casstudio.tv/search.php?tracker_search=torrent&keywords=star&terms=all&author=&sc=1&sf=titleonly&sr=topics&sk=t&sd=d&st=0&ch=300&t=0&submit=Search
     - path: search.php
   inputs:
     tracker_search: torrent

src/Jackett.Common/Definitions/ccfbits.yml

@@ -118,7 +118,7 @@ search:
       attribute: href
     imdb:
       optional: true
-      selector: a[href*="www.imdb.com/title/tt"]
+      selector: a[href*="imdb.com/title/tt"]
       attribute: href
     files:
       selector: a[href$="&filelist=1"]

src/Jackett.Common/Definitions/channelx.yml

@@ -130,7 +130,7 @@ search:
           args: (\d+)
     imdb:
       optional: true
-      selector: a[href*="www.imdb.com/title/tt"]
+      selector: a[href*="imdb.com/title/tt"]
       attribute: href
     date:
       selector: time

src/Jackett.Common/Definitions/chdbits.yml

@@ -26,13 +26,30 @@ caps:
     movie-search: [q]
     music-search: [q]
 
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+
 login:
   path: takelogin.php
   method: post
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
+    logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: yes
   error:
+    - selector: td.embedded:has(h2:contains("失败"))
     - selector: td.embedded:has(h2:contains("failed"))
   test:
     path: torrents.php
@@ -48,24 +65,26 @@ search:
   paths:
     - path: torrents.php
   inputs:
-    $raw: "{{range .Categories}}cat{{.}}=1&{{end}}"
-    search: "{{ .Query.Keywords }}"
-    incldead: "1"
+    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    incldead: 1
+
   rows:
     selector: table.torrents > tbody > tr:has(table.torrentname)
+
   fields:
-    title:
-      selector: a[href^="details.php?id="]
-    title:
-      optional: true
-      selector: a[title][href^="details.php?id="]
-      attribute: title
     category:
       selector: a[href^="?cat="]
       attribute: href
       filters:
         - name: querystring
           args: cat
+    title:
+      selector: a[href^="details.php?id="]
+    title:
+      optional: true
+      selector: a[title][href^="details.php?id="]
+      attribute: title
     details:
       selector: a[href^="details.php?id="]
       attribute: href
@@ -90,18 +109,19 @@ search:
           args: "2006-01-02 15:04:05 -07:00"
     downloadvolumefactor:
       case:
-        img.pro_free: "0"
-        img.pro_free2up: "0"
-        img.pro_50pctdown: "0.5"
-        img.pro_50pctdown2up: "0.5"
-        img.pro_30pctdown: "0.3"
-        "*": "1"
+        img.pro_free: 0
+        img.pro_free2up: 0
+        img.pro_50pctdown: 0.5
+        img.pro_50pctdown2up: 0.5
+        img.pro_30pctdown: 0.3
+        "*": 1
     uploadvolumefactor:
       case:
-        img.pro_50pctdown2up: "2"
-        img.pro_free2up: "2"
-        img.pro_2up: "2"
-        "*": "1"
+        img.pro_50pctdown2up: 2
+        img.pro_free2up: 2
+        img.pro_2up: 2
+        "*": 1
     description:
       selector: td:nth-child(2)
       remove: a, img
+# NexusPHP Standard v1.5 Beta 4

src/Jackett.Common/Definitions/chilebt.yml

@@ -137,7 +137,7 @@ search:
           args: (\d+)
     imdb:
       optional: true
-      selector: a[href*="www.imdb.com/title/tt"]
+      selector: a[href*="imdb.com/title/tt"]
       attribute: href
     date:
       selector: time

src/Jackett.Common/Definitions/cinemamovies.yml

@@ -43,7 +43,12 @@ settings:
   - name: info
     type: info
     label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+
+  - name: drop_polish_prefix
+    type: checkbox
+    label: Drop the Polish title prefix
+    default: false
   - name: sort
     type: select
     label: Sort requested from site
@@ -94,8 +99,15 @@ search:
       filters:
         - name: querystring
           args: cat
-    title:
+    title_raw:
       selector: a[href^="details.php?id="]
+    title_stripped:
+      selector: a[href^="details.php?id="]
+      filters:
+        - name: re_replace
+          args: ["^(.* / )(.*)$", "$2"]
+    title:
+      text: "{{ if .Config.drop_polish_prefix }}{{ .Result.title_stripped }}{{ else }}{{ .Result.title_raw }}{{ end }}"
     details:
       selector: a[href^="details.php?id="]
       attribute: href
@@ -110,7 +122,7 @@ search:
           args: "src=(.+?) "
     imdb:
       optional: true
-      selector: a[href*="www.imdb.com/title/tt"]
+      selector: a[href*="imdb.com/title/tt"]
       attribute: href
     description:
       optional: true

src/Jackett.Common/Definitions/concen.yml

@@ -63,9 +63,6 @@ search:
     magnet:
       selector: td.views-field-name a
       attribute: href
-      filters:
-        - name: prepend
-          args: "magnet:"
     date:
       selector: td.views-field-created
     size:

src/Jackett.Common/Definitions/concertos.yml

@@ -115,7 +115,7 @@ search:
       selector: td:nth-last-child(1)
     imdb:
       optional: true
-      selector: a[href*="www.imdb.com/title/tt"]
+      selector: a[href*="imdb.com/title/tt"]
       attribute: href
     downloadvolumefactor:
       case:

src/Jackett.Common/Definitions/crazyhd.yml

@@ -52,7 +52,7 @@ caps:
     - {id: 39, cat: PC, desc: "Software Tutorials"}
     - {id: 63, cat: PC, desc: "Software Linux"}
     - {id: 89, cat: PC/Mac, desc: "Software MAC OSX"}
-    #Bangla
+    # Bangla
     - {id: 56, cat: Movies, desc: "Movies Bangla"}
     - {id: 35, cat: Movies, desc: "Movies Bangla Natok"}
     - {id: 47, cat: Movies, desc: "Movies Indian Bangla"}

src/Jackett.Common/Definitions/crazyspirits.yml

@@ -109,7 +109,8 @@ settings:
   - name: info
     type: info
     label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+
   - name: sort
     type: select
     label: Sort requested from site
@@ -148,7 +149,7 @@ download:
 
 search:
   paths:
-  # http://crazyspirits.com/torrents-search.php?c101=1&c102=1&c103=1&c104=1&c105=1&c106=1&search=&cat=0&incldead=0&freeleech=0&lang=0
+    # http://crazyspirits.com/torrents-search.php?c101=1&c102=1&c103=1&c104=1&c105=1&c106=1&search=&cat=0&incldead=0&freeleech=0&lang=0
     - path: torrents-search.php
   inputs:
     $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"

src/Jackett.Common/Definitions/dark-shadow.yml

@@ -207,7 +207,7 @@ search:
       attribute: src
       optional: true
     imdb:
-      selector: a[href*="www.imdb.com/title/tt"]
+      selector: a[href*="imdb.com/title/tt"]
       attribute: href
       optional: true
     size:

src/Jackett.Common/Definitions/datascene.yml

@@ -127,7 +127,7 @@ search:
         - name: regexp
           args: src=([^\s]+)
     imdb:
-      selector: a[href*="www.imdb.com/title/tt"]
+      selector: a[href*="imdb.com/title/tt"]
       optional: true
       attribute: href
     category:

src/Jackett.Common/Definitions/demonoid.yml

@@ -283,7 +283,7 @@ settings:
   - name: info
     type: info
     label: How to get the Cookie
-    default: "<ol><li>Access this tracker with your browser<li>click on the <b>Apply Filter</b> button on the page to invoke the search and solve the challenge<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+    default: "<ol><li>Access this tracker with your browser<li>click on the <b>Apply Filter</b> button on the page to invoke the search and solve the challenge<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
   - name: sort
     type: select
     label: Sort requested from site

src/Jackett.Common/Definitions/demonsite.yml

@@ -128,7 +128,7 @@ search:
       selector: a.preview
       attribute: href
     imdb:
-      selector: a[href*="www.imdb.com/title/tt"]
+      selector: a[href*="imdb.com/title/tt"]
       attribute: href
     files:
       selector: td:nth-child(3)

src/Jackett.Common/Definitions/desireleasers.yml

@@ -130,7 +130,7 @@ search:
           args: (\d+)
     imdb:
       optional: true
-      selector: a[href*="www.imdb.com/title/tt"]
+      selector: a[href*="imdb.com/title/tt"]
       attribute: href
     date:
       selector: time

src/Jackett.Common/Definitions/diablotorrent.yml

@@ -126,7 +126,7 @@ search:
           args: src='(.*?)'
     imdb:
       optional: true
-      selector: a[href*="www.imdb.com/title/tt"]
+      selector: a[href*="imdb.com/title/tt"]
       attribute: href
     description:
       selector: div.torrent_row_magyarcim

src/Jackett.Common/Definitions/divteam.yml

@@ -64,7 +64,8 @@ settings:
   - name: info_cookie
     type: info
     label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+
   - name: sort
     type: select
     label: Sort requested from site

src/Jackett.Common/Definitions/dxdhd.yml

@@ -137,7 +137,7 @@ search:
           args: (\d+)
     imdb:
       optional: true
-      selector: a[href*="www.imdb.com/title/tt"]
+      selector: a[href*="imdb.com/title/tt"]
       attribute: href
     date:
       selector: time

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

@@ -6,7 +6,7 @@ language: es-es
 type: public
 encoding: UTF-8
 links:
-  - https://www.elitetorrent.nl/
+  - https://wvvw.elitetorrent.nl/
 legacylinks:
   - https://www.elitetorrent.biz/
   - https://www.elitetorrent.io/
@@ -16,6 +16,8 @@ legacylinks:
   - https://www.elitetorrent.tv/
   - https://www.elitetorrent.li/
   - https://www.elitetorrent.bz/
+  - https://www.elitetorrent.nl/
+  - https://wwvv.elitetorrent.nl/
 
 caps:
   categories:
@@ -77,12 +79,20 @@ search:
     banner:
       selector: .imagen img
       attribute: data-src
-    category:
+    category_movie:
       selector: .meta a
       attribute: href
       filters:
-        - name: split
-          args: ["/", 3]
+        - name: regexp
+          args: "^.*/(peliculas)/.*$"
+    category_tv:
+      selector: .meta a
+      attribute: href
+      filters:
+        - name: regexp
+          args: "^.*/(series)/.*$"
+    category:
+      text: "{{ if or .Result.category_movie .Result.category_tv }}{{ or .Result.category_movie .Result.category_tv }}{{ else }}{{ end }}"
     size:
       text: "0 B"
     size:

src/Jackett.Common/Definitions/empornium2fa.yml

@@ -0,0 +1,151 @@
+---
+id: empornium2fa
+name: Empornium2FA
+description: "this indexer uses a cookie login for Empornium for those that want to use 2FA"
+language: en-us
+type: private
+encoding: UTF-8
+links:
+  - https://www.empornium.me/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: XXX, desc: "Amateur"}
+    - {id: 2, cat: XXX, desc: "Anal"}
+    - {id: 5, cat: XXX, desc: "Asian"}
+    - {id: 6, cat: XXX, desc: "BBW"}
+    - {id: 30, cat: XXX, desc: "BDSM"}
+    - {id: 36, cat: XXX, desc: "Big Ass"}
+    - {id: 8, cat: XXX, desc: "Big Tits"}
+    - {id: 7, cat: XXX, desc: "Black"}
+    - {id: 9, cat: XXX, desc: "Classic"}
+    - {id: 37, cat: XXX, desc: "Creampie"}
+    - {id: 10, cat: XXX, desc: "Cumshot"}
+    - {id: 11, cat: XXX, desc: "DVD-R"}
+    - {id: 12, cat: XXX, desc: "Fetish"}
+    - {id: 14, cat: XXX, desc: "Gang Bang / Orgy"}
+    - {id: 39, cat: XXX, desc: "Gay / Bi"}
+    - {id: 56, cat: XXX, desc: "Hairy"}
+    - {id: 35, cat: XXX, desc: "Hardcore"}
+    - {id: 44, cat: XXX, desc: "HD Porn"}
+    - {id: 3, cat: XXX, desc: "Hentai / 3D"}
+    - {id: 25, cat: XXX, desc: "Homemade"}
+    - {id: 43, cat: XXX, desc: "Interracial"}
+    - {id: 16, cat: XXX, desc: "Latina"}
+    - {id: 23, cat: XXX, desc: "Lesbian"}
+    - {id: 52, cat: XXX, desc: "Lingerie"}
+    - {id: 27, cat: XXX, desc: "Magazines"}
+    - {id: 53, cat: XXX, desc: "Manga / Comic"}
+    - {id: 18, cat: XXX, desc: "Masturbation"}
+    - {id: 26, cat: XXX, desc: "Mature"}
+    - {id: 40, cat: XXX, desc: "Megapack"}
+    - {id: 41, cat: XXX, desc: "Natural Tits"}
+    - {id: 17, cat: XXX, desc: "Oral"}
+    - {id: 29, cat: XXX, desc: "Other"}
+    - {id: 47, cat: XXX, desc: "Parody"}
+    - {id: 24, cat: XXX, desc: "Paysite"}
+    - {id: 21, cat: XXX, desc: "Pictures / Images"}
+    - {id: 50, cat: XXX, desc: "Piss"}
+    - {id: 55, cat: XXX, desc: "Porn Music Videos"}
+    - {id: 46, cat: XXX, desc: "Pregnant / Preggo"}
+    - {id: 51, cat: XXX, desc: "Scat/Puke"}
+    - {id: 22, cat: XXX, desc: "Siterip"}
+    - {id: 20, cat: XXX, desc: "Softcore"}
+    - {id: 49, cat: XXX, desc: "Squirt"}
+    - {id: 34, cat: XXX, desc: "Straight"}
+    - {id: 19, cat: XXX, desc: "Teen"}
+    - {id: 15, cat: XXX, desc: "Transsexual"}
+    - {id: 45, cat: XXX, desc: "Voyeur"}
+    - {id: 13, cat: XXX, desc: "XXX Games / Apps"}
+
+  modes:
+    search: [q]
+    tv-search: [q]
+    movie-search: [q]
+
+settings:
+  - name: cookie
+    type: text
+    label: Cookie
+  - name: infocookie
+    type: info
+    label: How to get the Cookie
+    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+
+
+login:
+  method: cookie
+  inputs:
+    cookie: "{{ .Config.cookie }}"
+  test:
+    path: torrents.php
+    selector: "#nav_userinfo"
+
+search:
+  paths:
+    - path: torrents.php
+  inputs:
+    $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+    title: "{{ .Keywords }}"
+    order_by: time
+    order_way: desc
+    action: basic
+    searchsubmit: 1
+
+  rows:
+    # exclude redbar torrents
+    selector: table#torrent_table > tbody > tr[class^="torrent row"]
+
+  fields:
+    download:
+      selector: a[href^="/torrents.php?action=download&id="]
+      attribute: href
+    description:
+      selector: div.tags
+    title:
+      selector: a[href^="/torrents.php?id="]
+    category:
+      selector: a[href*="filter_cat"]
+      attribute: href
+      filters:
+        - name: regexp
+          args: "(\\d+)]=1"
+    details:
+      selector: a[href^="/torrents.php?id="]
+      attribute: href
+    banner:
+      optional: true
+      selector: td:nth-child(2) > script
+      filters:
+        - name: regexp
+          args: "src=\\\\\"(.*?)\\\\\""
+        - name: re_replace
+          args: ["\\\\(.)", "$1"]
+        - name: replace
+          args: ["/static/common/noartwork/noimage.png", ""]
+    files:
+      selector: td:nth-child(3)
+    date:
+      selector: td:nth-child(5) > span
+      attribute: title
+      filters:
+        - name: append
+          args: " +00:00"
+        - name: dateparse
+          args: "Jan 02 2006, 15:04 -07:00"
+    size:
+      selector: td:nth-child(6)
+    grabs:
+      selector: td:nth-child(7)
+    seeders:
+      selector: td:nth-child(8)
+    leechers:
+      selector: td:nth-child(9)
+    downloadvolumefactor:
+      case:
+        span.icon[title*="Freeleech"]: 0
+        "img[alt=\"Freeleech\"]": 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+# Luminance

src/Jackett.Common/Definitions/erzsebetpl.yml

@@ -0,0 +1,327 @@
+---
+id: erzsebetpl
+name: Erzsebet.pl
+description: "Erzsebet.pl is a RUSSIAN Semi-Private Torrent Tracker for 3X"
+language: ru-ru
+type: semi-private
+encoding: UTF-8
+links:
+  - https://erzsebet.pl/
+
+caps:
+  categorymappings:
+    # Movies
+    - {id: 3, cat: Movies, desc: "Зарубежное кино"}
+    - {id: 4, cat: Movies, desc: "Зарубежное кино Классика мирового кинематографа"}
+    - {id: 10, cat: Movies, desc: "Зарубежное кино Зарубежные фильмы"}
+    - {id: 157, cat: Movies, desc: "Зарубежное кино Зарубежное кино (DVD Video)"}
+    - {id: 142, cat: Movies, desc: "Зарубежное кино Зарубежное кино (HD Video)"}
+    - {id: 161, cat: TV, desc: "Зарубежное кино Зарубежные сериалы"}
+    - {id: 11, cat: Movies, desc: "Кино России, CCCР и бывших стран СССР"}
+    - {id: 12, cat: Movies, desc: "Кино России Кино СССР"}
+    - {id: 132, cat: Movies, desc: "Кино России Наше кино"}
+    - {id: 158, cat: Movies, desc: "Кино России Наше кино (DVD Video)"}
+    - {id: 133, cat: Movies, desc: "Кино России Наше кино (HD Video)"}
+    - {id: 160, cat: TV, desc: "Кино России Русские сериалы"}
+    - {id: 111, cat: Movies, desc: "Мультфильмы"}
+    - {id: 113, cat: Movies, desc: "Мультфильмы Иностранные мультфильмы"}
+    - {id: 196, cat: Movies, desc: "Мультфильмы Мультсериалы"}
+    - {id: 112, cat: Movies, desc: "Мультфильмы Отечественные мультфильмы"}
+    - {id: 162, cat: TV/Anime, desc: "Мультфильмы Аниме (Японская анимация)"}
+    - {id: 179, cat: Movies, desc: "Театр"}
+    - {id: 180, cat: Movies, desc: "Театр Произведения театрального искусства"}
+    # Audio
+    - {id: 175, cat: Audio, desc: "Популярная музыка"}
+    - {id: 183, cat: Audio/Lossless, desc: "Популярная музыка Зарубежная популярная музыка (lossless)"}
+    - {id: 184, cat: Audio, desc: "Популярная музыка Сборники песен для детей (lossy и lossless)"}
+    - {id: 182, cat: Audio/Video, desc: "Популярная музыка Наша популярная музыка (Видео и DVD)"}
+    - {id: 176, cat: Audio/Video, desc: "Популярная музыка Наша популярная музыка (HD Video)"}
+    - {id: 199, cat: Audio, desc: "Джазовая и Блюзовая музыка"}
+    - {id: 201, cat: Audio/MP3, desc: "Джазовая и Блюзовая музыка Jazz (lossy)"}
+    - {id: 200, cat: Audio/Lossless, desc: "Джазовая и Блюзовая музыка Jazz (lossless)"}
+    - {id: 204, cat: Audio/MP3, desc: "Джазовая и Блюзовая музыка Blues (lossy)"}
+    - {id: 203, cat: Audio/Lossless, desc: "Джазовая и Блюзовая музыка Blues (lossless)"}
+    - {id: 150, cat: Audio, desc: "Рок-музыка"}
+    - {id: 181, cat: Audio/Lossless, desc: "Рок-музыка Зарубежный Rock (lossless)"}
+    - {id: 245, cat: Audio/MP3, desc: "Рок-музыка Зарубежный Metal (lossy)"}
+    - {id: 246, cat: Audio/Lossless, desc: "Рок-музыка Зарубежный Metal (lossless)"}
+    - {id: 156, cat: Audio/MP3, desc: "Рок-музыка Отечественный Rock, Metal (lossy)"}
+    - {id: 155, cat: Audio/Lossless, desc: "Рок-музыка Отечественный Rock, Metal (lossless)"}
+    - {id: 154, cat: Audio/Video, desc: "Рок-музыка Metal (DVD Video)"}
+    - {id: 153, cat: Audio/Video, desc: "Рок-музыка Рок-музыка (HD Video)"}
+    # Games
+    - {id: 27, cat: PC/Games, desc: "Игры для Windows "}
+    - {id: 28, cat: PC/Games, desc: "Игры для Windows Горячие новинки"}
+    - {id: 38, cat: PC/Games, desc: "Игры для Windows Аркады"}
+    - {id: 214, cat: PC/Games, desc: "Игры для Windows Файтинги"}
+    - {id: 31, cat: PC/Games, desc: "Игры для Windows Экшены"}
+    - {id: 185, cat: PC/Games, desc: "Игры для Windows Логические игры"}
+    - {id: 215, cat: PC/Games, desc: "Игры для Windows Хорроры"}
+    - {id: 219, cat: PC/Games, desc: "Игры для Windows Приключения и квесты"}
+    - {id: 29, cat: PC/Games, desc: "Игры для Windows Демо-версии"}
+    - {id: 186, cat: PC/Games, desc: "Игры для Windows Многопользовательские игры"}
+    - {id: 187, cat: PC/Games, desc: "Игры для Windows Онлайновые игры"}
+    - {id: 33, cat: PC/Games, desc: "Игры для Windows Стратегии в реальном времени"}
+    - {id: 35, cat: PC/Games, desc: "Игры для Windows Пошаговые стратегии"}
+    - {id: 41, cat: PC/Games, desc: "Игры для Windows Разное"}
+    - {id: 168, cat: Console, desc: "Игры для Linux "}
+    - {id: 169, cat: Console, desc: "Игры для Linux Нативные игры для Linux "}
+    - {id: 170, cat: Console, desc: "Игры для Linux Портированные игры для Linux "}
+    - {id: 163, cat: Console, desc: "Игры для Консолей"}
+    - {id: 189, cat: Console, desc: "Игры для Консолей PS "}
+    - {id: 166, cat: Console, desc: "Игры для Консолей PS2 "}
+    - {id: 239, cat: Console, desc: "Игры для Консолей PS3 "}
+    - {id: 165, cat: Console, desc: "Игры для Консолей PS4 "}
+    - {id: 171, cat: Console, desc: "Игры для Консолей PSP "}
+    - {id: 164, cat: Console, desc: "Игры для Консолей Xbox 360 "}
+    - {id: 167, cat: Console, desc: "Игры для Консолей Остальные платформы"}
+    # Programs
+    - {id: 13, cat: PC, desc: "Операционные системы"}
+    - {id: 14, cat: PC, desc: "Операционные системы Windows "}
+    - {id: 15, cat: PC, desc: "Операционные системы Linux "}
+    - {id: 147, cat: PC, desc: "Операционные системы Mac OS "}
+    - {id: 173, cat: PC, desc: "Системные программы"}
+    - {id: 190, cat: PC, desc: "Системные программы Работа с жёстким диском"}
+    - {id: 216, cat: PC, desc: "Системные программы Резервное копирование"}
+    - {id: 217, cat: PC, desc: "Системные программы Архиваторы и файловые менеджеры"}
+    - {id: 174, cat: PC, desc: "Системные программы Программы для настройки и оптимизации ОС"}
+    - {id: 218, cat: PC, desc: "Системные программы Сервисное обслуживание компьютера"}
+    - {id: 244, cat: PC, desc: "Системные программы Программы для интернет и сетей"}
+    - {id: 109, cat: PC, desc: "Программы для работы с мультимедиа и 3D "}
+    - {id: 172, cat: PC, desc: "Программы для работы с мультимедиа и 3D Графические редакторы"}
+    - {id: 110, cat: PC, desc: "Программы для работы с мультимедиа и 3D 3D моделирование, рендеринг и плагины для них"}
+    - {id: 77, cat: PC, desc: "ГИС, системы навигации и карты"}
+    - {id: 79, cat: PC, desc: "ГИС, системы навигации и карты Разное - системы навигации и карты"}
+    - {id: 78, cat: PC, desc: "ГИС, системы навигации и карты Navigon / Navitel "}
+    # tutorial video
+    - {id: 53, cat: Other, desc: "Видеоуроки и обучающие интерактивные DVD "}
+    - {id: 56, cat: Other, desc: "Видеоуроки и обучающие интерактивные DVD Кулинария"}
+    - {id: 57, cat: Other, desc: "Видеоуроки и обучающие интерактивные DVD Спорт"}
+    - {id: 59, cat: Other, desc: "Видеоуроки и обучающие интерактивные DVD Оздоровительные практики"}
+    - {id: 62, cat: Other, desc: "Видеоуроки и обучающие интерактивные DVD Игра на гитаре"}
+    - {id: 68, cat: Other, desc: "Видеоуроки и обучающие интерактивные DVD Психология"}
+    - {id: 69, cat: Other, desc: "Видеоуроки и обучающие интерактивные DVD Строительство, ремонт и дизайн"}
+    - {id: 55, cat: Other, desc: "Компьютерные видеоуроки и обучающие интерактивные DVD "}
+    - {id: 70, cat: Other, desc: "Компьютерные видеоуроки и обучающие интерактивные DVD Компьютерные сети и безопасность"}
+    - {id: 71, cat: Other, desc: "Компьютерные видеоуроки и обучающие интерактивные DVD ОС и серверные программы Microsoft "}
+    - {id: 72, cat: Other, desc: "Компьютерные видеоуроки и обучающие интерактивные DVD 2D и 3D графика"}
+    - {id: 75, cat: Other, desc: "Компьютерные видеоуроки и обучающие интерактивные DVD Программирование (видеоуроки)"}
+    - {id: 76, cat: Other, desc: "Компьютерные видеоуроки и обучающие интерактивные DVD Работа с видео"}
+    # Sport
+    - {id: 49, cat: TV/Sport, desc: "Футбол"}
+    - {id: 177, cat: TV/Sport, desc: "Футбол Чемпионаты Мира"}
+    - {id: 178, cat: TV/Sport, desc: "Футбол Россия и СССР"}
+    - {id: 193, cat: TV/Sport, desc: "Футбол Чемпионаты Европы"}
+    - {id: 194, cat: TV/Sport, desc: "Футбол Еврокубки"}
+    - {id: 205, cat: TV/Sport, desc: "Хоккей"}
+    - {id: 210, cat: TV/Sport, desc: "Хоккей Хоккей с мячом / Бенди"}
+    - {id: 209, cat: TV/Sport, desc: "Хоккей КХЛ"}
+    - {id: 208, cat: TV/Sport, desc: "Хоккей НХЛ"}
+    - {id: 207, cat: TV/Sport, desc: "Хоккей Международные турниры"}
+    - {id: 211, cat: TV/Sport, desc: "Хоккей СССР - Канада"}
+    - {id: 206, cat: TV/Sport, desc: "Хоккей Документальные фильмы и аналитика"}
+    - {id: 226, cat: TV/Sport, desc: "Баскетбол"}
+    - {id: 229, cat: TV/Sport, desc: "Баскетбол Международные соревнования"}
+    - {id: 228, cat: TV/Sport, desc: "Баскетбол NBA / NCAA "}
+    - {id: 227, cat: TV/Sport, desc: "Баскетбол Европейский клубный баскетбол"}
+    # XXX
+    - {id: 116, cat: XXX, desc: "Зарубежные порнофильмы"}
+    - {id: 126, cat: XXX, desc: "Зарубежные порнофильмы Паки полных фильмов"}
+    - {id: 118, cat: XXX, desc: "Зарубежные порнофильмы Классические фильмы"}
+    - {id: 145, cat: XXX, desc: "Зарубежные порнофильмы Фильмы с сюжетом"}
+    - {id: 136, cat: XXX, desc: "Зарубежные порнофильмы Гонзо-фильмы"}
+    - {id: 122, cat: XXX, desc: "Зарубежные порнофильмы Фильмы без сюжета"}
+    - {id: 137, cat: XXX, desc: "Зарубежные порнофильмы Лесбо-фильмы"}
+    - {id: 159, cat: XXX, desc: "Зарубежные порнофильмы Этнические фильмы"}
+    - {id: 146, cat: XXX, desc: "Зарубежные порнофильмы Видео для телефонов и КПК"}
+    - {id: 124, cat: XXX, desc: "Зарубежные порнофильмы Фильмы с сюжетом, Классические (DVD)"}
+    - {id: 117, cat: XXX, desc: "Зарубежные порнофильмы Гонзо, Лесбо и Фильмы без сюжета (DVD)"}
+    - {id: 198, cat: XXX, desc: "Зарубежные порнофильмы Фильмы с сюжетом (HD Video)"}
+    - {id: 125, cat: XXX, desc: "Зарубежные порнофильмы Гонзо, Лесбо и Фильмы без сюжета (HD Video)"}
+    - {id: 114, cat: XXX, desc: "Зарубежные порноролики"}
+    - {id: 121, cat: XXX, desc: "Зарубежные порноролики Паки сайтрипов"}
+    - {id: 127, cat: XXX, desc: "Зарубежные порноролики Паки порнороликов по актрисам"}
+    - {id: 129, cat: XXX, desc: "Зарубежные порноролики Сайтрипы"}
+    - {id: 115, cat: XXX, desc: "Зарубежные порноролики Сайтрипы (HD Video)"}
+    - {id: 195, cat: XXX, desc: "Зарубежные порноролики Сцены из фильмов"}
+    - {id: 123, cat: XXX, desc: "Зарубежные порноролики Порноролики Разное"}
+    - {id: 138, cat: XXX, desc: "Русское порно"}
+    - {id: 213, cat: XXX, desc: "Русское порно Русские порнофильмы"}
+    - {id: 144, cat: XXX, desc: "Русское порно Паки русских порнороликов"}
+    - {id: 140, cat: XXX, desc: "Русское порно Сайтрипы с русскими актрисами"}
+    - {id: 141, cat: XXX, desc: "Русское порно Сайтрипы с русскими актрисами (HD Video)"}
+    - {id: 143, cat: XXX, desc: "Русское порно Русские Порноролики Разное"}
+    - {id: 139, cat: XXX, desc: "Русское порно Русское любительское видео"}
+    - {id: 240, cat: XXX, desc: "Японское порно"}
+    - {id: 243, cat: XXX, desc: "Русское порно Паки японских фильмов и сайтрипов"}
+    - {id: 242, cat: XXX, desc: "Русское порно Японские фильмы и сайтрипы (DVD и HD Video)"}
+    - {id: 241, cat: XXX, desc: "Русское порно Японские фильмы и сайтрипы"}
+    - {id: 191, cat: XXX, desc: "Эротические студии, фото и журналы"}
+    - {id: 192, cat: XXX, desc: "Эротические студии Эротические студии (видео)"}
+    - {id: 232, cat: XXX, desc: "Эротические студии Met-Art &MetModels "}
+    - {id: 233, cat: XXX, desc: "Эротические студии Эротические студии Разное"}
+    - {id: 247, cat: XXX, desc: "Эротические студии Паки сайтрипов эротических студий"}
+    - {id: 220, cat: XXX, desc: "Эротические студии Любительское фото"}
+    - {id: 248, cat: XXX, desc: "Эротические студии Подборки по актрисам"}
+    - {id: 212, cat: XXX, desc: "Эротические студии Подборки сетов"}
+    - {id: 202, cat: XXX, desc: "Эротические студии Тематическое и нетрадиционное фото"}
+    - {id: 249, cat: XXX, desc: "Эротические студии Журналы"}
+    - {id: 250, cat: XXX, desc: "Порноигры"}
+    - {id: 251, cat: XXX, desc: "Порноигры Игры: основной подраздел"}
+    - {id: 252, cat: XXX, desc: "Порноигры Игры: визуальные новеллы"}
+    - {id: 256, cat: XXX, desc: "Порноигры Игры: ролевые"}
+    - {id: 255, cat: XXX, desc: "Порноигры Игры и Софт: Анимация"}
+    - {id: 254, cat: XXX, desc: "Порноигры Игры: В разработке и Демо (основной подраздел)"}
+    - {id: 253, cat: XXX, desc: "Порноигры Игры: В разработке и Демо (ролевые)"}
+    - {id: 119, cat: XXX, desc: "Нетрадиционное порно"}
+    - {id: 130, cat: XXX, desc: "Нетрадиционное порно Транссексуалы"}
+    - {id: 134, cat: XXX, desc: "Нетрадиционное порно Бисексуалы"}
+    - {id: 221, cat: XXX, desc: "Нетрадиционное порно БДСМ"}
+    - {id: 131, cat: XXX, desc: "Нетрадиционное порно Женское доминирование и страпон"}
+    - {id: 236, cat: XXX, desc: "Нетрадиционное порно Подглядывание"}
+    - {id: 128, cat: XXX, desc: "Нетрадиционное порно Фистинг и дилдо"}
+    - {id: 237, cat: XXX, desc: "Нетрадиционное порно Беременные"}
+    - {id: 120, cat: XXX, desc: "Нетрадиционное порно Буккаке"}
+    - {id: 135, cat: XXX, desc: "Нетрадиционное порно Мочеиспускание"}
+    - {id: 188, cat: XXX, desc: "Нетрадиционное порно Фетиш"}
+    - {id: 234, cat: XXX, desc: "Нетрадиционное порно Дефекация"}
+    - {id: 222, cat: XXX, desc: "Гей-порно"}
+    - {id: 223, cat: XXX, desc: "Гей-порно Полнометражные гей-фильмы"}
+    - {id: 224, cat: XXX, desc: "Гей-порно Полнометражные азиатские гей-фильмы"}
+    - {id: 225, cat: XXX, desc: "Гей-порно Классические гей-фильмы (до 1990 года)"}
+    - {id: 230, cat: XXX, desc: "Гей-порно Гей-фильмы в высоком качестве (DVD и HD)"}
+    - {id: 231, cat: XXX, desc: "Гей-порно Азиатские гей-фильмы в высоком качестве (DVD и HD)"}
+    - {id: 235, cat: XXX, desc: "Гей-порно ПАКи гей-роликов и сайтрипов"}
+    - {id: 238, cat: XXX, desc: "Гей-порно Гей-ролики в высоком качестве (HD Video)"}
+    # Archive
+    - {id: 197, cat: Other, desc: "Повторы и поглощенные раздачи"}
+
+  modes:
+    search: [q]
+    tv-search: [q]
+    movie-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: "1"
+    options:
+      "1": "created"
+      "10": "seeders"
+      "7": "size"
+      "2": "title"
+  - name: type
+    type: select
+    label: Order requested from site
+    default: "2"
+    options:
+      "2": "desc"
+      "1": "asc"
+
+login:
+  path: login.php
+  method: form
+  form: form[action="login.php"]
+  inputs:
+    login_username: "{{ .Config.username }}"
+    login_password: "{{ .Config.password }}"
+    autologin: 1
+  error:
+    - selector: table.error
+  test:
+    path: index.php
+    selector: a[href="./login.php?logout=1"]
+
+search:
+  paths:
+    - path: tracker.php
+  keywordsfilters:
+    - name: diacritics
+      args: replace
+    - name: re_replace # S01 to сезон 1
+      args: ["(?i)\\bS0*(\\d+)\\b", "сезон $1"]
+    - name: re_replace # S01E01 to сезон 1 серии 1
+      args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "сезон $1 серии $2"]
+  inputs:
+    $raw: "{{ if .Categories }}{{ range .Categories }}f[]={{.}}&{{end}}{{else}}f[]=-1{{end}}"
+    prev_allw: 1
+    prev_a: 0
+    prev_dla: 0
+    prev_dlc: 0
+    prev_dld: 0
+    prev_dlw: 0
+    prev_my: 0
+    prev_new: 0
+    prev_sd: 0
+    prev_da: 1
+    prev_dc: 0
+    prev_df: 1
+    prev_ds: 0
+    prev_tor_type: 0
+    o: "{{ .Config.sort }}"
+    s: "{{ .Config.type }}"
+    # show category
+    dc: 0
+    # show forum
+    df: 1
+    # show author
+    da: 1
+    # show speed
+    ds: 0
+    # -1=all time
+    tm: -1
+    # seed not seen -1=disregard
+    sns: -1
+    # group releases -1=not selected
+    srg: -1
+    # title search
+    nm: "{{ .Keywords }}"
+    # find a username
+    pn: ""
+    # search by partial word
+    allw: 0
+
+  rows:
+    selector: tr[id^="tor_"]:has(a[href^="./dl.php?id="])
+
+  fields:
+    category:
+      selector: a.gen
+      attribute: href
+      filters:
+        - name: querystring
+          args: f
+    title:
+      selector: a[data-topic_id]
+    details:
+      selector: a[data-topic_id]
+      attribute: href
+    download:
+      selector: a[href^="./dl.php?id="]
+      attribute: href
+    magnet:
+      optional: true
+      selector: a[href^="magnet:?xt="]
+      attribute: href
+    size:
+      selector: td:nth-child(6) > u
+    seeders:
+      selector: td.seedmed > b
+    leechers:
+      selector: td.leechmed > b
+    grabs:
+      selector: td:nth-child(9)
+    date:
+      selector: td:last-child > u
+    downloadvolumefactor:
+      text: 1
+    uploadvolumefactor:
+      text: 1
+# TorrentPier

src/Jackett.Common/Definitions/esharenet.yml

@@ -83,9 +83,7 @@ login:
       selector: input[name="_token"]
       attribute: value
   error:
-    - selector: script[nonce]:contains("Error")
-      message:
-        selector: script[nonce]:contains("Error")
+    - selector: div#ERROR_COPY
 #    test:
 #      path: /
 #      selector: a[href$="/logout"]
@@ -99,7 +97,7 @@ ratio:
 
 search:
   paths:
-    - path: filterTorrents
+    - path: torrents/filter
   inputs:
     $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
     search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
@@ -124,7 +122,7 @@ search:
       attribute: href
       filters:
         - name: regexp
-          args: "/categories/.*?\\.(\\d+)"
+          args: "/categories/(\\d+)"
     title:
       selector: a.view-torrent
     download:
@@ -156,7 +154,7 @@ search:
           args: (\d+)
     imdb:
       optional: true
-      selector: a[href*="www.imdb.com/title/tt"]
+      selector: a[href*="imdb.com/title/tt"]
       attribute: href
     date:
       selector: time
@@ -208,4 +206,4 @@ search:
         i[class*="fa-globe text-green"]: 2 # Global Double Upload
         i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
         "*": 1
-# UNIT3D 1.9.4
+# UNIT3D 2.4.0

src/Jackett.Common/Definitions/ettv.yml

@@ -142,7 +142,7 @@ search:
         - name: re_replace
           args: ["( torrent)$", ""]
     category:
-      text: 78 #7110
+      text: 78 # issue #7110
     category|noappend:
       optional: true
       selector: a[href^="/torrents.php?cat="]

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

@@ -13,7 +13,7 @@ legacylinks:
 
 caps:
   categorymappings:
-    #Anime
+    # Anime
     - {id: 1, cat: TV/Anime, desc: "Anime"}
     - {id: 963, cat: TV/Anime, desc: "Anime - Absolute Duo"}
     - {id: 951, cat: TV/Anime, desc: "Anime - Akame ga Kill"}
@@ -62,7 +62,7 @@ caps:
     - {id: 953, cat: TV/Anime, desc: "Anime - Sword Art Online II"}
     - {id: 958, cat: TV/Anime, desc: "Anime - Tokyo Ghoul"}
 
-    #Audio
+    # Audio
     - {id: 5, cat: Audio, desc: "Music"}
     - {id: 54, cat: Audio, desc: "Music - Alternative"}
     - {id: 990, cat: Audio, desc: "Music - Ambient"}
@@ -125,7 +125,7 @@ caps:
     - {id: 1011, cat: Audio, desc: "Music - Radio"}
     - {id: 1012, cat: Audio, desc: "Music - Single"}
 
-    #Movies
+    # Movies
     - {id: 4, cat: Movies, desc: "Movies"}
     - {id: 419, cat: Movies, desc: "Movies - Action"}
     - {id: 28, cat: Movies, desc: "Movies - Adventure"}
@@ -176,7 +176,7 @@ caps:
     - {id: 1034, cat: Movies, desc: "Movies - SVCD/VCD"}
     - {id: 1035, cat: Movies, desc: "Movies - YIFY"}
 
-    #TV
+    # TV
     - {id: 8, cat: TV, desc: "TV"}
     - {id: 986, cat: TV, desc: "TV - 12 Monkeys"}
     - {id: 598, cat: TV, desc: "TV - 19-2"}
@@ -833,7 +833,7 @@ caps:
     - {id: 1028, cat: TV, desc: "TV/HD - HD"}
     - {id: 1029, cat: TV, desc: "TV - SVCD/VCD"}
 
-    #Apps
+    # Apps
     - {id: 7, cat: PC, desc: "Software"}
     - {id: 416, cat: PC/Phone-Other, desc: "Software - Mobile"}
     - {id: 532, cat: PC, desc: "Software - KeyGen / Tools"}
@@ -849,7 +849,7 @@ caps:
     - {id: 23, cat: PC, desc: "Software - Windows - Sound Editing"}
     - {id: 24, cat: PC, desc: "Software - Windows - Video Apps"}
 
-    #Games
+    # Games
     - {id: 3, cat: PC/Games, desc: "Games"}
     - {id: 136, cat: PC/Games, desc: "Games - fixes/patches"}
     - {id: 422, cat: PC/Games, desc: "Games - Other"}
@@ -873,7 +873,7 @@ caps:
     - {id: 1015, cat: Console, desc: "Games - Dreamcast"}
     - {id: 1016, cat: Console, desc: "Games - GameCube"}
 
-    #XXX
+    # XXX
     - {id: 533, cat: XXX, desc: "XXX"}
     - {id: 943, cat: XXX, desc: "XXX - Animation/Hentai"}
     - {id: 553, cat: XXX/DVD, desc: "XXX - DVD"}
@@ -886,7 +886,7 @@ caps:
     - {id: 806, cat: XXX, desc: "XXX - Wallpapers"}
     - {id: 811, cat: XXX, desc: "XXX - Books"}
 
-    #Books
+    # Books
     - {id: 2, cat: Books, desc: "Books"}
     - {id: 625, cat: Books, desc: "Books - Adventure"}
     - {id: 51, cat: Books, desc: "Books - Audio books"}
@@ -900,7 +900,7 @@ caps:
     - {id: 1000, cat: Books, desc: "Books - Sexual Fitness and Education"}
     - {id: 626, cat: Books, desc: "Books - True Stories"}
 
-    #Other
+    # Other
     - {id: 6, cat: Other, desc: "Pictures"}
     - {id: 9, cat: Other, desc: "Other"}
     - {id: 53, cat: Other, desc: "Pictures - Other"}
@@ -918,7 +918,7 @@ caps:
     - {id: 1022, cat: Other, desc: "Other - Sounds"}
     - {id: 1023, cat: Other, desc: "Other - Nulled Scripts"}
 
-    #Mobile
+    # Mobile
     - {id: 752, cat: PC/Phone-Other, desc: "Mobile - Games for Android"}
     - {id: 746, cat: PC/Phone-Other, desc: "Mobile - Games for Apple iPod, iPod Touch, iPad, iPhone"}
     - {id: 745, cat: PC/Phone-Other, desc: "Mobile - Games for Java"}

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

@@ -37,7 +37,7 @@ search:
 
   fields:
     category:
-      text: other #8228
+      text: other # issue #8228
     title:
       selector: a[href*="/torrent/"][title^="view"]
     details:

src/Jackett.Common/Definitions/extremebits.yml

@@ -0,0 +1,157 @@
+---
+id: extremebits
+name: ExtremeBits
+description: "ExtremeBits is a Private Torrent Tracker for EXTREME SPORTS"
+language: en-us
+type: private
+encoding: UTF-8
+links:
+  - https://extremebits.net/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "BASE jump"}
+    - {id: 10, cat: Movies, desc: "BMX"}
+    - {id: 3, cat: Movies, desc: "Climbing"}
+    - {id: 19, cat: Other, desc: "Covers"}
+    - {id: 20, cat: Movies, desc: "Fiddy/MiniMX"}
+    - {id: 22, cat: Movies, desc: "Graffiti"}
+    - {id: 18, cat: Movies, desc: "Homevid"}
+    - {id: 16, cat: Movies, desc: "Inline Skate"}
+    - {id: 25, cat: Movies, desc: "Kayaking"}
+    - {id: 28, cat: Movies, desc: "Kiteboard"}
+    - {id: 17, cat: Movies, desc: "MC"}
+    - {id: 13, cat: Other, desc: "Misc"}
+    - {id: 4, cat: Movies, desc: "MotoX"}
+    - {id: 11, cat: Movies, desc: "MTB"}
+    - {id: 21, cat: Audio, desc: "Music"}
+    - {id: 26, cat: Movies, desc: "Paintball"}
+    - {id: 5, cat: Movies, desc: "Parkour"}
+    - {id: 24, cat: Movies, desc: "Quad/ATV"}
+    - {id: 29, cat: Movies, desc: "Rally/4x4"}
+    - {id: 6, cat: Movies, desc: "Skateboard"}
+    - {id: 12, cat: Movies, desc: "Ski"}
+    - {id: 14, cat: Movies, desc: "Skydive"}
+    - {id: 7, cat: Movies, desc: "Snowboard"}
+    - {id: 9, cat: Movies, desc: "Snowmobile"}
+    - {id: 15, cat: Movies, desc: "Streetrace"}
+    - {id: 2, cat: Movies, desc: "Surf"}
+    - {id: 23, cat: TV, desc: "Tv"}
+    - {id: 8, cat: Movies, desc: "Wakeboard/W.Ski"}
+
+  modes:
+    search: [q]
+    tv-search: [q]
+    movie-search: [q]
+    music-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - 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:
+    input[placeholder="Username"]: "{{ .Config.username }}"
+    input[placeholder="Password"]: "{{ .Config.password }}"
+  selectors: true
+  error:
+    - selector: h2:contains("fail")
+      message:
+        selector: div.contentframe
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: browse.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    # 0 active 1 incldead 2 onlydead 3 freeleech
+    incl: 1
+    # 0 name 1 descr 2 both
+    searchin: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+    # does not support imdbid searching or have imdb links in results.
+
+  rows:
+    selector: table.crowdedtablecenter > tbody >  tr:has(a[href^="details.php?id="])
+
+  fields:
+    category:
+      selector: a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="details.php?id="]
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="details.php?id="]
+      attribute: href
+      filters:
+        - name: replace
+          args: ["details.php", "download.php"]
+    files:
+      selector: td:nth-of-type(5)
+    seeders:
+      selector: td:nth-of-type(7)
+    leechers:
+      selector: td:nth-of-type(8)
+    grabs:
+      selector: td:nth-of-type(10) a
+      filters:
+        - name: regexp
+          args: (\d+)
+    size:
+      selector: td:nth-of-type(10)
+      remove: a
+    cat:
+      selector: td:nth-of-type(1) a img
+      attribute: alt
+    description:
+      selector: td:nth-of-type(4)
+      filters:
+        - name: prepend
+          args: "cat={{ .Result.cat }}, wait="
+    downloadvolumefactor:
+      case:
+        img[src="img/freedownload.png"]: 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    date:
+      selector: td:nth-of-type(2)
+      remove: a
+      filters:
+        - name: dateparse
+          args: "2006-01-02 15:04:05"
+# TBDEV

src/Jackett.Common/Definitions/fanoin.yml

@@ -129,7 +129,7 @@ search:
         - name: replace
           args: ["details.php", "download.php"]
     imdb:
-      selector: a[href*="www.imdb.com/title/tt"]
+      selector: a[href*="imdb.com/title/tt"]
       attribute: href
     size:
       selector: td:nth-child(5)

src/Jackett.Common/Definitions/finelite.yml

@@ -110,7 +110,7 @@ search:
       attribute: href
     imdb:
       optional: true
-      selector: a[href*="www.imdb.com/title/tt"]
+      selector: a[href*="imdb.com/title/tt"]
       attribute: href
     files:
       selector: td:nth-last-child(6)

src/Jackett.Common/Definitions/finvip.yml

@@ -131,7 +131,7 @@ search:
       attribute: href
     imdb:
       optional: true
-      selector: a[href*="www.imdb.com/title/tt"]
+      selector: a[href*="imdb.com/title/tt"]
       attribute: href
       filters:
         # javascript:popdetails('http://www.imdb.com/title/tt10209130');

src/Jackett.Common/Definitions/firebit.yml

@@ -8,11 +8,11 @@ encoding: UTF-8
 links:
   - https://firebit.net/
   - https://firebit.info/
-  - https://firebit.name/
   - https://firebit.pro/
   - https://firebit.club/
-  - https://firebit.biz/
 legacylinks:
+  - https://firebit.name/
+  - https://firebit.biz/
   - http://firebit.net/
   - http://firebit.info/
   - http://firebit.name/
@@ -32,6 +32,7 @@ caps:
     "Мобилка Игры": PC/Phone-Other
     "Литература": Books
     "Игры": PC/Games
+    "Игры Мобилка": PC/Games
     "Фильмы": Movies
     "Фильмы Видео": Movies
     "Фильмы Сериалы": Movies

src/Jackett.Common/Definitions/focusx.yml

@@ -7,6 +7,8 @@ type: public
 encoding: UTF-8
 links:
   - https://focu.sx/
+certificates:
+  - dbd67d579c0a9b5f3e354fdcfe41f13f78c44487 # expired 18 may 20
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/freetorrent.yml

@@ -141,7 +141,7 @@ search:
           args: (\d+)
     imdb:
       optional: true
-      selector: a[href*="www.imdb.com/title/tt"]
+      selector: a[href*="imdb.com/title/tt"]
       attribute: href
     date:
       selector: time

src/Jackett.Common/Definitions/frozenlayer.yml

@@ -46,13 +46,13 @@ search:
     - path: "{{ if .Keywords }}buscar/descargas/{{ .Config.category }}/{{ .Keywords }}?search=Buscar{{else}}descargas{{end}}"
     - path: "{{ if .Keywords }}buscar/descargas/{{ .Config.category }}/{{ .Keywords }}?search=Buscar&page=2{{else}}descargas{{end}}"
   keywordsfilters:
-    - name: re_replace #remove S/EXX from search string
+    - name: re_replace # remove S/EXX from search string
       args: ["(S1)", ""]
-    - name: re_replace #remove S/EXX from search string
+    - name: re_replace # remove S/EXX from search string
       args: ["(S2)", "segunda temporada"]
-    - name: re_replace #remove S/EXX from search string
+    - name: re_replace # remove S/EXX from search string
       args: ["(S3)", "tercera temporada"]
-    - name: re_replace #remove S/EXX from search string
+    - name: re_replace # remove S/EXX from search string
       args: ["E([0-9]+)", "$1"]
 
   rows:

src/Jackett.Common/Definitions/funkytorrents.yml

@@ -6,7 +6,9 @@ language: en-us
 type: private
 encoding: UTF-8
 links:
-  - http://funkytorrents.com/ # site does not support https ERR_CONNECTION_REFUSED
+  - https://funkytorrents.com/
+legacylinks:
+  - http://funkytorrents.com/
 
 caps:
   categories:
@@ -68,7 +70,7 @@ search:
   paths:
     - path: browse.php
   inputs:
-    #$raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+    # $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
     search: "{{if .Query.Artist}}{{ .Query.Artist }}{{else}}{{ .Keywords }}{{end}}"
     incldead: 1
   rows:

src/Jackett.Common/Definitions/galeriens.yml

@@ -195,7 +195,8 @@ settings:
   - name: info
     type: info
     label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+
   - name: torrentlanguage
     type: select
     label: Torrent Language

src/Jackett.Common/Definitions/generationfree.yml

@@ -183,11 +183,8 @@ download:
 
 search:
   paths:
-    # 40 results per page
+    # 40 results per page, but only fetching one page due to issue #8702
     - path: torrents-search.php
-    - path: torrents-search.php
-      inputs:
-        page: 1
   inputs:
     # multi cats unsupported, defaulting to all
     cat: 0

src/Jackett.Common/Definitions/girotorrent.yml

@@ -104,6 +104,10 @@ settings:
     options:
       "2": "desc"
       "1": "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. The default is <i>15</i>.
 
 login:
   path: index.php?page=login
@@ -132,20 +136,6 @@ search:
   paths:
     # 15 results per page fetch 5 (site is slow, dont be greedy and fetch more)
     - path: index.php
-      inputs:
-        pages: 1
-    - path: index.php
-      inputs:
-        pages: 2
-    - path: index.php
-      inputs:
-        pages: 3
-    - path: index.php
-      inputs:
-        pages: 4
-    - path: index.php
-      inputs:
-        pages: 5
   inputs:
     search: "{{ .Keywords }}"
     category: "{{ range .Categories }}{{.}};{{end}}"

src/Jackett.Common/Definitions/glodls.yml

@@ -93,7 +93,7 @@ search:
 
   fields:
     category:
-      text: 33 #7113
+      text: 33 # issue #7113
     category|noappend:
       optional: true
       selector: a[href^="/search.php?cat="]

src/Jackett.Common/Definitions/greekteam.yml

@@ -74,8 +74,8 @@ login:
   path: login.php
   method: post
   inputs:
-    take_login: "1"
-    logout: "no"
+    take_login: 1
+    logout: no
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
   error:
@@ -87,12 +87,14 @@ search:
   paths:
     - path: browse.php
   inputs:
-    $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     search: "{{ .Keywords }}"
-    incldead: "1"
-    blah: "0"
+    incldead: 1
+    blah: 0
+
   rows:
     selector: table.row1 > tbody > tr:has(a.torname)
+
   fields:
     _id:
       selector: a.torname
@@ -124,14 +126,19 @@ search:
           args: "2006-01-0215:04:05 -07:00"
     size:
       selector: td:has(a[href$="filelist=1"]) ~ td ~ td ~ td ~ td
-    seeders:
+    grabs:
       selector: td:has(a[href$="filelist=1"]) ~ td ~ td ~ td ~ td ~ td
-    leechers:
+      filters:
+        - name: regexp
+          args: (\d+)
+    seeders:
       selector: td:has(a[href$="filelist=1"]) ~ td ~ td ~ td ~ td ~ td ~ td
+    leechers:
+      selector: td:has(a[href$="filelist=1"]) ~ td ~ td ~ td ~ td ~ td ~ td ~ td
     downloadvolumefactor:
       case:
-        "img[src=\"pic/free.png\"]": "0"
-        "*": "1"
+        "img[src=\"pic/free.png\"]": 0
+        "*": 1
     uploadvolumefactor:
-      case:
-        "*": "1"
+      text: 1
+# engine tbc

src/Jackett.Common/Definitions/hachede.yml

@@ -114,7 +114,8 @@ settings:
   - name: info
     type: info
     label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+
   - name: sort
     type: select
     label: Sort requested from site

src/Jackett.Common/Definitions/haidan.yml

@@ -63,6 +63,10 @@ settings:
     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
@@ -81,7 +85,6 @@ login:
     trackerssl: yes
   error:
     - selector: td.embedded:has(h2:contains("失败"))
-    - selector: td.embedded:has(h2:contains("登录失败"))
   test:
     path: index.php
     selector: a[href*="logout.php"]

src/Jackett.Common/Definitions/hd4fans.yml

@@ -26,14 +26,30 @@ caps:
     movie-search: [q, imdbid]
     music-search: [q]
 
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+
 login:
   path: takelogin.php
   method: post
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
+    logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: yes
   error:
-    - selector: td.embedded:has(h2:contains("登录失败"))
+    - selector: td.embedded:has(h2:contains("失败"))
       message:
         selector: td.text
   test:

src/Jackett.Common/Definitions/hdarea.yml

@@ -58,6 +58,10 @@ settings:
     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: takelogin.php
@@ -65,8 +69,12 @@ login:
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
+    logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: yes
   error:
-    - selector: td.embedded:has(h2:contains("登录失败"))
+    - selector: td.embedded:has(h2:contains("失败"))
     - selector: td.embedded:has(h2:contains("failed"))
   test:
     path: index.php
@@ -120,7 +128,7 @@ search:
       attribute: href
     imdb:
       optional: true
-      selector: a[href*="www.imdb.com/title/tt"]
+      selector: a[href*="imdb.com/title/tt"]
       attribute: href
     date:
       # time type: time elapsed (default)

src/Jackett.Common/Definitions/hdbitscom.yml

@@ -71,7 +71,7 @@ search:
       selector: a[href^="torrents.php?id="]
       attribute: href
     imdb:
-      selector: a[href*="www.imdb.com/title/tt"]
+      selector: a[href*="imdb.com/title/tt"]
       optional: true
       attribute: href
     banner:

src/Jackett.Common/Definitions/hdc.yml

@@ -0,0 +1,174 @@
+---
+id: hdc
+name: HDC
+description: "HDC (HDCiTY) is a CHINESE Private Torrent Tracker for HD MOVIES / TV / GENERAL"
+language: zh-cn
+type: private
+encoding: UTF-8
+links:
+  - https://hdcity.city/
+  - https://hdcity.work/
+  - https://hdcity.leniter.org/
+  - https://hdcity4.leniter.org/
+
+caps:
+  categorymappings:
+    - {id: 401, cat: Movies, desc: "Movies/电影"}
+    - {id: 402, cat: TV, desc: "Series/剧集"}
+    - {id: 404, cat: TV/Documentary, desc: "Doc/档案记录"}
+    - {id: 405, cat: TV/Anime, desc: "Anim/动漫"}
+    - {id: 403, cat: TV, desc: "Shows/节目"}
+    - {id: 406, cat: Audio/Video, desc: "MV/音乐视频"}
+    - {id: 407, cat: TV/Sport, desc: "Sports/体育"}
+    - {id: 408, cat: Audio, desc: "Audio/音频"}
+    - {id: 727, cat: XXX, desc: "XXX/家长指引"}
+    - {id: 728, cat: Other, desc: "Edu/文档/教材"}
+    - {id: 729, cat: PC, desc: "Soft/软件"}
+    - {id: 409, cat: Other, desc: "Other/其他"}
+
+  modes:
+    search: [q, imdbid]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
+    music-search: [q]
+
+settings:
+  - name: cookie
+    type: text
+    label: Cookie
+  - name: info
+    type: info
+    label: How to get the Cookie
+    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: "4"
+    options:
+      "4": "created"
+      "7": "seeders"
+      "5": "size"
+  - name: type
+    type: select
+    label: Order requested from site
+    default: "desc"
+    options:
+      "desc": "desc"
+      "asc": "asc"
+  - name: info_Results
+    type: info
+    label: Settings for Results
+    default: "To use this indexer please set the following on your HDC account <b>profile</b>:<li><i>Site Language:</i><b> English</b><li><i>Torrent List Profile: </i><b>Default Modern [preview]</b><li><i>Time Type: </i><b>Time Added</b><li><i>Torrents per page:</i><b> 100</b>"
+
+login:
+  method: cookie
+  inputs:
+    cookie: "{{ .Config.cookie }}"
+  test:
+    path: pt
+    selector: a[href^="logout?key="]
+
+search:
+  paths:
+    # https://hdcity.city/pt?incldead=0&spstate=0&inclbookmarked=0&iwannaseethis=shanghai+triad&search_area=0&search_mode=0
+    # https://hdcity.city/pt?incldead=0&spstate=0&inclbookmarked=0&iwannaseethis=115012&search_area=4&search_mode=0
+    - path: pt
+  inputs:
+    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
+    iwannaseethis: "{{ if .Query.IMDBID }}{{ .Query.IMDBIDShort }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 incldead 1 active 2 dead
+    incldead: 0
+    # 0 all 1 normal 2 free 3 2x 4 2xfree 5 50% 6 2x50% 7 30%
+    spstate: 0
+    # 0 title 1 descr 3 uploader 4 imdb number
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    # 0 AND 1 OR 2 exact
+    search_mode: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+
+  rows:
+    selector: div.trblock
+
+  fields:
+    title:
+      selector: div.trtop a[href^="t-"]
+    category:
+      selector: div.trm
+      attribute: style
+      filters:
+        - name: regexp
+          args: (\d+)
+    details:
+      selector: div.trtop a[href^="t-"]
+      attribute: href
+    download:
+      selector: a[href^="download?id="]
+      attribute: href
+    banner:
+      optional: true
+      selector: div.trp:not(:has(img[src$="poster.jpg"])) img
+      attribute: src
+    imdb:
+      optional: true
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    size:
+      selector: div.trbo div:nth-last-child(8)
+      remove: i
+    seeders:
+      text: 0
+    seeders:
+      selector: div.trbo div:nth-last-child(7)
+      optional: true
+      filters:
+        - name: re_replace
+          args: ["\\s", "0"]
+        - name: regexp
+          args: (\d+)
+    leechers:
+      text: 0
+    leechers:
+      selector: div.trbo div:nth-last-child(6)
+      optional: true
+      filters:
+        - name: re_replace
+          args: ["\\s", "0"]
+        - name: regexp
+          args: (\d+)
+    grabs:
+      text: 0
+    grabs:
+      selector: div.trbo div:nth-last-child(5)
+      optional: true
+      filters:
+        - name: re_replace
+          args: ["\\s", "0"]
+        - name: regexp
+          args: (\d+)
+    date:
+      remove: a, span
+      selector: div[style="float:right;"]
+      filters:
+        - name: replace
+          args: ["@", ""]
+        - name: append
+          args: " +08:00"
+        - name: dateparse
+          args: "2006-01-02 15:04:05 -07:00"
+    downloadvolumefactor:
+      case:
+        img.pro_free: 0
+        img.pro_free2up: 0
+        img.pro_50pctdown: 0.5
+        img.pro_50pctdown2up: 0.5
+        img.pro_30pctdown: 0.3
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img.pro_50pctdown2up: 2
+        img.pro_free2up: 2
+        img.pro_2up: 2
+        "*": 1
+# engine n/a (likely based on NexusPHP)

src/Jackett.Common/Definitions/hdchina.yml

@@ -52,7 +52,12 @@ settings:
   - name: info
     type: info
     label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+
+  - name: 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:
   method: cookie

src/Jackett.Common/Definitions/hddisk.yml

@@ -51,6 +51,10 @@ settings:
     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
@@ -115,7 +119,7 @@ search:
       attribute: href
     imdb:
       optional: true
-      selector: a[href*="www.imdb.com/title/tt"]
+      selector: a[href*="imdb.com/title/tt"]
       attribute: href
     date:
       # time type: time elapsed (default)

src/Jackett.Common/Definitions/hddolby.yml

@@ -28,14 +28,43 @@ caps:
     movie-search: [q, imdbid]
     music-search: [q]
 
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: 2facode
+    type: text
+    label: 2FA code
+  - name: info_2fa
+    type: info
+    label: "About 2FA code"
+    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the HDDolby Web Site. Otherwise just leave it empty."
+  - 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: takelogin.php
-  method: post
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img[alt="CAPTCHA"]
+    input: imagestring
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
+    scode: "{{ .Config.2facode }}"
+    logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: ""
   error:
-    - selector: td.embedded:has(h2:contains("登录失败"))
+    - selector: td.embedded:has(h2:contains("失败"))
       message:
         selector: td.text
   test:

src/Jackett.Common/Definitions/hdhome.yml

@@ -76,7 +76,12 @@ settings:
   - name: info
     type: info
     label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+
+  - name: 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:
   method: cookie

src/Jackett.Common/Definitions/hdme.yml

@@ -39,15 +39,42 @@ caps:
     - {id: 40, cat: XXX, desc: "XXX"}
 
   modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
+    search: [q, imdbid]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
     music-search: [q]
 
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - 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"
+  - name: info_results
+    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. The default is 15.
+
 login:
   path: takelogin.php
   method: post
-  form: form
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
@@ -57,6 +84,7 @@ login:
         selector: td.text
   test:
     path: my.php
+    selector: a[href="logout.php"]
 
 ratio:
   path: my.php
@@ -71,12 +99,18 @@ search:
   paths:
     - path: browse.php
   inputs:
-    $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    incldead: "1"
-    blah: "0"
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 active, 1 incldead, 2 onlydead, 3 onlyfree
+    incldead: 1
+    # 0 name, 1 descr, 2 both
+    blah: "{{ if .Query.IMDBID }}1{{ else }}0{{ end }}"
+    sort: "{{ .Config.sort }}"
+    d: "{{ .Config.type }}"
+
   rows:
     selector: table[width="100%"] > tbody > tr:has(td.bottom[background="_images/bg_torrent.jpg"])
+
   fields:
     category:
       selector: td:nth-child(2) a
@@ -112,7 +146,13 @@ search:
       selector: td:nth-child(9)
     downloadvolumefactor:
       case:
-        "font:contains(\"(FreeLeech)\")": "0"
-        "*": "1"
+        "font:contains(\"(FreeLeech)\")": 0
+        "*": 1
     uploadvolumefactor:
-      text: "1"
+      text: 1
+    minimumratio:
+      text: 1.1
+    minimumseedtime:
+      # 3 day
+      text: 259200
+# engine n/a

src/Jackett.Common/Definitions/hdreactor.yml

@@ -8,8 +8,9 @@ encoding: windows-1251
 links:
   - https://hdreactor.net/
   - https://hdreactor.club/
-  - https://hdreactor.guru/
   - https://hdreactor.su/
+legacylinks:
+  - https://hdreactor.guru/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/hdsky.yml

@@ -34,7 +34,12 @@ settings:
   - name: info
     type: info
     label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+
+  - name: 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:
   method: cookie
@@ -92,7 +97,7 @@ search:
       selector: form[action^="download.php?id="]
       attribute: action
     imdb:
-      selector: a[href*="www.imdb.com/title/tt"]
+      selector: a[href*="imdb.com/title/tt"]
       attribute: href
     size:
       selector: td.rowfollow:nth-child(5)

src/Jackett.Common/Definitions/hdstreet.yml

@@ -51,6 +51,10 @@ settings:
     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

src/Jackett.Common/Definitions/hdtime.yml

@@ -53,6 +53,10 @@ settings:
     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: takelogin.php

src/Jackett.Common/Definitions/hdtorrentsit.yml

@@ -6,7 +6,7 @@ language: it-it
 type: private
 encoding: UTF-8
 links:
-  - https://hdtorrents.xyz/
+  - https://hdtorrents.xyz/ # Italian IP address filtering
 legacylinks:
   - http://hdtorrents.it/
   - http://hdtorrents.xyz/
@@ -53,9 +53,9 @@ search:
       args: ["[^a-zA-Z0-9]+", "%"]
     - name: diacritics
       args: replace
-    - name: re_replace #remove SXXEYY from research
+    - name: re_replace # remove SXXEYY from research
       args: ["(S\\d{1,2}E\\d{1,2})", ""]
-    - name: re_replace #remove SXX from research
+    - name: re_replace # remove SXX from research
       args: ["(S\\d{1,2})", ""]
   inputs:
     ajax: false
@@ -67,43 +67,43 @@ search:
     title:
       selector: td:nth-child(2) a:nth-child(1)
       filters:
-        - name: re_replace #separate title
+        - name: re_replace # separate title
           args: ["(\\s+\\/\\s+|\\/\\s+|\\s+\\/|\\/)(.*)\\s\\(", " ("]
-        - name: re_replace #remove (yyyy) from the title
+        - name: re_replace # remove (yyyy) from the title
           args: ["(\\(\\d{4}\\)?\\s?)", ""]
-        - name: re_replace #remove |
+        - name: re_replace # remove |
           args: ["(\\s\\||\\s\\/)", ""]
         - name: re_replace # Stagione X --> S0X
           args: ["(?i)\\bStagion[ei]\\s?(\\d{1})\\b|\\bSeason'?s?\\s?(\\d{1})\\b", "S0$1$2"]
         - name: re_replace # Stagione XX --> SXX
           args: ["(?i)\\bStagion[ei]\\s?(\\d{2,})\\b|\\bSeason'?s?\\s?(\\d{2,})\\b", "S$1$2"]
-        - name: re_replace #/ Episodio [YY-YY --> EYY-YY
+        - name: re_replace # / Episodio [YY-YY --> EYY-YY
           args: ["(?i)(\\s\\/?\\s?Episodi[o]?)\\s\\[", "E"]
         - name: re_replace # Episodio 4 to E4
           args: ["(?i)\\b(?:[\\s\\/\\|]?Episodi[o]?\\s?(\\d+)|Puntata\\s?(\\d+))", "E$1$2"]
-        - name: re_replace #/ Completa [episodi  YY-YY --> EYY-YY
+        - name: re_replace # / Completa [episodi  YY-YY --> EYY-YY
           args: ["(?i)(\\s\\/\\sCompleta\\s\\[episodi\\s)", "E"]
-        - name: re_replace #remove  di YY] | remove /YY]
+        - name: re_replace # remove  di YY] | remove /YY]
           args: ["(?i)(\\sdi\\s\\d{1,2}|\\/\\d{1,2})\\]", " "]
-        - name: re_replace #remove various
+        - name: re_replace # remove various
           args: ["(?i)(Serie completa|Completa|\\[in pausa\\])", ""]
-    title|append: #start year
+    title|append: # start year
       text: " ("
-    title|append: #add year
+    title|append: # add year
       selector: td:nth-child(2) a:nth-child(1)
       filters:
-        - name: regexp #find torrent year
+        - name: regexp # find torrent year
           args: (\d{4})
-    title|append: #end year
+    title|append: # end year
       text: ") "
-    title|append: #start quality TAG
+    title|append: # start quality TAG
       text: "["
-    title|append: #quality TAG (BDRip 1080, BDRip 720p etc)
+    title|append: # quality TAG (BDRip 1080, BDRip 720p etc)
       selector: td:nth-child(1) a:nth-child(1) img
       attribute: alt
-    title|append: #separator
+    title|append: # separator
       text: " - "
-    title|append: #ita audio TAG
+    title|append: # ita audio TAG
       selector: a[href^="download.php?id="]
       attribute: href
       filters:
@@ -113,7 +113,7 @@ search:
           args: (DTS AC3 ITA|DTS ITA|AC3 ITA)
         - name: re_replace
           args: ["ITA", ""]
-    title|append: #end TAG
+    title|append: # end TAG
       text: "ITA]"
       filters:
         - name: re_replace # replace multiple spaces

src/Jackett.Common/Definitions/hdturk.yml

@@ -2,7 +2,7 @@
 id: hdturk
 name: HDTurk
 description: "HDTurk is a TURKISH Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: tr
+language: tr-TR
 type: private
 encoding: UTF-8
 links:
@@ -93,7 +93,7 @@ login:
     selector: img#regimage2
     input: imagestring
   error:
-    - selector: table:contains("Bir hata oluştu!")
+    - selector: table:contains("hata")
   test:
     path: index.php
     selector: a[href*="/logout.php?logouthash="]

src/Jackett.Common/Definitions/hdu.yml

@@ -29,6 +29,18 @@ caps:
     movie-search: [q, imdbid]
     music-search: [q]
 
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+
 login:
   path: login.php
   method: form
@@ -40,8 +52,9 @@ login:
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
+    ssl: yes
+    trackerssl: ""
   error:
-    - selector: td.embedded:has(h2:contains("登录失败"))
     - selector: td.embedded:has(h2:contains("失败"))
   test:
     path: index.php

src/Jackett.Common/Definitions/hdzone.yml

@@ -74,7 +74,8 @@ settings:
   - name: info
     type: info
     label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+
   - name: sort
     type: select
     label: Sort requested from site
@@ -91,6 +92,10 @@ settings:
     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:
   method: cookie
@@ -143,7 +148,7 @@ search:
       attribute: href
     imdb:
       optional: true
-      selector: a[href*="www.imdb.com/title/tt"]
+      selector: a[href*="imdb.com/title/tt"]
       attribute: href
     comments:
       selector: td:nth-child(3) a

src/Jackett.Common/Definitions/horrorsite.yml

@@ -114,7 +114,7 @@ search:
       selector: a[href^="/download.php/"]
       attribute: href
     imdb:
-      selector: a[href*="www.imdb.com/title/tt"]
+      selector: a[href*="imdb.com/title/tt"]
       optional: true
       attribute: href
     banner:

src/Jackett.Common/Definitions/hqsource.yml

@@ -104,7 +104,7 @@ search:
           args: "{{ .Result.description }}"
     imdb:
       optional: true
-      selector: a[href*="www.imdb.com/title/tt"]
+      selector: a[href*="imdb.com/title/tt"]
     grabs:
       selector: td:nth-child(6)
       filters:

src/Jackett.Common/Definitions/hush.yml

@@ -107,7 +107,7 @@ search:
           args: (\d+)
     imdb:
       optional: true
-      selector: a[href*="www.imdb.com/title/tt"]
+      selector: a[href*="imdb.com/title/tt"]
       attribute: href
     date:
       selector: time

src/Jackett.Common/Definitions/icetorrent.yml

@@ -1,186 +0,0 @@
----
-id: icetorrent
-name: ICE Torrent
-description: "ICE Torrent is a ratioless ROMANIAN Private Torrent Tracker for 0DAY / GENERAL"
-language: ro-ro
-type: private
-encoding: UTF-8
-links:
-  - https://icetorrent.org/
-legacylinks:
-  - https://www.icetorrent.org/
-
-caps:
-  categorymappings:
-    - {id: 38, cat: Movies, desc: "Movie Packs"}
-    - {id: 10, cat: Movies/SD, desc: "Movies: SD"}
-    - {id: 35, cat: Movies/SD, desc: "Movies: SD Ro"}
-    - {id: 8, cat: Movies/HD, desc: "Movies: HD"}
-    - {id: 29, cat: Movies/HD, desc: "Movies: HD Ro"}
-    - {id: 7, cat: Movies/DVD, desc: "Movies: DVD"}
-    - {id: 2, cat: Movies/DVD, desc: "Movies: DVD Ro"}
-    - {id: 17, cat: Movies/BluRay, desc: "Movies: BluRay"}
-    - {id: 24, cat: Movies/BluRay, desc: "Movies: BluRay Ro"}
-    - {id: 59, cat: Movies, desc: "Movies: Ro"}
-    - {id: 57, cat: Movies/UHD, desc: "Movies: 4K (2160p) Ro"}
-    - {id: 61, cat: Movies/UHD, desc: "Movies: 4K (2160p)"}
-    - {id: 41, cat: TV, desc: "TV Packs"}
-    - {id: 66, cat: TV, desc: "TV Packs Ro"}
-    - {id: 45, cat: TV, desc: "TV Episodes"}
-    - {id: 46, cat: TV, desc: "TV Episodes Ro"}
-    - {id: 43, cat: TV/HD, desc: "TV Episodes HD"}
-    - {id: 44, cat: TV/HD, desc: "TV Episodes HD Ro"}
-    - {id: 60, cat: TV, desc: "TV Ro"}
-    - {id: 11, cat: PC/Games, desc: "Games: PC-ISO"}
-    - {id: 52, cat: Console, desc: "Games: Console"}
-    - {id: 1, cat: PC/0day, desc: "Applications"}
-    - {id: 14, cat: PC, desc: "Applications: Linux"}
-    - {id: 37, cat: PC/Mac, desc: "Applications: Mac"}
-    - {id: 19, cat: PC/Phone-Other, desc: "Applications: Mobile"}
-    - {id: 62, cat: TV, desc: "TV Cartoons"}
-    - {id: 3, cat: TV/Anime, desc: "TV Anime / Hentai"}
-    - {id: 6, cat: Books/Ebook, desc: "E-books"}
-    - {id: 5, cat: Audio, desc: "Music"}
-    - {id: 64, cat: Audio/Video, desc: "Music Video"}
-    - {id: 18, cat: Other, desc: "Images"}
-    - {id: 22, cat: TV/Sport, desc: "TV Sports"}
-    - {id: 58, cat: TV/Sport, desc: "TV Sports Ro"}
-    - {id: 9, cat: TV/Documentary, desc: "TV Documentary"}
-    - {id: 63, cat: TV/Documentary, desc: "TV Documentary Ro"}
-    - {id: 65, cat: Other, desc: "Tutorial"}
-    - {id: 67, cat: Other, desc: "Miscellaneous"}
-    - {id: 15, cat: XXX, desc: "XXX Movies"}
-    - {id: 47, cat: XXX, desc: "XXX DVD"}
-    - {id: 48, cat: XXX, desc: "XXX HD"}
-    - {id: 49, cat: XXX, desc: "XXX Images"}
-    - {id: 50, cat: XXX, desc: "XXX Packs"}
-    - {id: 51, cat: XXX, desc: "XXX SD"}
-
-  modes:
-    search: [q, imdbid]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
-    music-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: "refreshAt"
-    options:
-      "refreshAt": "created"
-      "seeders": "seeders"
-      "size": "size"
-  - name: type
-    type: select
-    label: Order requested from site
-    default: "desc"
-    options:
-      "desc": "desc"
-      "asc": "asc"
-  - name: browseadult
-    type: checkbox
-    label: Use the Adult search engine
-    default: false
-  - name: info_browseadult
-    type: info
-    label: "About the Adult search engine"
-    default: "The <b>Adult</b> search engine only returns <i>Adult category</i> results.</br>And Vice Versa."
-  - name: info_Search
-    type: info
-    label: "About Search results"
-    default: "This indexer supports only the <b>English</b> language. Choosing <i>non-English languages</i> will cause incorrect dates to be returned.</br>For best results edit your profile and set your <b>Torrents per page</b> to <b>100</b>. The Default is <i>50</i>."
-
-login:
-  path: login
-  method: form
-  form: form
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    _remember_me: on
-  selectorinputs:
-    _csrf_token:
-      selector: input[name="_csrf_token"]
-      attribute: value
-  error:
-    - selector: span:contains("Error")
-    - selector: div.alert:contains("failed")
-  test:
-    path: /
-    selector: a[href*="/logout?_csrf_token="]
-
-ratio:
-  text: -1
-
-search:
-  paths:
-    # https://icetorrent.org/browse?search=&submit=&sort=torrent.size&direction=desc&page=1
-    - path: "{{ if .Config.browseadult }}adult{{else}}browse{{end}}"
-  inputs:
-    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-    sort: "torrent.{{ .Config.sort }}"
-    direction: "{{ .Config.type }}"
-
-  rows:
-    selector: div.kt-portlet--mobile > div.kt-portlet__body--fit > div.mr-0
-
-  fields:
-    category:
-      selector: a[href^="/browse?categories"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: (\d+)$
-    title:
-      selector: a[href^="/browse/"]
-    details:
-      selector: a[href^="/browse/"]
-      attribute: href
-    download:
-      selector: a[href^="/torrents/"]
-      attribute: href
-    imdb:
-      optional: true
-      selector: a[href*="www.imdb.com/title/tt"]
-      attribute: href
-    date:
-      selector: div[data-toggle="kt-tooltip"]
-      attribute: title
-      filters:
-        - name: dateparse
-          args: "Jan 2, 2006, 3:04:05 PM"
-    size:
-      selector: div[data-toggle="kt-tooltip"] + div + div
-    grabs:
-      selector: div[data-toggle="kt-tooltip"] + div
-      filters:
-        - name: regexp
-          args: (\d+)
-    seeders:
-      selector: div[data-toggle="kt-tooltip"] + div + div + div > div div:nth-child(1)
-      filters:
-        - name: regexp
-          args: (\d+)
-    leechers:
-      selector: div[data-toggle="kt-tooltip"] + div + div + div > div div:nth-child(2)
-      filters:
-        - name: regexp
-          args: (\d+)
-    downloadvolumefactor:
-      case:
-        "span.kt-badge--success:contains(\"free\")": 0
-        "span.kt-badge--dark:contains(\"half\")": 0.5
-        "*": 1
-    uploadvolumefactor:
-      case:
-        "span.kt-badge--info:contains(\"double\")": 2
-        "*": 1
-# engine n/a

src/Jackett.Common/Definitions/ilcorsaronero.yml

@@ -7,7 +7,7 @@ type: public
 encoding: Windows-1252
 followredirect: true
 links:
-  - https://ilcorsaronero.xyz/
+  - https://ilcorsaronero.link/
   - https://ilcorsaronero.fun/
   - https://ilcorsaronero.pro/
   - https://ilcorsaronero.unblockit.me/
@@ -21,6 +21,7 @@ legacylinks:
   - https://ilcorsaronero.pw/
   - https://ilcorsaronero.unblockit.pro/
   - https://ilcorsaronero.unblockit.one/
+  - https://ilcorsaronero.xyz/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/immortuos.yml

@@ -112,7 +112,7 @@ search:
           args: (\d+)
     imdb:
       optional: true
-      selector: a[href*="www.imdb.com/title/tt"]
+      selector: a[href*="imdb.com/title/tt"]
       attribute: href
     date:
       selector: time

src/Jackett.Common/Definitions/isohunt2.yml

@@ -6,8 +6,9 @@ language: en-us
 type: public
 encoding: UTF-8
 links:
-  - https://isohunt2.net/
   - https://isohunt.nz/
+legacylinks:
+  - https://isohunt2.net/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/kapaki.yml

@@ -175,7 +175,7 @@ search:
       selector: a[href*="?p=torrents&pid=10&action=download"]
       attribute: href
     imdb:
-      selector: a[href*="www.imdb.com/title/tt"]
+      selector: a[href*="imdb.com/title/tt"]
       attribute: href
     size:
       selector: a[rel="torrent_size"]

src/Jackett.Common/Definitions/karagarga.yml

@@ -1,13 +1,10 @@
 ---
-# Update by LA5T based on the orignial 'karagarga.yml'
-# 29.07.2018 23:15 UTC+2
-#
 id: karagarga
 name: Karagarga
-description: "Tracker for non-hollywood, rare and obscure movies, music and literature."
+description: "Karagarga tracks non-hollywood, rare and obscure movies, music and literature."
 language: en-us
 type: private
-encoding: UTF-8
+encoding: iso-8859-1
 links:
   - https://karagarga.in/
 
@@ -16,73 +13,16 @@ caps:
     - {id: 1, cat: Movies, desc: "Movies"}
     - {id: 2, cat: Audio, desc: "Music"}
     - {id: 3, cat: Books, desc: "Literature"}
-    - {id: 4, cat: Movies, desc: "Action"}
-    - {id: 55, cat: Movies, desc: "Adventure"}
-    - {id: 5, cat: Movies, desc: "Animation"}
-    - {id: 6, cat: Movies, desc: "Arthouse"}
-    - {id: 7, cat: Movies, desc: "Asian"}
-    - {id: 43, cat: Movies, desc: "Camp"}
-    - {id: 8, cat: Movies, desc: "Classics"}
-    - {id: 9, cat: Movies, desc: "Comedy"}
-    - {id: 10, cat: Movies, desc: "Crime"}
-    - {id: 11, cat: Movies, desc: "Cult"}
-    - {id: 20, cat: Movies, desc: "Documentary"}
-    - {id: 12, cat: Movies, desc: "Drama"}
-    - {id: 44, cat: Movies, desc: "Epic"}
-    - {id: 13, cat: Movies, desc: "Erotica"}
-    - {id: 51, cat: Movies, desc: "Experimental"}
-    - {id: 47, cat: Movies, desc: "Exploitation"}
-    - {id: 14, cat: Movies, desc: "Fantasy"}
-    - {id: 15, cat: Movies, desc: "Film Noir"}
-    - {id: 53, cat: Movies, desc: "Giallo"}
-    - {id: 17, cat: Movies, desc: "Horror"}
-    - {id: 18, cat: Movies, desc: "Martial Arts"}
-    - {id: 19, cat: Movies, desc: "Musical"}
-    - {id: 54, cat: Movies, desc: "Mystery"}
-    - {id: 60, cat: Movies, desc: "Performance"}
-    - {id: 48, cat: Movies, desc: "Philosophy"}
-    - {id: 49, cat: Movies, desc: "Politics"}
-    - {id: 50, cat: Movies, desc: "Romance"}
-    - {id: 21, cat: Movies, desc: "Sci-Fi"}
-    - {id: 22, cat: Movies, desc: "Short"}
-    - {id: 23, cat: Movies, desc: "Silent"}
-    - {id: 24, cat: Movies, desc: "Thriller"}
-    - {id: 25, cat: Movies, desc: "TV"}
-    - {id: 56, cat: Movies, desc: "Video Art"}
-    - {id: 26, cat: Movies, desc: "War"}
-    - {id: 27, cat: Movies, desc: "Western"}
-    - {id: 800, cat: Audio, desc: "Blues"}
-    - {id: 31, cat: Audio, desc: "Classical"}
-    - {id: 600, cat: Audio, desc: "Country"}
-    - {id: 34, cat: Audio, desc: "Electronica"}
-    - {id: 63, cat: Audio, desc: "Exotica"}
-    - {id: 1000, cat: Audio, desc: "Experimental"}
-    - {id: 250, cat: Audio, desc: "Folk"}
-    - {id: 500, cat: Audio, desc: "Funk"}
-    - {id: 700, cat: Audio, desc: "Indie"}
-    - {id: 32, cat: Audio, desc: "Jazz"}
-    - {id: 1200, cat: Audio, desc: "Latin"}
-    - {id: 35, cat: Audio, desc: "Live"}
-    - {id: 900, cat: Audio, desc: "Metal"}
-    - {id: 62, cat: Audio, desc: "Punk & Hardcore"}
-    - {id: 52, cat: Audio, desc: "Rap & Hiphop"}
-    - {id: 5000, cat: Audio, desc: "Reggae"}
-    - {id: 36, cat: Audio, desc: "Rock"}
-    - {id: 400, cat: Audio, desc: "Soul"}
-    - {id: 33, cat: Audio, desc: "Soundtrack"}
-    - {id: 30, cat: Audio, desc: "World"}
-    - {id: 40, cat: Audio/Audiobook, desc: "Audiobooks"}
-    - {id: 41, cat: Books, desc: "Books"}
-    - {id: 42, cat: Books/Comics, desc: "Comics"}
 
   modes:
-    search: [q]
-    movie-search: [q]
+    search: [q, imdbid]
+    movie-search: [q, imdbid]
     music-search: [q]
 
 login:
-  path: takelogin.php
-  method: post
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
@@ -97,47 +37,67 @@ login:
 
 search:
   paths:
+    # https://karagarga.in/browse.php?search_type=title&search=&cat=3&genre=&subgenre=&country=0&hdrip=&sort=&d=&incldead=
     - path: browse.php
-  keywordsfilters:
-    - name: re_replace
-      args: ["(?<=^| )(?!-|\\+)[^ ]+(?= |$)", "+$&"]
   inputs:
-    $raw: "{{range .Categories}}genre={{.}}&{{end}}"
-    search: "{{ .Keywords }}"
-    search_type: title
+    # torrent, title, director, uploader, year, imdb
+    search_type: "{{ if .Query.IMDBID }}imdb{{ else }}title{{ end }}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # site does not support multiple cats
+    cat: 0
+    genre: ""
+    subgenre: ""
+    country: 0
+    hdrip: ""
+    # "" yes, 1 no
+    incldead: ""
+    # sort keywordless search to get the latest, but dont sort keyword search to allow andmatch to return more results.
+    sort: "{{ if .Keywords }}{{ else }}added{{ end }}"
+    d: "{{ if .Keywords }}{{ else }}DESC{{ end }}"
+    # site supports imdbid searches and returns imdb links in results.
+
   rows:
     selector: table#browse > tbody > tr:has(a[href^="browse.php?genre="])
+    filters:
+      - name: andmatch
+
   fields:
     category:
-      selector: a[href^="browse.php?genre="]
+      selector: a[href^="browse.php?genre="] img
+      case:
+        img[title^="Movie"]: 1
+        img[title^="Music"]: 2
+        img[title^="Literature"]: 3
+    year:
+      selector: a[href$="search_type=year"]
+      optional: true
+    flag:
+      selector: a[href^="browse.php?country="] img
+      attribute: title
+      optional: true
+    filename:
+      selector: a[href^="/down.php/"]
       attribute: href
       filters:
-        - name: querystring
-          args: genre
+        - name: regexp
+          args: "(?:/down\\.php/\\d+/)(.+?)\\.torrent"
+        - name: re_replace
+          args: ["%20", "."]
     title:
-      selector: td:nth-child(2) span
-    download:
       selector: a[href^="details.php?id="]
-      attribute: href
       filters:
-        - name: replace
-          args: ["details.php?id=", "download.php?id="]
+        - name: append
+          args: " {{ .Result.year }} {{ .Result.flag }} [{{ .Result.filename }}]"
     details:
       selector: a[href^="details.php?id="]
       attribute: href
-    grabs:
-      selector: td:nth-child(12)
-      filters:
-        - name: regexp
-          args: ([\d,]+)
-    files:
-      selector: td:nth-child(10)
-    size:
-      selector: td:nth-child(11)
-    seeders:
-      selector: td:nth-child(13)
-    leechers:
-      selector: td:nth-child(14)
+    download:
+      selector: a[href^="/down.php/"]
+      attribute: href
+    imdb:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+      optional: true
     date:
       selector: td:nth-child(9)
       filters:
@@ -145,12 +105,48 @@ search:
           args: ["([a-zA-Z]+)\\s+(\\d{1,2})\\s+'(\\d{2})", "$2 $1 $3"]
         - name: dateparse
           args: "2 Jan 06"
+    files:
+      selector: td:nth-child(10)
+    size:
+      selector: td:nth-child(11)
+    grabs:
+      selector: td:nth-child(12)
+      filters:
+        - name: regexp
+          args: (\d+)
+    seeders:
+      selector: td:nth-child(13)
+    leechers:
+      selector: td:nth-child(14)
+    subs:
+      text: ""
+    subs:
+      selector: span:contains("Subs:")
+      optional: true
+    genre:
+      text: ""
+    genre:
+      selector: td:nth-child(5)
+      optional: true
+      filters:
+        - name: prepend
+          args: "Genre: "
+    mom:
+      text: ""
+    mom:
+      selector: img[title^="CURRENT"]
+      attribute: title
+      optional: true
+    description:
+      text: "{{ .Result.subs }} {{ .Result.genre }}{{ if .Result.mom }} Current MoM{{ else }}{{ end }}"
     downloadvolumefactor:
       case:
+        "span:contains(\"Freeleech\")": 0
+        "span:contains(\"Featured\")": 0
         "*": 1
     uploadvolumefactor:
       case:
-        ":has(img[title^=HD]):has(img[title^=CURRENT])": 1.8
-        "img[title^=CURRENT]": 1.6
-        "img[title^=HD]": 1.3
+#        ":has(img[title^=\"HD\"]):has(img[title^=\"CURRENT\"])": 1.8
+        "img[title^=\"CURRENT\"]": 1.6
+#        "img[title^=\"HD\"]": 1.3
         "*": 1.1

src/Jackett.Common/Definitions/keepfriends.yml

@@ -0,0 +1,185 @@
+---
+id: keepfriends
+name: Keep Friends
+description: "Keep Friends is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
+language: zh-cn
+type: private
+encoding: UTF-8
+links:
+  - https://pt.keepfrds.com/
+
+caps:
+  categorymappings:
+    - {id: 401, cat: Movies, desc: "Movies/电影"}
+    - {id: 301, cat: Movies, desc: "Movie Packs/电影(合集)"}
+    - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片"}
+    - {id: 304, cat: TV/Documentary, desc: "Documentary Packs/纪录片(合集)"}
+    - {id: 405, cat: TV/Anime, desc: "Animations/动漫"}
+    - {id: 305, cat: TV/Anime, desc: "Animation Packs/动漫(合集)"}
+    - {id: 402, cat: TV, desc: "TV Series/剧集"}
+    - {id: 302, cat: TV, desc: "TV Serie Packs/剧集(合集)"}
+    - {id: 403, cat: TV, desc: "TV Shows/综艺"}
+    - {id: 303, cat: TV, desc: "TV Show Packs/综艺(合集)"}
+    - {id: 407, cat: TV/Sport, desc: "Sports/体育"}
+    - {id: 307, cat: TV/Sport, desc: "Sport Packs/体育(合集)"}
+    - {id: 406, cat: Audio/Video, desc: "MusicVideo/音乐录影带"}
+    - {id: 306, cat: Audio/Video, desc: "MusicVideo Packs/音乐录影带(合集)"}
+    - {id: 408, cat: Audio, desc: "Music/音乐"}
+    - {id: 308, cat: Audio, desc: "Music Packs/音乐(合集)"}
+    - {id: 409, cat: Other, desc: "Misc/其他"}
+    - {id: 309, cat: Other, desc: "Misc Packs/其他(合集)"}
+    - {id: 300, cat: Other, desc: "Recycle Bin/回收站"}
+
+  modes:
+    search: [q, imdbid]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
+    music-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: 2facode
+    type: text
+    label: 2FA code
+  - name: info_2fa
+    type: info
+    label: "About 2FA code"
+    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the KeepFriends Web Site. Otherwise just leave it empty."
+  - name: english_title
+    type: checkbox
+    label: "Use English titles instead of Chinese ones (when available)."
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: "4"
+    options:
+      "4": "created"
+      "7": "seeders"
+      "5": "size"
+      "10": "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: takelogin.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    token: "{{ .Config.2facode }}"
+    logout: ""
+  error:
+    - selector: td.embedded:has(h2:contains("失败"))
+  test:
+    path: index.php
+    selector: a[href*="logout.php"]
+
+search:
+  paths:
+    - path: torrents.php
+  inputs:
+    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+    # 0 incldead 1 active 2 dead
+    incldead: 0
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: 0
+    # 0 title, 1 descr, 3 uploader, 4 imdburl, 5 douban keywords
+    search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
+    # 0 AND 1 OR 2 exact
+    search_mode: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+    # supports imdbid searches but does not display imdb links in results.
+
+  rows:
+    selector: table.torrents > tbody > tr:has(table.torrentname)
+
+  fields:
+    category:
+      selector: a[href^="?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title_raw:
+      selector: a[href^="details.php?id="]
+    title_raw:
+      optional: true
+      selector: a[title][href^="details.php?id="]
+      attribute: title
+    # note: final title processing is at the bottom after descrptions is fetched.
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    imdb:
+      optional: true
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    date:
+      # time type: time elapsed (default)
+      selector: td:nth-child(4) > span[title]
+      attribute: title
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00"
+        - name: dateparse
+          args: "2006-01-02 15:04:05 -07:00"
+    date:
+      # time added
+      selector: td:nth-child(4):not(:has(span))
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00"
+        - name: dateparse
+          args: "2006-01-0215:04:05 -07:00"
+    size:
+      selector: td:nth-child(5)
+    seeders:
+      selector: td:nth-child(6)
+    leechers:
+      selector: td:nth-child(7)
+    grabs:
+      selector: td:nth-child(8)
+    downloadvolumefactor:
+      case:
+        img.pro_free: 0
+        img.pro_free2up: 0
+        img.pro_50pctdown: 0.5
+        img.pro_50pctdown2up: 0.5
+        img.pro_30pctdown: 0.3
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img.pro_50pctdown2up: 2
+        img.pro_free2up: 2
+        img.pro_2up: 2
+        "*": 1
+    description:
+      selector: td:nth-child(2)
+      remove: a, img
+    title_english:
+      selector: table.torrentname > tbody > tr > td.embedded
+    title:
+      text: "{{ if and .Config.english_title .Result.title_english }}{{ .Result.title_english }}{{ else }}{{ .Result.title_raw }}{{ end }}"
+# NexusPHP Standard v1.5 Beta 4 (custom title search)

src/Jackett.Common/Definitions/kinonavse100.yml

@@ -107,7 +107,7 @@ login:
 
 search:
   paths:
-    #http://kinonavse100.com/search.php?tracker_search=torrent&keywords=2020&terms=all&author=&sc=1&sf=titleonly&sk=t&sd=d&sr=topics&st=0&ch=300&t=0&submit=Search
+    # http://kinonavse100.com/search.php?tracker_search=torrent&keywords=2020&terms=all&author=&sc=1&sf=titleonly&sk=t&sd=d&sr=topics&st=0&ch=300&t=0&submit=Search
     - path: search.php
   inputs:
     tracker_search: torrent

src/Jackett.Common/Definitions/kinozal.yml

@@ -109,8 +109,8 @@ search:
     # http://kinozal.tv/browse.php?s=lucifer+2017&g=0&c=0&v=0&d=0&w=0&t=0&f=0
     - path: browse.php
   keywordsfilters:
-    - name: diacritics
-      args: replace
+#    - name: diacritics # 8686
+#      args: replace
     - name: re_replace # S01 to 1
       args: ["(?i)\\bS0*(\\d+)\\b", "$1"]
     - name: re_replace # S01E01 to 1 1

src/Jackett.Common/Definitions/leaguehd.yml

@@ -45,7 +45,8 @@ settings:
   - name: info
     type: info
     label: How to get the Cookie
-    default: "<ol><li>Access to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+
   - name: sort
     type: select
     label: Sort requested from site
@@ -62,6 +63,10 @@ settings:
     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:
   method: cookie
@@ -111,7 +116,7 @@ search:
       attribute: href
     imdb:
       optional: true
-      selector: a[href*="www.imdb.com/title/tt"]
+      selector: a[href*="imdb.com/title/tt"]
       attribute: href
     date:
       # time type: time elapsed (default)