turkseed: update date selector and filter

add filter freeleech
fix DLVF/ULVF
add tpp info
add engine tag

README.md

@@ -32,7 +32,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Anidex
  * AniLibria
  * AnimeClipse
- * Animedia
  * Anime Tosho
  * AniRena
  * AniSource
@@ -136,7 +135,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * The Pirate Bay (TPB)
  * Tokyo Tosho
  * Torlock
- * Torlook
  * Torrent[CORE]
  * Torrent Downloads (TD)
  * Torrent Oyun indir
@@ -160,7 +158,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Torrentz2nz
  * TrahT
  * truPornolabs
- * Underverse
  * UnionDHT
  * VSTHouse
  * VST Torrents
@@ -274,7 +271,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * BeyondHD (BHD)
  * Bibliotik
  * Bit-Bázis
- * Bit-City Reloaded
  * BIT-HDTV
  * Bitded
  * Bithorlo (BHO)
@@ -414,7 +410,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * leech24
  * LegacyHD (HD4Free)
  * LemonHD
- * Libble [![(invite needed)][inviteneeded]](#)
+ * Libble
  * LibraNet (LN)
  * LinkoManija [![(invite needed)][inviteneeded]](#)
  * Locadora
@@ -439,10 +435,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Moviesite
  * MyAnonamouse (MAM)
  * MySpleen [![(invite needed)][inviteneeded]](#)
- * NBTorrents
  * NCore
  * Nebulance (NBL) (TransmiTheNet)
- * NetCosmo
  * NorBits
  * Old Toons World
  * OpenCD [![(invite needed)][inviteneeded]](#)
@@ -516,7 +510,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Superbits (SBS)
  * Swarmazon
  * Tapochek
- * Tasmanit [![(invite needed)][inviteneeded]](#)
+ * Tasmanit
  * Team CT Game (TCTG)
  * TeamHD
  * TeamOS

src/Jackett.Common/Content/custom.js

@@ -917,8 +917,7 @@ function doErrorNotify(indexerId, errorMessage, errorEvent) {
     var githubTemplate = "?template=bug_report.yml&"
     if (errorMessage.includes("FlareSolverr")) {
       githubRepo = "FlareSolverr/FlareSolverr";
-      githubText = "FlareSolverr";
-      githubTemplate = "?"
+      githubText = "FlareSolverr"
     }
     var githubUrl = "https://github.com/" + githubRepo + "/issues/new" + githubTemplate + "title=[" + indexerId + "] (" + errorEvent + ")";
     var indexEnd = 2000 - githubUrl.length; // keep url <= 2k #5104

src/Jackett.Common/Content/index.html

@@ -756,6 +756,6 @@
     </script>
 
     <script type="text/javascript" src="../libs/api.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../custom.js?changed=20221003"></script>
+    <script type="text/javascript" src="../custom.js?changed=20221221"></script>
 </body>
 </html>

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

@@ -125,9 +125,15 @@ search:
     download:
       selector: a[href^="download.php?id="]
       attribute: href
+    poster:
+      selector: img.lazyload
+      attribute: data-src
+    imdbid:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
     date_elapsed:
       # time type: time elapsed (default)
-      selector: td:nth-child(4) > span[title]
+      selector: td.rowfollow:nth-child(5) > span[title]
       attribute: title
       optional: true
       filters:
@@ -137,7 +143,7 @@ search:
           args: "2006-01-02 15:04:05 -07:00"
     date_added:
       # time added
-      selector: td:nth-child(4):not(:has(span))
+      selector: td.rowfollow:nth-child(5):not(:has(span))
       optional: true
       filters:
         - name: append
@@ -147,13 +153,13 @@ search:
     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(5)
+      selector: td.rowfollow:nth-child(6)
     seeders:
-      selector: td:nth-child(6)
+      selector: td.rowfollow:nth-child(7)
     leechers:
-      selector: td:nth-child(7)
+      selector: td.rowfollow:nth-child(8)
     grabs:
-      selector: td:nth-child(8)
+      selector: td.rowfollow:nth-child(9)
     downloadvolumefactor:
       case:
         img.pro_free: 0

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

@@ -142,22 +142,19 @@ search:
     date_day:
       # Today<br> 10:20 AM
       # Yesterday<br> 08:03 PM
-      optional: true
       selector: td:nth-last-child(7):contains("day")
-      filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
+      # auto adjusted by site account profile
+      optional: true
     date_year:
       # Feb 14 2019<br> 10:20 AM
-      optional: true
       selector: td:nth-last-child(7):not(:contains("day"))
+      # auto adjusted by site account profile
+      optional: true
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "Jan 2 2006 03:04 PM -07:00"
+          args: "Jan 2 2006 03:04 PM"
     date:
-      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
+      text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
     size:
       selector: td:nth-last-child(6)
     grabs:

src/Jackett.Common/Definitions/abtorrents.yml

@@ -129,6 +129,7 @@ search:
           args: cat
     title:
       selector: a[href^="details.php?id="]
+      remove: span
     details:
       selector: a[href^="details.php?id="]
       attribute: href
@@ -137,25 +138,23 @@ search:
       attribute: href
     files:
       selector: td:nth-last-child(9)
-    date_yday:
+    date_day:
       # Yesterday<br/>6:00 AM
       selector: td:nth-last-child(7):contains("day")
+      # auto adjusted by site account profile
       optional: true
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: fuzzytime
     date_year:
       # Aug 6 2021<br/>7:25 PM
       selector: td:nth-last-child(7):not(:contains("day"))
+      # auto adjusted by site account profile
       optional: true
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "Jan 2 2006 3:04 PM -07:00"
+          args: "Jan 2 2006 3:04 PM"
     date:
-      text: "{{ if or .Result.date_yday .Result.date_year }}{{ or .Result.date_yday .Result.date_year }}{{ else }}now{{ end }}"
+      text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
     size:
       selector: td:nth-last-child(6)
     grabs:

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

@@ -140,8 +140,13 @@ search:
     grabs:
       selector: times_completed
     date:
-      # 2021-10-18T00:34:50.000000Z"
+      # "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: "01/02/2006 15:04:05 -07:00"
     size:
       selector: size
     downloadvolumefactor:

src/Jackett.Common/Definitions/aidoruonline.yml

@@ -115,11 +115,10 @@ search:
       selector: td:nth-last-child(2)
     date:
       selector: td:last-child
+      # auto adjusted by site account profile
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "060102 15:04:05 -07:00"
+          args: "060102 15:04:05"
     downloadvolumefactor:
       case:
         img[src="images/freeleech.png"]: 0 # dl not counted

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

@@ -79,7 +79,7 @@ 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
     api_token: "{{ .Config.apikey }}"
     name: "{{ .Keywords }}"
-    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free[]=100{{ else }}{{ end }}"
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
@@ -137,8 +137,13 @@ search:
     grabs:
       selector: times_completed
     date:
-      # 2021-10-18T00:34:50.000000Z"
+      # "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: "01/02/2006 15:04:05 -07:00"
     size:
       selector: size
     downloadvolumefactor:
@@ -163,4 +168,4 @@ search:
     minimumseedtime:
       # 5 days (as seconds = 3 x 24 x 60 x 60)
       text: 432000
-# json UNIT3D 6.4.0
+# json UNIT3D 6.5.0

src/Jackett.Common/Definitions/amigosshare.yml

@@ -299,16 +299,15 @@ search:
         "[src$=\"/outros2.png\"]": 130
     date_optional:
       selector: p:contains("Lançado:")
+      # auto adjusted by site account profile
       optional: true
       filters:
         - name: regexp
           args: "Lançado: (.+?)$"
         - name: re_replace
           args: [" (\\d:)", " 0$1"]
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "02/01/06 15:04:05 -07:00"
+          args: "02/01/06 15:04:05"
     date:
       text: "{{ if .Result.date_optional }}{{ .Result.date_optional }}{{ else }}now{{ end }}"
     size:

src/Jackett.Common/Definitions/animeclipse.yml

@@ -2,7 +2,7 @@
 id: animeclipse
 name: AnimeClipse
 description: "AnimeClipse is a Public site for Hellenic Fansubs Anime."
-language: en-US
+language: el-GR
 type: public
 encoding: UTF-8
 links:

src/Jackett.Common/Definitions/animetracker.yml

@@ -137,8 +137,13 @@ search:
     grabs:
       selector: times_completed
     date:
-      # 2021-10-18T00:34:50.000000Z"
+      # "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: "01/02/2006 15:04:05 -07:00"
     size:
       selector: size
     downloadvolumefactor:

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

@@ -125,8 +125,13 @@ search:
     grabs:
       selector: times_completed
     date:
-      # 2021-10-18T00:34:50.000000Z"
+      # "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: "01/02/2006 15:04:05 -07:00"
     size:
       selector: size
     downloadvolumefactor:

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

@@ -84,6 +84,9 @@ search:
       selector: container
     _media:
       selector: media
+      filters:
+        - name: replace
+          args: ["WEB", "WEB-DL"]
     _resolution:
       selector: resolution
     _audioFormat:
@@ -100,13 +103,18 @@ search:
     _language:
       selector: language
       optional: true
+    _releaseGroup:
+      selector: releaseGroup
+      optional: true
+      filters:
+        - name: trim
     title:
       selector: title
       filters:
         - name: replace
           args: ["'", "'"]
         - name: append
-          args: " {{ .Result.year }} {{ .Result._codec }} {{ .Result._container }} {{ .Result._media }} {{ .Result._resolution }} {{ .Result._audioFormat }}{{ if .Result._subbing }} Subs{{ else }}{{ end }}{{ if .Result._flags }} {{ .Result._flags }}{{ else }}{{ end }}{{ if .Result._language }} {{ .Result._language }}{{ else }}{{ end }}"
+          args: " {{ .Result.year }} {{ .Result._codec }} {{ .Result._container }} {{ .Result._media }} {{ .Result._resolution }} {{ .Result._audioFormat }}{{ if .Result._subbing }} Subs{{ else }}{{ end }}{{ if .Result._flags }} {{ .Result._flags }}{{ else }}{{ end }}{{ if .Result._language }} {{ .Result._language }}{{ else }}{{ end }}{{ if and (.Result._releaseGroup) (ne .Result._releaseGroup \"NULL\") }} -{{ .Result._releaseGroup }}{{ else }}{{ end }}"
     details:
       selector: guid
     download:

src/Jackett.Common/Definitions/arabp2p.yml

@@ -149,11 +149,10 @@ search:
     date:
       selector: td:nth-child(4) span
       attribute: title
+      # auto adjusted by site account profile
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
+          args: "2006-01-02 15:04:05"
     seeders:
       selector: td:nth-child(5)
     leechers:

src/Jackett.Common/Definitions/backups.yml

@@ -10,33 +10,49 @@ links:
 
 caps:
   categorymappings:
-    - {id: 12, cat: Console, desc: "XBOX360"}
-    - {id: 9, cat: TV, desc: "TV-Boxsets"}
+    - {id: 15, cat: PC/Mobile-Android, desc: "Android"}
+    - {id: 35, cat: TV/Anime, desc: "Anime"}
+    - {id: 51, cat: PC/Mac, desc: "Apple"}
     - {id: 3, cat: PC, desc: "Apps"}
-    - {id: 24, cat: PC, desc: "Apple"}
-    - {id: 11, cat: TV, desc: "TV/x264"}
-    - {id: 23, cat: Console, desc: "Visionary"}
-    - {id: 14, cat: TV/Sport, desc: "WWE"}
-    - {id: 26, cat: Console, desc: "Xbox"}
-    - {id: 13, cat: Console, desc: "XBOX-JTAG"}
-    - {id: 35, cat: Movies/Other, desc: "Anime"}
+    - {id: 64, cat: Audio/Audiobook, desc: "Audiobooks"}
     - {id: 4, cat: Movies/BluRay, desc: "Blu-Ray"}
-    - {id: 6, cat: Movies, desc: "Movies/XVID"}
-    - {id: 10, cat: TV, desc: "TV/Xvid"}
-    - {id: 29, cat: TV/Sport, desc: "Sport"}
-    - {id: 40, cat: TV, desc: "Soaps"}
-    - {id: 27, cat: Console, desc: "Roms and Emulators"}
-    - {id: 30, cat: Console, desc: "Playstation"}
-    - {id: 7, cat: Audio, desc: "Music"}
+    - {id: 22, cat: Console, desc: "CoinOps"}
+    - {id: 42, cat: Console, desc: "CoinOPS Official"}
+    - {id: 65, cat: Console, desc: "CoinOps Unofficial"}
+    - {id: 63, cat: Books/Comics, desc: "Comics"}
+    - {id: 60, cat: Console, desc: "Core"}
+    - {id: 44, cat: Console, desc: "CP78"}
     - {id: 16, cat: TV/Documentary, desc: "Docu"}
+    - {id: 41, cat: Console, desc: "Dragon"}
     - {id: 5, cat: Books, desc: "EBooks"}
-    - {id: 38, cat: Console, desc: "Hyperspin Bolt-on Edition"}
+    - {id: 61, cat: Console, desc: "emuxtras"}
+    - {id: 69, cat: TV, desc: "Entertainment"}
     - {id: 34, cat: TV, desc: "Kids"}
-    - {id: 8, cat: PC/Games, desc: "PC Games"}
-    - {id: 22, cat: PC/Games, desc: "CoinOPS"}
+    - {id: 43, cat: Console, desc: "LB No Intro"}
     - {id: 33, cat: TV/Sport, desc: "MMA/Boxing"}
     - {id: 32, cat: Movies, desc: "Movie Pack"}
+    - {id: 6, cat: Movies, desc: "Movies/XVID"}
+    - {id: 7, cat: Audio, desc: "Music"}
     - {id: 31, cat: Console, desc: "Nintendo"}
+    - {id: 59, cat: Console, desc: "P-R-U"}
+    - {id: 8, cat: PC/Games, desc: "PC Games"}
+    - {id: 50, cat: Console, desc: "PlayBox"}
+    - {id: 30, cat: Console, desc: "Playstation"}
+    - {id: 62, cat: Console, desc: "RaspberryPi"}
+    - {id: 56, cat: Console, desc: "Retro Minis"}
+    - {id: 67, cat: Console, desc: "Retrobat"}
+    - {id: 27, cat: Console, desc: "Roms and Emulators"}
+    - {id: 68, cat: Console, desc: "Schmoomer's"}
+    - {id: 57, cat: Console, desc: "Sega"}
+    - {id: 40, cat: TV, desc: "Soaps"}
+    - {id: 29, cat: TV/Sport, desc: "Sport"}
+    - {id: 9, cat: TV, desc: "TV-Boxsets"}
+    - {id: 11, cat: TV, desc: "TV/x264"}
+    - {id: 10, cat: TV, desc: "TV/Xvid"}
+    - {id: 14, cat: TV/Sport, desc: "WWE"}
+    - {id: 26, cat: Console, desc: "Xbox"}
+    - {id: 12, cat: Console, desc: "XBOX360"}
+    - {id: 23, cat: XXX, desc: "xxx18+"}
 
   modes:
     search: [q]
@@ -45,6 +61,22 @@ caps:
     music-search: [q]
     book-search: [q]
 
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Filter freeleech only
+    default: false
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>40</b> on your account profile.
+
 login:
   path: takelogin.php
   method: post
@@ -67,12 +99,15 @@ search:
   inputs:
     do: search
     keywords: "{{ .Keywords }}"
+    # t_name, t_description, t_both, t_uploader, t_genre
     search_type: t_name
     category: 0 # multi cat search not supported
+    # yes, no
     include_dead_torrents: yes
+    # sort is done via do=quick_sort, and freeleech sorting is part of that set
 
   rows:
-    selector: table#sortabletable > tbody > tr:has(a[href*="/details.php?id="])
+    selector: "table#sortabletable > tbody > tr:has(a[href*=\"/details.php?id=\"]){{ if .Config.freeleech }}:has(img[src$=\"freedownload.gif\"]){{ else }}{{ end }}"
     filters:
       - name: andmatch
         args: 66
@@ -108,6 +143,18 @@ search:
       selector: td:nth-child(7)
     leechers:
       selector: td:nth-child(8)
+    poster:
+      selector: div.tooltip-content > img
+      attribute: src
+    downloadvolumefactor:
+      case:
+        img[src$="freedownload.gif"]: 0
+        img[src$="silverdownload.gif"]: 0.5
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img[src$="x2.gif"]: 2
+        "*": 1
     date:
       selector: "td:nth-child(2) > div:has(span[style=\"float: right;\"])"
       remove: span
@@ -116,14 +163,4 @@ search:
           args: " +00:00" # GMT
         - name: dateparse
           args: "02-01-2006 15:04 -07:00"
-    poster:
-      selector: div.tooltip-content > img
-      attribute: src
-    downloadvolumefactor:
-      case:
-        img[alt^="Free Torrent "]: 0
-        img[alt^="Silver Torrent "]: 0.5
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-# engine tbd
+# TS Special Edition v.8.0

src/Jackett.Common/Definitions/bitcityreloaded.yml

@@ -1,161 +0,0 @@
----
-id: bitcityreloaded
-name: Bit-City Reloaded
-description: "Bit-City Reloaded is a GERMAN Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: de-DE
-type: private
-encoding: ISO-8859-1
-links:
-  - https://bc-reloaded.net/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Other, desc: "Anderes"}
-    - {id: 34, cat: PC, desc: "Appz/Linux"}
-    - {id: 35, cat: PC/Mac, desc: "Appz/Mac"}
-    - {id: 36, cat: PC, desc: "Appz/Other"}
-    - {id: 20, cat: PC/0day, desc: "Appz/Win"}
-    - {id: 4, cat: Books/EBook, desc: "EBooks"}
-    - {id: 10, cat: PC/Games, desc: "Games/PC"}
-    - {id: 15, cat: PC/Mobile-Android, desc: "Handy & PDA"}
-    - {id: 16, cat: Audio/Audiobook, desc: "Hörspiel/Hörbuch"}
-    - {id: 30, cat: Movies/Foreign, desc: "International"}
-    - {id: 43, cat: Movies/3D, desc: "Movie/3D"}
-    - {id: 6, cat: Movies/HD, desc: "Movie/HD 1080p"}
-    - {id: 7, cat: Movies/HD, desc: "Movie/HD 720p"}
-    - {id: 17, cat: Movies/Other, desc: "Movie/MegaPack"}
-    - {id: 9, cat: Movies/SD, desc: "Movie/SD"}
-    - {id: 26, cat: XXX, desc: "Movie/XXX"}
-    - {id: 41, cat: XXX/Other, desc: "Movie/XXX/Other"}
-    - {id: 42, cat: XXX/Pack, desc: "Movie/XXX/Pack"}
-    - {id: 45, cat: Movies/UHD, desc: "Movies/4K"}
-    - {id: 33, cat: Movies/BluRay, desc: "Movies/BluRay"}
-    - {id: 19, cat: Audio/Video, desc: "Musik Videos"}
-    - {id: 18, cat: Audio, desc: "Musik/MP3/Flac"}
-    - {id: 13, cat: Console/WiiU, desc: "Nintendo"}
-    - {id: 12, cat: Console/PS4, desc: "Playstation"}
-    - {id: 22, cat: TV/HD, desc: "Serie/HD"}
-    - {id: 38, cat: TV, desc: "Serie/Pack"}
-    - {id: 23, cat: TV/SD, desc: "Serie/SD"}
-    - {id: 25, cat: TV/Sport, desc: "Sport"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Filter freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: added
-    options:
-      added: created
-      seeds: seeders
-      size: size
-      name: 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>Anzahl der Torrents beim Durchsuchen</b> setting to <b>100</b> on your account profile.
-
-login:
-  path: login/index.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: div#login_error
-  test:
-    path: /
-    selector: a[href="logout.php"]
-
-search:
-  paths:
-    # https://bc-reloaded.net/uebersicht.php?c7=1&c17=1&showsearch=1&search=2021+720p&blah=0&incldead=1&orderby=added&sort=desc
-    - path: uebersicht.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    showsearch: 1
-    search: "{{ .Keywords }}"
-    # 0 name, 1 descr, 2 both, 3 noDVDRip
-    blah: 0
-    # 0 active, 1 incldead, 2 onlydead
-    incldead: 1
-    orderby: "{{ .Config.sort }}"
-    sort: "{{ .Config.type }}"
-    # site does not support imdbid searching or display imdb links in results.
-
-  rows:
-    selector: "table.tableinborder[cellpadding=0] > tbody > tr{{ if .Config.freeleech }}:has(img[src$=\"torrent_ou.gif\"]){{ else }}{{ end }}"
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      selector: a[href^="uebersicht.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^="download.php"]
-      attribute: href
-    date:
-      selector: table tbody tr:nth-of-type(2) td:nth-of-type(5)
-      filters:
-        - name: re_replace
-          args: ["\u00a0", " "]
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "02.01.2006 15:04:05 -07:00"
-    size:
-      selector: table tbody tr:nth-of-type(2) > td > b
-    files:
-      selector: td:has(a[href*="&filelist=1"])> b:nth-child(2)
-    grabs:
-      selector: td:has(a[href*="&tosnatchers=1"])> b:nth-child(1)
-    seeders:
-      selector: table tbody tr:nth-of-type(2) td:nth-of-type(2) b:nth-of-type(1) font
-    leechers:
-      selector: table tbody tr:nth-of-type(2) td:nth-of-type(2) b:nth-of-type(2) font
-    downloadvolumefactor:
-      case:
-        img[src$="torrent_ou.gif"]: 0
-        "*": 1
-    uploadvolumefactor:
-      case:
-        img[src$="torrent_2u.gif"]: 2
-        "*": 1
-    minimumratio:
-      text: 0.7
-    minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-# engine n/a

src/Jackett.Common/Definitions/bitsexy.yml

@@ -151,20 +151,20 @@ search:
           args: "src=(.*?) width"
     files:
       selector: div.torrenttable:nth-last-child(7)
-    date_year:
-      # Jul 4 2019 08:04 AM
-      selector: div.torrenttable:nth-last-child(5):not(:contains("day"))
-      optional: true
-      filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: dateparse
-          args: "Jan 2 2006 03:04 PM -07:00"
     date_day:
       # Today 02:40 PM
       # Yesterday 09:10 AM
       selector: div.torrenttable:nth-last-child(5):contains("day")
+      # auto adjusted by site account profile
       optional: true
+    date_year:
+      # Jul 4 2019 08:04 AM
+      selector: div.torrenttable:nth-last-child(5):not(:contains("day"))
+      # auto adjusted by site account profile
+      optional: true
+      filters:
+        - name: dateparse
+          args: "Jan 2 2006 03:04 PM"
     date:
       text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
     size:

src/Jackett.Common/Definitions/bitturk.yml

@@ -172,34 +172,34 @@ search:
     download:
       selector: a[href*="?p=torrents&pid=10&action=download"]
       attribute: href
-    date_year:
-      # Uploaded 30-01-2019 15:02 by
-      selector: td.torrent_name:not(:contains(" at ")):not(:has(abbr[data-time]))
-      optional: true
-      filters:
-        - name: regexp
-          args: "Uploaded (.+?) by"
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: dateparse
-          args: "02-01-2006 15:04 -07:00"
     date_day:
       # Uploaded Friday at 05:11 by
       # Uploaded Today at 00:48 by
       # Uploaded Yesterday at 23:57 by
       selector: td.torrent_name:contains(" at "):not(:has(abbr[data-time]))
+      # auto adjusted by site account profile
       optional: true
       filters:
         - name: regexp
           args: "Uploaded (.+?) by"
         - name: fuzzytime
+    date_year:
+      # Uploaded 30-01-2019 15:02 by
+      selector: td.torrent_name:not(:contains(" at ")):not(:has(abbr[data-time]))
+      # auto adjusted by site account profile
+      optional: true
+      filters:
+        - name: regexp
+          args: "Uploaded (.+?) by"
+        - name: dateparse
+          args: "02-01-2006 15:04"
     date_unix:
       # within the hour (unix)
       selector: abbr[data-time]
       attribute: data-time
       optional: true
     date:
-      text: "{{ if or .Result.date_year .Result.date_unix .Result.date_day }}{{ or .Result.date_year .Result.date_unix .Result.date_day }}{{ else }}now{{ end }}"
+      text: "{{ if or .Result.date_day .Result.date_year .Result.date_unix }}{{ or .Result.date_day .Result.date_year .Result.date_unix }}{{ else }}now{{ end }}"
     size:
       selector: a[rel="torrent_size"]
     seeders:

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

@@ -6,6 +6,8 @@ language: en-US
 type: private
 encoding: UTF-8
 links:
+  - https://blutopia.cc/
+legacylinks:
   - https://blutopia.xyz/
 
 caps:
@@ -27,7 +29,7 @@ settings:
   - name: info_key
     type: info
     label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://blutopia.xyz/\" target =_blank>Blutopia</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://blutopia.cc/\" target =_blank>Blutopia</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -129,8 +131,13 @@ search:
     grabs:
       selector: times_completed
     date:
-      # 2021-10-18T00:34:50.000000Z"
+      # "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: "01/02/2006 15:04:05 -07:00"
     size:
       selector: size
     downloadvolumefactor:

src/Jackett.Common/Definitions/broadcity.yml

@@ -25,7 +25,6 @@ caps:
     - {id: 5, cat: Movies/WEB-DL, desc: "HD - WEB-DL"}
     - {id: 14, cat: Movies/HD, desc: "HD - WEBRip"}
     - {id: 40, cat: Movies/HD, desc: "PTer"}
-    - {id: 32, cat: PC/Games, desc: "Oyunlar (Games)"}
     - {id: 9, cat: Movies/SD, desc: "SD"}
     - {id: 23, cat: Movies/SD, desc: "SD - BluRay"}
     - {id: 10, cat: Movies/DVD, desc: "SD - DVD"}
@@ -60,12 +59,19 @@ login:
     path: index.php
     selector: a[href*="/logout.php?logouthash="]
 
+download:
+  before:
+    path: takethanks.php
+    method: post
+    inputs:
+      torrentid: "{{ .DownloadUri.Query.id }}"
+  selectors:
+    - selector: a[href*="download.php?id="]
+      attribute: href
+
 search:
   paths:
     - path: browse.php
-  keywordsfilters:
-    - name: re_replace # E01 to BL01
-      args: ["(?i)\\bE(\\d+)\\b", "E$1"]
   inputs:
     # does not support multi categories so defaulting to ALL
     do: search
@@ -86,14 +92,11 @@ search:
           args: category
     title:
       selector: div[id^="port-target-"] a
-      filters:
-        - name: re_replace # BL01 to E01
-          args: ["(?i)\\bBL(\\d+)\\b", " E$1 "]
     details:
       selector: div[id^="port-target-"] a
       attribute: href
     download:
-      selector: a[href*="download.php?id="]
+      selector: div[id^="port-target-"] a
       attribute: href
     poster:
       selector: div[id^="port-content-"] img

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

@@ -112,8 +112,13 @@ search:
     grabs:
       selector: times_completed
     date:
-      # 2021-10-18T00:34:50.000000Z"
+      # "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: "01/02/2006 15:04:05 -07:00"
     downloadvolumefactor:
       # api returns 0=false, 1=true
       selector: freeleech

src/Jackett.Common/Definitions/bwtorrents.yml

@@ -184,11 +184,10 @@ search:
       selector: td:nth-child(3)
     date:
       selector: td:nth-child(5)
+      # auto adjusted by site account profile
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "02-01-200615:04:05 -07:00"
+          args: "02-01-200615:04:05"
     size:
       selector: td:nth-child(6)
     download:

src/Jackett.Common/Definitions/cartoonchaos.yml

@@ -140,25 +140,23 @@ search:
     date_day:
       # Yesterday at 10:03:30 PM
       selector: td:nth-child(5):contains("day")
+      # auto adjusted by site account profile
       optional: true
       filters:
         - name: re_replace
           args: ["[ ]at|[\\s+]|[//\xa0],\\/g", " "]
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
     date_year:
       # February 09, 2019, 06:35:08 AM
       selector: td:nth-child(5):not(:contains("day"))
+      # auto adjusted by site account profile
       optional: true
       filters:
         - name: re_replace
           args: ["[,]|[\\s+]|[//\xa0],\\/g", " "]
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "January 02  2006  03:04:05 PM -07:00"
+          args: "January 02  2006  03:04:05 PM"
     date:
-      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
+      text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
     seeders:
       selector: td:nth-child(6)
     leechers:

src/Jackett.Common/Definitions/cathoderaytube.yml

@@ -137,11 +137,10 @@ search:
     date:
       selector: td:nth-child(5) > span
       attribute: title
+      # auto adjusted by site account profile
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "Jan 02 2006, 15:04 -07:00"
+          args: "Jan 02 2006, 15:04"
     size:
       selector: td:nth-child(6)
     grabs:

src/Jackett.Common/Definitions/crazyhd.yml

@@ -200,11 +200,10 @@ search:
       selector: div.torrent-size
     date:
       selector: div.torrent-time
+      # auto adjusted by site account profile
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "02/01/2006 -07:00"
+          args: "02/01/2006"
     seeders:
       selector: div.torrent-seeder
     leechers:

src/Jackett.Common/Definitions/crazyspirits.yml

@@ -269,13 +269,12 @@ search:
     date:
       selector: a[onmouseover][href^="torrents-details.php?id="]
       attribute: onmouseover
+      # auto adjusted by site account profile
       filters:
         - name: regexp
           args: "Partagé Voilà : </b>(.*?)<br"
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "01-02-2006 -07:00"
+          args: "01-02-2006"
     downloadvolumefactor:
       case:
         img[src="images/Torrents/free.png"]: 0

src/Jackett.Common/Definitions/crnaberza.yml

@@ -140,26 +140,24 @@ search:
     date_day:
       # Danas<br>08:10 AM
       # Juče<br>06:44 PM
-      optional: true
       selector: td:nth-of-type(6):contains("Danas"), td:nth-of-type(6):contains("Juče")
+      # auto adjusted by site account profile
+      optional: true
       filters:
         - name: replace
           args: ["Danas", "Today"]
         - name: replace
           args: ["Juče", "Yesterday"]
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
     date_year:
       # Feb 14 2019<br>10:20 AM
-      optional: true
       selector: td:nth-of-type(6):not(:contains("Juče")):not(:contains("Danas"))
+      # auto adjusted by site account profile
+      optional: true
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "Jan 2 2006 03:04 PM -07:00"
+          args: "Jan 2 2006 03:04 PM"
     date:
-      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
+      text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
     size:
       selector: td:nth-of-type(7)
     grabs:

src/Jackett.Common/Definitions/crt2fa.yml

@@ -127,11 +127,10 @@ search:
     date:
       selector: td:nth-child(5) > span
       attribute: title
+      # auto adjusted by site account profile
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "Jan 02 2006, 15:04 -07:00"
+          args: "Jan 02 2006, 15:04"
     size:
       selector: td:nth-child(6)
     grabs:

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

@@ -118,8 +118,13 @@ search:
     grabs:
       selector: times_completed
     date:
-      # 2022-02-28T19:09:44.000000Z
+      # "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: "01/02/2006 15:04:05 -07:00"
     size:
       selector: size
     downloadvolumefactor:

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

@@ -138,8 +138,13 @@ search:
     grabs:
       selector: times_completed
     date:
-      # 2021-10-18T00:34:50.000000Z"
+      # "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: "01/02/2006 15:04:05 -07:00"
     size:
       selector: size
     downloadvolumefactor:

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

@@ -73,7 +73,7 @@ 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
     api_token: "{{ .Config.apikey }}"
     name: "{{ .Keywords }}"
-    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free[]=100{{ else }}{{ end }}"
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
@@ -98,6 +98,8 @@ search:
       selector: details_link
     download:
       selector: download_link
+    infohash:
+      selector: info_hash
     poster:
       selector: meta.poster
       filters:
@@ -129,8 +131,13 @@ search:
     grabs:
       selector: times_completed
     date:
-      # 2021-10-18T00:34:50.000000Z"
+      # "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: "01/02/2006 15:04:05 -07:00"
     size:
       selector: size
     downloadvolumefactor:
@@ -149,9 +156,10 @@ search:
       case:
         0: 1 # normal
         1: 2 # double
-    minimumratio:
-      text: 1.0
+# global MR is 0.5 but torrents must be seeded for 7 days regardless of ratio
+#    minimumratio:
+#      text: 0.5
     minimumseedtime:
-      # 7 day (as seconds = 7 x 24 x 60 x 60)
+      # 7 days (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 6.4.1 (custom)
+# json UNIT3D 6.5.0 (custom)

src/Jackett.Common/Definitions/digitalcore.yml

@@ -110,7 +110,7 @@ search:
     limit: 100
     order: "{{ .Config.type }}"
     page: search
-    searchText: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    searchText: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }} {{ else }}{{ end }}{{ .Keywords }}"
     section: all
     sort: "{{ .Config.sort }}"
     stereoscopic: false

src/Jackett.Common/Definitions/divteam.yml

@@ -157,11 +157,10 @@ search:
       selector: td:nth-child(4)
     date:
       selector: td:nth-child(6)
+      # auto adjusted by site account profile
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "02/01/2006 -07:00"
+          args: "02/01/2006"
     seeders:
       selector: td:nth-last-child(4)
     leechers:

src/Jackett.Common/Definitions/docspedia.yml

@@ -139,22 +139,22 @@ search:
         "*": 1
     uploadvolumefactor:
       text: 1
-    date_year:
-      remove: a
-      # Jul 4 2019 08:04 AM
-      selector: div.torrenttable:nth-child(2):not(:contains("day"))
-      optional: true
-      filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: dateparse
-          args: "Jan 2 2006 03:04 PM -07:00"
     date_day:
       remove: a
       # Today 02:40 PM
       # Yesterday 09:10 AM
       selector: div.torrenttable:nth-child(2):contains("day")
+      # auto adjusted by site account profile
       optional: true
+    date_year:
+      remove: a
+      # Jul 4 2019 08:04 AM
+      selector: div.torrenttable:nth-child(2):not(:contains("day"))
+      # auto adjusted by site account profile
+      optional: true
+      filters:
+        - name: dateparse
+          args: "Jan 2 2006 03:04 PM"
     date:
       text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
     minimumratio:

src/Jackett.Common/Definitions/dreamtracker.yml

@@ -167,34 +167,34 @@ search:
     download:
       selector: a[href*="?p=torrents&pid=10&action=download"]
       attribute: href
-    date_year:
-      # Uploaded 30-01-2019 15:02 by
-      selector: td.torrent_name:not(:contains(" at ")):not(:has(abbr[data-time]))
-      optional: true
-      filters:
-        - name: regexp
-          args: "Uploaded (.+?) by"
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: dateparse
-          args: "02-01-2006 15:04 -07:00"
     date_day:
       # Uploaded Friday at 05:11 by
       # Uploaded Today at 00:48 by
       # Uploaded Yesterday at 23:57 by
       selector: td.torrent_name:contains(" at "):not(:has(abbr[data-time]))
+      # auto adjusted by site account profile
       optional: true
       filters:
         - name: regexp
           args: "Uploaded (.+?) by"
         - name: fuzzytime
+    date_year:
+      # Uploaded 30-01-2019 15:02 by
+      selector: td.torrent_name:not(:contains(" at ")):not(:has(abbr[data-time]))
+      # auto adjusted by site account profile
+      optional: true
+      filters:
+        - name: regexp
+          args: "Uploaded (.+?) by"
+        - name: dateparse
+          args: "02-01-2006 15:04"
     date_unix:
       # within the hour (unix)
       selector: abbr[data-time]
       attribute: data-time
       optional: true
     date:
-      text: "{{ if or .Result.date_year .Result.date_unix .Result.date_day }}{{ or .Result.date_year .Result.date_unix .Result.date_day }}{{ else }}now{{ end }}"
+      text: "{{ if or .Result.date_day .Result.date_year .Result.date_unix }}{{ or .Result.date_day .Result.date_year .Result.date_unix }}{{ else }}now{{ end }}"
     size:
       selector: a[rel="torrent_size"]
     seeders:

src/Jackett.Common/Definitions/empornium.yml

@@ -141,11 +141,10 @@ search:
     date:
       selector: td:nth-child(5) > span
       attribute: title
+      # auto adjusted by site account profile
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "Jan 02 2006, 15:04 -07:00"
+          args: "Jan 02 2006, 15:04"
     size:
       selector: td:nth-child(6)
     grabs:

src/Jackett.Common/Definitions/empornium2fa.yml

@@ -136,11 +136,10 @@ search:
     date:
       selector: td:nth-child(5) > span
       attribute: title
+      # auto adjusted by site account profile
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "Jan 02 2006, 15:04 -07:00"
+          args: "Jan 02 2006, 15:04"
     size:
       selector: td:nth-child(6)
     grabs:

src/Jackett.Common/Definitions/extremlymtorrents.yml

@@ -151,11 +151,10 @@ search:
           args: "src=(.+?) "
     date:
       selector: td:nth-last-child(1)
+      # auto adjusted by site account profile
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "02.01.200615:04:05 -07:00"
+          args: "02.01.200615:04:05"
     leechers:
       selector: td:nth-last-child(2)
     seeders:

src/Jackett.Common/Definitions/falkonvisionteam.yml

@@ -120,13 +120,12 @@ search:
       attribute: src
     date:
       selector: td:nth-child(2)
+      # auto adjusted by site account profile
       filters:
         - name: regexp
           args: "(\\d{2}-\\d{2}-\\d{2} \\d{2}:\\d{2})"
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "02-01-06 15:04 -07:00"
+          args: "02-01-06 15:04"
     size:
       selector: td:nth-last-child(5)
     grabs:

src/Jackett.Common/Definitions/fantastiko.yml

@@ -149,8 +149,9 @@ search:
     uploadvolumefactor:
       text: 1
     date_day:
-      optional: true
       selector: td.torrent_name:contains("day"), td.torrent_name:contains("σήμερα"), td.torrent_name:contains("εχθές"), td.torrent_name:contains("Δευτέρα"), td.torrent_name:contains("Τρίτη"), td.torrent_name:contains("Τετάρτη"), td.torrent_name:contains("Πέμπτη"), td.torrent_name:contains("Παρασκευή"), td.torrent_name:contains("Σάββατο"), td.torrent_name:contains("Κυριακή")
+      # auto adjusted by site account profile
+      optional: true
       remove: span, a
       filters:
         - name: replace
@@ -185,8 +186,9 @@ search:
           args: ["Κυριακή", "Sunday"]
         - name: fuzzytime
     date_year:
-      optional: true
       selector: td.torrent_name:contains("-")
+      # auto adjusted by site account profile
+      optional: true
       remove: span, a
       filters:
         - name: replace
@@ -203,12 +205,10 @@ search:
           args: [" τον/την", ""] # him/her
         - name: replace
           args: ["στις ", ""] # at
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "02-01-2006 15:04 -07:00"
+          args: "02-01-2006 15:04"
     date:
-      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
+      text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
     minimumratio:
       text: 1.0
     minimumseedtime:

src/Jackett.Common/Definitions/femdomcult.yml

@@ -119,12 +119,11 @@ search:
     date_optional:
       selector: td:nth-child(5) > span
       attribute: title
+      # auto adjusted by site account profile
       optional: true
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "Jan 02 2006, 15:04 -07:00"
+          args: "Jan 02 2006, 15:04"
     date: # some torrents have "Never" date
       text: "{{ if .Result.date_optional }}{{ .Result.date_optional }}{{ else }}20 years ago{{ end }}"
     size:

src/Jackett.Common/Definitions/fenyarnyek-tracker.yml

@@ -146,11 +146,10 @@ search:
           args: "src=(.+?) "
     date:
       selector: td:nth-last-child(11)
+      # auto adjusted by site account profile
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "02/01/2006 -07:00"
+          args: "02/01/2006"
     size:
       selector: td:nth-last-child(5)
     seeders:

src/Jackett.Common/Definitions/finvip.yml

@@ -146,11 +146,10 @@ search:
     date:
       # 23/12/2019 07:57
       selector: td:nth-last-child(4)
+      # auto adjusted by site account profile
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "02/01/2006 15:04 -07:00"
+          args: "02/01/2006 15:04"
     genre:
       selector: td:nth-child(2)
       remove: a

src/Jackett.Common/Definitions/gaytorrentru.yml

@@ -167,13 +167,12 @@ search:
       selector: a[href$="&todlers=1"]
     date:
       selector: .tadded
+      # auto adjusted by site account profile
       filters:
         - name: re_replace
           args: ["(\\d{4}-\\d{2}-\\d{2})(\\d{2}:\\d{2}:\\d{2}).*", "$1 $2"]
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
+          args: "2006-01-02 15:04:05"
     downloadvolumefactor:
       case:
         "td:nth-child(3) > div > nobr > font[color=\"yellow\"]": 0

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

@@ -163,8 +163,13 @@ search:
     grabs:
       selector: times_completed
     date:
-      # 2021-10-18T00:34:50.000000Z"
+      # "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: "01/02/2006 15:04:05 -07:00"
     size:
       selector: size
     downloadvolumefactor:

src/Jackett.Common/Definitions/genesismovement.yml

@@ -116,15 +116,14 @@ search:
       attribute: href
     date:
       selector: div[id^="kt"] > table > tbody > tr > td:contains("Date Added:")
+      # auto adjusted by site account profile
       filters:
         - name: regexp
           args: "(\\d{2}-\\d{2}-\\d{4} at \\d{2}:\\d{2}:\\d{2})"
         - name: replace
           args: [" at ", " "]
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "02-01-2006 15:04:05 -07:00"
+          args: "02-01-2006 15:04:05"
     size:
       selector: td:nth-last-child(6)
     grabs:

src/Jackett.Common/Definitions/girotorrent.yml

@@ -222,11 +222,10 @@ search:
           args: "src=(.+?) "
     date:
       selector: td:nth-last-child(9)
+      # auto adjusted by site account profile
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "02/01/2006 -07:00"
+          args: "02/01/2006"
     seeders:
       selector: td:nth-last-child(8)
     leechers:

src/Jackett.Common/Definitions/gktorrent.yml

@@ -35,6 +35,7 @@ legacylinks:
 caps:
   categorymappings:
     - {id: Films, cat: Movies, desc: "Movies"}
+    - {id: Animes, cat: TV/Anime, desc: "Anime"}
     - {id: Séries, cat: TV, desc: "TV"}
     - {id: Musiques, cat: Audio, desc: "Music"}
     - {id: Ebooks, cat: Books, desc: "Books"}

src/Jackett.Common/Definitions/greekdiamond.yml

@@ -155,11 +155,10 @@ search:
     # some users will have an extra wait time column before the bookmark column, so we count up from the bottom
     date:
       selector: td:nth-last-of-type(12)
+      # auto adjusted by site account profile
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "02/01/2006 -07:00"
+          args: "02/01/2006"
     seeders:
       selector: td:nth-last-of-type(10)
     leechers:

src/Jackett.Common/Definitions/gtorrentpro.yml

@@ -1,11 +1,13 @@
 ---
 id: gtorrentpro
-name: GTorrent.pro
-description: "GTorrent.pro is a RUSSIAN Public Torrent Tracker for MOVIES / TV / GENERAL"
+name: GTorrent.ru
+description: "GTorrent.ru is a RUSSIAN Public Torrent Tracker for MOVIES / TV / GENERAL"
 language: ru-RU
 type: public
 encoding: windows-1251
 links:
+  - http://gtorrent.ru/
+legacylinks:
   - http://gtorrent.pro/
 
 caps:

src/Jackett.Common/Definitions/happyfappy.yml

@@ -106,11 +106,10 @@ search:
     date:
       selector: td:nth-child(5) > span
       attribute: title
+      # auto adjusted by site account profile
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "Jan 02 2006, 15:04 -07:00"
+          args: "Jan 02 2006, 15:04"
     size:
       selector: td:nth-child(6)
     grabs:

src/Jackett.Common/Definitions/hawke-uno.yml

@@ -61,10 +61,24 @@ search:
   paths:
     # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
     # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
-    - path: "/api/torrents/filter?api_token={{ .Config.apikey }}&name={{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}&sortField={{ .Config.sort }}&sortDirection={{ .Config.type }}&perPage=100&page=1{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    - path: "/api/torrents/filter"
       response:
         type: json
 
+  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
+    api_token: "{{ .Config.apikey }}"
+    name: "{{ .Keywords }}"
+    $raw: "{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+    page: 1
+
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+
   rows:
     selector: data
     attribute: attributes
@@ -100,8 +114,13 @@ search:
     grabs:
       selector: times_completed
     date:
-      # 2021-10-18T00:34:50.000000Z"
+      # "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: "01/02/2006 15:04:05 -07:00"
     size:
       selector: size
     downloadvolumefactor:

src/Jackett.Common/Definitions/hd-unit3d-api.yml

@@ -117,8 +117,13 @@ search:
     grabs:
       selector: times_completed
     date:
-      # 2021-10-18T00:34:50.000000Z"
+      # "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: "01/02/2006 15:04:05 -07:00"
     size:
       selector: size
     downloadvolumefactor:

src/Jackett.Common/Definitions/hdcztorrent.yml

@@ -157,11 +157,10 @@ search:
           args: "src=(.+?) "
     date:
       selector: td:nth-child(6)
+      # auto adjusted by site account profile
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "02/01/2006 -07:00"
+          args: "02/01/2006"
     size:
       selector: td:nth-child(11)
     seeders:

src/Jackett.Common/Definitions/hdgalaktik.yml

@@ -8,6 +8,7 @@ encoding: UTF-8
 links:
   - https://www.trackerpmr.com/
   - https://freetmd.com/
+  - https://kinoradiomagia.tv/
 legacylinks:
   - https://hdgalaktik.com/
 

src/Jackett.Common/Definitions/hdmonkey.yml

@@ -135,11 +135,10 @@ search:
     date:
       # 15.11.21<br>07:47
       selector: td:nth-child(5)
+      # auto adjusted by site account profile
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "2.01.0615:04 -07:00"
+          args: "2.01.0615:04"
     grabs:
       selector: td:nth-child(7)
     seeders:

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

@@ -159,8 +159,13 @@ search:
     grabs:
       selector: times_completed
     date:
-      # 2021-10-18T00:34:50.000000Z"
+      # "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: "01/02/2006 15:04:05 -07:00"
     size:
       selector: size
     downloadvolumefactor:

src/Jackett.Common/Definitions/hdturk.yml

@@ -154,11 +154,10 @@ search:
       attribute: src
     date:
       selector: td:nth-child(2) > div:nth-last-child(1)
+      # auto adjusted by site account profile
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "02-01-2006 15:04 -07:00"
+          args: "02-01-2006 15:04"
     download:
       selector: div[id^="port-target-"] a
       attribute: href

src/Jackett.Common/Definitions/hebits.yml

@@ -61,11 +61,15 @@ login:
   inputs:
     cookie: "{{ .Config.cookie }}"
   test:
-    path: torrents.php
+    path: /
+    selector: a[href*="/logout.php?auth="]
 
 search:
   paths:
-    - path: torrents.php
+    - path: ajax.php
+      response:
+        type: json
+
   inputs:
     searchstr: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
     order_by: "{{ .Config.sort }}"
@@ -74,29 +78,21 @@ search:
     imdblt: 10
     # 1 freeleech, 2 neutral, 3 50%, 4 2x, 5 3x, 9 75%, 11 only perks, 0 normal
     freetorrent: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-    action: advanced
-    searchsubmit: 1
+    action: browse
     $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
 
   rows:
-    selector: .torrent
+    selector: response.results
+    attribute: torrents
+    multiple: true
 
   fields:
+    _id:
+      selector: torrentId
     category:
-      selector: .tooltip
-      case:
-        "div[class*=\"movies\"]": 1
-        "div[class*=\"tv\"]": 2
-        "div[class*=\"theater\"]": 3
-        "div[class*=\"software\"]": 4
-        "div[class*=\"games\"]": 5
-        "div[class*=\"music\"]": 6
-        "div[class*=\"books\"]": 7
-        "div[class*=\"packs\"]": 8
-        "div[class*=\"porno\"]": 9
-        "div[class*=\"other\"]": 10
+      selector: ..categoryID
     title_notenglish:
-      selector: .torrent_info:not(:contains("a")):not(:contains("e")):not(:contains("i")):not(:contains("o")):not(:contains("u")):not(:contains("y"))
+      selector: release:not(:contains("a")):not(:contains("e")):not(:contains("i")):not(:contains("o")):not(:contains("u")):not(:contains("y"))
       optional: true
       filters:
         # space out the book language at the end of the title
@@ -106,7 +102,7 @@ search:
         - name: re_replace
           args: ["(עברית)$", " - עברית"] # Hebrew
     title_english:
-      selector: .torrent_info
+      selector: release
       optional: true
       filters:
         - name: append
@@ -116,54 +112,59 @@ search:
     title:
       text: "{{ if .Result.title_notenglish }}{{ .Result.title_notenglish }}{{ else }}{{ .Result.title_english }}{{ end }}"
     details:
-      selector: a[href*="torrentid"]
-      attribute: href
-    magnet:
-      selector: a[href^="magnet"]
-      attribute: href
-      optional: true
+      text: "{{ .Config.sitelink }}torrents.php?torrentid={{ .Result._id }}"
     download:
-      selector: a[href^="torrents.php?action=download"]
-      attribute: href
+      text: "{{ .Config.sitelink }}torrents.php?action=download&id={{ .Result._id }}"
     poster:
-      selector: a[data-cover^="/images/"]
-      attribute: data-cover
+      selector: ..cover
+    imdbid:
+      selector: ..catalogue
     files:
-      selector: td:nth-child(4)
+      selector: fileCount
     date:
-      selector: td:nth-child(5) span
-      attribute: title
+      selector: time
       filters:
         - name: append
           args: " +02:00" # IST
         - name: dateparse
-          args: "02/01/2006, 15:04 -07:00"
+          args: "2006-01-02 15:04:05 -07:00"
     size:
-      selector: td:nth-child(6)
+      selector: size
     grabs:
-      selector: td:nth-child(7)
+      selector: snatches
     seeders:
-      selector: td:nth-child(8)
+      selector: seeders
     leechers:
-      selector: td:nth-child(9)
+      selector: leechers
+    description:
+      selector: ..tags
+    _half:
+      selector: isHalfFreeleech
+    _free:
+      selector: isFreeleech
+    _x2:
+      selector: isUploadX2
+    _x3:
+      selector: isUploadX3
+    _quarter:
+      selector: isQuarterLeech
+    _neutral:
+      selector: isNeutralLeech
+    _personal:
+      selector: isPersonalFreeleech
+    downloadvolumefactor_special:
+      optional: true
+      text: "{{ if eq .Result._half \"True\" }}0.5{{ else }}{{ end }}{{ if eq .Result._quarter \"True\" }}0.25{{ else }}{{ end }}{{ if eq .Result._neutral \"True\" }}0{{ else }}{{ end }}{{ if eq .Result._free \"True\" }}0{{ else }}{{ end }}{{ if eq .Result._personal \"True\" }}0{{ else }}{{ end }}"
     downloadvolumefactor:
-      case:
-        "strong.tl_notice[title*=\"חצי פריליץ'\"]": 0.5 # 50%
-        "strong.tl_notice[title*=\"75% פריליץ'!\"]": 0.25 # 75%
-        "strong.tl_notice[title*=\"נטרלי\"]": 0 # neutral
-        "strong.tl_notice[title*=\"פריליץ'\"]": 0 # freeleech
-        "*": 1
+      text: "{{ if .Result.downloadvolumefactor_special }}{{ .Result.downloadvolumefactor_special }}{{ else }}1{{ end }}"
+    uploadvolumefactor_special:
+      optional: true
+      text: "{{ if eq .Result._x3 \"True\" }}3{{ else }}{{ end }}{{ if eq .Result._x2 \"True\" }}2{{ else }}{{ end }}{{ if eq .Result._neutral \"True\" }}0{{ else }}{{ end }}"
     uploadvolumefactor:
-      case:
-        "strong.tl_notice[title*=\"העלאה משולשת\"]": 3 # 3x
-        "strong.tl_notice[title*=\"העלאה כפולה\"]": 2 # 2x
-        "strong.tl_notice[title*=\"נטרלי\"]": 0 # neutral
-        "*": 1
+      text: "{{ if .Result.uploadvolumefactor_special }}{{ .Result.uploadvolumefactor_special }}{{ else }}1{{ end }}"
     minimumratio:
       text: 1.0
     minimumseedtime:
       # 7 days (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-    description:
-      selector: div.tags
-# Gazelle
+# JSON Gazelle

src/Jackett.Common/Definitions/ilcorsaroblu.yml

@@ -232,19 +232,19 @@ search:
       selector: td:nth-last-child(2)
     date_ago:
       selector: td:nth-last-child(7):contains('ago')
+      # auto adjusted by site account profile
       optional: true
       filters:
         - name: timeago
     date_year:
       selector: td:nth-last-child(7):contains('/')
+      # auto adjusted by site account profile
       optional: true
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "02/01/2006 -07:00"
+          args: "02/01/2006"
     date:
-      text: "{{ if or .Result.date_year .Result.date_ago }}{{ or .Result.date_year .Result.date_ago }}{{ else }}now{{ end }}"
+      text: "{{ if or .Result.date_ago .Result.date_year }}{{ or .Result.date_ago .Result.date_year }}{{ else }}now{{ end }}"
     grabs:
       selector: td:nth-last-child(4)
     seeders:

src/Jackett.Common/Definitions/jme-reunit3d-api.yml

@@ -125,8 +125,13 @@ search:
     grabs:
       selector: times_completed
     date:
-      # 2021-10-18T00:34:50.000000Z"
+      # "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: "01/02/2006 15:04:05 -07:00"
     size:
       selector: size
     downloadvolumefactor:

src/Jackett.Common/Definitions/jpopsuki.yml

@@ -128,11 +128,10 @@ search:
     date:
       selector: td:nth-last-child(5)
       attribute: title
+      # auto adjusted by site account profile
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "Jan 02 2006, 15:04 -07:00"
+          args: "Jan 02 2006, 15:04"
     size:
       selector: td:nth-last-child(4)
     grabs:

src/Jackett.Common/Definitions/kinozal.yml

@@ -271,6 +271,7 @@ search:
       # Today 09:10
       # Yesterday 13:04
       selector: td:nth-child(7):not(:contains("."))
+      # auto adjusted by site account profile
       optional: true
       filters:
         - name: replace
@@ -284,16 +285,15 @@ search:
     date_year:
       # 24.10.2017 at 23:44
       selector: td:nth-child(7):contains(".")
+      # auto adjusted by site account profile
       optional: true
       filters:
         - name: replace
           args: [" в", ""]
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "02.01.2006 15:04 -07:00"
+          args: "02.01.2006 15:04"
     date:
-      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
+      text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
     downloadvolumefactor:
       case:
         a.r1: 0 # gold

src/Jackett.Common/Definitions/krazyzone.yml

@@ -182,11 +182,10 @@ search:
     date:
       # 24.Jul<br>2022<br>07:47
       selector: td:nth-child(5)
+      # auto adjusted by site account profile
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "2.Jan200615:04 -07:00"
+          args: "2.Jan200615:04"
     seeders:
       selector: td:nth-child(7)
     leechers:

src/Jackett.Common/Definitions/kufirc.yml

@@ -167,11 +167,10 @@ search:
     date:
       selector: td:nth-child(5) > span
       attribute: title
+      # auto adjusted by site account profile
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "Jan 02 2006, 15:04 -07:00"
+          args: "Jan 02 2006, 15:04"
     size:
       selector: td:nth-child(6)
     grabs:

src/Jackett.Common/Definitions/lastfiles.yml

@@ -169,23 +169,21 @@ search:
     download:
       selector: a[href^="download.php"]
       attribute: href
-    date_year:
-      selector: td:nth-child(4) span:not(:contains("day"))
-      optional: true
-      filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: dateparse
-          args: "Jan 2 2006 03:04 PM -07:00"
     date_day:
       selector: td:nth-child(4) span:contains("day")
+      # auto adjusted by site account profile
       optional: true
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: fuzzytime
+    date_year:
+      selector: td:nth-child(4) span:not(:contains("day"))
+      # auto adjusted by site account profile
+      optional: true
+      filters:
+        - name: dateparse
+          args: "Jan 2 2006 03:04 PM"
     date:
-      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
+      text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
     size:
       selector: td:nth-child(5)
     grabs:

src/Jackett.Common/Definitions/lat-team-api.yml

@@ -154,8 +154,13 @@ search:
     grabs:
       selector: times_completed
     date:
-      # 2021-10-18T00:34:50.000000Z"
+      # "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: "01/02/2006 15:04:05 -07:00"
     size:
       selector: size
     downloadvolumefactor:

src/Jackett.Common/Definitions/learnbits.yml

@@ -191,24 +191,22 @@ search:
       remove: b
     date_day:
       selector: td:nth-child(2):contains("day ")
+      # auto adjusted by site account profile
       optional: true
       remove: a, b, img, span
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: fuzzytime
     date_year:
       # 2021-07-16 09:30 PM
       selector: td:nth-child(2):not(:contains("day "))
+      # auto adjusted by site account profile
       optional: true
       remove: a, b, img, span
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "2006-01-02 03:04 PM -07:00"
+          args: "2006-01-02 03:04 PM"
     date:
-      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
+      text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
     minimumratio:
       text: 1.0
 # TS Special Edition

src/Jackett.Common/Definitions/learnflakes.yml

@@ -150,31 +150,29 @@ search:
       selector: a[rel="torrent_seeders"]
     leechers:
       selector: a[rel="torrent_leechers"]
-    date_time:
-      selector: div.torrentOwner abbr
-      optional: true
-      attribute: data-time
     date_day:
       selector: div.torrentOwner:contains("day")
+      # auto adjusted by site account profile
       optional: true
       filters:
         - name: regexp
           args: "Uploaded (.+?) by"
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: fuzzytime
     date_year:
       selector: div.torrentOwner:contains("-")
+      # auto adjusted by site account profile
       optional: true
       filters:
         - name: regexp
           args: "Uploaded (.+?) by"
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "02-01-2006 15:04 -07:00"
+          args: "02-01-2006 15:04"
+    date_unix:
+      selector: div.torrentOwner abbr
+      optional: true
+      attribute: data-time
     date:
-      text: "{{ if or .Result.date_time .Result.date_year .Result.date_day }}{{ or .Result.date_time .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
+      text: "{{ if or .Result.date_day .Result.date_year .Result.date_unix }}{{ or .Result.date_day .Result.date_year .Result.date_unix }}{{ else }}now{{ end }}"
     downloadvolumefactor:
       case:
         img[src$="/torrent_free.png"]: 0

src/Jackett.Common/Definitions/locadora.yml

@@ -123,8 +123,13 @@ search:
     grabs:
       selector: times_completed
     date:
-      # 2021-10-18T00:34:50.000000Z"
+      # "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: "01/02/2006 15:04:05 -07:00"
     size:
       selector: size
     downloadvolumefactor:

src/Jackett.Common/Definitions/lst.yml

@@ -128,8 +128,13 @@ search:
     grabs:
       selector: times_completed
     date:
-      # 2021-10-18T00:34:50.000000Z"
+      # "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: "01/02/2006 15:04:05 -07:00"
     size:
       selector: size
     downloadvolumefactor:

src/Jackett.Common/Definitions/magicheaven.yml

@@ -171,13 +171,12 @@ search:
       attribute: src
     date:
       selector: td:nth-child(2) > div:last-child
+      # auto adjusted by site account profile
       filters:
         - name: regexp
           args: (\d{2}-\d{2}-\d{4} \d{2}:\d{2})
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "02-01-2006 15:04 -07:00"
+          args: "02-01-2006 15:04"
     size:
       selector: td:nth-child(5)
     grabs:

src/Jackett.Common/Definitions/magico.yml

@@ -206,14 +206,11 @@ search:
     uploadvolumefactor:
       case:
         "*": 1
-    date_unix:
-      optional: true
-      selector: div.torrentOwner > abbr.timeago
-      attribute: data-time
     date_day:
       # Uploaded Yesterday at 20:12 by
-      optional: true
       selector: div.torrentOwner:not(:has(abbr.timeago)):contains("day"), div.torrentOwner:not(:has(abbr.timeago)):contains("σήμερα"), div.torrentOwner:not(:has(abbr.timeago)):contains("εχθές"), div.torrentOwner:not(:has(abbr.timeago)):contains("Δευτέρα"), div.torrentOwner:not(:has(abbr.timeago)):contains("Τρίτη"), div.torrentOwner:not(:has(abbr.timeago)):contains("Τετάρτη"), div.torrentOwner:not(:has(abbr.timeago)):contains("Πέμπτη"), div.torrentOwner:not(:has(abbr.timeago)):contains("Παρασκευή"), div.torrentOwner:not(:has(abbr.timeago)):contains("Σάββατο"), div.torrentOwner:not(:has(abbr.timeago)):contains("Κυριακή")
+      # auto adjusted by site account profile
+      optional: true
       remove: span
       filters:
         - name: replace
@@ -249,8 +246,9 @@ search:
         - name: fuzzytime
     date_year:
       # 23-10-2021 22:59
-      optional: true
       selector: div.torrentOwner:not(:has(abbr.timeago)):contains("-")
+      # auto adjusted by site account profile
+      optional: true
       remove: span
       filters:
         - name: replace
@@ -267,13 +265,12 @@ search:
           args: [" τον/την", ""] # him/her
         - name: replace
           args: ["στις ", ""] # at
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "02-01-2006 15:04 -07:00"
+          args: "02-01-2006 15:04"
     date_other:
-      optional: true
       selector: td.torrent_name
+      # auto adjusted by site account profile
+      optional: true
       remove: div, a, span
       filters:
         - name: replace
@@ -282,10 +279,12 @@ search:
           args: [" by", ""]
         - name: replace
           args: ["at ", ""]
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "02-01-2006 15:04 -07:00"
+          args: "02-01-2006 15:04"
+    date_unix:
+      selector: div.torrentOwner > abbr.timeago
+      attribute: data-time
+      optional: true
     date:
-      text: "{{ if or .Result.date_unix .Result.date_day .Result.date_year .Result.date_other }}{{ or .Result.date_unix .Result.date_day .Result.date_year .Result.date_other }}{{ else }}now{{ end }}"
+      text: "{{ if or .Result.date_day .Result.date_year .Result.date_other .Result.date_unix }}{{ or .Result.date_day .Result.date_year .Result.date_other .Result.date_unix }}{{ else }}now{{ end }}"
 # TSUE 2.2

src/Jackett.Common/Definitions/mojblink.yml

@@ -180,6 +180,7 @@ search:
       # Naložen: Danes, 06:46:17
       # Uploaded: Danes, 06:46:17
       selector: div.release-info__meta:contains("Naložen:"):contains("Včeraj"), div.release-info__meta:contains("Naložen:"):contains("Danes"), div.release-info__meta:contains("Uploaded:"):contains("Včeraj"), div.release-info__meta:contains("Uploaded:"):contains("Danes")
+      # auto adjusted by site account profile
       optional: true
       filters:
         - name: replace
@@ -195,18 +196,17 @@ search:
       # Uploaded: 15.11.2022 07:24:18
       # Naložen: 15.11.2022 07:24:18
       selector: div.release-info__meta:contains("Naložen:"):contains("."), div.release-info__meta:contains("Uploaded:"):contains(".")
+      # auto adjusted by site account profile
       optional: true
       filters:
         - name: replace
           args: ["Uploaded: ", ""]
         - name: replace
           args: ["Naložen: ", ""]
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "02.01.2006 15:04:05 -07:00"
+          args: "02.01.2006 15:04:05"
     date:
-      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
+      text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
     size:
       selector: a[href^="/download/"]
     seeders:

src/Jackett.Common/Definitions/mousebits.yml

@@ -117,11 +117,10 @@ search:
       text: "512 MB"
     date:
       selector: td:nth-child(4)
+      # auto adjusted by site account profile
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "02/01/2006 -07:00"
+          args: "02/01/2006"
     seeders:
       selector: td:nth-child(5)
     leechers:

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

@@ -1,148 +0,0 @@
----
-id: nbtorrents-api
-name: NBTorrents (API)
-description: "NBTorrents is an INDIAN Private site for MOVIES / TV / MUSIC"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://www.nbtorrents.com/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Movies, desc: "Movies"}
-    - {id: 2, cat: TV, desc: "TV"}
-    - {id: 3, cat: Audio, desc: "Music"}
-    - {id: 4, cat: PC/Games, desc: "Game"}
-    - {id: 5, cat: PC/0day, desc: "Application"}
-
-  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://www.nbtorrents.com/\" target =_blank>NBTorrents</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
-  inputs:
-    api_token: "{{ .Config.apikey }}"
-  error:
-    - selector: a[href*="/login"]
-      message:
-        text: "The API key was not accepted by {{ .Config.sitelink }}."
-
-search:
-  paths:
-    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
-    - path: "/api/torrents/filter"
-      response:
-        type: json
-
-  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
-    api_token: "{{ .Config.apikey }}"
-    name: "{{ .Keywords }}"
-    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
-    sortField: "{{ .Config.sort }}"
-    sortDirection: "{{ .Config.type }}"
-    perPage: 100
-    page: 1
-
-  keywordsfilters:
-    - name: re_replace
-      args: ["\\.", " "]
-
-  rows:
-    selector: data
-    attribute: attributes
-    count:
-      selector: meta.total
-
-  fields:
-    category:
-      selector: category_id
-    title:
-      selector: name
-    details:
-      selector: details_link
-    download:
-      selector: download_link
-    poster:
-      selector: poster
-      filters:
-        - name: replace
-          args: ["https://via.placeholder.com/90x135", ""]
-    imdbid:
-      selector: imdb_id
-    tmdbid:
-      selector: tmdb_id
-    tvdbid:
-      selector: tvdb_id
-    files:
-      selector: num_file
-    seeders:
-      selector: seeders
-    leechers:
-      selector: leechers
-    grabs:
-      selector: times_completed
-    date:
-      # 2021-10-18T00:34:50.000000Z"
-      selector: created_at
-    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 7 days regardless of ratio
-#    minimumratio:
-#      text: 0.4
-    minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-# json UNIT3D 6.3.0

src/Jackett.Common/Definitions/netcosmo.yml

@@ -1,181 +0,0 @@
----
-id: netcosmo
-name: NetCosmo
-description: "NetCosmo is an ITALIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: it-IT
-type: private
-encoding: UTF-8
-links:
-  - http://netcosmo.it/ # site does not support https NET::ERR_CERT_AUTHORITY_INVALID
-
-caps:
-  categorymappings:
-    - {id: 14, cat: Movies, desc: "Screener"}
-    - {id: 39, cat: Movies/WEB-DL, desc: "BDRip - Download WEB"}
-    - {id: 15, cat: Movies/HD, desc: "Rip H264"}
-    - {id: 16, cat: Movies/HD, desc: "Rip H265"}
-    - {id: 24, cat: Movies/UHD, desc: "Rip 4K"}
-    - {id: 40, cat: Movies/UHD, desc: "4K - 3840X2160"}
-    - {id: 21, cat: Movies/HD, desc: "Full HD"}
-    - {id: 31, cat: TV/HD, desc: "Serie TV 720P"}
-    - {id: 25, cat: Audio, desc: "Musica"}
-    - {id: 26, cat: PC/Games, desc: "PC-Game"}
-    - {id: 27, cat: PC, desc: "Software"}
-    - {id: 28, cat: Books, desc: "Letture"}
-    - {id: 32, cat: Other, desc: "Navigazione Saghe"}
-    - {id: 35, cat: Other, desc: "Happy Hour"}
-    - {id: 37, cat: Other, desc: "Tutte le saghe"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 3
-    options:
-      3: created
-      5: seeders
-      4: size
-      2: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: 2
-    options:
-      2: desc
-      1: asc
-  - name: info
-    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: index.php?page=login
-  method: post
-  inputs:
-    uid: "{{ .Config.username }}"
-    pwd: "{{ .Config.password }}"
-  error:
-    - selector: body[onLoad^="makeAlert('"]
-      message:
-        selector: body[onLoad^="makeAlert('"]
-        attribute: onLoad
-        filters:
-          - name: replace
-            args: ["makeAlert('Error' , '", ""]
-          - name: replace
-            args: ["');", ""]
-  test:
-    path: index.php
-    selector: a[href="logout.php"]
-
-search:
-  paths:
-    - path: index.php
-  keywordsfilters:
-    # most ITA TV torrents are in XXxYY format, so we search without S/E prefixes and filter later
-    - name: re_replace
-      args: ["(?i)S0?(\\d{1,2})", " $1 "]
-    - name: re_replace
-      args: ["(?i)E(\\d{2,3})", " $1 "]
-    - name: replace
-      args: ["-", ""]
-  inputs:
-    search: "{{ .Keywords }}"
-    page: torrents
-    category: "{{ range .Categories }}{{.}};{{end}}"
-    # 0 all, 1 active, 2 dead
-    active: 0
-    # 0 filename, 1 file&descr, 2 descr, 3 uploader, 5 gold, 6 silver, 7 bronze, 18 genre
-    options: "{{ if .Config.freeleech }}5{{ else }}0{{ end }}"
-    order: "{{ .Config.sort }}"
-    by: "{{ .Config.type }}"
-    # does not support imdbid searching or provide imdb link in results.
-
-  rows:
-    selector: table > tbody > tr > td > table.lista > tbody > tr:has(a[href^="index.php?page=torrent-details&id="])
-
-  fields:
-    category:
-      selector: a[href^="index.php?page=torrents&category="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: category
-    title:
-      selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
-      filters:
-        # normalize to SXXEYY format
-        - name: re_replace
-          args: ["(\\d{2})x(\\d{2})", "S$1E$2"]
-        - name: re_replace
-          args: ["(\\d{1})x(\\d{2})", "S0$1E$2"]
-    poster:
-      selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "src=(.*?) "
-        - name: replace
-          args: ["torrentimg/nocover.jpg", ""]
-    details:
-      selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php?id="]
-      attribute: href
-    size:
-      selector: td:nth-last-child(3)
-    date:
-      selector: td:nth-last-child(7)
-      filters:
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "02/01/2006 -07:00"
-    grabs:
-      selector: td:nth-last-child(4)
-    seeders:
-      selector: td:nth-last-child(6)
-    leechers:
-      selector: td:nth-last-child(5)
-    downloadvolumefactor:
-      case:
-        img[alt="Gold 100% Free"]: 0
-        img[alt="Silver 50% Free"]: 0.5
-        img[alt="Bronze 25% Free"]: 0.75
-        "*": 1
-    uploadvolumefactor:
-      case:
-        img[alt="2x Upload Multiplier"]: 2
-        img[alt="3x Upload Multiplier"]: 3
-        img[alt="4x Upload Multiplier"]: 4
-        img[alt="5x Upload Multiplier"]: 5
-        img[alt="6x Upload Multiplier"]: 6
-        img[alt="7x Upload Multiplier"]: 7
-        img[alt="8x Upload Multiplier"]: 8
-        img[alt="9x Upload Multiplier"]: 9
-        img[alt="10x Upload Multiplier"]: 10
-        "*": 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 1 day (as seconds = 1 x 24 x 60 x 60)
-      text: 86400
-# xbtitFM v3.1.01

src/Jackett.Common/Definitions/p2pbg.yml

@@ -171,6 +171,7 @@ search:
       # Yesterday
       # Вчера
       selector: td:nth-last-child(5):not(:contains("/"))
+      # auto adjusted by site account profile
       optional: true
       filters:
         - name: re_replace
@@ -182,14 +183,13 @@ search:
     date_year:
       # 14/03/2019
       selector: td:nth-last-child(5):contains("/")
+      # auto adjusted by site account profile
       optional: true
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "02/01/2006 -07:00"
+          args: "02/01/2006"
     date:
-      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
+      text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
     size:
       selector: td:nth-last-child(4)
     seeders:

src/Jackett.Common/Definitions/p2pelite.yml

@@ -143,17 +143,17 @@ search:
       selector: td:nth-last-child(8)
     date_day:
       selector: td:nth-last-child(6):contains("day")
+      # auto adjusted by site account profile
       optional: true
     date_year:
       selector: td:nth-last-child(6):not(:contains("day"))
+      # auto adjusted by site account profile
       optional: true
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "Jan 2 2006 03:04 PM -07:00"
+          args: "Jan 2 2006 03:04 PM"
     date:
-      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
+      text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
     size:
       selector: td:nth-last-child(5)
     grabs:

src/Jackett.Common/Definitions/peeratiko.yml

@@ -171,22 +171,19 @@ search:
     date_day:
       # Today<br>08:10 AM
       # Yesterday<br>06:44 PM
-      optional: true
       selector: td:nth-last-child(6):contains("day")
-      filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
+      # auto adjusted by site account profile
+      optional: true
     date_year:
       # Dec 4 2021<br>10:20 AM
-      optional: true
       selector: td:nth-last-child(6):not(:contains("day"))
+      # auto adjusted by site account profile
+      optional: true
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "Jan 2 2006 03:04 PM -07:00"
+          args: "Jan 2 2006 03:04 PM"
     date:
-      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
+      text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
     size:
       selector: td:nth-last-child(5)
     grabs:

src/Jackett.Common/Definitions/peersfm.yml

@@ -114,6 +114,7 @@ search:
       selector: td:nth-child(6)
     date:
       selector: td:nth-child(5)
+      # auto adjusted by site account profile
       filters:
         # replace month abbreviations
         - name: replace
@@ -140,10 +141,8 @@ search:
           args: ["ноя", "Nov"]
         - name: replace
           args: ["дек", "Dec"]
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "15:04:0502 Jan 2006 -07:00"
+          args: "15:04:0502 Jan 2006"
     seeders:
       selector: td:nth-child(8)
     leechers:

src/Jackett.Common/Definitions/pixelados.yml

@@ -165,8 +165,13 @@ search:
     grabs:
       selector: times_completed
     date:
-      # 2021-10-18T00:34:50.000000Z"
+      # "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: "01/02/2006 15:04:05 -07:00"
     size:
       selector: size
     downloadvolumefactor:

src/Jackett.Common/Definitions/pixelcove.yml

@@ -154,22 +154,20 @@ search:
     date_elapsed:
       # <td class="nobr"><span class="time" alt="1 month ago" title="1 month ago">Oct 01 2022, 18:41</span></td>
       selector: td:nth-child(5) > span:not(:contains("ago"))
+      # auto adjusted by site account profile
       optional: true
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "Jan 02 2006, 15:04 -07:00"
+          args: "Jan 02 2006, 15:04"
     date_added:
     # <td class="nobr"><span class="time" alt="Nov 17 2022, 01:44" title="Nov 17 2022, 01:44">13 hours ago</span></td>
       selector: td:nth-child(5) > span:contains("ago")
       attribute: title
+      # auto adjusted by site account profile
       optional: true
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "Jan 02 2006, 15:04 -07:00"
+          args: "Jan 02 2006, 15:04"
     date:
       text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
     size:

src/Jackett.Common/Definitions/pixelcove2fa.yml

@@ -149,22 +149,20 @@ search:
     date_elapsed:
       # <td class="nobr"><span class="time" alt="1 month ago" title="1 month ago">Oct 01 2022, 18:41</span></td>
       selector: td:nth-child(5) > span:not(:contains("ago"))
+      # auto adjusted by site account profile
       optional: true
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "Jan 02 2006, 15:04 -07:00"
+          args: "Jan 02 2006, 15:04"
     date_added:
     # <td class="nobr"><span class="time" alt="Nov 17 2022, 01:44" title="Nov 17 2022, 01:44">13 hours ago</span></td>
       selector: td:nth-child(5) > span:contains("ago")
       attribute: title
+      # auto adjusted by site account profile
       optional: true
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "Jan 02 2006, 15:04 -07:00"
+          args: "Jan 02 2006, 15:04"
     date:
       text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
     size:

src/Jackett.Common/Definitions/polishsource.yml

@@ -154,11 +154,10 @@ search:
       selector: a[href*="imdb.com/title/tt"]
     date:
       selector: td:nth-child(4)
+      # auto adjusted by site account profile
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "2006-01-0215:04:05 -07:00"
+          args: "2006-01-0215:04:05"
     size:
       selector: td:nth-child(5)
     grabs:

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

@@ -141,8 +141,13 @@ search:
     grabs:
       selector: times_completed
     date:
-      # 2021-10-18T00:34:50.000000Z"
+      # "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: "01/02/2006 15:04:05 -07:00"
     size:
       selector: size
     downloadvolumefactor:

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

@@ -147,8 +147,13 @@ search:
     grabs:
       selector: times_completed
     date:
-      # 2021-10-18T00:34:50.000000Z"
+      # "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: "01/02/2006 15:04:05 -07:00"
     size:
       selector: size
     downloadvolumefactor:

src/Jackett.Common/Definitions/rainbowtracker.yml

@@ -202,6 +202,7 @@ search:
           args: "(\\d{1,2}-\\w{3,4}-\\d{2})"
     date:
       text: "{{ .Result.date_time }} {{ .Result.date_date }}"
+      # auto adjusted by site account profile
       filters:
         - name: replace
           args: ["Янв", "Jan"]
@@ -227,10 +228,8 @@ search:
           args: ["Ноя", "Nov"]
         - name: replace
           args: ["Дек", "Dec"]
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "15:04 2-Jan-06 -07:00"
+          args: "15:04 2-Jan-06"
     downloadvolumefactor:
       case:
         img[src="images/tor_gold.gif"]: 0

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

@@ -157,8 +157,13 @@ search:
     grabs:
       selector: times_completed
     date:
-      # 2021-10-18T00:34:50.000000Z"
+      # "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: "01/02/2006 15:04:05 -07:00"
     size:
       selector: size
     downloadvolumefactor:

src/Jackett.Common/Definitions/redstartorrent.yml

@@ -94,11 +94,10 @@ search:
       attribute: href
     date:
       selector: td:nth-child(5)
+      # auto adjusted by site account profile
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "2006-01-0215:04:05 -07:00"
+          args: "2006-01-0215:04:05"
     grabs:
       selector: td:nth-child(7)
     size:

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

@@ -72,7 +72,7 @@ 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
     api_token: "{{ .Config.apikey }}"
     name: "{{ .Keywords }}"
-    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free[]=100{{ else }}{{ end }}"
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
@@ -100,7 +100,7 @@ search:
     infohash:
       selector: info_hash
     poster:
-      selector: poster
+      selector: meta.poster
       filters:
         - name: replace
           args: ["https://via.placeholder.com/90x135", ""]
@@ -110,6 +110,17 @@ search:
       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: [" & ", "_&_"]
+    description:
+      text: "{{ .Result.genre }}"
     files:
       selector: num_file
     seeders:
@@ -119,8 +130,13 @@ search:
     grabs:
       selector: times_completed
     date:
-      # 2021-10-18T00:34:50.000000Z"
+      # "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: "01/02/2006 15:04:05 -07:00"
     size:
       selector: size
     downloadvolumefactor:
@@ -141,4 +157,4 @@ search:
         1: 2 # double
     minimumratio:
       text: 1.0
-# json UNIT3D 6.1.0
+# json UNIT3D 6.5.0

src/Jackett.Common/Definitions/resurrectthenet.yml

@@ -136,11 +136,10 @@ search:
           args: "src=(.*?) "
     date:
       selector: td:nth-last-child(5)
+      # auto adjusted by site account profile
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "15:04:05 02/01/2006 -07:00"
+          args: "15:04:05 02/01/2006"
     seeders:
       selector: td:nth-last-child(4)
     leechers:

src/Jackett.Common/Definitions/rgfootball.yml

@@ -11,53 +11,103 @@ links:
 caps:
   categorymappings:
     # VIP-Архив / VIP-Archive
-    - {id: 224, cat: TV/Sport, desc: "VIP January 2021"}
-    - {id: 225, cat: TV/Sport, desc: "VIP February 2021"}
-    - {id: 402, cat: TV/Sport, desc: "VIP March 2021"}
-    - {id: 403, cat: TV/Sport, desc: "VIP April 2021"}
-    - {id: 408, cat: TV/Sport, desc: "VIP May 2021"}
-    - {id: 409, cat: TV/Sport, desc: "VIP June 2021"}
-    - {id: 436, cat: TV/Sport, desc: "VIP July 2021"}
-    - {id: 438, cat: TV/Sport, desc: "VIP August 2021"}
-    - {id: 448, cat: TV/Sport, desc: "VIP September 2021"}
-    - {id: 449, cat: TV/Sport, desc: "VIP October 2021"}
-    - {id: 450, cat: TV/Sport, desc: "VIP November 2021"}
-    - {id: 451, cat: TV/Sport, desc: "VIP December 2021"}
-    - {id: 235, cat: TV/Sport, desc: "VIP January 2020"}
-    - {id: 247, cat: TV/Sport, desc: "VIP February 2020"}
-    - {id: 250, cat: TV/Sport, desc: "VIP March 2020"}
-    - {id: 252, cat: TV/Sport, desc: "VIP April 2020"}
-    - {id: 273, cat: TV/Sport, desc: "VIP May 2020"}
-    - {id: 275, cat: TV/Sport, desc: "VIP June 2020"}
-    - {id: 375, cat: TV/Sport, desc: "VIP July 2020"}
-    - {id: 378, cat: TV/Sport, desc: "VIP August 2020"}
-    - {id: 382, cat: TV/Sport, desc: "VIP September 2020"}
-    - {id: 384, cat: TV/Sport, desc: "VIP October 2020"}
-    - {id: 385, cat: TV/Sport, desc: "VIP November 2020"}
-    - {id: 386, cat: TV/Sport, desc: "VIP December 2020"}
+    - {id: 235, cat: TV/Sport, desc: " |- VIP January 2022"}
+    - {id: 247, cat: TV/Sport, desc: " |- VIP February 2022"}
+    - {id: 250, cat: TV/Sport, desc: " |- VIP March 2022"}
+    - {id: 252, cat: TV/Sport, desc: " |- VIP April 2022"}
+    - {id: 273, cat: TV/Sport, desc: " |- VIP May 2022"}
+    - {id: 275, cat: TV/Sport, desc: " |- VIP June 2022"}
+    - {id: 375, cat: TV/Sport, desc: " |- VIP July 2022"}
+    - {id: 378, cat: TV/Sport, desc: " |- VIP August 2022"}
+    - {id: 382, cat: TV/Sport, desc: " |- VIP September 2022"}
+    - {id: 384, cat: TV/Sport, desc: " |- VIP October 2022"}
+    - {id: 385, cat: TV/Sport, desc: " |- VIP November 2022"}
+    - {id: 386, cat: TV/Sport, desc: " |- VIP December 2022"}
+    - {id: 224, cat: TV/Sport, desc: " |- VIP January 2021"}
+    - {id: 225, cat: TV/Sport, desc: " |- VIP February 2021"}
+    - {id: 402, cat: TV/Sport, desc: " |- VIP March 2021"}
+    - {id: 403, cat: TV/Sport, desc: " |- VIP April 2021"}
+    - {id: 408, cat: TV/Sport, desc: " |- VIP May 2021"}
+    - {id: 409, cat: TV/Sport, desc: " |- VIP June 2021"}
+    - {id: 436, cat: TV/Sport, desc: " |- VIP July 2021"}
+    - {id: 438, cat: TV/Sport, desc: " |- VIP August 2021"}
+    - {id: 448, cat: TV/Sport, desc: " |- VIP September 2021"}
+    - {id: 449, cat: TV/Sport, desc: " |- VIP October 2021"}
+    - {id: 450, cat: TV/Sport, desc: " |- VIP November 2021"}
+    - {id: 451, cat: TV/Sport, desc: " |- VIP December 2021"}
+    # Олимпийские игры / Olympic Games
+    - {id: 465, cat: TV/Sport, desc: "Зимние Олимпийские игры 2022 /..."}
+    - {id: 473, cat: TV/Sport, desc: " |- Церемонии"}
+    - {id: 483, cat: TV/Sport, desc: " |- Биатлон"}
+    - {id: 485, cat: TV/Sport, desc: " |- Фигурное катание"}
+    - {id: 467, cat: TV/Sport, desc: " |- Лыжный спорт"}
+    - {id: 474, cat: TV/Sport, desc: " |- Хоккей"}
+    - {id: 475, cat: TV/Sport, desc: " |- Конькобежный спорт/Шорт-трек"}
+    - {id: 484, cat: TV/Sport, desc: " |- Бобслей/Санный спорт/Скелетон"}
+    - {id: 481, cat: TV/Sport, desc: " |- Сноуборд/Фристайл/Кёрлинг"}
+    - {id: 482, cat: TV/Sport, desc: " |- Обзорные и тематические..."}
+    - {id: 476, cat: TV/Sport, desc: " |- Архив - Олимпиады прошлых лет"}
+    - {id: 464, cat: TV/Sport, desc: "Летние Олимпийские игры / Summer..."}
+    - {id: 486, cat: TV/Sport, desc: " |- Церемонии"}
+    - {id: 487, cat: TV/Sport, desc: " |- Футбол"}
+    - {id: 489, cat: TV/Sport, desc: " |- Баскетбол"}
+    - {id: 491, cat: TV/Sport, desc: " |- Волейбол"}
+    - {id: 500, cat: TV/Sport, desc: " |- Гандбол"}
+    - {id: 488, cat: TV/Sport, desc: " |- Теннис"}
+    - {id: 490, cat: TV/Sport, desc: " |- Бокс"}
+    - {id: 331, cat: TV/Sport, desc: " |- Лёгкая атлетика"}
+    - {id: 330, cat: TV/Sport, desc: " |- Тяжёлая атлетика"}
+    - {id: 329, cat: TV/Sport, desc: " |- Водные виды спорта и гребля"}
+    - {id: 323, cat: TV/Sport, desc: " |- Велоспорт"}
+    - {id: 324, cat: TV/Sport, desc: " |- Гимнастика"}
+    - {id: 327, cat: TV/Sport, desc: " |- Борьба и единоборства"}
+    - {id: 292, cat: TV/Sport, desc: " |- Другие виды спорта"}
+    - {id: 304, cat: TV/Sport, desc: " |- Обзорные и тематические..."}
     # Футбол / Football
-    - {id: 163, cat: TV/Sport, desc: "EURO 2020 / Чемпионат Европы 2020"}
-    - {id: 528, cat: TV/Sport, desc: " |- VIP-Extra 4K EURO 2020"}
-    - {id: 521, cat: TV/Sport, desc: " |- VIP-Extra SAT FEED EURO 2020"}
-    - {id: 216, cat: TV/Sport, desc: " |- VIP UEFA EURO 2020"}
-    - {id: 497, cat: TV/Sport, desc: " |- VIP-Light UEFA EURO 2020"}
-    - {id: 395, cat: TV/Sport, desc: " |- UEFA EURO 2020"}
-    - {id: 447, cat: TV/Sport, desc: " |- UEFA EURO 2020 qualifying"}
-    - {id: 426, cat: TV/Sport, desc: " |- VIP-Extra UEFA EURO 2020 qualifying"}
     - {id: 580, cat: TV/Sport, desc: "FIFA WC 2022 / Чемпионат мира 2022"}
-    - {id: 234, cat: TV/Sport, desc: " |- VIP-Extra FIFA WC 2022"}
+    - {id: 515, cat: TV/Sport, desc: " |- VIP-Extra FIFA SATFEEDS WC 2022"}
+    - {id: 234, cat: TV/Sport, desc: " |- VIP-Extra FIFA 4K WC 2022"}
     - {id: 583, cat: TV/Sport, desc: " |- VIP FIFA WC 2022"}
     - {id: 525, cat: TV/Sport, desc: " |- VIP-Light FIFA WC 2022"}
     - {id: 581, cat: TV/Sport, desc: " |- FIFA WC 2022"}
     - {id: 582, cat: TV/Sport, desc: " |- FIFA WC 2022. Qualifiers"}
+    - {id: 163, cat: TV/Sport, desc: "EURO 2020 / Чемпионат Европы 2020"}
+    - {id: 528, cat: TV/Sport, desc: " |- VIP-Extra 4K EURO 2020"}
+    - {id: 521, cat: TV/Sport, desc: " |- VIP-Extra SAT FEED EURO 2020"}
+    - {id: 216, cat: TV/Sport, desc: " |- VIP-Archive UEFA EURO 2020"}
+    - {id: 497, cat: TV/Sport, desc: " |- VIP-Light UEFA EURO 2020"}
+    - {id: 395, cat: TV/Sport, desc: " |- UEFA EURO 2020"}
+    - {id: 447, cat: TV/Sport, desc: " |- UEFA EURO 2020 qualifying"}
+    - {id: 426, cat: TV/Sport, desc: " |- VIP-Extra UEFA EURO 2020 qualifying"}
     - {id: 432, cat: TV/Sport, desc: "FIFA WC 2018 / Чемпионат мира 2018"}
     - {id: 535, cat: TV/Sport, desc: " |- VIP-Extra FIFA WC 2018 4K"}
     - {id: 559, cat: TV/Sport, desc: " |- VIP-Extra FIFA WC 2018 Sat Feed"}
-    - {id: 574, cat: TV/Sport, desc: " |- VIP FIFA WC 2018"}
+    - {id: 574, cat: TV/Sport, desc: " |- VIP-Extra FIFA WC 2018"}
     - {id: 185, cat: TV/Sport, desc: " |- FIFA WC 2018"}
     - {id: 136, cat: TV/Sport, desc: " |- FIFA WC 2018. Qualifiers"}
     - {id: 217, cat: TV/Sport, desc: " |- FIFA WC 2018. Reviews"}
     - {id: 458, cat: TV/Sport, desc: " |- VIP-Extra Archive FIFA WC 2018 Qualifiers"}
+    - {id: 452, cat: TV/Sport, desc: "2022-23 UEFA Champions League"}
+    - {id: 558, cat: TV/Sport, desc: " |- VIP-Extra 4k + Sat Feed UCL"}
+    - {id: 346, cat: TV/Sport, desc: " |- VIP-Extra UCL 2022-23"}
+    - {id: 415, cat: TV/Sport, desc: " |- VIP UCL 2022-23"}
+    - {id: 569, cat: TV/Sport, desc: " |- VIP-Light UCL 2022-23"}
+    - {id: 158, cat: TV/Sport, desc: " |- Qualifying Rounds"}
+    - {id: 159, cat: TV/Sport, desc: " |- Group stage"}
+    - {id: 232, cat: TV/Sport, desc: " |- Play-off"}
+    - {id: 160, cat: TV/Sport, desc: "2022-23 UEFA Europa League"}
+    - {id: 347, cat: TV/Sport, desc: " |- VIP-Extra UEL 2022-23"}
+    - {id: 570, cat: TV/Sport, desc: " |- VIP-Light UEL 2022-23"}
+    - {id: 161, cat: TV/Sport, desc: " |- Qualifying Rounds"}
+    - {id: 162, cat: TV/Sport, desc: " |- Group stage"}
+    - {id: 231, cat: TV/Sport, desc: " |- Play-off"}
+    - {id: 48, cat: TV/Sport, desc: "2022–23 UEFA Europa Conference League"}
+    - {id: 419, cat: TV/Sport, desc: " |- VIP-Extra UEFA ECL"}
+    - {id: 442, cat: TV/Sport, desc: " |- VIP 2022-23 UEFA Europa Conference League"}
+    - {id: 517, cat: TV/Sport, desc: " |- VIP-Light 2022-23 UEFA Europa Conference League"}
+    - {id: 405, cat: TV/Sport, desc: " |- Qualifying Rounds"}
+    - {id: 536, cat: TV/Sport, desc: " |- Group stage"}
+    - {id: 249, cat: TV/Sport, desc: " |- Play-off"}
     - {id: 578, cat: TV/Sport, desc: "2021-22 UEFA Champions League"}
     - {id: 13, cat: TV/Sport, desc: " |- VIP-Extra 4k + Sat Feed UCL"}
     - {id: 511, cat: TV/Sport, desc: " |- VIP-Extra UCL 2021-22"}
@@ -74,104 +124,86 @@ caps:
     - {id: 343, cat: TV/Sport, desc: " |- Group stage"}
     - {id: 341, cat: TV/Sport, desc: " |- Qualifying Rounds"}
     - {id: 315, cat: TV/Sport, desc: "2021–22 UEFA Europa Conference League"}
-    - {id: 419, cat: TV/Sport, desc: " |- VIP-Extra UEFA ECL"}
-    - {id: 442, cat: TV/Sport, desc: " |- VIP 2021–22 UEFA Europa Conference League"}
-    - {id: 517, cat: TV/Sport, desc: " |- VIP-Light 2021–22 UEFA Europa Conference League"}
     - {id: 132, cat: TV/Sport, desc: " |- 2021–22 UEFA Europa Conference League"}
     - {id: 114, cat: TV/Sport, desc: " |- Qualifying Rounds"}
     - {id: 165, cat: TV/Sport, desc: " |- Group stage"}
     - {id: 164, cat: TV/Sport, desc: " |- Play-off"}
-    - {id: 452, cat: TV/Sport, desc: "2020-21 UEFA Champions League"}
-    - {id: 558, cat: TV/Sport, desc: " |- VIP-Extra 4k + Sat Feed UCL"}
-    - {id: 346, cat: TV/Sport, desc: " |- VIP-Extra UCL 2020-21"}
-    - {id: 415, cat: TV/Sport, desc: " |- VIP UCL 2020-21"}
-    - {id: 569, cat: TV/Sport, desc: " |- VIP-Light UCL 2020-21"}
-    - {id: 158, cat: TV/Sport, desc: " |- Qualifying Rounds"}
-    - {id: 159, cat: TV/Sport, desc: " |- Group stage"}
-    - {id: 232, cat: TV/Sport, desc: " |- Play-off"}
-    - {id: 160, cat: TV/Sport, desc: "2020-21 UEFA Europa League"}
-    - {id: 347, cat: TV/Sport, desc: " |- VIP-Extra UEL 2020-21"}
-    - {id: 570, cat: TV/Sport, desc: " |- VIP-Light UEL 2020-21"}
-    - {id: 161, cat: TV/Sport, desc: " |- Qualifying Rounds"}
-    - {id: 162, cat: TV/Sport, desc: " |- Group stage"}
-    - {id: 231, cat: TV/Sport, desc: " |- Play-off"}
     - {id: 3, cat: TV/Sport, desc: "Англия/England"}
     - {id: 407, cat: TV/Sport, desc: " |- VIP-Extra 4k England"}
     - {id: 561, cat: TV/Sport, desc: " |- VIP-Extra EPL Classic"}
     - {id: 223, cat: TV/Sport, desc: " |- VIP England"}
     - {id: 553, cat: TV/Sport, desc: " |- VIP-Light England"}
+    - {id: 54, cat: TV/Sport, desc: " |- Premier League 2022-23"}
+    - {id: 412, cat: TV/Sport, desc: " |- National Cups 2022-23"}
+    - {id: 418, cat: TV/Sport, desc: " |- Championship+ 2022-23"}
     - {id: 538, cat: TV/Sport, desc: " |- Premier League 2021-22"}
-    - {id: 412, cat: TV/Sport, desc: " |- National Cups 2021-22"}
-    - {id: 418, cat: TV/Sport, desc: " |- Championship+ 2021-22"}
-    - {id: 54, cat: TV/Sport, desc: " |- Premier League 2020-21"}
     - {id: 351, cat: TV/Sport, desc: " |- Championship+"}
-    - {id: 53, cat: TV/Sport, desc: " |- National Cups up to 2021"}
+    - {id: 53, cat: TV/Sport, desc: " |- National Cups up to 2023"}
     - {id: 55, cat: TV/Sport, desc: " |- Previous years matches"}
     - {id: 2, cat: TV/Sport, desc: "Россия/СССР - Russia/USSR"}
     - {id: 562, cat: TV/Sport, desc: " |- VIP-Light Russia"}
+    - {id: 57, cat: TV/Sport, desc: " |- RPL 2022-23"}
+    - {id: 496, cat: TV/Sport, desc: " |- FNL 2022-23"}
+    - {id: 423, cat: TV/Sport, desc: " |- National Cups 2022-23"}
     - {id: 251, cat: TV/Sport, desc: " |- RPL 2021-22"}
-    - {id: 423, cat: TV/Sport, desc: " |- National Cups 2021-22"}
-    - {id: 496, cat: TV/Sport, desc: " |- FNL 2021-22"}
-    - {id: 57, cat: TV/Sport, desc: " |- RPL 2020-21"}
-    - {id: 56, cat: TV/Sport, desc: " |- National Cups up to 2021"}
+    - {id: 56, cat: TV/Sport, desc: " |- National Cups up to 2022"}
     - {id: 46, cat: TV/Sport, desc: " |- Previous years matches"}
     - {id: 8, cat: TV/Sport, desc: "Украина/Ukraine"}
     - {id: 563, cat: TV/Sport, desc: " |- VIP-Light Ukraine"}
+    - {id: 72, cat: TV/Sport, desc: " |- UPL 2022-23"}
+    - {id: 152, cat: TV/Sport, desc: " |- National Cups 2022-23"}
     - {id: 410, cat: TV/Sport, desc: " |- UPL 2021-22"}
-    - {id: 152, cat: TV/Sport, desc: " |- National Cups 2021-22"}
-    - {id: 72, cat: TV/Sport, desc: " |- UPL 2020-21"}
-    - {id: 71, cat: TV/Sport, desc: " |- National Cups up to 2021"}
+    - {id: 71, cat: TV/Sport, desc: " |- National Cups up to 2023"}
     - {id: 348, cat: TV/Sport, desc: " |- Lower leagues"}
     - {id: 70, cat: TV/Sport, desc: " |- Previous years matches"}
     - {id: 4, cat: TV/Sport, desc: "Испания/Spain"}
     - {id: 516, cat: TV/Sport, desc: " |- VIP-Extra 4k + Sat Feed"}
-    - {id: 189, cat: TV/Sport, desc: " |- VIP-Extra Barca 2020-21"}
     - {id: 173, cat: TV/Sport, desc: " |- VIP-Extra Spain Classic"}
     - {id: 506, cat: TV/Sport, desc: " |- VIP-Extra El Clasico"}
     - {id: 208, cat: TV/Sport, desc: " |- VIP Spain"}
     - {id: 564, cat: TV/Sport, desc: " |- VIP-Light Spain"}
+    - {id: 58, cat: TV/Sport, desc: " |- Primera Division 2022-23"}
+    - {id: 424, cat: TV/Sport, desc: " |- National Cups 2022-23"}
     - {id: 194, cat: TV/Sport, desc: " |- Primera Division 2021-22"}
-    - {id: 424, cat: TV/Sport, desc: " |- National Cups 2021-22"}
-    - {id: 58, cat: TV/Sport, desc: " |- Primera Division 2020-21"}
+    - {id: 59, cat: TV/Sport, desc: " |- National Cups up to 2023"}
     - {id: 353, cat: TV/Sport, desc: " |- Segunda, Segunda B"}
-    - {id: 59, cat: TV/Sport, desc: " |- National Cups up to 2021"}
     - {id: 60, cat: TV/Sport, desc: " |- Previous years matches"}
     - {id: 6, cat: TV/Sport, desc: "Германия/Germany"}
     - {id: 555, cat: TV/Sport, desc: " |- VIP-Extra 4k+ Germany"}
     - {id: 210, cat: TV/Sport, desc: " |- VIP Germany"}
     - {id: 565, cat: TV/Sport, desc: " |- VIP-Light Germany"}
+    - {id: 66, cat: TV/Sport, desc: " |- Bundesliga 2022-23"}
+    - {id: 352, cat: TV/Sport, desc: " |- National Cups 2022-23"}
     - {id: 175, cat: TV/Sport, desc: " |- Bundesliga 2021-22"}
-    - {id: 352, cat: TV/Sport, desc: " |- National Cups 2021-22"}
-    - {id: 66, cat: TV/Sport, desc: " |- Bundesliga 2020-21"}
     - {id: 355, cat: TV/Sport, desc: " |- 2. Bundesliga"}
-    - {id: 65, cat: TV/Sport, desc: " |- National Cups up to 2021"}
+    - {id: 65, cat: TV/Sport, desc: " |- National Cups up to 2022"}
     - {id: 427, cat: TV/Sport, desc: " |- Lower leagues"}
     - {id: 64, cat: TV/Sport, desc: " |- Previous years matches"}
     - {id: 5, cat: TV/Sport, desc: "Италия/Italy"}
     - {id: 529, cat: TV/Sport, desc: " |- VIP-Extra Italy"}
     - {id: 209, cat: TV/Sport, desc: " |- VIP Italy"}
     - {id: 566, cat: TV/Sport, desc: " |- VIP-Light Italy"}
-    - {id: 63, cat: TV/Sport, desc: " |- Serie A 2020/21"}
-    - {id: 196, cat: TV/Sport, desc: " |- National Cups 2020/21"}
+    - {id: 63, cat: TV/Sport, desc: " |- Serie A 2022-23"}
+    - {id: 196, cat: TV/Sport, desc: " |- National Cups 2022-23"}
+    - {id: 174, cat: TV/Sport, desc: " |- Serie A 2021-22"}
     - {id: 354, cat: TV/Sport, desc: " |- Serie B, Lega Pro, Serie D"}
-    - {id: 174, cat: TV/Sport, desc: " |- Serie A 2019/20"}
-    - {id: 62, cat: TV/Sport, desc: " |- National Cups up to 2020"}
+    - {id: 62, cat: TV/Sport, desc: " |- National Cups up to 2023"}
     - {id: 540, cat: TV/Sport, desc: " |- 1996-97 Juventus Classic"}
     - {id: 61, cat: TV/Sport, desc: " |- Previous years matches"}
     - {id: 7, cat: TV/Sport, desc: "Франция/France"}
     - {id: 184, cat: TV/Sport, desc: " |- VIP-Extra 4k + Sat Feed"}
-    - {id: 515, cat: TV/Sport, desc: " |- VIP-Extra Ligue 2"}
     - {id: 211, cat: TV/Sport, desc: " |- VIP France"}
     - {id: 567, cat: TV/Sport, desc: " |- VIP-Light France"}
-    - {id: 69, cat: TV/Sport, desc: " |- Ligue 1 2020/21"}
-    - {id: 133, cat: TV/Sport, desc: " |- National Cups 2020/21"}
+    - {id: 69, cat: TV/Sport, desc: " |- Ligue 1 2022-23"}
+    - {id: 133, cat: TV/Sport, desc: " |- National Cups 2022-23"}
+    - {id: 176, cat: TV/Sport, desc: " |- Ligue 1 2021-22"}
     - {id: 428, cat: TV/Sport, desc: " |- Ligue 2"}
-    - {id: 176, cat: TV/Sport, desc: " |- Ligue 1 2019/20"}
-    - {id: 68, cat: TV/Sport, desc: " |- National Cups up to 2020"}
+    - {id: 68, cat: TV/Sport, desc: " |- National Cups up to 2023"}
     - {id: 67, cat: TV/Sport, desc: " |- Previous years matches"}
     - {id: 188, cat: TV/Sport, desc: "Нидерланды/Netherlands"}
-    - {id: 568, cat: TV/Sport, desc: " |- VIP-Light Netherlands"}
-    - {id: 356, cat: TV/Sport, desc: " |- Season 2020/21"}
+    - {id: 189, cat: TV/Sport, desc: " |- VIP-Extra Eredividie"}
+    - {id: 568, cat: TV/Sport, desc: " |- VIP Netherlands"}
+    - {id: 356, cat: TV/Sport, desc: " |- Season 2022-23"}
     - {id: 190, cat: TV/Sport, desc: " |- National Cups"}
     - {id: 191, cat: TV/Sport, desc: " |- Previous years matches"}
     - {id: 9, cat: TV/Sport, desc: "Другие национальные чемпионаты..."}
@@ -205,18 +237,6 @@ caps:
     - {id: 78, cat: TV/Sport, desc: " |- UEFA Cup"}
     - {id: 79, cat: TV/Sport, desc: " |- Cup Winners Cup"}
     - {id: 80, cat: TV/Sport, desc: " |- Other Compeitions"}
-    - {id: 405, cat: TV/Sport, desc: " |- VIP-Extra UCL 2018-19"}
-    - {id: 536, cat: TV/Sport, desc: " |- VIP-Extra UEL 2018-19"}
-    - {id: 249, cat: TV/Sport, desc: " |- VIP-Extra UCL 2017-18"}
-    - {id: 527, cat: TV/Sport, desc: " |- VIP-Extra UEL 2017-18"}
-    - {id: 202, cat: TV/Sport, desc: " |- VIP-Extra UCL 2016-17"}
-    - {id: 431, cat: TV/Sport, desc: " |- VIP-Extra UEL 2016-17"}
-    - {id: 440, cat: TV/Sport, desc: " |- VIP-Extra UСL 2015-16"}
-    - {id: 381, cat: TV/Sport, desc: " |- VIP-Extra UEL 2015-16"}
-    - {id: 557, cat: TV/Sport, desc: " |- VIP-Extra UCL 2014-15"}
-    - {id: 556, cat: TV/Sport, desc: " |- VIP-Extra UEL 2014-15"}
-    - {id: 514, cat: TV/Sport, desc: " |- VIP-Extra UСL 2013-14"}
-    - {id: 513, cat: TV/Sport, desc: " |- VIP-Extra UEL 2013-14"}
     - {id: 328, cat: TV/Sport, desc: "Лига наций УЕФА / UEFA Nations League"}
     - {id: 530, cat: TV/Sport, desc: " |- VIP-Extra UEFA Nations League"}
     - {id: 201, cat: TV/Sport, desc: " |- VIP UEFA Nations League"}
@@ -228,6 +248,7 @@ caps:
     - {id: 117, cat: TV/Sport, desc: " |- Play-off"}
     - {id: 15, cat: TV/Sport, desc: "Чемпионаты Мира/FIFA World Cups"}
     - {id: 461, cat: TV/Sport, desc: " |- VIP-Extra FIFA WC Classic"}
+    - {id: 509, cat: TV/Sport, desc: " |- VIP-Extra 2019 FIFA U-17 World Cup"}
     - {id: 510, cat: TV/Sport, desc: " |- VIP 2019 FIFA U-17 World Cup"}
     - {id: 443, cat: TV/Sport, desc: " |- VIP-Extra 2019 FIFA U-20 World Cup"}
     - {id: 411, cat: TV/Sport, desc: " |- 2019 FIFA U-20 World Cup"}
@@ -259,29 +280,29 @@ caps:
     - {id: 550, cat: TV/Sport, desc: " |- VIP-Extra AFC Competitions"}
     - {id: 399, cat: TV/Sport, desc: " |- VIP-Extra CAF Competitions"}
     - {id: 524, cat: TV/Sport, desc: " |- VIP-Extra CONCACAF Competitions"}
-    - {id: 463, cat: TV/Sport, desc: " |- 2021 Copa Libertadores"}
-    - {id: 433, cat: TV/Sport, desc: " |- 2021 Copa Sudamericana"}
+    - {id: 463, cat: TV/Sport, desc: " |- 2022 Copa Libertadores"}
+    - {id: 433, cat: TV/Sport, desc: " |- 2022 Copa Sudamericana"}
     - {id: 457, cat: TV/Sport, desc: " |- FIFA Club World Cups"}
     - {id: 472, cat: TV/Sport, desc: " |- CONCACAF Champions League"}
     - {id: 241, cat: TV/Sport, desc: " |- Copa Libertadores"}
     - {id: 367, cat: TV/Sport, desc: " |- Copa Sudamericana"}
     - {id: 390, cat: TV/Sport, desc: " |- AFC Club Competitions"}
     - {id: 10, cat: TV/Sport, desc: "Международные турниры/National Team..."}
-    - {id: 534, cat: TV/Sport, desc: " |- VIP-Extra 2021 CONCACAF Gold Cup"}
-    - {id: 230, cat: TV/Sport, desc: " |- VIP-Extra Copa America 2021"}
-    - {id: 575, cat: TV/Sport, desc: " |- VIP-Light Copa America 2021"}
-    - {id: 422, cat: TV/Sport, desc: " |- 2021 Copa America"}
+    - {id: 462, cat: TV/Sport, desc: " |- VIP-Extra 2022 Africa Cup of Nations"}
+    - {id: 575, cat: TV/Sport, desc: " |- VIP 2022 Africa Cup of Nations"}
     - {id: 466, cat: TV/Sport, desc: " |- VIP-Extra International"}
     - {id: 213, cat: TV/Sport, desc: " |- VIP International"}
-    - {id: 532, cat: TV/Sport, desc: " |- 2020 CONMEBOL Pre-Olympic"}
-    - {id: 507, cat: TV/Sport, desc: " |- 2019 AFC Asian Cup"}
+    - {id: 532, cat: TV/Sport, desc: " |- 2022 Africa Cup of Nations"}
+    - {id: 230, cat: TV/Sport, desc: " |- VIP-Extra Copa America 2021"}
+    - {id: 422, cat: TV/Sport, desc: " |- 2021 Copa America"}
     - {id: 155, cat: TV/Sport, desc: " |- Copa America"}
-    - {id: 435, cat: TV/Sport, desc: " |- CONCACAF Gold Cups"}
+    - {id: 435, cat: TV/Sport, desc: " |- CONCACAF Competitions"}
     - {id: 406, cat: TV/Sport, desc: " |- FIFA Confederations Cups"}
     - {id: 239, cat: TV/Sport, desc: " |- Africa Cup of Nations"}
+    - {id: 507, cat: TV/Sport, desc: " |- AFC Asian Cups"}
     - {id: 393, cat: TV/Sport, desc: " |- Sudamericano U-20"}
+    - {id: 534, cat: TV/Sport, desc: " |- VIP-Extra 2021 CONCACAF Gold Cup"}
     - {id: 560, cat: TV/Sport, desc: " |- VIP-Extra 2019 Sudamericano U-20 + U-17"}
-    - {id: 462, cat: TV/Sport, desc: " |- VIP-Extra 2020 Africa Cup of Nations"}
     - {id: 233, cat: TV/Sport, desc: " |- VIP-Extra 2020 AFC U-23"}
     - {id: 16, cat: TV/Sport, desc: "Товарищеские турниры и матчи/Frie..."}
     - {id: 387, cat: TV/Sport, desc: " |- VIP-Extra Friendlies"}
@@ -297,6 +318,104 @@ caps:
     - {id: 199, cat: TV/Sport, desc: " |- Видео для мобильных устройств"}
     - {id: 86, cat: TV/Sport, desc: " |- Футбольная графика"}
     - {id: 43, cat: TV/Sport, desc: "Аудиопередачи /Футбольное..."}
+    # Спорт / Sport
+    - {id: 23, cat: TV/Sport, desc: "Авто/мотоспорт"}
+    - {id: 131, cat: TV/Sport, desc: " |- Formula 1. Season 2022"}
+    - {id: 492, cat: TV/Sport, desc: " |- Formula 1. Season 2021"}
+    - {id: 400, cat: TV/Sport, desc: " |- Formula 1. Seasons until 2022"}
+    - {id: 21, cat: TV/Sport, desc: "Хоккей"}
+    - {id: 420, cat: TV/Sport, desc: " |- ЧМ 2022 /  IIHF WС 2022"}
+    - {id: 501, cat: TV/Sport, desc: " |- ЧМ 2022 U-20 / IIHF WС 2022 U-20"}
+    - {id: 207, cat: TV/Sport, desc: " |- КХЛ 2022/23"}
+    - {id: 391, cat: TV/Sport, desc: " |- NHL 2022/23"}
+    - {id: 444, cat: TV/Sport, desc: " |- КХЛ 2021/22"}
+    - {id: 445, cat: TV/Sport, desc: " |- NHL 2021/22"}
+    - {id: 151, cat: TV/Sport, desc: " |- NHL до 2021"}
+    - {id: 47, cat: TV/Sport, desc: " |- КХЛ до 2021"}
+    - {id: 460, cat: TV/Sport, desc: " |- World Championships until 2022"}
+    - {id: 206, cat: TV/Sport, desc: " |- European club championships"}
+    - {id: 222, cat: TV/Sport, desc: " |- Euro Hockey Tour"}
+    - {id: 49, cat: TV/Sport, desc: " |- International tournaments"}
+    - {id: 468, cat: TV/Sport, desc: " |- СССР - Канада"}
+    - {id: 20, cat: TV/Sport, desc: "Баскетбол"}
+    - {id: 50, cat: TV/Sport, desc: " |- NBA 2022/23"}
+    - {id: 453, cat: TV/Sport, desc: " |- NCAA"}
+    - {id: 204, cat: TV/Sport, desc: " |- WNBA"}
+    - {id: 150, cat: TV/Sport, desc: " |- NBA до 2022"}
+    - {id: 51, cat: TV/Sport, desc: " |- European club basketball"}
+    - {id: 197, cat: TV/Sport, desc: " |- World Championships. Men"}
+    - {id: 379, cat: TV/Sport, desc: " |- World Championships. Women"}
+    - {id: 446, cat: TV/Sport, desc: " |- European Championships"}
+    - {id: 171, cat: TV/Sport, desc: " |- International tournaments"}
+    - {id: 203, cat: TV/Sport, desc: " |- Women's basketball"}
+    - {id: 22, cat: TV/Sport, desc: "Теннис"}
+    - {id: 227, cat: TV/Sport, desc: " |- Australian Open 2022"}
+    - {id: 248, cat: TV/Sport, desc: " |- Roland Garros 2022"}
+    - {id: 388, cat: TV/Sport, desc: " |- Wimbledon 2022"}
+    - {id: 459, cat: TV/Sport, desc: " |- US Open 2022"}
+    - {id: 505, cat: TV/Sport, desc: " |- ATP 1000 WT Masters 2022"}
+    - {id: 502, cat: TV/Sport, desc: " |- ATP 250/500 World Tour 2022"}
+    - {id: 504, cat: TV/Sport, desc: " |- WTA Tour 2022"}
+    - {id: 503, cat: TV/Sport, desc: " |- Team Season 2022"}
+    - {id: 128, cat: TV/Sport, desc: " |- Grand Slam Tournaments up to 2022"}
+    - {id: 127, cat: TV/Sport, desc: " |- ATP WT Masters 1000 up to 2022"}
+    - {id: 125, cat: TV/Sport, desc: " |- ATP World Tour up to 2022"}
+    - {id: 126, cat: TV/Sport, desc: " |- WTA Tour up to 2022"}
+    - {id: 130, cat: TV/Sport, desc: " |- Team Season up to 2022"}
+    - {id: 129, cat: TV/Sport, desc: " |- Matches of previous years"}
+    - {id: 274, cat: TV/Sport, desc: " |- VIP-Extra Tennis"}
+    - {id: 44, cat: TV/Sport, desc: "Биатлон"}
+    - {id: 498, cat: TV/Sport, desc: " |- Season 2023"}
+    - {id: 455, cat: TV/Sport, desc: " |- Seasons until 2022"}
+    - {id: 82, cat: TV/Sport, desc: "Гандбол"}
+    - {id: 548, cat: TV/Sport, desc: " |- VIP-Extra Handball"}
+    - {id: 205, cat: TV/Sport, desc: " |- VIP Handball"}
+    - {id: 469, cat: TV/Sport, desc: " |- WC's and EURO's. Men"}
+    - {id: 547, cat: TV/Sport, desc: " |- WC's and EURO's. Women"}
+    - {id: 397, cat: TV/Sport, desc: " |- European club handball"}
+    - {id: 398, cat: TV/Sport, desc: " |- International tournaments"}
+    - {id: 38, cat: TV/Sport, desc: "Волейбол"}
+    - {id: 261, cat: TV/Sport, desc: " |- Лига наций"}
+    - {id: 262, cat: TV/Sport, desc: " |- Клубный волейбол"}
+    - {id: 170, cat: TV/Sport, desc: " |- Международные турниры"}
+    - {id: 169, cat: TV/Sport, desc: " |- Пляжный волейбол"}
+    - {id: 25, cat: TV/Sport, desc: "Боевые единоборства"}
+    - {id: 98, cat: TV/Sport, desc: " |- Бокс"}
+    - {id: 101, cat: TV/Sport, desc: " |- Рестлинг"}
+    - {id: 100, cat: TV/Sport, desc: " |- Mixed Martial Arts"}
+    - {id: 99, cat: TV/Sport, desc: " |- Ultimate Fighting Championship"}
+    - {id: 97, cat: TV/Sport, desc: " |- Боевые искусства"}
+    - {id: 137, cat: TV/Sport, desc: "Легкая атлетика"}
+    - {id: 139, cat: TV/Sport, desc: "Тяжелая атлетика"}
+    - {id: 122, cat: TV/Sport, desc: "Бильярд"}
+    - {id: 123, cat: TV/Sport, desc: " |- Снукер"}
+    - {id: 106, cat: TV/Sport, desc: "Покер"}
+    - {id: 140, cat: TV/Sport, desc: "Велоспорт"}
+    - {id: 141, cat: TV/Sport, desc: "Гимнастика"}
+    - {id: 24, cat: TV/Sport, desc: "Зимние виды спорта"}
+    - {id: 142, cat: TV/Sport, desc: " |- Фигурное катание"}
+    - {id: 105, cat: TV/Sport, desc: " |- Лыжи"}
+    - {id: 104, cat: TV/Sport, desc: " |- Горные лыжи"}
+    - {id: 149, cat: TV/Sport, desc: " |- Фристайл и сноуборд"}
+    - {id: 103, cat: TV/Sport, desc: " |- Прыжки с трамплина"}
+    - {id: 148, cat: TV/Sport, desc: " |- Кёрлинг"}
+    - {id: 96, cat: TV/Sport, desc: " |- Всемирные зимние Универсиады"}
+    - {id: 192, cat: TV/Sport, desc: "Летние виды спорта"}
+    - {id: 143, cat: TV/Sport, desc: " |- Бадминтон"}
+    - {id: 144, cat: TV/Sport, desc: " |- Настольный теннис"}
+    - {id: 147, cat: TV/Sport, desc: " |- Гольф"}
+    - {id: 439, cat: TV/Sport, desc: " |- Всемирные летние Универсиады"}
+    - {id: 138, cat: TV/Sport, desc: "Водные виды спорта"}
+    - {id: 121, cat: TV/Sport, desc: "Бейсбол"}
+    - {id: 145, cat: TV/Sport, desc: "Американский футбол"}
+    - {id: 541, cat: TV/Sport, desc: " |- VIP-Extra American football"}
+    - {id: 26, cat: TV/Sport, desc: "Другие виды спорта"}
+    - {id: 146, cat: TV/Sport, desc: " |- Регби"}
+    - {id: 95, cat: TV/Sport, desc: "Информационно-аналитические..."}
+    - {id: 180, cat: TV/Sport, desc: "Разное о спорте"}
+    - {id: 182, cat: TV/Sport, desc: " |- Спортивная литература"}
+    - {id: 181, cat: TV/Sport, desc: " |- Спортивное видео"}
+    - {id: 183, cat: TV/Sport, desc: " |- Обучающее видео"}
     # Летняя Олимпиада 2020 / Summer Olympic Games 2020
     - {id: 276, cat: TV/Sport, desc: "Football / Soccer"}
     - {id: 277, cat: TV/Sport, desc: " |- VIP-Extra Football"}
@@ -334,10 +453,10 @@ caps:
     - {id: 279, cat: TV/Sport, desc: " |- Water polo"}
     - {id: 284, cat: TV/Sport, desc: " |- Canoeing - Rowing - Sailing - Surfing"}
     - {id: 303, cat: TV/Sport, desc: "Boxing / Wrestling / Judo / Karate / Taekwondo"}
-    - {id: 518, cat: TV/Sport, desc: " |- VIP-Extra"}
+    - {id: 518" value="518, cat: TV/Sport, desc: " |- VIP-Extra"}
     - {id: 310, cat: TV/Sport, desc: "Gymnastics"}
-    - {id: 312, cat: TV/Sport, desc: " |- Artistic - Художественная"}
-    - {id: 311, cat: TV/Sport, desc: " |- Rhythmic - Спортивная"}
+    - {id: 312, cat: TV/Sport, desc: " |- Artistic - Спортивная"}
+    - {id: 311, cat: TV/Sport, desc: " |- Rhythmic - Художественная"}
     - {id: 313, cat: TV/Sport, desc: " |- Trampoline - Прыжки на батуте"}
     - {id: 294, cat: TV/Sport, desc: "Cycling"}
     - {id: 519, cat: TV/Sport, desc: " |- VIP-Extra Cycling"}
@@ -356,137 +475,19 @@ caps:
     - {id: 319, cat: TV/Sport, desc: " |- Modern pentathlon - Triathlon"}
     - {id: 336, cat: TV/Sport, desc: " |- Golf - Skateboarding - Sport climbing"}
     - {id: 349, cat: TV/Sport, desc: "Обзорные передачи / Reviews"}
-    # Спорт / Sport
-    - {id: 23, cat: TV/Sport, desc: "Авто/мотоспорт"}
-    - {id: 492, cat: TV/Sport, desc: " |- Formula 1. Season 2021"}
-    - {id: 131, cat: TV/Sport, desc: " |- Formula 1. Season 2020"}
-    - {id: 400, cat: TV/Sport, desc: " |- Formula 1. Seasons until 2020"}
-    - {id: 21, cat: TV/Sport, desc: "Хоккей"}
-    - {id: 420, cat: TV/Sport, desc: " |- ЧМ 2021 /  IIHF WС 2021"}
-    - {id: 501, cat: TV/Sport, desc: " |- ЧМ 2021 U-20 / IIHF WС 2021 U-20"}
-    - {id: 391, cat: TV/Sport, desc: " |- NHL 2020/21"}
-    - {id: 207, cat: TV/Sport, desc: " |- КХЛ 2020/21"}
-    - {id: 445, cat: TV/Sport, desc: " |- NHL 2019/20"}
-    - {id: 444, cat: TV/Sport, desc: " |- КХЛ 2019/20"}
-    - {id: 151, cat: TV/Sport, desc: " |- NHL до 2020"}
-    - {id: 47, cat: TV/Sport, desc: " |- КХЛ до 2020"}
-    - {id: 460, cat: TV/Sport, desc: " |- World Championships until 2021"}
-    - {id: 206, cat: TV/Sport, desc: " |- European club championships"}
-    - {id: 222, cat: TV/Sport, desc: " |- Euro Hockey Tour"}
-    - {id: 49, cat: TV/Sport, desc: " |- International tournaments"}
-    - {id: 468, cat: TV/Sport, desc: " |- СССР - Канада"}
-    - {id: 20, cat: TV/Sport, desc: "Баскетбол"}
-    - {id: 50, cat: TV/Sport, desc: " |- NBA 2020/21"}
-    - {id: 453, cat: TV/Sport, desc: " |- NCAA"}
-    - {id: 204, cat: TV/Sport, desc: " |- WNBA"}
-    - {id: 150, cat: TV/Sport, desc: " |- NBA до 2020"}
-    - {id: 51, cat: TV/Sport, desc: " |- European club basketball"}
-    - {id: 197, cat: TV/Sport, desc: " |- World Championships. Men"}
-    - {id: 379, cat: TV/Sport, desc: " |- World Championships. Women"}
-    - {id: 446, cat: TV/Sport, desc: " |- European Championships"}
-    - {id: 171, cat: TV/Sport, desc: " |- International tournaments"}
-    - {id: 203, cat: TV/Sport, desc: " |- Women's basketball"}
-    - {id: 22, cat: TV/Sport, desc: "Теннис"}
-    - {id: 227, cat: TV/Sport, desc: " |- Australian Open 2021"}
-    - {id: 248, cat: TV/Sport, desc: " |- Roland Garros 2021"}
-    - {id: 388, cat: TV/Sport, desc: " |- Wimbledon 2021"}
-    - {id: 459, cat: TV/Sport, desc: " |- US Open 2021"}
-    - {id: 505, cat: TV/Sport, desc: " |- ATP 1000 WT Masters 2021"}
-    - {id: 502, cat: TV/Sport, desc: " |- ATP 250/500 World Tour 2021"}
-    - {id: 504, cat: TV/Sport, desc: " |- WTA Tour 2021"}
-    - {id: 503, cat: TV/Sport, desc: " |- Team Season 2021"}
-    - {id: 128, cat: TV/Sport, desc: " |- Grand Slam Tournaments up to 2020"}
-    - {id: 127, cat: TV/Sport, desc: " |- ATP WT Masters 1000 up to 2020"}
-    - {id: 125, cat: TV/Sport, desc: " |- ATP World Tour up to 2020"}
-    - {id: 126, cat: TV/Sport, desc: " |- WTA Tour up to 2020"}
-    - {id: 130, cat: TV/Sport, desc: " |- Team Season up to 2020"}
-    - {id: 129, cat: TV/Sport, desc: " |- Matches of previous years"}
-    - {id: 274, cat: TV/Sport, desc: " |- VIP-Extra Tennis"}
-    - {id: 44, cat: TV/Sport, desc: "Биатлон"}
-    - {id: 498, cat: TV/Sport, desc: " |- Season 2021"}
-    - {id: 455, cat: TV/Sport, desc: " |- Seasons until 2020"}
-    - {id: 82, cat: TV/Sport, desc: "Гандбол"}
-    - {id: 548, cat: TV/Sport, desc: " |- VIP-Extra Handball"}
-    - {id: 205, cat: TV/Sport, desc: " |- VIP Handball"}
-    - {id: 469, cat: TV/Sport, desc: " |- WC's and EURO's. Men"}
-    - {id: 547, cat: TV/Sport, desc: " |- WC's and EURO's. Women"}
-    - {id: 397, cat: TV/Sport, desc: " |- European club handball"}
-    - {id: 398, cat: TV/Sport, desc: " |- International tournaments"}
-    - {id: 38, cat: TV/Sport, desc: "Волейбол"}
-    - {id: 261, cat: TV/Sport, desc: " |- Лига наций"}
-    - {id: 262, cat: TV/Sport, desc: " |- Клубный волейбол"}
-    - {id: 170, cat: TV/Sport, desc: " |- Международные турниры"}
-    - {id: 169, cat: TV/Sport, desc: " |- Пляжный волейбол"}
-    - {id: 25, cat: TV/Sport, desc: "Боевые единоборства"}
-    - {id: 98, cat: TV/Sport, desc: " |- Бокс"}
-    - {id: 101, cat: TV/Sport, desc: " |- Рестлинг"}
-    - {id: 100, cat: TV/Sport, desc: " |- Mixed Martial Arts"}
-    - {id: 99, cat: TV/Sport, desc: " |- Ultimate Fighting Championship"}
-    - {id: 97, cat: TV/Sport, desc: " |- Боевые искусства"}
-    - {id: 137, cat: TV/Sport, desc: "Легкая атлетика"}
-    - {id: 139, cat: TV/Sport, desc: "Тяжелая атлетика"}
-    - {id: 122, cat: TV/Sport, desc: "Бильярд"}
-    - {id: 123, cat: TV/Sport, desc: " |- Снукер"}
-    - {id: 106, cat: TV/Sport, desc: "Покер"}
-    - {id: 140, cat: TV/Sport, desc: "Велоспорт"}
-    - {id: 141, cat: TV/Sport, desc: "Гимнастика"}
-    - {id: 24, cat: TV/Sport, desc: "Зимние виды спорта"}
-    - {id: 142, cat: TV/Sport, desc: " |- Фигурное катание"}
-    - {id: 105, cat: TV/Sport, desc: " |- Лыжи"}
-    - {id: 104, cat: TV/Sport, desc: " |- Горные лыжи"}
-    - {id: 149, cat: TV/Sport, desc: " |- Фристайл"}
-    - {id: 103, cat: TV/Sport, desc: " |- Прыжки с трамплина"}
-    - {id: 148, cat: TV/Sport, desc: " |- Кёрлинг"}
-    - {id: 96, cat: TV/Sport, desc: " |- Всемирные зимние Универсиады"}
-    - {id: 192, cat: TV/Sport, desc: "Летние виды спорта"}
-    - {id: 143, cat: TV/Sport, desc: " |- Бадминтон"}
-    - {id: 144, cat: TV/Sport, desc: " |- Настольный теннис"}
-    - {id: 147, cat: TV/Sport, desc: " |- Гольф"}
-    - {id: 439, cat: TV/Sport, desc: " |- Всемирные летние Универсиады"}
-    - {id: 138, cat: TV/Sport, desc: "Водные виды спорта"}
-    - {id: 121, cat: TV/Sport, desc: "Бейсбол"}
-    - {id: 145, cat: TV/Sport, desc: "Американский футбол"}
-    - {id: 541, cat: TV/Sport, desc: " |- VIP-Extra American football"}
-    - {id: 26, cat: TV/Sport, desc: "Другие виды спорта"}
-    - {id: 146, cat: TV/Sport, desc: " |- Регби"}
-    - {id: 95, cat: TV/Sport, desc: "Информационно-аналитические..."}
-    - {id: 180, cat: TV/Sport, desc: "Разное о спорте"}
-    - {id: 182, cat: TV/Sport, desc: " |- Спортивная литература"}
-    - {id: 181, cat: TV/Sport, desc: " |- Спортивное видео"}
-    - {id: 183, cat: TV/Sport, desc: " |- Обучающее видео"}
-    # Олимпийские игры / Olympic Games
-    - {id: 465, cat: TV/Sport, desc: "Зимние Олимпийские игры / Winter..."}
-    - {id: 473, cat: TV/Sport, desc: " |- Церемонии"}
-    - {id: 483, cat: TV/Sport, desc: " |- Биатлон"}
-    - {id: 485, cat: TV/Sport, desc: " |- Фигурное катание"}
-    - {id: 467, cat: TV/Sport, desc: " |- Лыжный спорт"}
-    - {id: 474, cat: TV/Sport, desc: " |- Хоккей"}
-    - {id: 475, cat: TV/Sport, desc: " |- Конькобежный спорт"}
-    - {id: 484, cat: TV/Sport, desc: " |- Бобслей/Санный спорт/Скелетон"}
-    - {id: 481, cat: TV/Sport, desc: " |- Сноуборд/Фристайл/Шорт-трек/Кё<D09A>..."}
-    - {id: 482, cat: TV/Sport, desc: " |- Обзорные и тематические..."}
-    - {id: 476, cat: TV/Sport, desc: " |- Архив"}
-    - {id: 464, cat: TV/Sport, desc: "Летние Олимпийские игры / Summer..."}
-    - {id: 486, cat: TV/Sport, desc: " |- Церемонии"}
-    - {id: 487, cat: TV/Sport, desc: " |- Футбол"}
-    - {id: 489, cat: TV/Sport, desc: " |- Баскетбол"}
-    - {id: 491, cat: TV/Sport, desc: " |- Волейбол"}
-    - {id: 500, cat: TV/Sport, desc: " |- Гандбол"}
-    - {id: 488, cat: TV/Sport, desc: " |- Теннис"}
-    - {id: 490, cat: TV/Sport, desc: " |- Бокс"}
-    - {id: 331, cat: TV/Sport, desc: " |- Лёгкая атлетика"}
-    - {id: 330, cat: TV/Sport, desc: " |- Тяжёлая атлетика"}
-    - {id: 329, cat: TV/Sport, desc: " |- Водные виды спорта и гребля"}
-    - {id: 323, cat: TV/Sport, desc: " |- Велоспорт"}
-    - {id: 324, cat: TV/Sport, desc: " |- Гимнастика"}
-    - {id: 327, cat: TV/Sport, desc: " |- Борьба и единоборства"}
-    - {id: 292, cat: TV/Sport, desc: " |- Другие виды спорта"}
-    - {id: 304, cat: TV/Sport, desc: " |- Обзорные и тематические..."}
     # Разное / Other
     - {id: 229, cat: TV/Sport, desc: "Тестовый форум"}
     # Администраторский
-    - {id: 48, cat: TV/Sport, desc: "2021-22 UEFA Champions League"}
     - {id: 417, cat: TV/Sport, desc: "2021-22 UEFA Europa League"}
+    - {id: 527, cat: TV/Sport, desc: " |- VIP-Extra UEL 2017-18"}
+    - {id: 202, cat: TV/Sport, desc: " |- VIP-Extra UCL 2016-17"}
+    - {id: 431, cat: TV/Sport, desc: " |- VIP-Extra UEL 2016-17"}
+    - {id: 440, cat: TV/Sport, desc: " |- VIP-Extra UСL 2015-16"}
+    - {id: 381, cat: TV/Sport, desc: " |- VIP-Extra UEL 2015-16"}
+    - {id: 557, cat: TV/Sport, desc: " |- VIP-Extra UCL 2014-15"}
+    - {id: 556, cat: TV/Sport, desc: " |- VIP-Extra UEL 2014-15"}
+    - {id: 514, cat: TV/Sport, desc: " |- VIP-Extra UСL 2013-14"}
+    - {id: 513, cat: TV/Sport, desc: " |- VIP-Extra UEL 2013-14"}
     - {id: 508, cat: TV/Sport, desc: " |- VIP 2021 Copa America"}
     # Приватные разделы
     - {id: 429, cat: TV/Sport, desc: " |- VIP-Extra Real Madrid 2020-21"}

src/Jackett.Common/Definitions/riperam.yml

@@ -955,11 +955,10 @@ search:
     date:
       # 12 янв 2019, 11:26
       selector: dt
+      # auto adjusted by site account profile
       filters:
-        # extract the date
         - name: regexp
           args: "(\\d{2} \\D{3} \\d{4}, \\d{2}:\\d{2})"
-          # replace month abbreviations
         - name: replace
           args: ["янв", "Jan"]
         - name: replace
@@ -984,10 +983,8 @@ search:
           args: ["ноя", "Nov"]
         - name: replace
           args: ["дек", "Dec"]
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "02 Jan 2006, 15:04 -07:00"
+          args: "02 Jan 2006, 15:04"
     downloadvolumefactor:
       text: 0
     uploadvolumefactor:

src/Jackett.Common/Definitions/rockbox.yml

@@ -83,15 +83,15 @@ search:
     date_year:
       # 13/10/2018
       selector: td:nth-child(6):contains("/")
+      # auto adjusted by site account profile
       optional: true
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "02/01/2006 -07:00"
+          args: "02/01/2006"
     date_ago:
       # 1 hour ago, 2 days ago, 3 weeks ago etc
       selector: td:nth-child(6):not(:contains("/"))
+      # auto adjusted by site account profile
       optional: true
       filters:
         - name: timeago

src/Jackett.Common/Definitions/scenepalace.yml

@@ -121,17 +121,17 @@ search:
       selector: td:nth-last-child(8)
     date_day:
       selector: td:nth-last-child(6):contains("day")
+      # auto adjusted by site account profile
       optional: true
     date_year:
       selector: td:nth-last-child(6):not(:contains("day"))
+      # auto adjusted by site account profile
       optional: true
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "Jan 2 2006 03:04 PM -07:00"
+          args: "Jan 2 2006 03:04 PM"
     date:
-      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
+      text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
     size:
       selector: td:nth-last-child(5)
     grabs:

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

@@ -166,8 +166,13 @@ search:
     grabs:
       selector: times_completed
     date:
-      # 2021-10-18T00:34:50.000000Z"
+      # "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: "01/02/2006 15:04:05 -07:00"
     size:
       selector: size
     downloadvolumefactor:

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

@@ -68,7 +68,7 @@ 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
     api_token: "{{ .Config.apikey }}"
     name: "{{ .Keywords }}"
-    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free[]=100{{ else }}{{ end }}"
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
@@ -126,8 +126,13 @@ search:
     grabs:
       selector: times_completed
     date:
-      # 2021-10-18T00:34:50.000000Z"
+      # "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: "01/02/2006 15:04:05 -07:00"
     size:
       selector: size
     downloadvolumefactor:
@@ -149,4 +154,4 @@ search:
     minimumseedtime:
       # 7 days (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 6.4.1
+# json UNIT3D 6.5.0

src/Jackett.Common/Definitions/skipthetrailers.yml

@@ -126,8 +126,13 @@ search:
     grabs:
       selector: times_completed
     date:
-      # 2021-10-18T00:34:50.000000Z"
+      # "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: "01/02/2006 15:04:05 -07:00"
     size:
       selector: size
     downloadvolumefactor: