zetorrents: new domain

This reverts commit ed60f38b94

README.md

@@ -453,6 +453,7 @@ Prior versions of Jackett are no longer supported.
  * Nebulance (NBL) (TransmiTheNet)
  * NewHeaven (TorrentHeavenResurrection) [![(invite needed)][inviteneeded]](#)
  * NicePT
+ * Nirvana
  * NorBits
  * NordicQuality
  * Nusanta(RA.RE)

src/Jackett.Common/Definitions/nirvana.yml

@@ -0,0 +1,187 @@
+---
+id: nirvana
+name: Nirvana (API)
+description: "Nirvana is a Private RUSSIAN Tracker for MOVIES / TV"
+language: ru-RU
+type: private
+encoding: UTF-8
+links:
+  - https://nirvana.li/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Фильмы"}
+    - {id: 2, cat: TV, desc: "Сериалы"}
+    - {id: 6, cat: Movies/Other, desc: "Аниме-фильмы"}
+    - {id: 7, cat: TV/Anime, desc: "Аниме-сериалы"}
+    - {id: 8, cat: Movies/Other, desc: "35mm"}
+    - {id: 4, cat: Other, desc: "No"}
+
+  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://nirvana.li/\" target=\"_blank\">Nirvana</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: single_file_release_use_filename
+    type: checkbox
+    label: Use filename as title for single file releases
+    default: true
+  - 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
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Inactive users are regularly deleted. To keep an account, you must visit the site at least once a season."
+
+login:
+  path: /api/torrents
+  method: get
+  error:
+    - selector: a[href*="/login"]
+      message:
+        text: "The API key was not accepted by {{ .Config.sitelink }}."
+    - selector: :root:contains("Account is Banned")
+
+search:
+  paths:
+    # https://hdinnovations.github.io/UNIT3D/torrent_api.html
+    # https://github.com/HDInnovations/UNIT3D/blob/master/app/Http/Controllers/API/TorrentController.php#L657
+    - 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_optional:
+      selector: name
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    files:
+      selector: num_file
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
+    details:
+      selector: details_link
+    download:
+      selector: download_link
+    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
+    _internal:
+      selector: internal
+      case:
+        False: "{{ .False }}"
+        True: "{{ .True }}"
+    description:
+      text: "{{ if .Result._internal }}Internal{{ else }}{{ end }}{{ if and .Result._internal .Result.genre }} | {{ else }}{{ end }}{{ .Result.genre }}"
+    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
+    _featured:
+      selector: featured
+      case:
+        False: "{{ .False }}"
+        True: "{{ .True }}"
+    downloadvolumefactor_freeleech:
+      # 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
+    downloadvolumefactor:
+      text: "{{ if .Result._featured }}0{{ else }}{{ .Result.downloadvolumefactor_freeleech }}{{ end }}"
+    uploadvolumefactor_double_upload:
+      # api returns False, True
+      selector: double_upload
+      case:
+        False: 1 # normal
+        True: 2 # double
+    uploadvolumefactor:
+      text: "{{ if .Result._featured }}2{{ else }}{{ .Result.uploadvolumefactor_double_upload }}{{ end }}"
+# global MR is 0.4 but torrents must be seeded for 7 days regardless of ratio
+#    minimumratio:
+#      text: 0.4
+    minimumseedtime:
+      # 7 days (as seconds = 7 x 24 x 60 x 60)
+      text: 604800
+# json UNIT3D 9.1.7

src/Jackett.Common/Definitions/oxtorrent-vip.yml

@@ -11,8 +11,8 @@ encoding: UTF-8
 # to fetch current domain use https://www.rantop.my/
 links:
   - https://www.oxtorrent.fyi/
-  - https://www.zone-torrent.me/
-  - https://www.mega-torrent.net/
+  - https://www.zone-torrent4.com/
+  - https://www.mega-torrent7.com/
 legacylinks:
   # latest domains list
   - https://www.rantop.my/
@@ -28,8 +28,6 @@ legacylinks:
   - https://oxtorrent.blog/
   - https://www.site-torrent.com/
   # actual legacylinks
-  - https://oxtorrent.proxyninja.org/
-  - https://www-oxtorrent.com/
   - https://www.oxtorrent.ke/
   - https://www-torrent911.com/
   - https://www.oxtorrent1.com/
@@ -49,6 +47,8 @@ legacylinks:
   - https://www.zone-torrent3.com/
   - https://www.oxtorrent8.com/
   - https://www.oxtorrent.diy/
+  - https://www.zone-torrent.me/
+  - https://www.mega-torrent.net/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/pornbay.yml

@@ -131,13 +131,29 @@ search:
           args: ["/static/common/noartwork/noimage.png", ""]
     files:
       selector: td:nth-child(3)
-    date:
-      selector: td:nth-child(5) > span
+    date_elapsed:
+      # time type: time elapsed
+      # <span class="time" title="Sep 22 2025, 07:47">1 week ago</span>
+      selector: span.time:contains("ago")
+      attribute: title
+      optional: true
       filters:
         - name: append
           args: " +00:00" # GMT
         - name: dateparse
           args: "MMM dd yyyy, HH:mm zzz"
+    date_added:
+      # time added
+      # <span class="time" title="1 week ago">May 08 2025, 01:05</span>
+      selector: span.time:not(:contains("ago"))
+      optional: true
+      filters:
+        - name: append
+          args: " +00:00" # GMT
+        - name: dateparse
+          args: "MMM dd yyyy, HH:mm zzz"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
     size:
       selector: td:nth-child(6)
     grabs:

src/Jackett.Common/Definitions/rudub.yml

@@ -9,12 +9,8 @@ type: semi-private
 encoding: windows-1251
 followredirect: true
 links:
-  - https://sep30.rudub.bet/
+  - https://oct02.rudub.bet/
 legacylinks:
-  - https://sep15.rudub.bet/
-  - http://sep16.rudub.bet/
-  - https://sep16.rudub.bet/
-  - http://sep17.rudub.bet/
   - https://sep17.rudub.bet/
   - http://sep18.rudub.bet/
   - https://sep18.rudub.bet/
@@ -41,6 +37,10 @@ legacylinks:
   - http://sep29.rudub.bet/
   - https://sep29.rudub.bet/
   - http://sep30.rudub.bet/
+  - https://sep30.rudub.bet/
+  - http://oct01.rudub.bet/
+  - https://oct01.rudub.bet/
+  - http://oct02.rudub.bet/
 caps:
   categorymappings:
     - {id: 1, cat: TV, desc: "TV"}

src/Jackett.Common/Definitions/tocashare.yml

@@ -1,7 +1,7 @@
 ---
 id: tocashare
 name: Toca Share (API)
-description: "Toca Share is a PORTUGUESE Private Torrent Tracker for MOVIES / TV / GENERAL"
+description: "Toca Share is a PORTUGUESE Private Torrent Tracker for EBOOKS / AUDIOBOOKS / COURSES"
 language: pt-PT
 type: private
 encoding: UTF-8
@@ -12,22 +12,12 @@ legacylinks:
 
 caps:
   categorymappings:
-    - {id: 1, cat: Movies, desc: "Filme"}
-    - {id: 2, cat: TV, desc: "Seriado"}
-    - {id: 3, cat: Audio, desc: "Som (Música)"}
-    - {id: 4, cat: Console, desc: "Jogo"}
-    - {id: 5, cat: PC, desc: "Aplicativo"}
     - {id: 6, cat: Books/EBook, desc: "E-Books"}
     - {id: 7, cat: Other, desc: "Cursos"}
-    - {id: 8, cat: XXX/ImageSet, desc: "Fotos Adultas"}
     - {id: 9, cat: Audio/Audiobook, desc: "Audio E-Book"}
-    - {id: 10, cat: XXX, desc: "XXX"}
-    - {id: 11, cat: Audio/Video, desc: "Shows"}
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
-    movie-search: [q, imdbid, tmdbid]
     book-search: [q]
     music-search: [q]
 
@@ -92,11 +82,6 @@ search:
   # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
     $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 }}"
