polishtorrent: add cat

yes, there are 2 called Reality TV 🤷

README.md

@@ -35,7 +35,6 @@ Prior versions of Jackett are no longer supported.
  * 52BT
  * ACG.RIP
  * AniLibria
- * Anime Time
  * Anime Tosho
  * AniRena
  * AniSource
@@ -76,7 +75,6 @@ Prior versions of Jackett are no longer supported.
  * ilCorSaRoNeRo
  * Internet Archive (archive.org)
  * Isohunt2
- * iTorrent
  * kickasstorrents.to
  * kickasstorrents.ws
  * Knaben
@@ -105,7 +103,6 @@ Prior versions of Jackett are no longer supported.
  * plugintorrent
  * PornoTorrent
  * PornRips
- * PornXLab
  * Postman
  * Qbite (Hubite)
  * Rapidzona
@@ -158,7 +155,6 @@ Prior versions of Jackett are no longer supported.
 <details> <summary> <b> Supported Semi-Private Trackers </b> </summary>
 
  * AniDUB
- * Anime Time (login)
  * AnimeLayer
  * ArenaBG
  * Best-Torrents [PAY2DL]

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

@@ -18,8 +18,10 @@ caps:
     - {id: 17, cat: Movies/BluRay, desc: "Movies Blu-ray"}
     - {id: 27, cat: Movies/BluRay, desc: "Movies BD25 Encode"}
     - {id: 33, cat: Movies/BluRay, desc: "Movies BD9 AVCHD"}
-    - {id: 22, cat: Movies, desc: "Movies 2D to 3D Conv"}
-    - {id: 32, cat: Movies, desc: "Bluray MKV Remux"}
+    - {id: 22, cat: Movies, desc: "Movies Home Conversions"}
+    - {id: 32, cat: Movies, desc: "Movies Bluray MKV Remux"}
+    - {id: 38, cat: Movies, desc: "Movies Studio Conversion"}
+    - {id: 39, cat: Movies/3D, desc: "Movies VR 360"}
     - {id: 23, cat: Movies/3D, desc: "Movies Evo 3D"}
     - {id: 36, cat: Movies/UHD, desc: "Movies 4K UHD Bluray"}
     - {id: 37, cat: Movies/UHD, desc: "Movies 4K UHD Encode"}

src/Jackett.Common/Definitions/anime-time.yml

@@ -1,83 +0,0 @@
----
-id: anime-time
-name: Anime Time
-description: "Anime Time is a Public Torrent Tracker for ANIME."
-language: en-US
-type: public
-encoding: UTF-8
-requestDelay: 2
-links:
-  - https://animetime.cc/
-
-caps:
-  categories:
-    anime: TV/Anime
-    books: Books
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    book-search: [q]
-
-settings: []
-
-search:
-  paths:
-    # https://animetime.cc/search?query=
-    - path: "{{ if .Keywords }}search{{ else }}{{ end }}"
-
-  inputs:
-    query: "{{ .Keywords }}"
-
-  keywordsfilters:
-    - name: trim
-    - name: re_replace
-      args: ["\\W+", "%"]
-
-  rows:
-    selector: div.flow-root > div.divide-y > div.p-2.space-y-2
-
-  fields:
-    category:
-      selector: span.badge.badge-primary
-    title:
-      selector: a[href*="/view/"]
-    details:
-      selector: a[href*="/view/"]
-      attribute: href
-    download:
-      selector: a[href*="/download/"]
-      attribute: href
-    magnet:
-      selector: a[href^="magnet:?xt="]
-      attribute: href
-    date:
-      selector: span[data-tip]
-      attribute: data-tip
-      filters:
-        - name: append
-          args: " +02:00" # EET
-        - name: dateparse
-          args: "yyyy-MM-dd HH:mm:ss zzz"
-    size:
-      selector: span.badge.badge-ghost
-    seeders:
-      text: 1
-    leechers:
-      text: 1
-    genre:
-      selector: span.badge.badge-secondary, span.badge.badge-error
-      filters:
-        - name: replace
-          args: ["non english", "non_english"]
-        - name: replace
-          args: ["music video", "music_video"]
-        - name: replace
-          args: ["Anime Time", "Anime_Time"]
-    description:
-      text: "{{ .Result.genre }}"
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a

