dontorrent: new domain

README.md

@@ -37,7 +37,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * AudioBook Bay (ABB)
  * Badass Torrents
  * Bangumi Moe
- * BiatchTorrents
  * BigFANGroup
  * BitRu
  * BitSearch
@@ -250,7 +249,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * AnimeBytes (AB)
  * AnimeTorrents (AnT)
  * AnimeTorrents.ro (Anime Torrents Romania)
- * AnimeTracker
  * AnimeWorld
  * AniToons
  * Anthelion
@@ -600,7 +598,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * U2 (U2分享園@動漫花園) [![(invite needed)][inviteneeded]](#)
  * UBits
  * UHDBits
- * ULTRA HD
  * UltraHD
  * UnionGang
  * Universal-Torrents

src/Jackett.Common/Definitions/1ptbar.yml

@@ -189,4 +189,4 @@ search:
     description:
       selector: td:nth-child(2)
       remove: a, b, font, img, span
-# NexusPHP v1.8.8 2023-09-25
+# NexusPHP v1.8.9 2023-11-15

src/Jackett.Common/Definitions/animetracker.yml

@@ -1,174 +0,0 @@
----
-id: animetracker
-name: AnimeTracker (API)
-description: "AnimeTracker is a Private Torrent Tracker for HD ANIME / MANGA / HENTAI"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://animetracker.cc/
-
-caps:
-  categorymappings:
-    - {id: 7, cat: TV/Anime, desc: "Series English"}
-    - {id: 16, cat: TV/Anime, desc: "Ongoing"}
-    - {id: 11, cat: TV/Anime, desc: "Series Non-English"}
-    - {id: 1, cat: TV/Anime, desc: "Raws"}
-    - {id: 2, cat: TV/Anime, desc: "OVA"}
-    - {id: 4, cat: Movies, desc: "Movie"}
-    - {id: 15, cat: Books/Comics, desc: "Manga"}
-    - {id: 6, cat: XXX, desc: "Hentai Censored"}
-    - {id: 14, cat: XXX, desc: "Hentai Uncensored"}
-    - {id: 9, cat: XXX, desc: "Hentai Manga"}
-    - {id: 10, cat: Movies, desc: "Live Action"}
-    - {id: 3, cat: Audio, desc: "Music"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
-    movie-search: [q, imdbid, tmdbid]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: apikey
-    type: text
-    label: APIKey
-  - name: info_key
-    type: info
-    label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://animetracker.cc/\" target=\"_blank\">AnimeTracker</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: created_at
-    options:
-      created_at: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  path: /api/torrents
-  method: get
-  error:
-    - selector: a[href*="/login"]
-      message:
-        text: "The API key was not accepted by {{ .Config.sitelink }}."
-
-search:
-  paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
-    - path: "/api/torrents/filter"
-      response:
-        type: json
-
-  headers:
-    Authorization: ["Bearer {{ .Config.apikey }}"]
-
-  inputs:
-  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
-    $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
-    name: "{{ .Keywords }}"
-    seasonNumber: "{{ .Query.Season }}"
-    episodeNumber: "{{ .Query.Ep }}"
-    imdbId: "{{ .Query.IMDBIDShort }}"
-    tmdbId: "{{ .Query.TMDBID }}"
-    tvdbId: "{{ .Query.TVDBID }}"
-    free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-    sortField: "{{ .Config.sort }}"
-    sortDirection: "{{ .Config.type }}"
-    perPage: 100
-
-  keywordsfilters:
-    - name: re_replace
-      args: ["\\.", " "]
-
-  rows:
-    selector: data
-    attribute: attributes
-
-  fields:
-    category:
-      selector: category_id
-    title:
-      selector: name
-    details:
-      selector: details_link
-    download:
-      selector: download_link
-    infohash:
-      selector: info_hash
-    poster:
-      selector: meta.poster
-      filters:
-        - name: replace
-          args: ["https://via.placeholder.com/90x135", ""]
-    imdbid:
-      selector: imdb_id
-    tmdbid:
-      selector: tmdb_id
-    tvdbid:
-      selector: tvdb_id
-    genre:
-      selector: meta.genres
-      filters:
-        - name: re_replace
-          args: ["(?i)(Science Fiction)", "Science_Fiction"]
-        - name: replace
-          args: [" & ", "_&_"]
-    description:
-      text: "{{ .Result.genre }}"
-    files:
-      selector: num_file
-    seeders:
-      selector: seeders
-    leechers:
-      selector: leechers
-    grabs:
-      selector: times_completed
-    date:
-      # "created_at": "2021-10-18T00:34:50.000000Z" is returned by Newtonsoft.Json.Linq as 18/10/2021 00:34:50
-      selector: created_at
-      filters:
-        - name: append
-          args: " +00:00" # GMT
-        - name: dateparse
-          args: "MM/dd/yyyy HH:mm:ss zzz"
-    size:
-      selector: size
-    downloadvolumefactor:
-      # api returns 0%, 25%, 50%, 75%, 100%
-      selector: freeleech
-      case:
-        0%: 1 # not free
-        25%: 0.75
-        50%: 0.5
-        75%: 0.25
-        100%: 0 # freeleech
-        "*": 0 # catch errors
-    uploadvolumefactor:
-      # api returns 0=false, 1=true
-      selector: double_upload
-      case:
-        0: 1 # normal
-        1: 2 # double
-# global MR is 0.4 but torrents must be seeded for 5 days regardless of ratio
-#    minimumratio:
-#      text: 0.4
-    minimumseedtime:
-      # 5 day (as seconds = 5 x 24 x 60 x 60)
-      text: 432000
-# json UNIT3D 6.4.1

src/Jackett.Common/Definitions/biatch.yml

@@ -1,67 +0,0 @@
----
-id: biatch
-name: BiatchTorrents
-description: "BiatchTorrents is a FRENCH Public torrent site for MOVIES / TV / GENERAL"
-type: public
-language: fr-FR
-encoding: UTF-8
-links:
-  - https://biat.ch/
-
-caps:
-  categories:
-    Other: Other
-
-  modes:
-    search: [q]
-
-settings: []
-
-search:
-  paths:
-    - path: search
-      method: get
-      response:
-        type: json
-
-  inputs:
-    $raw: "format=json&q={{ .Keywords }}"
-  keywordsfilters:
-    # ignore ' (e.g. search for america's Next Top Model)
-    - name: re_replace
-      args: ["[^\\w]+", " "]
-
-  rows:
-    selector: $
-
-  fields:
-    _id:
-      selector: id
-    category:
-      text: Other
-    title:
-      selector: name
-    details:
-      text: "{{ .Config.sitelink }}"
-    download:
-      text: "download?id={{ .Result._id }}"
-    infohash:
-      text: "{{ .Result._id }}"
-    date:
-      selector: date
-    size:
-      selector: size
-      filters:
-        - name: re_replace
-          args: ["(\\w)o", "$1B"]
-    grabs:
-      selector: completed
-    seeders:
-      selector: seeders
-    leechers:
-      selector: leechers
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# json engine n/a

src/Jackett.Common/Definitions/discfan.yml

@@ -184,4 +184,4 @@ search:
           args: "cat={{ .Result._cat }} - "
     minimumratio:
       text: 0.9
-# NexusPHP v1.8.6 2023-08-18
+# NexusPHP v1.8.8 2023-09-25

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

@@ -13,6 +13,7 @@ legacylinks:
 caps:
   categorymappings:
     # from https://electro-torrent.pl/szukaj.php
+    # don't forget to update the category case block below
     - {id: 1298, cat: Movies/SD, desc: "Filmy - Zwiastuny"}
     - {id: 1, cat: Movies/SD, desc: "Filmy XviD/DivX"}
     - {id: 769, cat: Movies/HD, desc: "Filmy 1080p AVC"}
@@ -109,6 +110,7 @@ search:
     category:
       selector: div#kategoria-gatunek-1
       case:
+        "div#kategoria-gatunek-1:contains(\"Filmy - Zwiastuny\")": 1298
         "div#kategoria-gatunek-1:contains(\"Filmy XviD/DivX\")": 1
         "div#kategoria-gatunek-1:contains(\"Filmy 1080p AVC\")": 769
         "div#kategoria-gatunek-1:contains(\"Filmy x264/1080p\")": 770
@@ -124,6 +126,7 @@ search:
         "div#kategoria-gatunek-1:contains(\"Filmy 3D\")": 5
         "div#kategoria-gatunek-1:contains(\"Filmy IVO\")": 362
         "div#kategoria-gatunek-1:contains(\"Filmy TS/CAM\")": 696
+        "div#kategoria-gatunek-1:contains(\"TV/Seriale - Warezy\")": 1255
         "div#kategoria-gatunek-1:contains(\"TV/Seriale\")": 7
         "div#kategoria-gatunek-1:contains(\"Erotyka\")": 8
         "div#kategoria-gatunek-1:contains(\"Muzyka\")": 10

src/Jackett.Common/Definitions/happyfappy.yml

@@ -19,6 +19,7 @@ caps:
     - {id: 10, cat: XXX, desc: "Pics"}
     - {id: 1, cat: XXX, desc: "Pron"}
     - {id: 8, cat: XXX, desc: "Retro"}
+    - {id: 12, cat: XXX, desc: "Transsexual"}
     - {id: 7, cat: XXX, desc: "VR"}
 
   modes:

src/Jackett.Common/Definitions/hdcztorrent.yml

@@ -35,6 +35,8 @@ caps:
     - {id: 134, cat: TV/WEB-DL, desc: "TV -WEB- DL NETLIFIX"}
     - {id: 135, cat: TV/WEB-DL, desc: "TV - WEB- DL Prime"}
     - {id: 136, cat: TV/WEB-DL, desc: "TV -WEB- DL Skyshow"}
+    - {id: 147, cat: TV/WEB-DL, desc: "marvel"}
+    - {id: 148, cat: TV/WEB-DL, desc: "VOYO"}
     # rls track
     - {id: 131, cat: Movies, desc: "RLS For HDCZT"}
     - {id: 132, cat: Movies, desc: "Film na přání"}

src/Jackett.Common/Definitions/hdfans.yml

@@ -195,4 +195,4 @@ search:
     description:
       selector: td:nth-child(2)
       remove: a, b, font, img, span
-# NexusPHP v1.8.4 2023-05-27
+# NexusPHP v1.8.9 2023-11-15

src/Jackett.Common/Definitions/infire.yml

@@ -123,16 +123,22 @@ settings:
       ASC: asc
 
 login:
-  method: post
   path: login.php
+  method: form
+  form: form[action^="login.php"]
   inputs:
     uid: "{{ .Config.username }}"
     pwd: "{{ .Config.password }}"
+    login: "Prijavi se"
+  selectorinputs:
+    csrf_token:
+      selector: input[name="csrf_token"]
+      attribute: value
   error:
     - selector: font[color="#FF0000"]
   test:
     path: index.php
-    selector: a[href^="logout.php"]
+    selector: a[href="logout.php"]
 
 search:
   paths:

src/Jackett.Common/Definitions/korsar.yml

@@ -468,7 +468,7 @@ login:
   inputs:
     cookie: "{{ .Config.cookie }}"
   test:
-    path: index.php
+    path: /
     selector: a[href*="ucp.php?mode=logout"]
 
 search:

src/Jackett.Common/Definitions/kufei.yml

@@ -196,4 +196,4 @@ search:
     description:
       selector: td:nth-child(2)
       remove: a, b, font, img, span
-# NexusPHP v1.8.8 2023-09-25
+# NexusPHP v1.8.9 2023-11-15

src/Jackett.Common/Definitions/oshenpt.yml

@@ -188,4 +188,4 @@ search:
     description:
       selector: td:nth-child(2)
       remove: a, b, font, img, span
-# NexusPHP v1.8.8 2023-09-25
+# NexusPHP v1.8.9 2023-11-15

src/Jackett.Common/Definitions/ptchina.yml

@@ -185,4 +185,4 @@ search:
     description:
       selector: td.rowfollow:nth-child(2)
       remove: a, b, font, img, span
-# NexusPHP v1.8.4 2023-05-27
+# NexusPHP v1.8.9 2023-11-15

src/Jackett.Common/Definitions/torrentz2eu.yml

@@ -29,6 +29,7 @@ caps:
     - {id: "Applications(Android)", cat: PC/Mobile-Android, desc: "Applications(Android)"}
     - {id: "Applications(IOS (iPad/iPhone))", cat: PC/Mobile-iOS, desc: "Applications(IOS (iPad/iPhone))"}
     - {id: "Applications(Mac)", cat: PC/Mac, desc: "Applications(Mac)"}
+    - {id: "Applications(UNIX)", cat: PC/ISO, desc: "Applications(UNIX)"}
     - {id: "Applications(Windows)", cat: PC/0day, desc: "Applications(Windows)"}
     - {id: "Audio(Audio books)", cat: Audio/Audiobook, desc: "Audio(Audio books)"}
     - {id: "Audio(FLAC)", cat: Audio/Lossless, desc: "Audio(FLAC)"}

src/Jackett.Common/Definitions/twisted-music.yml

@@ -186,4 +186,9 @@ search:
       case:
         img[src$="/x2.gif"]: 2
         "*": 1
+    minimumratio:
+      text: 0.5
+    minimumseedtime:
+      # 1 day (as seconds = 24 x 60 x 60)
+      text: 86400
 # TS Special Edition v.8.0

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

@@ -1,165 +0,0 @@
----
-id: ultra-hd
-name: ULTRA HD
-description: "ULTRA HD is a BRAZILIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: pt-BR
-type: private
-encoding: UTF-8
-links:
-  - https://ultrahd.online/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Movies, desc: "FILMES"}
-    - {id: 2, cat: TV, desc: "SÉRIES"}
-    - {id: 4, cat: PC/Games, desc: "JOGOS"}
-    - {id: 5, cat: PC/0day, desc: "APPS"}
-    - {id: 6, cat: XXX, desc: "ADULTO"}
-    - {id: 7, cat: Other, desc: "CURSOS"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
-    movie-search: [q, imdbid, tmdbid]
-
-settings:
-  - name: apikey
-    type: text
-    label: APIKey
-  - name: info_key
-    type: info
-    label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://ultrahd.online/\" target=\"_blank\">ULTRA HD</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: created_at
-    options:
-      created_at: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  path: /api/torrents
-  method: get
-  error:
-    - selector: a[href*="/login"]
-      message:
-        text: "The API key was not accepted by {{ .Config.sitelink }}."
-
-search:
-  paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
-    - path: "/api/torrents/filter"
-      response:
-        type: json
-
-  headers:
-    Authorization: ["Bearer {{ .Config.apikey }}"]
-
-  inputs:
-  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
-    $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
-    name: "{{ .Keywords }}"
-    seasonNumber: "{{ .Query.Season }}"
-    episodeNumber: "{{ .Query.Ep }}"
-    imdbId: "{{ .Query.IMDBIDShort }}"
-    tmdbId: "{{ .Query.TMDBID }}"
-    tvdbId: "{{ .Query.TVDBID }}"
-    "free[]": "{{ if .Config.freeleech }}100{{ else }}{{ end }}"
-    sortField: "{{ .Config.sort }}"
-    sortDirection: "{{ .Config.type }}"
-    perPage: 100
-
-  keywordsfilters:
-    - name: re_replace
-      args: ["\\.", " "]
-
-  rows:
-    selector: data
-    attribute: attributes
-
-  fields:
-    category:
-      selector: category_id
-    title:
-      selector: name
-    details:
-      selector: details_link
-    download:
-      selector: download_link
-    infohash:
-      selector: info_hash
-    poster:
-      selector: meta.poster
-      filters:
-        - name: replace
-          args: ["https://via.placeholder.com/90x135", ""]
-    imdbid:
-      selector: imdb_id
-    tmdbid:
-      selector: tmdb_id
-    tvdbid:
-      selector: tvdb_id
-    genre:
-      selector: meta.genres
-      filters:
-        - name: re_replace
-          args: ["(?i)(Cinema TV)", "Cinema_TV"]
-        - name: re_replace
-          args: ["(?i)(Ficção científica)", "Ficção_científica"]
-        - name: replace
-          args: [" & ", "_&_"]
-    description:
-      text: "{{ .Result.genre }}"
-    files:
-      selector: num_file
-    seeders:
-      selector: seeders
-    leechers:
-      selector: leechers
-    grabs:
-      selector: times_completed
-    date:
-      # "created_at": "2021-10-18T00:34:50.000000Z" is returned by Newtonsoft.Json.Linq as 18/10/2021 00:34:50
-      selector: created_at
-      filters:
-        - name: append
-          args: " +00:00" # GMT
-        - name: dateparse
-          args: "MM/dd/yyyy HH:mm:ss zzz"
-    size:
-      selector: size
-    downloadvolumefactor:
-      # api returns 0%, 25%, 50%, 75%, 100%
-      selector: freeleech
-      case:
-        0%: 1 # not free
-        25%: 0.75
-        50%: 0.5
-        75%: 0.25
-        100%: 0 # freeleech
-        "*": 0 # catch errors
-    uploadvolumefactor:
-      # api returns False, True
-      selector: double_upload
-      case:
-        False: 1 # normal
-        True: 2 # double
-    minimumseedtime:
-      # 1 day (as seconds = 24 x 60 x 60)
-      text: 86400
-# json UNIT3D 7.0.0

src/Jackett.Common/Definitions/yggcookie.yml

@@ -8,16 +8,8 @@ encoding: UTF-8
 followredirect: true
 requestDelay: 2
 links:
-  - https://www3.yggtorrent.wtf/
+  - https://www3.yggtorrent.qa/
 legacylinks:
-  - https://www.yggtorrent.gg/
-  - https://www.yggtorrent.ch/
-  - https://www.yggtorrent.pe/
-  - https://www3.yggtorrent.pe/
-  - https://www5.yggtorrent.pe/
-  - https://yggtorrent.ws/
-  - https://yggtorrent.se/
-  - https://www.yggtorrent.si/
   - https://ww3.yggtorrent.si/
   - https://yggtorrent.si/
   - http://www2.yggtorrent.si/
@@ -32,6 +24,7 @@ legacylinks:
   - https://yggtorrent.lol/
   - https://www6.yggtorrent.lol/
   - https://www3.yggtorrent.do/
+  - https://www3.yggtorrent.wtf/
 
 caps:
   # dont forget to update the search fields category case block

src/Jackett.Common/Definitions/yggtorrent.yml

@@ -8,16 +8,8 @@ encoding: UTF-8
 followredirect: true
 requestDelay: 2
 links:
-  - https://www3.yggtorrent.wtf/
+  - https://www3.yggtorrent.qa/
 legacylinks:
-  - https://www.yggtorrent.gg/
-  - https://www.yggtorrent.ch/
-  - https://www.yggtorrent.pe/
-  - https://www3.yggtorrent.pe/
-  - https://www5.yggtorrent.pe/
-  - https://yggtorrent.ws/
-  - https://yggtorrent.se/
-  - https://www.yggtorrent.si/
   - https://ww3.yggtorrent.si/
   - https://yggtorrent.si/
   - http://www2.yggtorrent.si/
@@ -32,6 +24,7 @@ legacylinks:
   - https://yggtorrent.lol/
   - https://www6.yggtorrent.lol/
   - https://www3.yggtorrent.do/
+  - https://www3.yggtorrent.wtf/
 
 caps:
   # dont forget to update the search fields category case block

src/Jackett.Common/Indexers/DonTorrent.cs

@@ -26,10 +26,10 @@ namespace Jackett.Common.Indexers
         public override string Name => "DonTorrent";
         public override string Description => "DonTorrent is a SPANISH public tracker for MOVIES / TV / GENERAL";
         // in the event the redirect is inactive https://t.me/s/dontorrent should have the latest working domain
-        public override string SiteLink { get; protected set; } = "https://dontorrent.nagoya/";
+        public override string SiteLink { get; protected set; } = "https://dontorrent.contact/";
         public override string[] AlternativeSiteLinks => new[]
         {
-            "https://dontorrent.nagoya/",
+            "https://dontorrent.contact/",
             "https://todotorrents.org/",
             "https://tomadivx.net/",
             "https://seriesblanco.one/",
@@ -38,7 +38,6 @@ namespace Jackett.Common.Indexers
         };
         public override string[] LegacySiteLinks => new[]
         {
-            "https://dontorrent.day/",
             "https://dontorrent.boo/",
             "https://dontorrent.foo/",
             "https://dontorrent.hair/",
@@ -53,6 +52,7 @@ namespace Jackett.Common.Indexers
             "https://dontorrent.party/",
             "https://dontorrent.joburg/",
             "https://dontorrent.wales/",
+            "https://dontorrent.nagoya/",
         };
         public override string Language => "es-ES";
         public override string Type => "public";

src/Jackett.Common/Indexers/NorBits.cs

@@ -139,7 +139,9 @@ namespace Jackett.Common.Indexers
             // Building login form data
             var pairs = new Dictionary<string, string> {
                 { "username", ConfigData.Username.Value },
-                { "password", ConfigData.Password.Value }
+                { "password", ConfigData.Password.Value },
+                { "logout", "no" },
+                { "returnto", "/" }
             };
 
             // Use 2FA code if defined
@@ -162,7 +164,7 @@ namespace Jackett.Common.Indexers
             logger.Info("\nNorBits - Getting login page (user simulation).. with " + LoginUrl);
             await webclient.GetResultAsync(myRequestLogin);
 
-            // Build WebRequest for submitting authentification
+            // Build WebRequest for submitting authentication
             var request = new WebRequest
             {
                 PostData = pairs,
@@ -173,8 +175,7 @@ namespace Jackett.Common.Indexers
                 Encoding = Encoding
             };
 
-            // Perform loggin
-            logger.Info("\nPerform loggin.. with " + LoginCheckUrl);
+            logger.Info("\nPerform login with " + LoginCheckUrl);
             var response = await webclient.GetResultAsync(request);
 
             // Test if we are logged in
@@ -238,7 +239,9 @@ namespace Jackett.Common.Indexers
             // duplicate search without diacritics
             var baseSearchTerm = StringUtil.RemoveDiacritics(exactSearchTerm);
             if (baseSearchTerm != exactSearchTerm)
+            {
                 searchTerms.Add(baseSearchTerm);
+            }
 
             foreach (var searchTerm in searchTerms)
             {
@@ -324,11 +327,17 @@ namespace Jackett.Common.Indexers
                         release.Imdb = ParseUtil.GetLongFromString(imdbLink);
 
                         if (row.QuerySelector("img[title=\"100% freeleech\"]") != null)
+                        {
                             release.DownloadVolumeFactor = 0;
+                        }
                         else if (row.QuerySelector("img[title=\"Halfleech\"]") != null)
+                        {
                             release.DownloadVolumeFactor = 0.5;
+                        }
                         else if (row.QuerySelector("img[title=\"90% Freeleech\"]") != null)
+                        {
                             release.DownloadVolumeFactor = 0.1;
+                        }
 
                         releases.Add(release);
                     }
@@ -364,9 +373,13 @@ namespace Jackett.Common.Indexers
 
             // If search term provided
             if (!string.IsNullOrWhiteSpace(query.ImdbID))
+            {
                 searchterm = "imdbsearch=" + query.ImdbID;
+            }
             else if (!string.IsNullOrWhiteSpace(term))
+            {
                 searchterm = "search=" + WebUtilityHelpers.UrlEncode(term, Encoding.GetEncoding(28591));
+            }
             else
             {
                 // Showing all torrents (just for output function)
@@ -375,14 +388,18 @@ namespace Jackett.Common.Indexers
             }
 
             if (((BoolConfigurationItem)configData.GetDynamic("freeleech")).Value)
+            {
                 parameters.Add("FL", "1");
+            }
 
             // Building our query
             searchUrl += "?" + searchterm + "&" + parameters.GetQueryString();
 
             var categoriesList = MapTorznabCapsToTrackers(query);
             if (categoriesList.Any())
+            {
                 searchUrl += "&" + string.Join("&", categoriesList);
+            }
 
             logger.Info("\nBuilded query for \"" + term + "\"... " + searchUrl);
 

src/Jackett.Common/Indexers/PassThePopcorn.cs

@@ -22,7 +22,7 @@ namespace Jackett.Common.Indexers
     {
         public override string Id => "passthepopcorn";
         public override string Name => "PassThePopcorn";
-        public override string Description => "PassThePopcorn is a Private site for MOVIES / TV";
+        public override string Description => "PassThePopcorn (PTP) is a Private site for MOVIES / TV";
         public override string SiteLink { get; protected set; } = "https://passthepopcorn.me/";
         public override string Language => "en-US";
         public override string Type => "private";
@@ -193,7 +193,12 @@ namespace Jackett.Common.Indexers
                             { "torrent_pass", PassKey }
                         };
 
-                        var free = !(torrent["FreeleechType"] is null);
+                        var downloadVolumeFactor = torrent.Value<string>("FreeleechType")?.ToUpperInvariant() switch
+                        {
+                            "FREELEECH" => 0,
+                            "HALF LEECH" => 0.5,
+                            _ => 1
+                        };
 
                         bool.TryParse((string)torrent["GoldenPopcorn"], out var golden);
                         bool.TryParse((string)torrent["Scene"], out var scene);
@@ -214,7 +219,7 @@ namespace Jackett.Common.Indexers
                             continue; //Skip release if user only wants Checked
                         }
 
-                        if (configFreeOnly && !free)
+                        if (configFreeOnly && downloadVolumeFactor != 0.0)
                         {
                             continue;
                         }
@@ -250,7 +255,7 @@ namespace Jackett.Common.Indexers
                             Seeders = seeders,
                             Peers = seeders + leechers,
                             PublishDate = publishDate,
-                            DownloadVolumeFactor = free ? 0 : 1,
+                            DownloadVolumeFactor = downloadVolumeFactor,
                             UploadVolumeFactor = 1,
                             MinimumRatio = 1,
                             MinimumSeedTime = 345600

src/Jackett.Updater/Program.cs

@@ -273,6 +273,7 @@ namespace Jackett.Updater
                 "Definitions/anidex.yml", // migrated to C#
                 "Definitions/animeclipse.yml",
                 "Definitions/animeitalia.yml",
+                "Definitions/animetracker.yml",
                 "Definitions/animeworld.yml", // switch to *-API #8682
                 "Definitions/aox.yml",
                 "Definitions/apollo.yml", // migrated to C# gazelle base tracker
@@ -287,6 +288,7 @@ namespace Jackett.Updater
                 "Definitions/b2s-share.yml",
                 "Definitions/baibako.yml", // renamed rudub #5673
                 "Definitions/beyond-hd-oneurl.yml", // #12993
+                "Definitions/biatch.yml",
                 "Definitions/biho.yml",
                 "Definitions/bigtorrent.yml", // merged with eStone #12352
                 "Definitions/bigtower.yml",
@@ -648,6 +650,7 @@ namespace Jackett.Updater
                 "Definitions/u-torrents.yml",
                 "Definitions/uhd-heaven.yml",
                 "Definitions/ultimategamerclub.yml",
+                "Definitions/ultra-hd.yml",
                 "Definitions/ultrahdclub.yml",
                 "Definitions/underverse.yml",
                 "Definitions/underversel.yml",