@@ -133,21 +118,8 @@ search:
       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: re_replace
-          args: ["(?i)(TV Movie)", "TV_Movie"]
-        - name: replace
-          args: [" & ", "_&_"]
     _internal:
       selector: internal
       case:

src/Jackett.Common/Definitions/torrentsome.yml

@@ -9,9 +9,8 @@ followredirect: true
 requestDelay: 2
 # to fetch current domain use https://tzip.top/
 links:
-  - https://torrentsome214.com/
+  - https://torrentsome215.com/
 legacylinks:
-  - https://torrentsome199.com/
   - https://torrentsome200.com/
   - https://torrentsome201.com/
   - https://torrentsome202.com/
@@ -26,6 +25,7 @@ legacylinks:
   - https://torrentsome211.com/
   - https://torrentsome212.com/
   - https://torrentsome213.com/
+  - https://torrentsome214.com/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrenttip.yml

@@ -9,9 +9,8 @@ followredirect: true
 requestDelay: 2
 # to fetch current domain use https://tzip.top/
 links:
-  - https://torrenttip195.top/
+  - https://torrenttip196.top/
 legacylinks:
-  - https://torrenttip180.top/
   - https://torrenttip181.top/
   - https://torrenttip182.top/
   - https://torrenttip183.top/
@@ -26,6 +25,7 @@ legacylinks:
   - https://torrenttip192.top/
   - https://torrenttip193.top/
   - https://torrenttip194.top/