src/Jackett.Common/Definitions/anime-timel.yml

@@ -1,103 +0,0 @@
----
-id: anime-timel
-name: Anime TimeL
-description: "This is the Anime Time indexer with Login enabled in the config to include NSFW content."
-language: en-US
-type: semi-private
-encoding: UTF-8
-requestDelay: 2
-links:
-  - https://animetime.cc/
-
-caps:
-  categories:
-    anime: TV/Anime
-    books: Books
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-
-login:
-  path: auth/log-in
-  method: form
-  form: form[action$="/auth/log-in"]
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    remember_me: true
-  error:
-    - selector: span.text-error
-  test:
-    path: /
-    selector: form[action$="/auth/log-out"]
-
-search:
-  paths:
-    # https://animetime.cc/search?query=
-    - path: "{{ if .Keywords }}search{{ else }}{{ end }}"
-
-  inputs:
-    query: "{{ .Keywords }}"
-
-  keywordsfilters:
-    - name: trim
-    - name: re_replace
-      args: ["\\W+", "%"]
-
-  rows:
-    selector: div.flow-root > div.divide-y > div.p-2.space-y-2
-
-  fields:
-    category:
-      selector: span.badge.badge-primary
-    title:
-      selector: a[href*="/view/"]
-    details:
-      selector: a[href*="/view/"]
-      attribute: href
-    download:
-      selector: a[href*="/download/"]
-      attribute: href
-    magnet:
-      selector: a[href^="magnet:?xt="]
-      attribute: href
-    date:
-      selector: span[data-tip]
-      attribute: data-tip
-      filters:
-        - name: append
-          args: " +02:00" # EET
-        - name: dateparse
-          args: "yyyy-MM-dd HH:mm:ss zzz"
-    size:
-      selector: span.badge.badge-ghost
-    seeders:
-      text: 1
-    leechers:
-      text: 1
-    genre:
-      selector: span.badge.badge-secondary, span.badge.badge-error
-      filters:
-        - name: replace
-          args: ["non english", "non_english"]
-        - name: replace
-          args: ["music video", "music_video"]
-        - name: replace
-          args: ["Anime Time", "Anime_Time"]
-    description:
-      text: "{{ .Result.genre }}"
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a

src/Jackett.Common/Definitions/bitporn.yml

@@ -143,8 +143,6 @@ search:
       selector: details_link
     download:
       selector: download_link
-    infohash:
-      selector: info_hash
     files:
       selector: num_file
     seeders:
@@ -193,4 +191,4 @@ search:
     minimumseedtime:
       # 48 hours (as seconds = 2 x 24 x 60 x 60)
       text: 172800
-# json UNIT3D 9.1.5 (custom)
+# json UNIT3D 9.1.7 (custom)

src/Jackett.Common/Definitions/hdspace.yml

@@ -108,8 +108,23 @@ search:
       filters:
         - name: querystring
           args: category
-    title:
+    title_default:
       selector: td a[href^="index.php?page=torrent-details"]