+  - https://torrenttip195.top/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/zetorrents.yml

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 # to fetch current domain use https://www.rantop.my/
 links:
-  - https://www.zetorrents.diy/
+  - https://www.zetorrents2.com/
 legacylinks:
   # latest domains list
   - https://www.rantop.my/
@@ -22,7 +22,6 @@ legacylinks:
   - https://www.rantop.org/
   - https://www.site-torrent.com/
   # actual legacylinks
-  - https://www.zetorrents.tv/
   - https://www.zetorrents.bz/
   - https://www.zetorrents.nl/
   - https://www.zetorrents.biz/
@@ -39,6 +38,7 @@ legacylinks:
   - https://wvw-zetorrents.com/
   - https://www-zetorrents.com/
   - https://www.zetorrents1.com/
+  - https://www.zetorrents.diy/
 
 caps:
   categories:

src/Jackett.Common/Definitions/zktorrent.yml

@@ -11,7 +11,7 @@ certificates:
   - 6daab5aed021a47614f439584fc450bde16cb528 # cloudflare
 # to fetch current domain use https://www.rantop.my/
 links:
-  - https://www.zktorrent.net/
+  - https://www.zktorrent6.com/
 legacylinks:
   # latest domains list
   - https://www.rantop.my/
@@ -27,7 +27,6 @@ legacylinks:
   - https://gktorrent.news/
   - https://www.site-torrent.com/
   # actual legacylinks
-  - https://www.gktorrent.uno/
   - https://www.gktorrent.gy/
   - https://www.gktorrent.si/
   - https://www.gktorrent.my/
@@ -42,6 +41,7 @@ legacylinks:
   - https://www.zktorrent3.com/
   - https://www.zktorrent4.com/
   - https://www.zktorrent5.com/
+  - https://www.zktorrent.net/
 
 caps:
   categorymappings:

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

@@ -22,7 +22,11 @@ namespace Jackett.Common.Indexers.Definitions
         public override string Id => "revolutiontt";
         public override string Name => "RevolutionTT";
         public override string Description => "RevolutionTT is a Private site. The Revolution has begun";
-        public override string SiteLink { get; protected set; } = "https://revolutiontt.me/";
+        public override string SiteLink { get; protected set; } = "https://revott.me/";
+        public override string[] LegacySiteLinks => new[]
+        {
+            "https://revolutiontt.me/",
+        };
         public override Encoding Encoding => Encoding.GetEncoding("iso-8859-1");
         public override string Language => "en-US";
         public override string Type => "private";

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

@@ -22,7 +22,11 @@ namespace Jackett.Common.Indexers.Definitions
         public override string Id => "shazbat";
         public override string Name => "Shazbat";
         public override string Description => "Shazbat is a Private site with highly curated TV content";
-        public override string SiteLink { get; protected set; } = "https://www.shazbat.tv/";
+        public override string SiteLink { get; protected set; } = "https://www.shazbat.tube/";
+        public override string[] LegacySiteLinks => new[]
+        {
+            "https://www.shazbat.tv/",
+        };
         public override string Language => "en-US";
         public override string Type => "private";
 

src/Jackett.Updater/Program.cs

@@ -588,7 +588,6 @@ namespace Jackett.Updater
                 "Definitions/nextjav.yml",
                 "Definitions/nexttorrent.yml",
                 "Definitions/nforce.yml",
-                "Definitions/nirvana.yml",
                 "Definitions/nitro.yml",
                 "Definitions/nnm-club.yml", // renamed to noname-club
                 "Definitions/nntt.yml",