+      filters:
+        - name: htmldecode
+    title:
+      selector: a[href^="download.php?id="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: f
+        - name: htmldecode
+        - name: htmldecode # double usage is intentional
+        - name: replace
+          args: [".torrent", ""]
+        - name: trim
+      optional: true
+      default: "{{ .Result.title_default }}"
     details:
       selector: td a[href^="index.php?page=torrent-details"]
       attribute: href

src/Jackett.Common/Definitions/itorrent.yml

@@ -1,108 +0,0 @@
----
-id: itorrent
-name: iTorrent
-description: "iTorrent is a HUNGARIAN Public site"
-language: hu-HU
-type: public
-encoding: UTF-8
-links:
-  - https://itorrent.ws/
-legacylinks:
-  - https://itorrent.hu/
-
-caps:
-  categorymappings:
-    - {id: app, cat: PC, desc: Apps}
-    - {id: book, cat: Books, desc: Books}
-    - {id: game, cat: PC/Games, desc: Games}
-    - {id: movies, cat: Movies, desc: Movies}
-    - {id: music, cat: Audio, desc: Music}
-    - {id: heart, cat: XXX, desc: XXX}
-    - {id: tv, cat: TV, desc: TV}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: date_added
-    options:
-      date_added: created
-      seeders: seeders
-      size: size
-      title: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: DESC
-    options:
-      DESC: desc
-      ASC: asc
-
-download:
-  selectors:
-    - selector: a[href^="/torrentfiles/"]
-      attribute: href
-
-search:
-  paths:
-    - path: "torrentek/title/{{ .Keywords }}/order/{{ .Config.sort }}/by/{{ .Config.type }}/"
-
-  rows:
-    selector: tr.gradeX
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      selector: td:nth-child(1) i
-      attribute: class
-      filters:
-        - name: replace
-          args: ["zqf zqf-", ""]
-    title:
-      selector: td:nth-child(2) a
-    details:
-      selector: td:nth-child(2) a
-      attribute: href
-    download:
-      selector: td:nth-child(2) a
-      attribute: href
-    date_time:
-      selector: td:nth-child(4) span
-      optional: true
-      attribute: title
-      filters:
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "yyyy.MM.dd HH:mm zzz"
-    date_year:
-      selector: td:nth-child(4):not(:has(span))
-      optional: true
-      filters:
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "yyyy.MM.dd zzz"
-    date:
-      text: "{{ if or .Result.date_year .Result.date_time }}{{ or .Result.date_year .Result.date_time }}{{ else }}now{{ end }}"
-    size:
-      selector: td:nth-child(5)
-    grabs:
-      selector: td:nth-child(6)
-    seeders:
-      selector: td:nth-child(7)
-    leechers:
-      selector: td:nth-child(8)
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a

src/Jackett.Common/Definitions/mircrew.yml

@@ -196,22 +196,27 @@ search:
       filters:
         - name: regexp
           args: "(?i)[\\[\\({](1?\\d{1,3}(?:[\\.,]\\d{1,2})?\\s*[KMGTP]?i?B)[\\]\\)}]"
+    _is_4k:
+      selector: a.topictitle
+      filters:
+        - name: regexp
+          args: "(?i)\\b(2160p|4K|UHD)\\b"
     size_default:
       selector: a[href^="./viewforum.php?f="]
       attribute: href
       case:
-        a[href*="f=25"]: 10GB
-        a[href*="f=26"]: 10GB
-        a[href*="f=34"]: 10GB
-        a[href*="f=36"]: 10GB
-        a[href*="f=51"]: 2GB
-        a[href*="f=52"]: 2GB
-        a[href*="f=29"]: 2GB
-        a[href*="f=30"]: 2GB
-        a[href*="f=31"]: 2GB
-        a[href*="f=33"]: 2GB
-        a[href*="f=35"]: 2GB
-        a[href*="f=37"]: 2GB
+        a[href*="f=25"]: "{{ if .Result._is_4k }}15GB{{ else }}10GB{{ end }}"
+        a[href*="f=26"]: "{{ if .Result._is_4k }}15GB{{ else }}10GB{{ end }}"
+        a[href*="f=34"]: "{{ if .Result._is_4k }}15GB{{ else }}10GB{{ end }}"
+        a[href*="f=36"]: "{{ if .Result._is_4k }}15GB{{ else }}10GB{{ end }}"
+        a[href*="f=51"]: "{{ if .Result._is_4k }}5GB{{ else }}2GB{{ end }}"
+        a[href*="f=52"]: "{{ if .Result._is_4k }}5GB{{ else }}2GB{{ end }}"
+        a[href*="f=29"]: "{{ if .Result._is_4k }}5GB{{ else }}2GB{{ end }}"
+        a[href*="f=30"]: "{{ if .Result._is_4k }}5GB{{ else }}2GB{{ end }}"
+        a[href*="f=31"]: "{{ if .Result._is_4k }}5GB{{ else }}2GB{{ end }}"
+        a[href*="f=33"]: "{{ if .Result._is_4k }}5GB{{ else }}2GB{{ end }}"
+        a[href*="f=35"]: "{{ if .Result._is_4k }}5GB{{ else }}2GB{{ end }}"
+        a[href*="f=37"]: "{{ if .Result._is_4k }}5GB{{ else }}2GB{{ end }}"
         "*": 512MB
     size:
       text: "{{ if .Result.size_title }}{{ .Result.size_title }}{{ else }}{{ .Result.size_default }}{{ end }}"

src/Jackett.Common/Definitions/polishtorrent.yml

@@ -32,6 +32,7 @@ caps:
     - {id: 33, cat: Movies, desc: "iNTERNAL"}
     - {id: 18, cat: PC/Mobile-Android, desc: "Mobile"}
     - {id: 8, cat: Audio, desc: "Muzyka"}
+    - {id: 37, cat: TV, desc: "Reality TV"}
     - {id: 11, cat: Movies, desc: "Paczki"}
     - {id: 36, cat: TV, desc: "Seriale TV - Całe Sezony"}
     - {id: 21, cat: TV/Sport, desc: "Sport"}

src/Jackett.Common/Definitions/pornxlab.yml

@@ -1,72 +0,0 @@
----
-id: pornxlab
-replaces:
-  - ptorrents
-name: PornXLab
-description: "PornXLab is a Public tracker for 3X"
-language: en-US
-type: public
-encoding: UTF-8
-links:
-  - https://www.pornxlab.com/
-legacylinks:
-  - https://www.ptorrents.com/
-
-caps:
-  categories:
-    XXX: XXX
-
-  modes:
-    search: [q]
-
-settings: []
-
-download:
-  selectors:
-    - selector: a.download-button
-      attribute: href
-
-search:
-  paths:
-    - path: "s.php?search={{ if .Keywords }}{{ .Keywords }}{{ else }}%20{{ end }}"
-
-  rows:
-    selector: div.image-wrapper
-
-  fields:
-    category:
-      text: XXX
-    title:
-      selector: a.overlay
-      filters:
-        - name: re_replace
-          args: ["^.+?\\] ", ""]
-    details:
-      selector: a.overlay
-      attribute: href
-    download:
-      selector: a.overlay
-      attribute: href
-      filters:
-        - name: regexp
-          args: "-(\\d+).html"
-        - name: prepend
-          args: "/dl.php?t="
-    poster:
-      selector: img
-      attribute: src
-    date:
-      text: now
-    size:
-      selector: span.size
-    seeders:
-      text: 1
-    leechers:
-      text: 1
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-    description:
-      selector: div.catalog a
-# engine n/a

src/Jackett.Common/Definitions/rudub.yml

@@ -9,14 +9,8 @@ type: semi-private
 encoding: windows-1251
 followredirect: true
 links:
-  - https://sep26.rudub.bet/
+  - https://sep29.rudub.bet/
 legacylinks:
-  - https://sep11.rudub.bet/
-  - http://sep12.rudub.bet/
-  - https://sep12.rudub.bet/
-  - http://sep13.rudub.bet/
-  - https://sep13.rudub.bet/
-  - http://sep14.rudub.bet/
   - https://sep14.rudub.bet/
   - http://sep15.rudub.bet/
   - https://sep15.rudub.bet/
@@ -41,6 +35,12 @@ legacylinks:
   - http://sep25.rudub.bet/
   - https://sep25.rudub.bet/
   - http://sep26.rudub.bet/
+  - https://sep26.rudub.bet/
+  - http://sep27.rudub.bet/
+  - https://sep27.rudub.bet/
+  - http://sep28.rudub.bet/
+  - https://sep28.rudub.bet/
+  - http://sep29.rudub.bet/
 caps:
   categorymappings:
     - {id: 1, cat: TV, desc: "TV"}

src/Jackett.Common/Definitions/teamos.yml

@@ -105,6 +105,10 @@ caps:
     book-search: [q]
 
 settings:
+  - name: info_novpn
+    type: info
+    label: VPN Not Allowed
+    default: "You may be banned if you use a VPN, proxy, TOR or data center to access the TeamOS web site.​ This mean all brands of VPNS, no exceptions!!"
   # using cookie method because login page is dynamically generated using JS #5572
   - name: cookie
     type: text

src/Jackett.Common/Definitions/torrentsome.yml

@@ -48,7 +48,9 @@ caps:
     movie-search: [q]
     music-search: [q]
 
-settings: []
+settings:
+  - name: info_flaresolverr
+    type: info_flaresolverr
 
 download:
   infohash:

src/Jackett.Common/Definitions/torrenttip.yml

@@ -55,7 +55,9 @@ caps:
     music-search: [q]
     book-search: [q]
 
-settings: []
+settings:
+  - name: info_flaresolverr
+    type: info_flaresolverr
 
 download:
   infohash:

src/Jackett.Common/Indexers/Definitions/BluDV.cs

@@ -19,7 +19,11 @@ namespace Jackett.Common.Indexers.Definitions
     {
         public override string Id => "bludv";
         public override string Name => "BluDV";
-        public override string SiteLink { get; protected set; } = "https://bludv.xyz/";
+        public override string SiteLink { get; protected set; } = "https://bludv.org/";
+
+        public override string[] LegacySiteLinks { get; protected set; } = {
+            "https://bludv.xyz/",
+        };
 
         public BluDV(IIndexerConfigurationService configService, WebClient wc, Logger l, IProtectionService ps, ICacheService cs)
             : base(configService, wc, l, ps, cs)

src/Jackett.Common/Indexers/Definitions/FilmesHdTorrent.cs

@@ -19,7 +19,7 @@ namespace Jackett.Common.Indexers.Definitions
     {
         public override string Id => "filmeshdtorrent";
         public override string Name => "Filmes HD Torrent";
-        public override string SiteLink { get; protected set; } = "https://www.filmeshdtorrent.vip/";
+        public override string SiteLink { get; protected set; } = "https://www.limontorrents.vip/";
 
         public override string[] LegacySiteLinks { get; protected set; } = {
             "https://baixarfilmestorrents.net/",
@@ -29,6 +29,7 @@ namespace Jackett.Common.Indexers.Definitions
             "https://filmetorrent.org/x/",
             "https://bludvfilmes.org/",
             "https://bludvfilmes.org/rarbg/",
+            "https://www.filmeshdtorrent.vip/",
         };
 
         public FilmesHdTorrent(IIndexerConfigurationService configService, WebClient wc, Logger l, IProtectionService ps, ICacheService cs) : base(configService, wc, l, ps, cs)

src/Jackett.Common/Indexers/Definitions/TorrentDosFilmes.cs

@@ -21,15 +21,17 @@ namespace Jackett.Common.Indexers.Definitions
     {
         public override string Id => "torrentdosfilmes";
         public override string Name => "TorrentDosFilmes";
-        public override string SiteLink { get; protected set; } = "https://torrentsdosfilmes.to/";
+        public override string SiteLink { get; protected set; } = "https://torrentdosfilmes.net/";
 
         public override string[] AlternativeSiteLinks { get; protected set; } = {
-            "https://torrentsdosfilmes.to/",
-            "https://ComandoFilmes.xyz/"
+            "https://torrentdosfilmes.net/",
+            "https://comando4kfilmes.xyz/",
         };
 
         public override string[] LegacySiteLinks { get; protected set; } = {
-            "https://torrentdosfilmes.site/"
+            "https://torrentdosfilmes.site/",
+            "https://torrentsdosfilmes.to/",
+            "https://ComandoFilmes.xyz/",
         };
 
         public TorrentDosFilmes(IIndexerConfigurationService configService, WebClient wc, Logger l, IProtectionService ps,

src/Jackett.Updater/Program.cs

@@ -277,6 +277,8 @@ namespace Jackett.Updater
                 "Definitions/anidex.yml", // migrated to C#
                 "Definitions/anilibria.yml", // migrated to c# #5762
                 "Definitions/anime-free.yml",
+                "Definitions/anime-time.yml",
+                "Definitions/anime-timel.yml",
                 "Definitions/animeclipse.yml",
                 "Definitions/animeitalia.yml",
                 "Definitions/animetime.yml",
@@ -510,6 +512,7 @@ namespace Jackett.Updater
                 "Definitions/inperil.yml",
                 "Definitions/irishtv.yml",
                 "Definitions/isohunt.yml",
+                "Definitions/itorrent.yml",
                 "Definitions/iv-torrents.yml",
                 "Definitions/jme-reunit3d.yml", // switch to -API #13043
                 "Definitions/jav-torrent.yml",
@@ -630,6 +633,7 @@ namespace Jackett.Updater
                 "Definitions/pornorip.yml",
                 "Definitions/pornoslab.yml",
                 "Definitions/pornotor.yml",
+                "Definitions/pornxlab.yml",
                 "Definitions/portugas.yml", // switch to *-API #13542
                 "Definitions/potuk.yml",
                 "Definitions/privatesilverscreen-api.yml",