generationfree: renew categories resolves #10559

removes duplicate first result

README.md

@@ -17,9 +17,8 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 
 A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](https://github.com/webtor-io/go-jackett)
 
-
 #### Supported Systems
-* Windows 7SP1 or greater
+* Windows 7 SP1 or greater
 * Linux [supported operating systems here](https://github.com/dotnet/core/blob/master/release-notes/5.0/5.0-supported-os.md#linux)
 * macOS 10.13 or greater
 
@@ -394,7 +393,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * LatinoP2P
  * Le Saloon
  * LeChaudron
- * LeagueHD
+ * LemonHD
  * LearnFlakes
  * LegacyHD (HD4Free)
  * Libble
@@ -489,7 +488,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * SportsCult
  * SpringSunday
  * Superbits (SBS)
- * TakeaByte
  * Tapochek
  * Tasmanit [![(invite needed)][inviteneeded]](#)
  * TeamHD
@@ -701,6 +699,20 @@ location /jackett {
 }
 ```
 
+## Search Cache
+Jackett has an internal cache to increase search speed and to reduce the number of requests to the torrent sites.
+The default values should be good for most users. If you have problems, you can reduce the TTL value in the
+configuration or even disable the cache. Keep in mind that you can be banned by the sites if you make a lot of requests.
+* **Cache TTL (seconds)**: (default 2100 / 35 minutes) It indicates how long the results can remain in the cache.
+* **Cache max results per indexer**: (default 1000) How many results are kept in cache for each indexer. This limit is used to limit the use of RAM. If you make many requests and you have enough memory, increase this number.
+
+## Configuring FlareSolverr
+Some indexers are protected by CloudFlare or similar services and Jackett is not able to solve the challenges.
+For these cases, [FlareSolverr](https://github.com/FlareSolverr/FlareSolverr) has been integrated into Jackett. This service is in charge of solving the challenges and configuring Jackett with the necessary cookies.
+Setting up this service is optional, most indexers don't need it.
+* Install FlareSolverr service (following their instructions)
+* Configure **FlareSolverr API URL** in Jackett. For example: http://172.17.0.2:8191
+
 ## Configuring OMDb
 This feature is used as a fallback (when using the aggregate Indexer) to get the movie/series title if only the IMDB ID is provided in the request.
 To use it, please just request a free API key on [OMDb](http://www.omdbapi.com/apikey.aspx) (1,000 daily requests limit) and paste the key in Jackett

src/Jackett.Common/Content/custom.js

@@ -106,6 +106,7 @@ function loadJackettSettings() {
             $("#jackett-show-releases").attr("disabled", true);
         }
 
+        $("#jackett-flaresolverrurl").val(data.flaresolverrurl);
         $("#jackett-omdbkey").val(data.omdbkey);
         $("#jackett-omdburl").val(data.omdburl);
         var password = data.password;
@@ -1137,6 +1138,7 @@ function bindUIButtons() {
         var jackett_cache_enabled = $("#jackett-cache-enabled").is(':checked');
         var jackett_cache_ttl = $("#jackett-cache-ttl").val();
         var jackett_cache_max_results_per_indexer = $("#jackett-cache-max-results-per-indexer").val();
+        var jackett_flaresolverr_url = $("#jackett-flaresolverrurl").val();
         var jackett_omdb_key = $("#jackett-omdbkey").val();
         var jackett_omdb_url = $("#jackett-omdburl").val();
 
@@ -1158,6 +1160,7 @@ function bindUIButtons() {
             cache_enabled: jackett_cache_enabled,
             cache_ttl: jackett_cache_ttl,
             cache_max_results_per_indexer: jackett_cache_max_results_per_indexer,
+            flaresolverrurl: jackett_flaresolverr_url,
             omdbkey: jackett_omdb_key,
             omdburl: jackett_omdb_url,
             proxy_type: jackett_proxy_type,

src/Jackett.Common/Content/index.html

@@ -200,6 +200,10 @@
             <span class="input-header">Cache max results per indexer: </span>
             <input id="jackett-cache-max-results-per-indexer" class="form-control input-right" type="text" value="" placeholder="">
         </div>
+        <div class="input-area">
+          <span class="input-header">FlareSolverr API URL: </span>
+          <input id="jackett-flaresolverrurl" class="form-control input-right" type="text" value="" placeholder="Blank for default">
+        </div>
         <div class="input-area">
             <span class="input-header">OMDB API key: </span>
             <input id="jackett-omdbkey" class="form-control input-right" type="text" value="" placeholder="">
@@ -692,6 +696,6 @@
     </script>
 
     <script type="text/javascript" src="../libs/api.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../custom.js?changed=20201208"></script>
+    <script type="text/javascript" src="../custom.js?changed=20201220"></script>
 </body>
 </html>

src/Jackett.Common/Definitions/arenabg.yml

@@ -130,7 +130,7 @@ search:
 
   fields:
     category:
-      selector: td.filename a[href^="/en/torrents/?category="]:last-of-type
+      selector: td.category a[href^="/en/torrents/?category="]:last-of-type
       attribute: href
       filters:
         - name: querystring
@@ -163,15 +163,15 @@ search:
         - name: replace
           args: ["\\", ""]
     date:
-      # 16 November 2020
+      # 16 November 2020, 15:13
       selector: div.row
       filters:
         - name: regexp
-          args: "uplodaded (.+?),"
+          args: "(.+?, [0-9]{2}:[0-9]{2})"
         - name: append
           args: " +02:00" # EET
         - name: dateparse
-          args: "2 January 2006 -07:00"
+          args: "2 January 2006, 15:04 -07:00"
     size:
       selector: td:nth-child(3)
     seeders:

src/Jackett.Common/Definitions/carpathians.yml

@@ -11,22 +11,20 @@ links:
 caps:
   categorymappings:
     - {id: 186, cat: Books, desc: "E-book"}
-    - {id: 194, cat: Movies/SD, desc: "Film/CAM/Hun"}
+    - {id: 199, cat: Movies/SD, desc: "Film/Bluray/Hun"}
+    - {id: 194, cat: Movies/SD, desc: "Film/CAM"}
     - {id: 60, cat: Movies/DVD, desc: "Film/DVD-R/Eng"}
     - {id: 10, cat: Movies/DVD, desc: "Film/DVD-R/Hun"}
     - {id: 20, cat: Movies/DVD, desc: "Film/DVD9/Hun"}
     - {id: 181, cat: Movies/HD, desc: "Film/HD/Eng"}
     - {id: 183, cat: Movies/HD, desc: "Film/HD/Hun"}
+    - {id: 200, cat: Movies/HD, desc: "Film/UHD/Hun"}
     - {id: 192, cat: Movies/HD, desc: "Film/x264/Eng"}
     - {id: 190, cat: Movies/HD, desc: "Film/x264/Hun"}
     - {id: 70, cat: Movies/SD, desc: "Film/XviD/Eng"}
     - {id: 30, cat: Movies/SD, desc: "Film/XviD/Hun"}
-    - {id: 140, cat: PC/Games, desc: "Játék/DOX"}
-    - {id: 130, cat: PC/Games, desc: "Játék/PCiso"}
-    - {id: 160, cat: Console/PS3, desc: "Játék/PS2-PS3"}
-    - {id: 189, cat: Console/PSP, desc: "Játék/PSP"}
-    - {id: 184, cat: Console/Wii, desc: "Játék/Wii"}
-    - {id: 150, cat: Console/XBox, desc: "Játék/XBOX (XBOX360)"}
+    - {id: 150, cat: Console, desc: "Játék/Konzol"}
+    - {id: 130, cat: PC/Games, desc: "Játék/PC"}
     - {id: 182, cat: Audio/Lossless, desc: "Lossless"}
     - {id: 90, cat: Audio/MP3, desc: "Mp3/Eng"}
     - {id: 50, cat: Audio/MP3, desc: "Mp3/Hun"}

src/Jackett.Common/Definitions/cpabien.yml

@@ -66,6 +66,10 @@ settings:
     type: info
     label: How to get the User-Agent
     default: "<ol><li>From the same place you fetched the cookie,<li>Find <b>'user-agent:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole user-agent string <i>(everything after 'user-agent: ')</i> and <b>Paste</b> here.</ol>"
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
   - name: info_8000
     type: info
     label: About cpasbien Categories

src/Jackett.Common/Definitions/dmhy.yml

@@ -41,7 +41,11 @@ caps:
     music-search: [q]
     book-search: [q]
 
-settings: []
+settings:
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
 
 search:
   paths:

src/Jackett.Common/Definitions/epizod.yml

@@ -45,6 +45,10 @@ settings:
     type: checkbox
     label: Replace VOSTFR with ENGLISH
     default: false
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
 
 download:
   selector: a[href^="magnet:?xt="]
@@ -57,28 +61,49 @@ search:
   inputs:
     s: "{{ .Keywords }}"
 
+  headers:
+    # Windows User-Agent is required, Linux is blocked
+    User-Agent: ["Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36"]
+
   rows:
-    selector: article:not(:has(a[title="DMCA"]))
+    selector: li[class^="ilovewp-post"]:not(:has(a[title="DMCA"]))
 
   fields:
-    category:
-      text: other
-    category|noappend:
+    category1:
       selector: a[href*="/category/"]
       attribute: href
       optional: true
       filters:
         - name: split
           args: ["/", 4]
+    category2:
+      selector: li[class^="ilovewp-post"]
+      attribute: class
+      optional: true
+      filters:
+        - name: regexp
+          args: "category-(.+?) "
+    category3:
+      selector: img[src*="img"]
+      attribute: src
+      optional: true
+      filters:
+        - name: regexp
+          args: "img/(.+?)_"
+        - name: replace
+          args: ["ebooks", "ebook"]
+    category:
+      text: "{{ if or .Result.category1 .Result.category2 .Result.category3 }}{{ or .Result.category1 .Result.category2 .Result.category3 }}{{ else }}other{{ end }}"
+    sizecat:
+      text: "{{ if or .Result.category1 .Result.category2 .Result.category3 }}{{ or .Result.category1 .Result.category2 .Result.category3 }}{{ else }}other{{ end }}"
     site_date:
-      selector: div.post-cover > a
-      attribute: title
+      selector: time > a
       filters:
         # year can be at the end of the title, so we get it and name it site_date
         - name: regexp
           args: "(19|20\\d{2})$"
     title_phase1:
-      selector: div.post-cover > a
+      selector: time > a
       attribute: title
       filters:
         # now we put the date at the right place according scene naming rules using .Result.site_date
@@ -112,10 +137,10 @@ search:
     title:
       text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
     details:
-      selector: div.post-cover > a
+      selector: h2.title-post > a
       attribute: href
     download:
-      selector: div.post-cover > a
+      selector: h2.title-post > a
       attribute: href
     poster:
       selector: img[data-lazy-src]
@@ -128,17 +153,8 @@ search:
           args: ["T", " "]
         - name: dateparse
           args: "2006-01-02 15:04:05-07:00"
-    cat:
-      selector: a[href*="/category/"]
-      attribute: href
-      optional: true
-      filters:
-        - name: split
-          args: ["/", 4]
-    cat:
-      text: "{{ if .Result.cat }}{{ .Result.cat }}{{ else }}other{{ end }}"
     size:
-      text: "{{ if eq .Result.cat \"ebook\" }}1 MB{{ else }}{{ end }}{{ if eq .Result.cat \"musique\" }}128 MB{{ else }}{{ end }}{{ if or (eq .Result.cat \"series\") (eq .Result.cat \"other\") }}512 MB{{ else }}{{ end }}{{ if eq .Result.cat \"films\" }}2 GB{{ else }}{{ end }}"
+      text: "{{ if eq .Result.sizecat \"ebook\" }}1 MB{{ else }}{{ end }}{{ if eq .Result.sizecat \"musique\" }}128 MB{{ else }}{{ end }}{{ if or (eq .Result.sizecat \"series\") (eq .Result.sizecat \"other\") }}512 MB{{ else }}{{ end }}{{ if eq .Result.sizecat \"films\" }}2 GB{{ else }}{{ end }}"
     seeders:
       text: 1
     leechers:

src/Jackett.Common/Definitions/exttorrents.yml

@@ -76,7 +76,10 @@ settings:
     options:
       desc: desc
       asc: asc
-
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
 
 download:
   selector: a[href^="magnet:?xt="]

src/Jackett.Common/Definitions/fouducinema.yml

@@ -13,27 +13,36 @@ caps:
     # when refreshing categories dont forget to update the category case block
     - {id: 65, cat: TV/Documentary, desc: "Documentaires Divers"}
     - {id: 66, cat: TV/Documentary, desc: "Documentaires audio"}
-    - {id: 2, cat: Movies/DVD, desc: "Film DVD"}
-    - {id: 4, cat: Movies/HD, desc: "Film 1080P"}
-    - {id: 15, cat: Movies/BluRay, desc: "Film Bluray"}
-    - {id: 16, cat: Movies/WEB-DL, desc: "Film Web"}
-    - {id: 17, cat: Movies/Other, desc: "Film Iso"}
-    - {id: 19, cat: Movies/HD, desc: "Film 720P"}
-    - {id: 59, cat: Movies/Other, desc: "Film Divers"}
-    - {id: 67, cat: Movies/Other, desc: "Film Vob"}
+    - {id: 74, cat: Books/EBook, desc: "Documentaires Ebook"}
+    - {id: 75, cat: Audio/Audiobook, desc: "Documentaires Ebook audio"}
+    - {id: 81, cat: TV/Anime, desc: "Animation Séries"}
+    - {id: 79, cat: Movies/HD, desc: "Animation Film"}
+    - {id: 2, cat: Movies/DVD, desc: "Film DVDRip"}
     - {id: 69, cat: Movies/DVD, desc: "Film DVD-r"}
-    - {id: 46, cat: TV/HD, desc: "Série 1080P"}
-    - {id: 48, cat: TV/HD, desc: "Série Bluray"}
-    - {id: 60, cat: TV/Other, desc: "Série Divers"}
-    - {id: 12, cat: TV/Other, desc: "Série DVDRip"}
-    - {id: 30, cat: TV/HD, desc: "Série 720P"}
-    - {id: 23, cat: TV/WEB-DL, desc: "Série Web"}
-    - {id: 44, cat: TV/HD, desc: "Pack Séries 1080P"}
-    - {id: 38, cat: TV/Other, desc: "Pack Séries intégrale"}
-    - {id: 41, cat: TV/WEB-DL, desc: "Pack Séries Web"}
-    - {id: 45, cat: TV/HD, desc: "Pack Séries 720P"}
-    - {id: 63, cat: TV/Other, desc: "Pack Séries Divers"}
-    - {id: 10, cat: XXX, desc: "XxX Film"}
+    - {id: 67, cat: Movies/Other, desc: "Film Vob"}
+    - {id: 59, cat: Movies/Other, desc: "Film Divers"}
+    - {id: 19, cat: Movies/HD, desc: "Film 720P"}
+    - {id: 17, cat: Movies/Other, desc: "Film Iso"}
+    - {id: 16, cat: Movies/WEB-DL, desc: "Film Web"}
+    - {id: 15, cat: Movies/BluRay, desc: "Film Bluray"}
+    - {id: 4, cat: Movies/HD, desc: "Film 1080P"}
+    - {id: 70, cat: Movies/BluRay, desc: "Film BRRiP - BDRiP"}
+    - {id: 46, cat: TV/HD, desc: "Serie 1080P"}
+    - {id: 48, cat: TV/HD, desc: "Serie Bluray"}
+    - {id: 60, cat: TV/Other, desc: "Serie Divers"}
+    - {id: 72, cat: TV/HD, desc: "Serie BRRiP - BDRiP"}
+    - {id: 73, cat: TV/HD, desc: "Serie BRRiP - BDRiP"}
+    - {id: 12, cat: TV/Other, desc: "Serie DVDRip"}
+    - {id: 30, cat: TV/HD, desc: "Serie 720P"}
+    - {id: 23, cat: TV/WEB-DL, desc: "Serie Web"}
+    - {id: 44, cat: TV/HD, desc: "Pack_Series 1080P"}
+    - {id: 38, cat: TV/Other, desc: "Pack_Series intégrale"}
+    - {id: 41, cat: TV/WEB-DL, desc: "Pack_Series Web"}
+    - {id: 45, cat: TV/HD, desc: "Pack_Series 720P"}
+    - {id: 63, cat: TV/Other, desc: "Pack_Series Divers"}
+    - {id: 71, cat: TV/HD, desc: "Pack_Series BRRiP - BDRiP"}
+    - {id: 82, cat: TV/Anime, desc: "Pack_Series Animation"}
+    - {id: 10, cat: XXX, desc: "XxX 18 Film"}
     - {id: 13, cat: PC/0day, desc: "Apps Win"}
     - {id: 14, cat: PC/Mac, desc: "Apps Mac"}
     - {id: 52, cat: PC/Mobile-iOS, desc: "Apps Iphone"}
@@ -145,26 +154,35 @@ search:
       case:
         ":contains(\"Documentaires\"):contains(\"Divers\")": 65
         ":contains(\"Documentaires\"):contains(\"audio\")": 66
-        ":contains(\"Film\"):contains(\"DVD\")": 2
-        ":contains(\"Film\"):contains(\"1080P\")": 4
-        ":contains(\"Film\"):contains(\"Bluray\")": 15
-        ":contains(\"Film\"):contains(\"Web\")": 16
-        ":contains(\"Film\"):contains(\"Iso\")": 17
-        ":contains(\"Film\"):contains(\"720P\")": 19
-        ":contains(\"Film\"):contains(\"Divers\")": 59
-        ":contains(\"Film\"):contains(\"Vob\")": 67
+        ":contains(\"Documentaires\"):contains(\"Ebook\")": 74
+        ":contains(\"Documentaires\"):contains(\"Ebook audio\")": 75
+        ":contains(\"Animation\"):contains(\"Séries\")": 81
+        ":contains(\"Animation\"):contains(\"Film\")": 79
+        ":contains(\"Film\"):contains(\"DVDRip\")": 2
         ":contains(\"Film\"):contains(\"DVD-r\")": 69
-        ":contains(\"Série\"):contains(\"1080P\")": 46
-        ":contains(\"Série\"):contains(\"Bluray\")": 48
-        ":contains(\"Série\"):contains(\"Divers\")": 60
-        ":contains(\"Série\"):contains(\"DVDRip\")": 12
-        ":contains(\"Série\"):contains(\"720P\")": 30
-        ":contains(\"Série\"):contains(\"Web\")": 23
-        ":contains(\"Séries\"):contains(\"1080P\")": 44
-        ":contains(\"Séries\"):contains(\"intégrale\")": 38
-        ":contains(\"Séries\"):contains(\"Web\")": 41
-        ":contains(\"Séries\"):contains(\"720P\")": 45
-        ":contains(\"Séries\"):contains(\"Divers\")": 63
+        ":contains(\"Film\"):contains(\"Vob\")": 67
+        ":contains(\"Film\"):contains(\"Divers\")": 59
+        ":contains(\"Film\"):contains(\"720P\")": 19
+        ":contains(\"Film\"):contains(\"Iso\")": 17
+        ":contains(\"Film\"):contains(\"Web\")": 16
+        ":contains(\"Film\"):contains(\"Bluray\")": 15
+        ":contains(\"Film\"):contains(\"1080P\")": 4
+        ":contains(\"Film\"):contains(\"BRRiP - BDRiP\")": 70
+        ":contains(\"Serie\"):contains(\"1080P\")": 46
+        ":contains(\"Serie\"):contains(\"Bluray\")": 48
+        ":contains(\"Serie\"):contains(\"Divers\")": 60
+        ":contains(\"Serie\"):contains(\"BRRiP - BDRiP\")": 72
+        ":contains(\"Serie\"):contains(\"BRRiP - BDRiP\")": 73
+        ":contains(\"Serie\"):contains(\"DVDRip\")": 12
+        ":contains(\"Serie\"):contains(\"720P\")": 30
+        ":contains(\"Serie\"):contains(\"Web\")": 23
+        ":contains(\"Pack_Series\"):contains(\"1080P\")": 44
+        ":contains(\"Pack_Series\"):contains(\"intégrale\")": 38
+        ":contains(\"Pack_Series\"):contains(\"Web\")": 41
+        ":contains(\"Pack_Series\"):contains(\"720P\")": 45
+        ":contains(\"Pack_Series\"):contains(\"Divers\")": 63
+        ":contains(\"Pack_Series\"):contains(\"BRRiP - BDRiP\")": 71
+        ":contains(\"Pack_Series\"):contains(\"Animation\")": 82
         ":contains(\"XxX\"):contains(\"Film\")": 10
         ":contains(\"Apps\"):contains(\"Win\")": 13
         ":contains(\"Apps\"):contains(\"Mac\")": 14
@@ -199,6 +217,9 @@ search:
     details:
       selector: a[href^="details.php?id="]
       attribute: href
+    poster:
+      selector: img
+      attribute: src
     download:
       selector: a[href^="details.php?id="]
       attribute: href

src/Jackett.Common/Definitions/generationfree.yml

@@ -10,117 +10,66 @@ links:
 
 caps:
   categorymappings:
-    - {id: 106, cat: TV/HD, desc: "Animation: HDTV"}
-    - {id: 108, cat: TV/WEB-DL, desc: "Animation: WEBDL"}
-    - {id: 56, cat: TV/SD, desc: "Animation: DVDRip"}
-    - {id: 109, cat: TV/WEB-DL, desc: "Animation: WEB-Rip"}
-    - {id: 13, cat: TV/SD, desc: "Animation: DVD"}
-    - {id: 105, cat: TV/HD, desc: "Animation: Bluray"}
-    - {id: 10, cat: TV/HD, desc: "Animation: HD720P"}
-    - {id: 11, cat: TV/HD, desc: "Animation: HD1080P"}
+    - {id: 106, cat: TV/Anime, desc: "Animation: FR"}
+    - {id: 13, cat: TV/Anime, desc: "Animation: VO"}
     - {id: 140, cat: PC, desc: "Applications: Noel"}
-    - {id: 17, cat: PC/Mac, desc: "Applications: Mac"}
-    - {id: 38, cat: PC/Mobile-Other, desc: "Applications: Mobile Phone"}
-    - {id: 40, cat: PC, desc: "Applications: Linux"}
-    - {id: 19, cat: PC/Mobile-Android, desc: "Applications: Android"}
-    - {id: 117, cat: PC, desc: "Applications: Appli-autre"}
-    - {id: 18, cat: PC/0day, desc: "Applications: PC"}
     - {id: 16, cat: PC/Games, desc: "Applications: Jeux"}
+    - {id: 17, cat: PC/Mac, desc: "Applications: Mac"}
+    - {id: 18, cat: PC/0day, desc: "Applications: PC"}
+    - {id: 40, cat: PC, desc: "Applications: Linux"}
+    - {id: 117, cat: PC, desc: "Applications: Appli-autre"}
+    - {id: 38, cat: PC/Mobile-Other, desc: "Applications: Mobile Phone"}
+    - {id: 19, cat: PC/Mobile-Android, desc: "Applications: Android"}
     - {id: 67, cat: TV/Other, desc: "Autres: Emission TV"}
     - {id: 142, cat: TV/Sport, desc: "Autres: Emission sport"}
     - {id: 141, cat: TV/Other, desc: "Autres: Noel"}
     - {id: 90, cat: Books/EBook, desc: "BD: Bande Dessinée"}
-    - {id: 132, cat: TV/Documentary, desc: "Documentaires: BluRay"}
-    - {id: 133, cat: TV/Documentary, desc: "Documentaires: 4k"}
-    - {id: 134, cat: TV/Documentary, desc: "Documentaires: Vostfr"}
-    - {id: 147, cat: TV/Documentary, desc: "Documentaires: Web Dl"}
-    - {id: 15, cat: TV/Documentary, desc: "Documentaires: HD"}
-    - {id: 14, cat: TV/Documentary, desc: "Documentaires: DivX"}
-    - {id: 76, cat: TV/Documentary, desc: "Documentaires: TVRip/HDTV"}
+    - {id: 76, cat: TV/Documentary, desc: "Documentaires: FR"}
     - {id: 139, cat: TV/Documentary, desc: "Documentaires: Noel"}
+    - {id: 134, cat: TV/Documentary, desc: "Documentaires: VO"}
     - {id: 138, cat: Books/EBook, desc: "E-Books: Noel"}
     - {id: 62, cat: Audio/Audiobook, desc: "E-Books: E-Books Audio"}
-    - {id: 52, cat: Books/EBook, desc: "E-Books: Revue - Journaux"}
-    - {id: 53, cat: Books/EBook, desc: "E-Books: Livre Anglais"}
-    - {id: 49, cat: Books/EBook, desc: "E-Books: Manuel Anglais"}
     - {id: 36, cat: Books/EBook, desc: "E-Books: Livres Français"}
+    - {id: 49, cat: Books/EBook, desc: "E-Books: Manuel Anglais"}
+    - {id: 53, cat: Books/EBook, desc: "E-Books: Livre Anglais"}
+    - {id: 52, cat: Books/EBook, desc: "E-Books: Revue - Journaux"}
     - {id: 50, cat: Books/EBook, desc: "E-Books: Manuel Français"}
-    - {id: 94, cat: Movies/DVD, desc: "Films: DVDscreen"}
-    - {id: 72, cat: TV/HD, desc: "Films: TVRip/HDTV"}
-    - {id: 88, cat: Movies/BluRay, desc: "Films: Full BD/BR"}
-    - {id: 91, cat: Movies, desc: "Films: RemuX"}
-    - {id: 89, cat: Movies/BluRay, desc: "Films: BRRIP"}
-    - {id: 3, cat: Movies/DVD, desc: "Films: DVDRIP"}
     - {id: 66, cat: Movies, desc: "Films: VOSTFR"}
-    - {id: 96, cat: Movies/HD, desc: "Films: HDlight"}
-    - {id: 104, cat: Movies/BluRay, desc: "Films: BDRip"}
-    - {id: 131, cat: Movies/3D, desc: "Films: Remux Bluray 3D"}
-    - {id: 55, cat: Movies/HD, desc: "Films: MHD 720P"}
-    - {id: 129, cat: Movies/BluRay, desc: "Films: Remux Bluray"}
-    - {id: 110, cat: Movies/WEB-DL, desc: "Films: WEBRip"}
-    - {id: 71, cat: Movies/WEB-DL, desc: "Films: WEB-DL"}
-    - {id: 95, cat: Movies/BluRay, desc: "Films: bluray"}
-    - {id: 54, cat: Movies/HD, desc: "Films: MHD 1080P"}
     - {id: 65, cat: Movies, desc: "Films: VO"}
-    - {id: 69, cat: Movies/3D, desc: "Films: Film 3D"}
-    - {id: 1, cat: Movies/HD, desc: "Films: HD720P"}
-    - {id: 111, cat: Movies/WEB-DL, desc: "Films: WEBRIP-720P"}
-    - {id: 130, cat: Movies/UHD, desc: "Films:  Remux Bluray 4K"}
-    - {id: 145, cat: Movies/SD, desc: "Films: VHS"}
-    - {id: 103, cat: Movies/HD, desc: "Films: Film-HDRIP"}
-    - {id: 102, cat: Movies/WEB-DL, desc: "Films: WEB-DL 720P"}
-    - {id: 87, cat: XXX, desc: "Films: XXX"}
-    - {id: 112, cat: Movies/WEB-DL, desc: "Films: WEBRIP-1080P"}
-    - {id: 101, cat: Movies/WEB-DL, desc: "Films: WEB-DL 1080P"}
-    - {id: 2, cat: Movies/HD, desc: "Films: HD1080P"}
-    - {id: 126, cat: Movies/HD, desc: "Films: HD X265"}
-    - {id: 4, cat: Movies/DVD, desc: "Films: DVD5"}
-    - {id: 70, cat: Movies/HD, desc: "Films: MHD X265"}
-    - {id: 100, cat: Movies/UHD, desc: "Films: 4KLight"}
-    - {id: 5, cat: Movies/DVD, desc: "Films: DVD9"}
-    - {id: 128, cat: Movies/UHD, desc: "Films: Webdl 4K"}
-    - {id: 135, cat: Movies, desc: "Films: Noel"}
-    - {id: 92, cat: Movies/UHD, desc: "Films: 4K"}
+    - {id: 55, cat: Movies/HD, desc: "Films: MHD x265"}
+    - {id: 54, cat: Movies/HD, desc: "Films: MHD HDlight"}
+    - {id: 69, cat: Movies/3D, desc: "Films: 3D"}
+    - {id: 110, cat: Movies/WEB-DL, desc: "Films: WEB"}
+    - {id: 2, cat: Movies/HD, desc: "Films: HD"}
     - {id: 59, cat: Movies, desc: "Films: Spectacle"}
-    - {id: 150, cat: Movies, desc: "Films: .Film série"}
-    - {id: 151, cat: Movies, desc: "Films: .Série animation"}
-    - {id: 152, cat: Movies, desc: "Films: Sports"}
-    - {id: 78, cat: PC/Mobile-Other, desc: "GPS: Radars"}
+    - {id: 89, cat: Movies/SD, desc: "Films: SD"}
+    - {id: 70, cat: Movies/HD, desc: "Films: X265"}
+    - {id: 92, cat: Movies/UHD, desc: "Films: 4K"}
+    - {id: 135, cat: Movies, desc: "Films: Noel"}
+    - {id: 87, cat: XXX, desc: "Films: XXX"}
+    - {id: 4, cat: Movies, desc: "Films: ISO"}
+    - {id: 151, cat: TV, desc: "Films: .Série animation"}
+    - {id: 150, cat: TV, desc: "Films: .Film série"}
     - {id: 77, cat: PC/Mobile-Other, desc: "GPS: Cartes"}
-    - {id: 124, cat: TV/Anime, desc: "Mangas: HD720P"}
-    - {id: 125, cat: TV/Anime, desc: "Mangas: DVDRip"}
+    - {id: 78, cat: PC/Mobile-Other, desc: "GPS: Radars"}
+    - {id: 97, cat: Audio, desc: "Musique: Podcast"}
     - {id: 137, cat: Audio, desc: "Musique: Noel"}
-    - {id: 22, cat: Audio/MP3, desc: "Musique: Album MP3"}
-    - {id: 115, cat: Audio/MP3, desc: "Musique: Coffret mp3"}
     - {id: 25, cat: Audio/MP3, desc: "Musique: Single MP3"}
     - {id: 143, cat: Audio/MP3, desc: "Musique: Wav"}
-    - {id: 23, cat: Audio/Lossless, desc: "Musique: Album Flac"}
-    - {id: 24, cat: Audio/Lossless, desc: "Musique: Single Flac"}
-    - {id: 64, cat: Audio, desc: "Musique: Mégamix Maison"}
+    - {id: 22, cat: Audio/MP3, desc: "Musique: Album MP3"}
     - {id: 98, cat: Audio, desc: "Musique: karaoké"}
-    - {id: 97, cat: Audio, desc: "Musique: Podcast"}
     - {id: 58, cat: Audio, desc: "Musique: Concert"}
-    - {id: 75, cat: Audio, desc: "Musique: Concert TVRip"}
-    - {id: 116, cat: Audio/Lossless, desc: "Musique: Coffret flac"}
+    - {id: 24, cat: Audio/Lossless, desc: "Musique: Single Flac"}
+    - {id: 23, cat: Audio/Lossless, desc: "Musique: Album Flac"}
+    - {id: 64, cat: Audio, desc: "Musique: Mégamix Maison"}
     - {id: 6, cat: TV, desc: "Serie TV: Saison FR"}
-    - {id: 74, cat: TV/HD, desc: "Serie TV: TVRip/HDTV"}
     - {id: 7, cat: TV, desc: "Serie TV: Episode FR"}
-    - {id: 136, cat: TV, desc: "Serie TV: Noel"}
+    - {id: 153, cat: TV, desc: "Serie TV: Saison VO"}
     - {id: 63, cat: TV, desc: "Serie TV: Episode VO"}
-    - {id: 12, cat: TV, desc: "Serie TV: Animation"}
-    - {id: 113, cat: TV, desc: "Serie TV: Episode QC"}
-    - {id: 121, cat: TV/HD, desc: "Serie TV: Saison Bluray 720p"}
-    - {id: 122, cat: TV/HD, desc: "Serie TV: Saison Bluray 1080p"}
-    - {id: 73, cat: TV/WEB-DL, desc: "Serie TV: WEB-DL"}
-    - {id: 119, cat: TV/HD, desc: "Serie TV: Episode Bluray 720p"}
     - {id: 93, cat: TV, desc: "Serie TV: Saison VOSTFR"}
-    - {id: 120, cat: TV/HD, desc: "Serie TV: Episode Bluray 1080p"}
-    - {id: 144, cat: TV/WEB-DL, desc: "Serie TV: WEB-Rip"}
-    - {id: 146, cat: TV/SD, desc: "Serie TV: VHSrip"}
     - {id: 61, cat: TV, desc: "Serie TV: Episode VOSTFR"}
-    - {id: 114, cat: TV, desc: "Serie TV: Saison QC"}
-    - {id: 148, cat: TV/UHD, desc: "Serie TV: Saison 4K"}
-    - {id: 149, cat: TV/UHD, desc: "Serie TV: Episode 4K"}
+    - {id: 12, cat: TV, desc: "Serie TV: Animation"}
+    - {id: 136, cat: TV, desc: "Serie TV: Noel"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/hddolby.yml

@@ -47,6 +47,10 @@ settings:
     type: checkbox
     label: Search freeleech only
     default: false
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
   - name: info_tpp
     type: info
     label: Results Per Page

src/Jackett.Common/Definitions/hdolimpo.yml

@@ -197,7 +197,8 @@ search:
         i[class*="fa-star text-bold"]: 0 # Freeleech From Token
         i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
         i[class*="fa-globe text-blue"]: 0 # Global Freeleech
-        i[class*="fa-star text-gold"]: 0 # Freeleech
+        i[class*="fas fa-star text-gold"]: 0 # Freeleech
+        i[class*="fal fa-star text-gold"]: 0.5 # 50% Freeleech
         i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
         "*": 1
     uploadvolumefactor:
@@ -206,4 +207,7 @@ search:
         i[class*="fa-globe text-green"]: 2 # Global Double Upload
         i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
         "*": 1
+    minimumseedtime:
+      # 4 days (as seconds = 4 x 24 x 60 x 60)
+      text: 345600
 # UNIT3D 2.4.0

src/Jackett.Common/Definitions/lemonhd.yml

@@ -1,11 +1,13 @@
 ---
-id: leaguehd
-name: LeagueHD
-description: "LeagueHD is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
+id: lemonhd
+name: LemonHD
+description: "LemonHD is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
 language: zh-cn
 type: private
 encoding: UTF-8
 links:
+  - https://lemonhd.org/
+legacylinks:
   - https://leaguehd.com/
 
 caps:

src/Jackett.Common/Definitions/marinetracker.yml

@@ -24,6 +24,7 @@ caps:
     - {id: 188, cat: PC, desc: "Maritime Software-Other soft"}
     - {id: 179, cat: PC, desc: "Maritime Software-Programming and SDK software"}
     - {id: 21, cat: Books, desc: "Deckofficer's Library"}
+    - {id: 283, cat: Books, desc: "Deckofficer's Library-Radar at sea"}
     - {id: 114, cat: Books, desc: "Deckofficer's Library-Watch keeping"}
     - {id: 115, cat: Books, desc: "Deckofficer's Library-Keeping the ship documentation"}
     - {id: 32, cat: Books, desc: "Deckofficer's Library-Cargo operations"}
@@ -38,13 +39,9 @@ caps:
     - {id: 192, cat: Books, desc: "Deckofficer's Library-Navigation in the ice"}
     - {id: 42, cat: Books, desc: "Safety of Navigation"}
     - {id: 8, cat: Movies, desc: "Video for Seamen"}
-    - {id: 237, cat: Movies, desc: "Video for Seamen-Видео по яхтингу"}
     - {id: 234, cat: Movies, desc: "Video for Seamen-Video for Deck Officers"}
     - {id: 233, cat: Movies, desc: "Video for Seamen-Video for Marine Engineers"}
     - {id: 235, cat: Movies, desc: "Video for Seamen-Other videos"}
-    - {id: 206, cat: Movies, desc: "Marine films"}
-    - {id: 209, cat: Movies, desc: "Marine films-Documentary films"}
-    - {id: 208, cat: Movies, desc: "Marine films-Russian films"}
     - {id: 102, cat: Books, desc: "Marine Engineer's Library"}
     - {id: 28, cat: Books, desc: Marine Engineer's Library-Ship's systems and mechanisms"}
     - {id: 22, cat: Books, desc: Marine Engineer's Library-Daihatsu"}
@@ -61,6 +58,12 @@ caps:
     - {id: 17, cat: Books, desc: Marine Engineer's Library-Wärtsilä & Sulzer"}
     - {id: 7, cat: Books, desc: "Technical Books (Not maritime)"}
     - {id: 10, cat: Books, desc: "English for seamen"}
+    - {id: 266, cat: Books, desc: "English for seamen-English for Deck Officers"}
+    - {id: 267, cat: Books, desc: "English for seamen-English for Marine Engineers"}
+    - {id: 268, cat: Books, desc: "English for seamen-English for ETO's"}
+    - {id: 269, cat: Books, desc: "English for seamen-English for Shipbuilders"}
+    - {id: 270, cat: Books, desc: "English for seamen-RU↔EN dictionaries & phrasebooks"}
+    - {id: 271, cat: Books, desc: "English for seamen-Business English and Correspondence"}
     - {id: 205, cat: Books, desc: "General english"}
     - {id: 101, cat: Books, desc: "Electrical Technical Officer's Library"}
     - {id: 29, cat: Books, desc: "Electrical Technical Officer's Library-Marine Electronics"}
@@ -73,22 +76,69 @@ caps:
     - {id: 105, cat: Books, desc: "Electrical Technical Officer's Library-Sources of electricity"}
     - {id: 37, cat: Books, desc: "Organization and management of maritime transport"}
     - {id: 11, cat: Books, desc: "Section for cadets"}
+    - {id: 285, cat: Books, desc: "Section for cadets-Encyclopedias and atlases"}
+    - {id: 265, cat: Books, desc: "Section for cadets-Marine dictionaries and glossaries RU↔RU/EN↔EN"}
     - {id: 191, cat: Books, desc: "Maritime Law"}
     - {id: 240, cat: Books, desc: "Maritime Law-IMO Resolutions"}
-    - {id: 38, cat: Books, desc: "Handbooks, manuals"}
+    - {id: 38, cat: Books, desc: "Uncategorized"}
     - {id: 190, cat: Books, desc: "Catalogs"}
     - {id: 113, cat: Books, desc: "Medicine"}
     - {id: 39, cat: Books, desc: "Purpose-built ships"}
+    - {id: 51, cat: Books, desc: "Purpose-built ships-Oil & Chemical Tankers"}
+    - {id: 52, cat: Books, desc: "Purpose-built ships-Dry cargo vessels"}
+    - {id: 250, cat: Books, desc: "Purpose-built ships-LNG \ LPG"}
+    - {id: 284, cat: Books, desc: "Purpose-built ships-Nuclear powered ships"}
+    - {id: 54, cat: Books, desc: "Purpose-built ships-Passenger ships"}
+    - {id: 248, cat: Books, desc: "Purpose-built ships-Fishing vessels"}
     - {id: 239, cat: Books, desc: "Purpose-built ships-Offshore"}
     - {id: 99, cat: Audio, desc: "Audio"}
+    - {id: 288, cat: Audio, desc: "Audio-♬ Music"}
+    - {id: 287, cat: Audio, desc: "Audio-Non-Fiction"}
+    - {id: 286, cat: Audio, desc: "Audio-Fiction"}
     - {id: 212, cat: Books, desc: "Ship's documentation"}
+    - {id: 251, cat: Books, desc: "Diving"}
     - {id: 111, cat: Books, desc: "Yachting, sailing, boating"}
+    - {id: 258, cat: Books, desc: "Yachting, sailing, boating-Inflatable boats, boats, kayaks"}
+    - {id: 237, cat: Books, desc: "Yachting, sailing, boating-Yachting, sailing videos"}
+    - {id: 257, cat: Books, desc: "Yachting, sailing, boating-Motor Boat & Yachting magazines"}
+    - {id: 253, cat: Books, desc: "Yachting, sailing, boating-Seamanship practice"}
+    - {id: 254, cat: Books, desc: "Yachting, sailing, boating-Repair and Restoration"}
+    - {id: 253, cat: Books, desc: "Yachting, sailing, boating-Sailing Alone"}
+    - {id: 256, cat: Books, desc: "Yachting, sailing, boating-Rigging, knots"}
+    - {id: 252, cat: Books, desc: "Yachting, sailing, boating-Projects, design, construction"}
     - {id: 177, cat: Books, desc: "Shipmodeling"}
+    - {id: 293, cat: Books, desc: "Shipmodeling-Radio controlled models"}
+    - {id: 292, cat: Books, desc: "Shipmodeling-Marine Modelling Magazines"}
+    - {id: 291, cat: Books, desc: "Shipmodeling-Drawings and models of ships (CAD, 3D)"}
+    - {id: 290, cat: Books, desc: "Shipmodeling-Reference Material"}
+    - {id: 289, cat: Books, desc: "Shipmodeling-Ships in Bottles"}
     - {id: 197, cat: Books, desc: "Marine bulletins"}
-    - {id: 219, cat: Books, desc: "History of Merchant Marine"}
+    - {id: 219, cat: Books, desc: "Marine History"}
+    - {id: 282, cat: Books, desc: "Marine History-Fleets history"}
+    - {id: 281, cat: Books, desc: "Marine History-History of Merchant Marine"}
+    - {id: 280, cat: Books, desc: "Marine History-Historic ships"}
+    - {id: 279, cat: Books, desc: "Marine History-Marine vessels"}
+    - {id: 278, cat: Books, desc: "Marine History-Warships"}
+    - {id: 277, cat: Books, desc: "Marine History-Wars at Sea"}
+    - {id: 276, cat: Books, desc: "Marine History-War at sea (World War I)"}
+    - {id: 261, cat: Books, desc: "Marine History-War at sea (World War II)"}
+    - {id: 262, cat: Books, desc: "Marine History-The history of sailing ships"}
+    - {id: 273, cat: Books, desc: "Marine History-History of Seafaring"}
+    - {id: 275, cat: Books, desc: "Marine History-Accidents and disasters at sea"}
+    - {id: 264, cat: Books, desc: "Marine History-Marine cartography"}
+    - {id: 274, cat: Books, desc: "Marine History-Pirates"}
     - {id: 218, cat: Books, desc: "Maritime Fiction"}
     - {id: 198, cat: Books, desc: "Navy"}
+    - {id: 272, cat: Books, desc: "Navy-Naval magazines"}
+    - {id: 260, cat: Books, desc: "Navy-Naval shipbuilding (1950 - 20??)"}
     - {id: 220, cat: Books, desc: "Fishing & Spearfishing"}
+    - {id: 294, cat: Books, desc: "Environmental protection"}
+    - {id: 242, cat: Books, desc: "Foreign language books"}
+    - {id: 243, cat: Books, desc: "Rarity"}
+    - {id: 244, cat: Books, desc: "Rarity-1900 - 1950"}
+    - {id: 245, cat: Books, desc: "Rarity-1800 - 1900"}
+    - {id: 246, cat: Books, desc: "Rarity-1700 - 1800"}
+    - {id: 247, cat: Books, desc: "Rarity-1600 - 1700"}
     - {id: 187, cat: Books, desc: "Others (not maritime)"}
     - {id: 162, cat: Books, desc: "Archive"}
 

src/Jackett.Common/Definitions/mesevilag.yml

@@ -51,14 +51,13 @@ settings:
       4: created
       7: seeders
       5: size
-      1: title
   - name: type
     type: select
     label: Order requested from site
-    default: 2
+    default: desc
     options:
-      2: desc
-      1: asc
+      desc: desc
+      asc: asc
   - name: info
     type: info
     label: Results Per Page
@@ -93,7 +92,7 @@ search:
       args: ["[^a-zA-Z0-9]+", "%"]
 
   rows:
-    selector: table[cellpadding="3"] > tbody > tr:has(a[onmouseover])
+    selector: table[cellpadding="5"] > tbody > tr:has(a[onmouseover])
 
   fields:
     category:
@@ -103,17 +102,20 @@ search:
         - name: querystring
           args: cat
     title:
-      selector: a[href^="details.php?id="]
+      selector: a[href^="javascript:"]
       attribute: title
     details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="details.php?id="]
-      attribute: href
+      selector: span
+      attribute: id
       filters:
         - name: replace
-          args: ["details.php?", "download.php?"]
+          args: ["span_bookmark_", "details.php?id="]
+    download:
+      selector: span
+      attribute: id
+      filters:
+        - name: replace
+          args: ["span_bookmark_", "download.php?id="]
     imdb:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href

src/Jackett.Common/Definitions/mypornclub.yml

@@ -17,7 +17,11 @@ caps:
     tv-search: [q]
     movie-search: [q]
 
-settings: []
+settings:
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
 
 download:
   selector: a[href^="magnet:?xt="]

src/Jackett.Common/Definitions/noname-clubl.yml

@@ -0,0 +1,850 @@
+---
+id: noname-clubl
+name: NoNaMe ClubL
+description: "This is the NoNaMe Club indexer with Login enabled in the config."
+language: ru-ru
+type: semi-private
+encoding: windows-1251
+links:
+  - https://nnmclub.to/
+legacylinks:
+  - https://nnm-club.name/
+  - https://nnm-club.me/
+  - http://nnmclub.to/
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: striprussian
+    type: checkbox
+    label: Strip Russian Letters
+    default: true
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 1
+    options:
+      1: created
+      10: seeders
+      7: size
+      2: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: 2
+    options:
+      2: desc
+      1: asc
+
+caps:
+  categorymappings:
+    # forum
+    - {id: 48, cat: Other, desc: "Форум Региональные встречи"}
+    # forum tracker
+    - {id: 925, cat: Other, desc: "Форум-Трекер: Клубные таланты Авторские релизы"}
+    - {id: 872, cat: Other, desc: "Форум-Трекер: Клубные таланты Архив"}
+    # Everything for children and parents
+    - {id: 724, cat: TV, desc: "Видео"}
+    - {id: 725, cat: TV, desc: " |- Обучающее Видео для родителей"}
+    - {id: 729, cat: TV, desc: " |- Развивающее Видео для детей"}
+    - {id: 731, cat: TV, desc: " |- Отечественные Фильмы для детей"}
+    - {id: 733, cat: TV, desc: " |- Зарубежные Фильмы для детей"}
+    - {id: 730, cat: TV, desc: " |- Отечественные Мультфильмы для детей"}
+    - {id: 732, cat: TV, desc: " |- Зарубежные Мультфильмы для детей"}
+    - {id: 230, cat: TV, desc: " |- Отечественные Мультфильмы (HD*Rip/LQ, DVDRip, SATRip,..."}
+    - {id: 659, cat: TV, desc: " |- Отечественные Мультфильмы (HD, UHD, UHD-LQ, DVD, Сборники)"}
+    - {id: 658, cat: TV, desc: " |- Отечественные Мультсериалы"}
+    - {id: 231, cat: TV, desc: " |- Зарубежные Мультфильмы (HD*Rip/LQ, DVDRip, SATRip, VHSRip)"}
+    - {id: 660, cat: TV, desc: " |- Зарубежные Мультфильмы (DVD, Сборники)"}
+    - {id: 661, cat: TV, desc: " |- Зарубежные Мультфильмы (HD, UHD, UHD-LQ)"}
+    - {id: 890, cat: TV, desc: " |- Зарубежные Мультфильмы (3D)"}
+    - {id: 232, cat: Other, desc: " |- Зарубежные Мультсериалы"}
+    - {id: 734, cat: Other, desc: " |- Классика для мам и малышей"}
+    - {id: 742, cat: Other, desc: " |- Музыка и песни для детей"}
+    - {id: 735, cat: Other, desc: " |- Аудиокниги для детей и родителей"}
+    - {id: 738, cat: Other, desc: " |- Образование, обучение и развитие детей"}
+    - {id: 967, cat: Other, desc: " |- Логопедия, Психология, Педиатрия"}
+    - {id: 907, cat: Other, desc: " |- Журналы для детей и родителей"}
+    - {id: 739, cat: Other, desc: " |- Детская литература"}
+    - {id: 1109, cat: Other, desc: " |- Энциклопедии для детей"}
+    - {id: 736, cat: Other, desc: " |- Мультимедийные материалы для родителей"}
+    - {id: 737, cat: Other, desc: " |- Мультимедийные материалы для детей"}
+    - {id: 898, cat: Other, desc: " |- Рабочие тетради, прописи и разукрашки"}
+    - {id: 935, cat: Other, desc: " |- Настольные игры и Поделки"}
+    - {id: 871, cat: Other, desc: " |- Подвижные Игры"}
+    - {id: 973, cat: Other, desc: " |- Изобразительное искусство"}
+    - {id: 960, cat: Other, desc: " |- Прочие материалы для детей и родителей"}
+    - {id: 1239, cat: Other, desc: " |- ГИА, ОГЭ, ЕГЭ, ЕМЭ, ГВЭ"}
+    - {id: 740, cat: Other, desc: " |- Развивающие Игры для детей"}
+    - {id: 741, cat: Other, desc: " |- Детские Игры"}
+    # programs
+    - {id: 503, cat: Other, desc: "ОС Windows"}
+    - {id: 504, cat: Other, desc: " |- Оригинальные версии Windows"}
+    - {id: 506, cat: Other, desc: " |- Оригинальные версии Windows Server"}
+    - {id: 763, cat: Other, desc: " |- Windows OEM Recovery СD/DVD"}
+    - {id: 1241, cat: Other, desc: " |- Сборки Windows 10"}
+    - {id: 1023, cat: Other, desc: " |- Сборки Windows 8"}
+    - {id: 717, cat: Other, desc: " |- Сборки Windows 7"}
+    - {id: 509, cat: Other, desc: " |- Сборки Windows Vista"}
+    - {id: 508, cat: Other, desc: " |- Сборки Windows ХР"}
+    - {id: 510, cat: Other, desc: " |- Сборки Windows - всё в одном"}
+    - {id: 1254, cat: Other, desc: " |- Сборки Windows для незрячих"}
+    - {id: 1042, cat: Other, desc: " |- Песочница сборок Windows"}
+    - {id: 511, cat: Other, desc: " |- Разное (RC, Beta и Service Packs)"}
+    - {id: 916, cat: Other, desc: " |- Музей Windows"}
+    - {id: 512, cat: Other, desc: "Утилиты, Офис, Интернет"}
+    - {id: 561, cat: Other, desc: " |- ПО для Интернета и сетей"}
+    - {id: 1284, cat: Other, desc: " |- Оригинальные версии Office"}
+    - {id: 562, cat: Other, desc: " |- Офисное ПО"}
+    - {id: 513, cat: Other, desc: " |- Запись, создание, редактирование, эмуляция дисков и..."}
+    - {id: 514, cat: Other, desc: " |- Диагностика и обслуживание hardware"}
+    - {id: 515, cat: Other, desc: " |- Резервирование и восстановление данных"}
+    - {id: 516, cat: Other, desc: " |- Файловые менеджеры и архиваторы"}
+    - {id: 517, cat: Other, desc: " |- Обслуживание ОС"}
+    - {id: 518, cat: Other, desc: " |- Разное"}
+    - {id: 519, cat: Other, desc: "Безопасность"}
+    - {id: 520, cat: Other, desc: " |- Firewalls"}
+    - {id: 521, cat: Other, desc: " |- Антивирусы"}
+    - {id: 522, cat: Other, desc: " |- Комплексные системы защиты"}
+    - {id: 523, cat: Other, desc: " |- Разное (остальные программы по безопасности)"}
+    - {id: 524, cat: Other, desc: "Мультимедиа и Графика"}
+    - {id: 532, cat: Other, desc: " |- Аудио Плееры и Кодеки"}
+    - {id: 533, cat: Other, desc: " |- Аудио Граббинг, Мастеринг, Обработка"}
+    - {id: 535, cat: Other, desc: " |- Прочее ПО для Аудио"}
+    - {id: 530, cat: Other, desc: " |- Видео Плееры и Кодеки"}
+    - {id: 529, cat: Other, desc: " |- Нелинейный Видеомонтаж, Авторинг, Кодировщики"}
+    - {id: 525, cat: Other, desc: " |- Просмотрщики Графики (вьюверы)"}
+    - {id: 526, cat: Other, desc: " |- Графические редакторы"}
+    - {id: 527, cat: Other, desc: " |- ПО для моделирования"}
+    - {id: 545, cat: Other, desc: "Софт и оболочки для специалистов, Прочее"}
+    - {id: 764, cat: Other, desc: " |- LiveCD/DVD/Flash"}
+    - {id: 765, cat: Other, desc: " |- WPI"}
+    - {id: 820, cat: Other, desc: " |- Серверное ПО"}
+    - {id: 552, cat: Other, desc: " |- Разработка ПО"}
+    - {id: 553, cat: Other, desc: " |- САПР/ГИС"}
+    - {id: 554, cat: Other, desc: " |- Остальное ПО для специалистов"}
+    - {id: 550, cat: Other, desc: " |- Системы навигации и карты"}
+    - {id: 549, cat: Other, desc: " |- Драйверы"}
+    - {id: 548, cat: Other, desc: " |- Разное ПО"}
+    - {id: 536, cat: Other, desc: "Linux, Unix и другие ОС"}
+    - {id: 563, cat: Other, desc: " |- ОС Linux"}
+    - {id: 1032, cat: Other, desc: " |- ОС *NIX (Alpha, Beta, RC)"}
+    - {id: 1031, cat: Other, desc: " |- Сборки ОС Linux"}
+    - {id: 1025, cat: Other, desc: " |- ОС *BSD"}
+    - {id: 1026, cat: Other, desc: " |- Другие ОС"}
+    - {id: 564, cat: Other, desc: " |- *Nix. Программы"}
+    - {id: 1137, cat: Other, desc: " |- Специализированные ОС"}
+    # Movies
+    - {id: 216, cat: Movies, desc: "Горячие новинки"}
+    - {id: 270, cat: Movies, desc: " |- Отечественные Новинки (HD*Rip/LQ, DVDRip)"}
+    - {id: 218, cat: Movies, desc: " |- Зарубежные Новинки (HD*Rip/LQ, DVDRip)"}
+    - {id: 219, cat: Movies, desc: " |- Новинки (DVD)"}
+    - {id: 954, cat: Movies, desc: " |- Новинки (HD, UHD)"}
+    - {id: 888, cat: Movies, desc: " |- Новинки (3D)"}
+    - {id: 217, cat: Movies, desc: " |- Экранки"}
+    - {id: 1293, cat: Movies, desc: " |- Новинки с Рекламой"}
+    - {id: 1298, cat: Movies, desc: " |- Экранки с рекламой"}
+    - {id: 318, cat: Movies, desc: "Классика кино и Старые фильмы до 90-х"}
+    - {id: 320, cat: Movies, desc: " |- Отечественная Классика (HD*Rip/LQ, DVDRip, SATRip, VHSRip)"}
+    - {id: 677, cat: Movies, desc: " |- Отечественная Классика (DVD)"}
+    - {id: 1177, cat: Movies, desc: " |- Отечественная Классика (HD)"}
+    - {id: 319, cat: Movies, desc: " |- Зарубежная Классика (HD*Rip/LQ, DVDRip, SATRip, VHSRip)"}
+    - {id: 678, cat: Movies, desc: " |- Зарубежная Классика (DVD)"}
+    - {id: 885, cat: Movies, desc: " |- Зарубежная Классика (HD)"}
+    - {id: 908, cat: Movies, desc: " |- Старые Отечественные Фильмы (HD*Rip/LQ, DVDRip, SATRip,..."}
+    - {id: 1310, cat: Movies, desc: " |- Старые Отечественные Фильмы (DVD)"}
+    - {id: 909, cat: Movies, desc: " |- Старые Отечественные Фильмы (HD, DVD)"}
+    - {id: 910, cat: Movies, desc: " |- Старые Зарубежные Фильмы (HD*Rip/LQ, DVDRip, SATRip,..."}
+    - {id: 911, cat: Movies, desc: " |- Старые Зарубежные Фильмы (DVD)"}
+    - {id: 912, cat: Movies, desc: " |- Старые Зарубежные Фильмы (HD)"}
+    - {id: 220, cat: Movies, desc: "Отечественное кино"}
+    - {id: 221, cat: Movies, desc: " |- Отечественные Фильмы (HD*Rip/LQ, DVDRip, SATRip, VHSRip)"}
+    - {id: 222, cat: Movies, desc: " |- Отечественные Фильмы (DVD)"}
+    - {id: 882, cat: Movies, desc: " |- Отечественные Фильмы (HD)"}
+    - {id: 889, cat: Movies, desc: " |- Отечественные Фильмы (3D)"}
+    - {id: 224, cat: Movies, desc: "Зарубежное кино"}
+    - {id: 225, cat: Movies, desc: " |- Зарубежные Фильмы (HD*Rip/LQ, DVDRip, SATRip, VHSRip)"}
+    - {id: 226, cat: Movies, desc: " |- Зарубежные Фильмы (DVD)"}
+    - {id: 227, cat: Movies, desc: " |- Зарубежные Фильмы (HD, UHD-LQ)"}
+    - {id: 1296, cat: Movies, desc: " |- Зарубежные Фильмы (UHD)"}
+    - {id: 891, cat: Movies, desc: " |- Зарубежные Фильмы (3D)"}
+    - {id: 1299, cat: Movies, desc: " |- Фильмы ближнего зарубежья"}
+    - {id: 682, cat: Movies, desc: " |- Азиатское кино (HD*Rip/LQ, DVDRip, SATRip, VHSRip)"}
+    - {id: 694, cat: Movies, desc: " |- Азиатское кино (DVD)"}
+    - {id: 884, cat: Movies, desc: " |- Азиатское кино (HD)"}
+    - {id: 1211, cat: Movies, desc: " |- Азиатское кино (3D)"}
+    - {id: 693, cat: Movies, desc: " |- Индийское кино"}
+    - {id: 913, cat: Movies, desc: " |- Фильмы с переводом на др. языках"}
+    - {id: 228, cat: Movies, desc: " |- Фильмы в оригинале"}
+    - {id: 1150, cat: Movies, desc: " |- Фильмы в оригинале (HD)"}
+    - {id: 1311, cat: Movies, desc: "Коллекции / *логии"}
+    - {id: 1313, cat: Movies, desc: " |- Зарубежное кино (коллекции / *логии)"}
+    - {id: 1312, cat: Movies, desc: " |- Отечественное кино (коллекции / *логии)"}
+    - {id: 254, cat: Movies, desc: "Артхаус"}
+    - {id: 321, cat: Movies, desc: " |- Авторское кино"}
+    - {id: 255, cat: Movies, desc: " |- Интеллектуальное кино"}
+    - {id: 906, cat: Movies, desc: " |- Грайндхаус"}
+    - {id: 256, cat: Movies, desc: "Театр и Музыкальное видео"}
+    - {id: 257, cat: Movies, desc: " |- Музыкальные клипы"}
+    - {id: 258, cat: Movies, desc: " |- Концерты"}
+    - {id: 883, cat: Movies, desc: " |- Концерты (DVD)"}
+    - {id: 955, cat: Movies, desc: " |- Концерты (HD)"}
+    - {id: 905, cat: Movies, desc: " |- Театр"}
+    - {id: 271, cat: Movies, desc: " |- Опера, Балет, Мюзиклы"}
+    - {id: 1210, cat: Movies, desc: " |- Караоке"}
+    - {id: 264, cat: Movies, desc: "Остальное"}
+    - {id: 265, cat: Movies, desc: " |- Звуковые дорожки и сабы"}
+    - {id: 272, cat: Movies, desc: " |- Игровое видео"}
+    - {id: 1262, cat: Movies, desc: " |- hand made * video"}
+    - {id: 266, cat: Movies, desc: " |- Трейлеры"}
+    - {id: 1294, cat: Movies, desc: " |- Фильмы с Рекламой"}
+    # TV
+    - {id: 1219, cat: TV, desc: "Классика сериалов и многосерийное Кино до 90-х"}
+    - {id: 1221, cat: TV, desc: " |- Отечественная Классика. Сериалы и многосерийные Фильмы"}
+    - {id: 1220, cat: TV, desc: " |- Зарубежная Классика. Сериалы и многосерийные Фильмы"}
+    - {id: 768, cat: TV, desc: "Зарубежные сериалы"}
+    - {id: 779, cat: TV, desc: " |- Анатомия страсти / Grey's Anatomy"}
+    - {id: 778, cat: TV, desc: " |- Блудливая Калифорния / Californication"}
+    - {id: 788, cat: TV, desc: " |- Вавилон 5 / Babylon 5"}
+    - {id: 1288, cat: TV, desc: " |- Во все тяжкие / Breaking Bad"}
+    - {id: 787, cat: TV, desc: " |- Грань / Fringe"}
+    - {id: 1196, cat: TV, desc: " |- Декстер / Dexter"}
+    - {id: 1141, cat: TV, desc: " |- Дневники вампира / The Vampire Diaries ; Настоящая кровь..."}
+    - {id: 777, cat: TV, desc: " |- Доктор кто / Doctor Who; Торчвуд / Torchwood"}
+    - {id: 786, cat: TV, desc: " |- Доктор Хаус / House M.D."}
+    - {id: 803, cat: TV, desc: " |- Друзья / Friends"}
+    - {id: 776, cat: TV, desc: " |- Звездные врата / Stargate"}
+    - {id: 785, cat: TV, desc: " |- Звездный Крейсер Галактика / BattleStar Galactica"}
+    - {id: 775, cat: TV, desc: " |- Звездный путь / Star Trek"}
+    - {id: 1265, cat: TV, desc: " |- Игра престолов / Game of Thrones"}
+    - {id: 1242, cat: TV, desc: " |- Касл / Castle"}
+    - {id: 1289, cat: TV, desc: " |- Клан Сопрано / The Sopranos"}
+    - {id: 774, cat: TV, desc: " |- Клиника / Scrubs"}
+    - {id: 1140, cat: TV, desc: " |- Кости / Bones"}
+    - {id: 782, cat: TV, desc: " |- Менталист / The Mentalist ; Теория Лжи / Lie To Me"}
+    - {id: 773, cat: TV, desc: " |- Место преступления / CSI"}
+    - {id: 784, cat: TV, desc: " |- Остаться в живых / Lost"}
+    - {id: 1142, cat: TV, desc: " |- Морская полиция / Navy NCIS"}
+    - {id: 1195, cat: TV, desc: " |- Отбросы / Misfits"}
+    - {id: 772, cat: TV, desc: " |- Побег / Prison Break"}
+    - {id: 771, cat: TV, desc: " |- Пуаро / Poirot"}
+    - {id: 783, cat: TV, desc: " |- Сверхъестественное / Supernatural"}
+    - {id: 1144, cat: TV, desc: " |- Секретные материалы / X-Files"}
+    - {id: 804, cat: TV, desc: " |- Теория Большого Взрыва / The Big Bang Theory"}
+    - {id: 1290, cat: TV, desc: " |- Ходячие мертвецы / The Walking Dead ; Бойтесь ходячих..."}
+    - {id: 722, cat: TV, desc: " |- Чертова служба в госпитале МЭШ / M*A*S*H"}
+    - {id: 1300, cat: TV, desc: " |- Сериалы ближнего зарубежья"}
+    - {id: 770, cat: TV, desc: " |- Латиноамериканские сериалы"}
+    - {id: 922, cat: TV, desc: " |- Азиатские сериалы"}
+    - {id: 1320, cat: TV, desc: " |- Турецкие сериалы"}
+    - {id: 780, cat: TV, desc: " |- Сериалы без перевода (украинская звуковая дорожка)"}
+    - {id: 781, cat: TV, desc: " |- Сериалы без перевода"}
+    - {id: 1322, cat: TV, desc: " |- Сериалы с рекламой"}
+    - {id: 769, cat: TV, desc: "Отечественные сериалы"}
+    - {id: 799, cat: TV, desc: " |- Бандитский Петербург"}
+    - {id: 800, cat: TV, desc: " |- Глухарь"}
+    - {id: 791, cat: TV, desc: " |- Интерны"}
+    - {id: 798, cat: TV, desc: " |- Кадетство и Кремлевские курсанты"}
+    - {id: 797, cat: TV, desc: " |- Каменская"}
+    - {id: 790, cat: TV, desc: " |- Маргоша"}
+    - {id: 793, cat: TV, desc: " |- Ментовские войны"}
+    - {id: 794, cat: TV, desc: " |- Менты"}
+    - {id: 789, cat: TV, desc: " |- Папины дочки"}
+    - {id: 796, cat: TV, desc: " |- Солдаты"}
+    - {id: 792, cat: TV, desc: " |- Счастливы вместе"}
+    - {id: 795, cat: TV, desc: " |- Универ"}
+    # Documentary, Telecasts, Sports, Comedy
+    - {id: 713, cat: TV, desc: "Зарубежные TV-бренды"}
+    - {id: 706, cat: TV, desc: " |- Animal Planet"}
+    - {id: 577, cat: TV, desc: " |- BBC"}
+    - {id: 894, cat: TV, desc: " |- Da Vinci Learning"}
+    - {id: 578, cat: TV, desc: " |- Discovery"}
+    - {id: 580, cat: TV, desc: " |- History Channel"}
+    - {id: 579, cat: TV, desc: " |- National Geographic"}
+    - {id: 953, cat: TV, desc: " |- PBS"}
+    - {id: 581, cat: TV, desc: " |- Readers Digest"}
+    - {id: 806, cat: TV, desc: " |- Интересно обо всем"}
+    - {id: 714, cat: TV, desc: " |- Мега-Проекты"}
+    - {id: 761, cat: TV, desc: " |- Доисторический мир"}
+    - {id: 809, cat: TV, desc: " |- Мир будущего"}
+    - {id: 924, cat: TV, desc: " |- Одиссея Жака Кусто"}
+    - {id: 812, cat: TV, desc: " |- Тайны и Загадки"}
+    - {id: 576, cat: TV, desc: "Документалистика и Телепередачи"}
+    - {id: 590, cat: TV, desc: " |- Кинолетопись Страны Советской"}
+    - {id: 591, cat: TV, desc: " |- Вторая Мировая война"}
+    - {id: 588, cat: TV, desc: " |- Отечественная история"}
+    - {id: 589, cat: TV, desc: " |- История"}
+    - {id: 598, cat: TV, desc: " |- Личности в истории"}
+    - {id: 652, cat: TV, desc: " |- Посвящение искусству"}
+    - {id: 599, cat: TV, desc: " |- Телешоу"}
+    - {id: 959, cat: TV, desc: " |- Музыкальные шоу"}
+    - {id: 956, cat: TV, desc: " |- Интеллектуальные шоу"}
+    - {id: 597, cat: TV, desc: " |- Непознанное и сверхъестественное"}
+    - {id: 593, cat: TV, desc: " |- Живая природа"}
+    - {id: 594, cat: TV, desc: " |- Клуб кинопутешествий"}
+    - {id: 819, cat: TV, desc: " |- За рулем"}
+    - {id: 595, cat: TV, desc: " |- Релакс"}
+    - {id: 582, cat: TV, desc: " |- Крылья России"}
+    - {id: 587, cat: TV, desc: " |- Военное дело"}
+    - {id: 583, cat: TV, desc: " |- Ударная сила"}
+    - {id: 584, cat: TV, desc: " |- Авиация"}
+    - {id: 586, cat: TV, desc: " |- Космос"}
+    - {id: 585, cat: TV, desc: " |- Флот"}
+    - {id: 600, cat: TV, desc: " |- Тележурналистика"}
+    - {id: 596, cat: TV, desc: " |- Публицистика, политика и экономика"}
+    - {id: 1295, cat: TV, desc: " |- Общественно-политические ток-шоу"}
+    - {id: 614, cat: TV, desc: " |- Религии и культы"}
+    - {id: 603, cat: TV, desc: "Спорт и активный отдых"}
+    - {id: 1309, cat: TV, desc: " |- Футбол. Чемпионат мира 2018"}
+    - {id: 1308, cat: TV, desc: " |- Хоккей. Чемпионат мира 2018"}
+    - {id: 1206, cat: TV, desc: " |- Футбол. Чемпионат Мира 2014"}
+    - {id: 1194, cat: TV, desc: " |- ХХII Зимние Олимпийские игры. Сочи 2014"}
+    - {id: 1062, cat: TV, desc: " |- XXX Летние Олимпийские игры. Лондон 2012"}
+    - {id: 974, cat: TV, desc: " |- Футбол"}
+    - {id: 609, cat: TV, desc: " |- Баскетбол, Волейбол, Гандбол"}
+    - {id: 1263, cat: TV, desc: " |- Хоккей"}
+    - {id: 951, cat: TV, desc: " |- Прочие зимние виды спорта"}
+    - {id: 975, cat: TV, desc: " |- Бокс"}
+    - {id: 608, cat: TV, desc: " |- Бои без правил, Единоборства"}
+    - {id: 607, cat: TV, desc: " |- Гимнастика, Бодибилдинг, Красота тела"}
+    - {id: 606, cat: TV, desc: " |- Авто, Мото"}
+    - {id: 750, cat: TV, desc: " |- Формула 1"}
+    - {id: 605, cat: TV, desc: " |- Экстрим"}
+    - {id: 604, cat: TV, desc: " |- Рыбалка и Охота"}
+    - {id: 950, cat: TV, desc: " |- Бильярд"}
+    - {id: 610, cat: TV, desc: "Юмор"}
+    - {id: 613, cat: TV, desc: " |- КВН"}
+    - {id: 612, cat: TV, desc: " |- ПостКВН"}
+    - {id: 655, cat: TV, desc: " |- Кривое зеркало"}
+    - {id: 653, cat: TV, desc: " |- Украинские шоу"}
+    - {id: 654, cat: TV, desc: " |- Маски-шоу"}
+    - {id: 611, cat: TV, desc: " |- Сатирики"}
+    - {id: 656, cat: TV, desc: " |- Приколы"}
+    # anime
+    - {id: 615, cat: TV/Anime, desc: "Манга и Арт"}
+    - {id: 616, cat: TV/Anime, desc: " |- Манга"}
+    - {id: 1297, cat: TV/Anime, desc: " |- Ранобэ"}
+    - {id: 648, cat: TV/Anime, desc: " |- Визуальные новеллы"}
+    - {id: 617, cat: TV/Anime, desc: " |- Артбуки"}
+    - {id: 619, cat: TV/Anime, desc: " |- Фанарт, Обои"}
+    - {id: 620, cat: TV/Anime, desc: "Аниме с субтитрами"}
+    - {id: 623, cat: TV/Anime, desc: " |- Онгоинги"}
+    - {id: 622, cat: TV/Anime, desc: " |- Аниме (SD)"}
+    - {id: 621, cat: TV/Anime, desc: " |- Аниме (HD)"}
+    - {id: 632, cat: TV/Anime, desc: " |- Аниме (FullHD)"}
+    - {id: 624, cat: TV/Anime, desc: "Аниме с озвучкой"}
+    - {id: 627, cat: TV/Anime, desc: " |- Онгоинги с озвучкой"}
+    - {id: 626, cat: TV/Anime, desc: " |- Аниме с озвучкой (SD)"}
+    - {id: 625, cat: TV/Anime, desc: " |- Аниме с озвучкой (HD)"}
+    - {id: 644, cat: TV/Anime, desc: " |- Аниме с озвучкой (FullHD)"}
+    - {id: 628, cat: TV/Anime, desc: "Аниме разное"}
+    - {id: 635, cat: TV/Anime, desc: " |- Аниме DVD"}
+    - {id: 634, cat: TV/Anime, desc: " |- Аниме Blu-ray, Remux"}
+    - {id: 638, cat: TV/Anime, desc: " |- Аниме хардсаб"}
+    - {id: 646, cat: TV/Anime, desc: " |- Аниме прочее"}
+    - {id: 645, cat: TV/Anime, desc: "Аниме музыка"}
+    - {id: 639, cat: TV/Anime, desc: " |- Аниме OST (Lossless)"}
+    - {id: 640, cat: TV/Anime, desc: " |- Аниме OST"}
+    # Books and Training Materials
+    - {id: 432, cat: Books, desc: "Научная и техническая литература"}
+    - {id: 755, cat: Books, desc: " |- Учебники"}
+    - {id: 481, cat: Books, desc: " |- Иностранные языки"}
+    - {id: 557, cat: Books, desc: " |- Гуманитарные науки и искусство"}
+    - {id: 442, cat: Books, desc: " |- Точные и естественные науки"}
+    - {id: 441, cat: Books, desc: " |- Техническая литература"}
+    - {id: 875, cat: Books, desc: " |- Военно-историческая литература"}
+    - {id: 444, cat: Books, desc: " |- Научно-популярная литература"}
+    - {id: 443, cat: Books, desc: " |- Медицина"}
+    - {id: 440, cat: Books, desc: " |- Нормативная документация"}
+    - {id: 1199, cat: Books, desc: " |- Энциклопедии и словари"}
+    - {id: 558, cat: Books, desc: " |- Бизнес"}
+    - {id: 433, cat: Books, desc: "Компьютерная литература"}
+    - {id: 447, cat: Books, desc: " |- Программирование"}
+    - {id: 445, cat: Books, desc: " |- Веб-дизайн"}
+    - {id: 817, cat: Books, desc: " |- 2D графика"}
+    - {id: 818, cat: Books, desc: " |- 3D графика"}
+    - {id: 434, cat: Books, desc: "Художественная литература"}
+    - {id: 456, cat: Books, desc: " |- Библиотеки"}
+    - {id: 931, cat: Books, desc: " |- Собрания книг русскоязычных авторов"}
+    - {id: 1152, cat: Books, desc: " |- Собрания книг иностранных авторов"}
+    - {id: 957, cat: Books, desc: " |- Многоавторские сборники"}
+    - {id: 455, cat: Books, desc: " |- Сатира, Юмор"}
+    - {id: 1153, cat: Books, desc: " |- Боевики"}
+    - {id: 453, cat: Books, desc: " |- Детективы"}
+    - {id: 452, cat: Books, desc: " |- Исторические книги"}
+    - {id: 449, cat: Books, desc: " |- Классика, Проза, Поэзия"}
+    - {id: 1063, cat: Books, desc: " |- Приключенческая литература"}
+    - {id: 451, cat: Books, desc: " |- Фантастика, Фэнтези"}
+    - {id: 438, cat: Books, desc: "Художественные аудиокниги и публицистика"}
+    - {id: 485, cat: Books, desc: " |- Сатира, юмор"}
+    - {id: 473, cat: Books, desc: " |- Детектив, Боевик"}
+    - {id: 472, cat: Books, desc: " |- Историческая"}
+    - {id: 471, cat: Books, desc: " |- Классика"}
+    - {id: 895, cat: Books, desc: " |- Проза, Поэзия"}
+    - {id: 470, cat: Books, desc: " |- Фантастика, Фэнтези"}
+    - {id: 896, cat: Books, desc: " |- Публицистика"}
+    - {id: 480, cat: Books, desc: " |- Другие"}
+    - {id: 482, cat: Books, desc: "Комиксы"}
+    - {id: 484, cat: Books, desc: " |- Комиксы без перевода"}
+    - {id: 483, cat: Books, desc: " |- Комиксы на русском языке"}
+    - {id: 436, cat: Books, desc: "Обучающие аудиоматериалы"}
+    - {id: 460, cat: Books, desc: " |- Медитации"}
+    - {id: 459, cat: Books, desc: " |- Популярная психология"}
+    - {id: 458, cat: Books, desc: " |- Бизнес"}
+    - {id: 457, cat: Books, desc: " |- Иностранные языки"}
+    - {id: 462, cat: Books, desc: " |- Другие"}
+    - {id: 437, cat: Books, desc: "Обучающие видеоматериалы"}
+    - {id: 466, cat: Books, desc: " |- Бизнес"}
+    - {id: 1319, cat: Books, desc: " |- Иностранные языки, обуч.видео"}
+    - {id: 463, cat: Books, desc: " |- Компьютеры"}
+    - {id: 1223, cat: Books, desc: " |- Фотография, Видео"}
+    - {id: 467, cat: Books, desc: " |- Физические тренинги"}
+    - {id: 958, cat: Books, desc: " |- Дизайн"}
+    - {id: 464, cat: Books, desc: " |- Популярная психология"}
+    - {id: 465, cat: Books, desc: " |- Музыка"}
+    - {id: 469, cat: Books, desc: " |- Другие"}
+    - {id: 439, cat: Books, desc: "Мультимедийные материалы"}
+    - {id: 477, cat: Books, desc: " |- Образование"}
+    - {id: 476, cat: Books, desc: " |- Иностранные языки"}
+    - {id: 475, cat: Books, desc: " |- Компьютеры"}
+    - {id: 474, cat: Books, desc: " |- Мультимедийные справочники, Энциклопедии"}
+    - {id: 886, cat: Books, desc: " |- Приложения к журналам"}
+    - {id: 478, cat: Books, desc: " |- Другие"}
+    - {id: 486, cat: Books, desc: "Журналы"}
+    - {id: 490, cat: Books, desc: " |- Мужские журналы"}
+    - {id: 657, cat: Books, desc: " |- Женские журналы"}
+    - {id: 489, cat: Books, desc: " |- Игровые журналы"}
+    - {id: 488, cat: Books, desc: " |- Компьютерные журналы"}
+    - {id: 487, cat: Books, desc: " |- Научно-популярные журналы"}
+    - {id: 1198, cat: Books, desc: " |- Журналы по электротехнике и радиоэлектронике"}
+    - {id: 887, cat: Books, desc: " |- Автомобильные журналы"}
+    - {id: 1227, cat: Books, desc: " |- Кулинарные журналы"}
+    - {id: 893, cat: Books, desc: " |- Домоводство"}
+    - {id: 491, cat: Books, desc: " |- Хобби"}
+    - {id: 767, cat: Books, desc: " |- Другие"}
+    - {id: 299, cat: Books, desc: "Автомобили"}
+    - {id: 301, cat: Books, desc: " |- Автомобильная литература"}
+    - {id: 300, cat: Books, desc: " |- Автомобильные программы и мультимедийные материалы"}
+    - {id: 435, cat: Books, desc: "Религии и культы"}
+    - {id: 662, cat: Books, desc: " |- Религиозная литература"}
+    - {id: 663, cat: Books, desc: " |- Религиозное видео"}
+    - {id: 461, cat: Books, desc: " |- Религиозное аудио"}
+    - {id: 1226, cat: Books, desc: " |- Религиозное мультимедиа"}
+    - {id: 492, cat: Books, desc: "Разное"}
+    - {id: 398, cat: Books, desc: " |- Ноты"}
+    - {id: 1170, cat: Books, desc: " |- Спорт и Боевые искусства"}
+    - {id: 1176, cat: Books, desc: " |- Историография"}
+    - {id: 1174, cat: Books, desc: " |- Популярная психология"}
+    - {id: 1173, cat: Books, desc: " |- Публицистика"}
+    - {id: 1171, cat: Books, desc: " |- Эзотерика"}
+    - {id: 1175, cat: Books, desc: " |- Нетрадиционная медицина"}
+    - {id: 1172, cat: Books, desc: " |- Строительство и ремонт"}
+    - {id: 815, cat: Books, desc: " |- Кулинария"}
+    - {id: 933, cat: Books, desc: " |- Сад, огород, животноводство"}
+    - {id: 816, cat: Books, desc: " |- На досуге"}
+    # Music
+    - {id: 313, cat: Audio, desc: "HD Audio и Многоканальная Музыка"}
+    - {id: 1291, cat: Audio, desc: " |- Blu-ray Audio"}
+    - {id: 680, cat: Audio, desc: " |- DVD-Audio"}
+    - {id: 1149, cat: Audio, desc: " |- SACD-R"}
+    - {id: 429, cat: Audio, desc: " |- DTS-Audio"}
+    - {id: 1234, cat: Audio, desc: " |- WEB-DL-Audio"}
+    - {id: 681, cat: Audio, desc: " |- Vinyl-Rip и Hand-Made"}
+    - {id: 330, cat: Audio, desc: "Классика"}
+    - {id: 1256, cat: Audio, desc: " |- Классика (HD Audio)"}
+    - {id: 1285, cat: Audio, desc: " |- Полные собрания сочинений (Lossless)"}
+    - {id: 370, cat: Audio, desc: " |- Полные собрания сочинений"}
+    - {id: 1260, cat: Audio, desc: " |- Вокал (Lossless)"}
+    - {id: 371, cat: Audio, desc: " |- Вокал"}
+    - {id: 1261, cat: Audio, desc: " |- Концерты (Lossless)"}
+    - {id: 375, cat: Audio, desc: " |- Концерты"}
+    - {id: 1259, cat: Audio, desc: " |- Оркестровая (Lossless)"}
+    - {id: 374, cat: Audio, desc: " |- Оркестровая"}
+    - {id: 1257, cat: Audio, desc: " |- Камерная (Lossless)"}
+    - {id: 373, cat: Audio, desc: " |- Камерная"}
+    - {id: 1258, cat: Audio, desc: " |- Фортепиано (Lossless)"}
+    - {id: 372, cat: Audio, desc: " |- Фортепиано"}
+    - {id: 1160, cat: Audio, desc: " |- В обработке/Classical Crossover/Neoclassical (Lossless)"}
+    - {id: 876, cat: Audio, desc: " |- В обработке/Classical Crossover/Neoclassical"}
+    - {id: 1255, cat: Audio, desc: " |- Классика (сборники) (Lossless)"}
+    - {id: 376, cat: Audio, desc: " |- Классика (сборники)"}
+    - {id: 326, cat: Audio, desc: "Jazz, Blues, Soul"}
+    - {id: 359, cat: Audio, desc: " |- Jazz (Lossless)"}
+    - {id: 358, cat: Audio, desc: " |- Jazz"}
+    - {id: 1188, cat: Audio, desc: " |- Blues, Soul (Lossless)"}
+    - {id: 1189, cat: Audio, desc: " |- Blues, Soul"}
+    - {id: 328, cat: Audio, desc: "Шансон, Авторская и Военная песня"}
+    - {id: 1180, cat: Audio, desc: " |- Зарубежный Шансон (Lossless)"}
+    - {id: 1181, cat: Audio, desc: " |- Зарубежный Шансон"}
+    - {id: 364, cat: Audio, desc: " |- Русский Шансон (Lossless)"}
+    - {id: 363, cat: Audio, desc: " |- Русский Шансон"}
+    - {id: 1179, cat: Audio, desc: " |- Авторская и Военная песня (Lossless)"}
+    - {id: 879, cat: Audio, desc: " |- Авторская и Военная песня"}
+    - {id: 322, cat: Audio, desc: "Rock, Alternative, Punk, Metal"}
+    - {id: 962, cat: Audio, desc: " |- Rock (Lossless)"}
+    - {id: 333, cat: Audio, desc: " |- Rock"}
+    - {id: 965, cat: Audio, desc: " |- Alternative, Punk (Lossless)"}
+    - {id: 336, cat: Audio, desc: " |- Alternative, Punk"}
+    - {id: 337, cat: Audio, desc: " |- Hard Rock (Lossless)"}
+    - {id: 338, cat: Audio, desc: " |- Hard Rock"}
+    - {id: 963, cat: Audio, desc: " |- Metal (Lossless)"}
+    - {id: 334, cat: Audio, desc: " |- Metal"}
+    - {id: 961, cat: Audio, desc: " |- Русский Рок (Lossless)"}
+    - {id: 332, cat: Audio, desc: " |- Русский рок"}
+    - {id: 325, cat: Audio, desc: "Pop"}
+    - {id: 1165, cat: Audio, desc: " |- Eurodance, Euro-House, Technopop (Lossless)"}
+    - {id: 1166, cat: Audio, desc: " |- Eurodance, Euro-House, Technopop"}
+    - {id: 1167, cat: Audio, desc: " |- Disco, Italo-Disco, Euro-Disco, Hi-NRG (Lossless)"}
+    - {id: 1168, cat: Audio, desc: " |- Disco, Italo-Disco, Euro-Disco, Hi-NRG"}
+    - {id: 1162, cat: Audio, desc: " |- Отечественная поп-музыка (Lossless)"}
+    - {id: 352, cat: Audio, desc: " |- Отечественная поп-музыка"}
+    - {id: 1164, cat: Audio, desc: " |- Советская эстрада, Ретро (Lossless)"}
+    - {id: 1163, cat: Audio, desc: " |- Советская эстрада, Ретро"}
+    - {id: 1161, cat: Audio, desc: " |- Зарубежная поп-музыка (Lossless)"}
+    - {id: 353, cat: Audio, desc: " |- Зарубежная поп-музыка"}
+    - {id: 324, cat: Audio, desc: "Electronic"}
+    - {id: 976, cat: Audio, desc: " |- Trance (Lossless)"}
+    - {id: 346, cat: Audio, desc: " |- Trance"}
+    - {id: 1243, cat: Audio, desc: " |- Trance (Singles, EPs)"}
+    - {id: 977, cat: Audio, desc: " |- House, Techno, Electro, Minimal (Lossless)"}
+    - {id: 345, cat: Audio, desc: " |- House"}
+    - {id: 349, cat: Audio, desc: " |- Techno, Electro, Minimal"}
+    - {id: 978, cat: Audio, desc: " |- Easy listening (Lossless)"}
+    - {id: 347, cat: Audio, desc: " |- Easy listening"}
+    - {id: 979, cat: Audio, desc: " |- Experimental, Industrial, EBM, Dark Electro (Lossless)"}
+    - {id: 673, cat: Audio, desc: " |- Experimental Electronic"}
+    - {id: 1315, cat: Audio, desc: " |- Industrial, EBM, Dark Electro, Noise (Lossless)"}
+    - {id: 671, cat: Audio, desc: " |- Industrial, EBM, Dark Electro"}
+    - {id: 1224, cat: Audio, desc: " |- IDM (Lossless)"}
+    - {id: 1225, cat: Audio, desc: " |- IDM"}
+    - {id: 980, cat: Audio, desc: " |- Synthpop, New Wave (Lossless)"}
+    - {id: 672, cat: Audio, desc: " |- Synthpop, New Wave"}
+    - {id: 1316, cat: Audio, desc: " |- Dubstep, Future Garage, Bass Music, UK Garage (Lossless)"}
+    - {id: 1317, cat: Audio, desc: " |- Dubstep, Future Garage, Bass Music, UK Garage"}
+    - {id: 981, cat: Audio, desc: " |- Drum'n'Bass, Jungle, Breaks, Breakbeat, Dubstep (Lossless)"}
+    - {id: 344, cat: Audio, desc: " |- Drum'n'Bass, Jungle, Breaks, Breakbeat, Dubstep"}
+    - {id: 983, cat: Audio, desc: " |- Hardstyle, Jumpstyle, Hardcore (Lossless)"}
+    - {id: 984, cat: Audio, desc: " |- Hardstyle, Jumpstyle, Hardcore"}
+    - {id: 982, cat: Audio, desc: " |- Psychedelic, psytrance, fullon (Lossless)"}
+    - {id: 348, cat: Audio, desc: " |- Psychedelic, psytrance, fullon"}
+    - {id: 674, cat: Audio, desc: " |- Radioshow, Live Mixes"}
+    - {id: 323, cat: Audio, desc: "Rap, Hip-hop, RnB, Reggae"}
+    - {id: 1187, cat: Audio, desc: " |- Rap, Hip-hop зарубежный (Lossless)"}
+    - {id: 339, cat: Audio, desc: " |- Rap, Hip-hop зарубежный"}
+    - {id: 1186, cat: Audio, desc: " |- Rap, Hip-hop отечественный (Lossless)"}
+    - {id: 340, cat: Audio, desc: " |- Rap, Hip-hop отечественный"}
+    - {id: 1185, cat: Audio, desc: " |- RnB, Reggae (Lossless)"}
+    - {id: 341, cat: Audio, desc: " |- RnB, Reggae"}
+    - {id: 329, cat: Audio, desc: "East Asian Music"}
+    - {id: 369, cat: Audio, desc: " |- Asian Traditional, Ethnic (Lossless)"}
+    - {id: 368, cat: Audio, desc: " |- Asian Traditional, Ethnic"}
+    - {id: 1218, cat: Audio, desc: " |- Asian Pop (Lossless)"}
+    - {id: 365, cat: Audio, desc: " |- Asian Pop"}
+    - {id: 1217, cat: Audio, desc: " |- Asian Rock, Metal (Lossless)"}
+    - {id: 366, cat: Audio, desc: " |- Asian Rock, Metal"}
+    - {id: 1215, cat: Audio, desc: " |- Doujin Music (Lossless)"}
+    - {id: 1216, cat: Audio, desc: " |- Doujin Music"}
+    - {id: 1213, cat: Audio, desc: " |- Other Asian (Lossless)"}
+    - {id: 367, cat: Audio, desc: " |- Other Asian"}
+    - {id: 331, cat: Audio, desc: "Other Styles"}
+    - {id: 1157, cat: Audio, desc: " |- Instrumental (Lossless)"}
+    - {id: 711, cat: Audio, desc: " |- Instrumental"}
+    - {id: 1159, cat: Audio, desc: " |- New Age/Meditative/Relax (Lossless)"}
+    - {id: 378, cat: Audio, desc: " |- New Age/Meditative/Relax"}
+    - {id: 1158, cat: Audio, desc: " |- Folk (Lossless)"}
+    - {id: 379, cat: Audio, desc: " |- Folk"}
+    - {id: 380, cat: Audio, desc: " |- Other (Lossless)"}
+    - {id: 1178, cat: Audio, desc: " |- Other"}
+    - {id: 361, cat: Audio, desc: " |- OST (Lossless)"}
+    - {id: 360, cat: Audio, desc: " |- OST"}
+    - {id: 327, cat: Audio, desc: "Неофициальные сборники"}
+    - {id: 1184, cat: Audio, desc: " |- Jazz, Blues, Soul (сборники)"}
+    - {id: 824, cat: Audio, desc: " |- Шансон, Авторская и Военная песня (сборники)"}
+    - {id: 1182, cat: Audio, desc: " |- Rock, Alternative, Punk, Metal (сборники)"}
+    - {id: 354, cat: Audio, desc: " |- Pop (сборники)"}
+    - {id: 877, cat: Audio, desc: " |- Electronic (сборники)"}
+    - {id: 1183, cat: Audio, desc: " |- Rap, Hip-hop, RnB, Reggae (сборники)"}
+    - {id: 1190, cat: Audio, desc: " |- Instrumental/New Age/Meditative/Relax (сборники)"}
+    - {id: 917, cat: Audio, desc: " |- Прочее (сборники)"}
+    # Other
+    - {id: 410, cat: Other, desc: "Win Игры"}
+    - {id: 411, cat: Other, desc: " |- Горячие новинки Игр"}
+    - {id: 412, cat: Other, desc: " |- Action (FPS)"}
+    - {id: 1008, cat: Other, desc: " |- Action (TPS)"}
+    - {id: 415, cat: Other, desc: " |- Adventure/Quest"}
+    - {id: 746, cat: Other, desc: " |- Arcade"}
+    - {id: 428, cat: Other, desc: " |- Online (MMO)"}
+    - {id: 1009, cat: Other, desc: " |- Online Action (MMO)"}
+    - {id: 413, cat: Other, desc: " |- RPG"}
+    - {id: 414, cat: Other, desc: " |- Strategy (RTS/TBS/Grand)"}
+    - {id: 1010, cat: Other, desc: " |- Strategy Tactical (RTS/TBS)"}
+    - {id: 1012, cat: Other, desc: " |- Strategy (Manage/Busin)"}
+    - {id: 1014, cat: Other, desc: " |- Racing"}
+    - {id: 416, cat: Other, desc: " |- Simulation (Flight/Space)"}
+    - {id: 1013, cat: Other, desc: " |- Simulation (Sport)"}
+    - {id: 1015, cat: Other, desc: " |- Simulation (Other)"}
+    - {id: 268, cat: Other, desc: " |- Action/Arcade/Platformer (Casual)"}
+    - {id: 1016, cat: Other, desc: " |- Adventure/Quest (Casual)"}
+    - {id: 1041, cat: Other, desc: " |- Classic Arcade/Zuma/3match (Casual)"}
+    - {id: 1018, cat: Other, desc: " |- Board/Puzzle/Logic (Casual)"}
+    - {id: 1017, cat: Other, desc: " |- Strategy/Manager/Business (Casual)"}
+    - {id: 972, cat: Other, desc: " |- AddOn/DLC/Mod для Игр"}
+    - {id: 971, cat: Other, desc: " |- Demo/Beta версии Игр"}
+    - {id: 970, cat: Other, desc: " |- Языковые пакеты для Игр"}
+    - {id: 969, cat: Other, desc: " |- Patch/Tweak/Trainer/Other для Игр"}
+    - {id: 968, cat: Other, desc: " |- NoCD/NoDVD/Crack для Игр"}
+    - {id: 1146, cat: Other, desc: " |- Песочница Win Игр"}
+    - {id: 418, cat: Other, desc: "Win Старые Игры"}
+    - {id: 1061, cat: Other, desc: " |- Action (FPS)"}
+    - {id: 1060, cat: Other, desc: " |- Action (TPS)"}
+    - {id: 1059, cat: Other, desc: " |- Adventure/Quest"}
+    - {id: 1058, cat: Other, desc: " |- Arcade"}
+    - {id: 1057, cat: Other, desc: " |- RPG"}
+    - {id: 1056, cat: Other, desc: " |- Strategy (RTS/TBS/Grand)"}
+    - {id: 1054, cat: Other, desc: " |- Strategy Tactical (RTS/TBS/Wargame)"}
+    - {id: 1053, cat: Other, desc: " |- Strategy (Manage/Busin)"}
+    - {id: 1052, cat: Other, desc: " |- Racing"}
+    - {id: 1051, cat: Other, desc: " |- Simulation (Flight/Space)"}
+    - {id: 1050, cat: Other, desc: " |- Simulation (Sport)"}
+    - {id: 1049, cat: Other, desc: " |- Simulation (Other)"}
+    - {id: 1048, cat: Other, desc: " |- AddOn/DLC/Mod для Игр"}
+    - {id: 1047, cat: Other, desc: " |- Demo/Beta версии Игр"}
+    - {id: 1046, cat: Other, desc: " |- Языковые пакеты для Игр"}
+    - {id: 1045, cat: Other, desc: " |- Patch/Tweak/Trainer/Other для Игр"}
+    - {id: 1044, cat: Other, desc: " |- NoCD/NoDVD/Crack для Игр"}
+    - {id: 417, cat: Other, desc: "*NIX Игры"}
+    - {id: 1193, cat: Other, desc: " |- Native *Nix Games"}
+    - {id: 1192, cat: Other, desc: " |- Ported *Nix Games"}
+    - {id: 382, cat: Other, desc: "Консольные Игры"}
+    - {id: 390, cat: Other, desc: " |- Тех. раздел Консолей"}
+    - {id: 387, cat: Other, desc: " |- Xbox 360"}
+    - {id: 388, cat: Other, desc: " |- Wii"}
+    - {id: 1264, cat: Other, desc: " |- Wii U"}
+    - {id: 1318, cat: Other, desc: " |- Switch"}
+    - {id: 385, cat: Other, desc: " |- PS1"}
+    - {id: 386, cat: Other, desc: " |- PS2"}
+    - {id: 848, cat: Other, desc: " |- PS3"}
+    - {id: 1321, cat: Other, desc: " |- PS4"}
+    - {id: 383, cat: Other, desc: " |- PSP"}
+    - {id: 384, cat: Other, desc: " |- Psx to PSP"}
+    - {id: 1292, cat: Other, desc: " |- PS Vita"}
+    - {id: 389, cat: Other, desc: " |- Ромы"}
+    - {id: 391, cat: Other, desc: " |- Другие приставки"}
+    # pda and mobile
+    - {id: 1240, cat: Other, desc: " |- Всё для детей и родителей для Android"}
+    - {id: 830, cat: Other, desc: " |- ПО для Android"}
+    - {id: 833, cat: Other, desc: " |- Игры для Android"}
+    - {id: 839, cat: Other, desc: " |- Навигация для Android"}
+    - {id: 1233, cat: Other, desc: " |- Прошивки для Android устройств"}
+    - {id: 1236, cat: Other, desc: " |- Вспомогательное ПО для Android"}
+    - {id: 832, cat: Other, desc: " |- ПО и Игры на Java"}
+    - {id: 829, cat: Other, desc: " |- ПО и Игры для Symbian"}
+    - {id: 828, cat: Other, desc: " |- ПО и Игры для Windows Mobile"}
+    - {id: 1231, cat: Other, desc: " |- Навигация для др. мобильных устройств"}
+    - {id: 840, cat: Other, desc: " |- Прошивки для др. мобильных устройств"}
+    - {id: 1232, cat: Other, desc: " |- Вспомогательное ПО для др. мобильных устройств"}
+    - {id: 841, cat: Other, desc: " |- Прочее для мобильных устройств"}
+    - {id: 1238, cat: Other, desc: " |- Карты для навигационного ПО"}
+    - {id: 844, cat: Other, desc: " |- Мобильное Аудио"}
+    - {id: 842, cat: Other, desc: " |- Мобильное Видео"}
+    - {id: 843, cat: Other, desc: " |- Темы и Изображения"}
+    # apple
+    - {id: 537, cat: Other, desc: " |- macOS (Apple)"}
+    - {id: 538, cat: Other, desc: " |- macOS (osx86project/hackintosh)"}
+    - {id: 1151, cat: Other, desc: " |- Разное для macOS (Apple/hackintosh)"}
+    - {id: 1083, cat: Other, desc: " |- Графика для macOS"}
+    - {id: 1029, cat: Other, desc: " |- CAD, 3D, ПО для специалистов для macOS"}
+    - {id: 1082, cat: Other, desc: " |- Офис, Интернет для macOS"}
+    - {id: 1028, cat: Other, desc: " |- Аудио и видео редакторы для macOS"}
+    - {id: 1087, cat: Other, desc: " |- Плееры, конвертеры, кодеки для macOS"}
+    - {id: 1030, cat: Other, desc: " |- Утилиты для macOS"}
+    - {id: 1039, cat: Other, desc: " |- Kinder Games для macOS"}
+    - {id: 1038, cat: Other, desc: " |- Quests, Adventure, Arcade для macOS"}
+    - {id: 1037, cat: Other, desc: " |- Action, FPS для macOS"}
+    - {id: 1036, cat: Other, desc: " |- Strategy, RPG для macOS"}
+    - {id: 1035, cat: Other, desc: " |- Racing, Simulation, Sports для macOS"}
+    - {id: 1034, cat: Other, desc: " |- Casual Games, Other для macOS"}
+    - {id: 822, cat: Other, desc: " |- Тестовые macOS Игры"}
+    - {id: 1093, cat: Other, desc: " |- Прошивки iOS и AppleTV"}
+    - {id: 1092, cat: Other, desc: " |- UnLock, Jailbreak, Cydia"}
+    - {id: 1091, cat: Other, desc: " |- ПО для iOS"}
+    - {id: 834, cat: Other, desc: " |- Игры для iOS"}
+    - {id: 831, cat: Other, desc: " |- ПО из App Store"}
+    - {id: 1155, cat: Other, desc: " |- Отечественное видео для устройств Apple"}
+    - {id: 1156, cat: Other, desc: " |- Отечественное видео HD для устройств Apple"}
+    - {id: 1099, cat: Other, desc: " |- Зарубежное видео для устройств Apple"}
+    - {id: 1098, cat: Other, desc: " |- Зарубежное видео HD для устройств Apple"}
+    - {id: 1096, cat: Other, desc: " |- Музыка (AAC)"}
+    - {id: 1097, cat: Other, desc: " |- Музыка Lossless (ALAC)"}
+    - {id: 1095, cat: Other, desc: " |- Аудиокниги (AAC)"}
+    # multimedia, designs, graphics
+    - {id: 1102, cat: Other, desc: "Материалы для мультимедиа и дизайна"}
+    - {id: 1070, cat: Other, desc: " |- Digital Juice"}
+    - {id: 534, cat: Other, desc: " |- Звуковые библиотеки"}
+    - {id: 1077, cat: Other, desc: " |- Дополнения"}
+    - {id: 267, cat: Other, desc: " |- Футажи"}
+    - {id: 1071, cat: Other, desc: " |- 3D модели и материалы"}
+    - {id: 1134, cat: Other, desc: " |- Web-дизайн и шаблоны сайтов"}
+    - {id: 1107, cat: Other, desc: " |- Текстуры и Фоны"}
+    - {id: 1075, cat: Other, desc: " |- Шрифты"}
+    - {id: 1105, cat: Other, desc: " |- Шаблоны и Рамки"}
+    - {id: 676, cat: Other, desc: " |- Костюмы"}
+    - {id: 1072, cat: Other, desc: " |- Растровый клипарт (фото)"}
+    - {id: 166, cat: Other, desc: " |- Растровый клипарт (элементы)"}
+    - {id: 1078, cat: Other, desc: " |- Растровый клипарт (иллюстрации)"}
+    - {id: 1074, cat: Other, desc: " |- Векторный клипарт"}
+    - {id: 1076, cat: Other, desc: " |- Сборники"}
+    - {id: 1266, cat: Other, desc: "Проекты"}
+    - {id: 1267, cat: Other, desc: " |- Детские (проекты)"}
+    - {id: 1268, cat: Other, desc: " |- Свадебные и романтические (проекты)"}
+    - {id: 1269, cat: Other, desc: " |- Праздничные (проекты)"}
+    - {id: 1270, cat: Other, desc: " |- Презентации (проекты)"}
+    - {id: 1277, cat: Other, desc: " |- Трейлеры (проекты)"}
+    - {id: 1271, cat: Other, desc: " |- Спортивные (проекты)"}
+    - {id: 1272, cat: Other, desc: " |- Логотипы (проекты)"}
+    - {id: 1273, cat: Other, desc: " |- Слайдшоу (проекты)"}
+    - {id: 1274, cat: Other, desc: " |- Титры (проекты)"}
+    - {id: 1275, cat: Other, desc: " |- Элементы (проекты)"}
+    - {id: 1276, cat: Other, desc: " |- Разное (проекты)"}
+    - {id: 1103, cat: Other, desc: "Графика, Арт, Разное"}
+    - {id: 1114, cat: Other, desc: " |- Классическое искусство"}
+    - {id: 1113, cat: Other, desc: " |- Современное изобразительное искусство"}
+    - {id: 1115, cat: Other, desc: " |- Книжная иллюстрация"}
+    - {id: 1129, cat: Other, desc: " |- Современная фотография"}
+    - {id: 1111, cat: Other, desc: " |- Иконки и аватарки"}
+    - {id: 1116, cat: Other, desc: " |- Картинки"}
+    - {id: 808, cat: Other, desc: " |- Обои для рабочего стола"}
+    - {id: 1139, cat: Other, desc: " |- Обои для рабочего стола (16+)"}
+    - {id: 988, cat: Other, desc: " |- Графика (16+)"}
+    - {id: 1073, cat: Other, desc: " |- Интернет-творчество"}
+    # temp, archive
+    - {id: 892, cat: Other, desc: "Архив Мультфильмов"}
+    - {id: 91, cat: Other, desc: " |- Архив Видео"}
+    - {id: 668, cat: Other, desc: " |- Архив Классики и Старого кино / Артхаус"}
+    - {id: 1143, cat: Other, desc: " |- Архив Музыкального Видео"}
+    - {id: 802, cat: Other, desc: " |- Архив Сериалов"}
+    - {id: 669, cat: Other, desc: " |- Архив Документалистики и TV"}
+    - {id: 400, cat: Other, desc: " |- Архив Юмора"}
+    - {id: 169, cat: Other, desc: " |- Архив Аниме"}
+    - {id: 94, cat: Other, desc: " |- Архив Книг и обучающих материалов"}
+    - {id: 303, cat: Other, desc: " |- Архив Авто"}
+    - {id: 92, cat: Other, desc: " |- Архив Музыки"}
+    - {id: 93, cat: Other, desc: " |- Архив Игр"}
+    - {id: 95, cat: Other, desc: " |- Архив Программ"}
+    - {id: 184, cat: Other, desc: " |-  КПК и Мобильных устройств"}
+    - {id: 1080, cat: Other, desc: " |-  4Apple"}
+    - {id: 180, cat: Other, desc: " |-  Медиа-Диз-Графика"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+login:
+  path: forum/login.php
+  method: form
+  form: form#loginFrm
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    autologin: 1
+    redirect: index.php
+  error:
+    - selector: span.gen:contains("Вы ввели")
+  test:
+    path: forum/index.php
+    selector: table.menutable a.mainmenu:contains("Выход")
+
+search:
+  paths:
+    - path: forum/tracker.php
+      method: post
+  inputs:
+    $raw: "{{ if .Categories }}{{ range .Categories }}f[]={{.}}&{{end}}{{ else }}f[]=-1{{ end }}"
+    o: "{{ .Config.sort }}"
+    s: "{{ .Config.type }}"
+    tm: -1
+    shf: 1
+    sha: 1
+    ta: -1
+    sns: -1
+    sds: -1
+    nm: "{{ .Keywords }}"
+    pn: ""
+    submit: "Поиск"
+  keywordsfilters:
+    - name: re_replace # S01 to сезон 1
+      args: ["(?i)\\bS0*(\\d+)\\b", " сезон $1"]
+    - name: re_replace # S01E01 to сезон 1 серии 1
+      args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", " сезон $1 серии $2"]
+
+  rows:
+    selector: table.forumline.tablesorter > tbody > tr:has(a[href^="viewtopic.php?t="]):has(a[href^="download.php?id="])
+
+  fields:
+    category:
+      selector: a[href^="tracker.php?f="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: f
+    title:
+      selector: a[href^="viewtopic.php?t="] > b
+      filters:
+        - name: replace
+          args: [" / ", " "]
+        - name: replace
+          args: ["Кураж-Бамбей", "kurazh"]
+        - name: replace
+          args: ["Кубик в Кубе", "Kubik"]
+        - name: re_replace
+          args: ["((\\([12][0-9]{3}\\))(.+)\\([Сс]езон\\s+(\\d+).+[Сс]ери[ия]\\s+(?:(\\d+-*\\d*).*\\d+)*\\))", " - S$4E$5 - rus $3"]
+        - name: re_replace
+          args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
+        - name: replace
+          args: ["-Rip", "Rip"]
+        - name: replace
+          args: ["WEB-DL", "WEBDL"]
+        - name: replace
+          args: ["WEBDLRip", "WEBDL"]
+        - name: replace
+          args: ["HDTVRip", "HDTV"]
+    details:
+      selector: a[href^="viewtopic.php?t="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    size:
+      selector: td:nth-child(6) > u
+    grabs:
+      selector: td:nth-child(9)
+    date:
+      selector: td:nth-child(11)
+      filters:
+        - name: re_replace
+          args: [".*(\\d{2}-\\d{2}-\\d{4})(\\d{2}:\\d{2})", "$1 $2"]
+        - name: append
+          args: ":00 +03:00" # MSK
+        - name: dateparse
+          args: "02-01-2006 15:04:05 -07:00"
+    seeders:
+      selector: td.seedmed > b
+    leechers:
+      selector: td.leechmed > b
+    downloadvolumefactor:
+      case:
+        img[src$="/gold.gif"]: 0
+        img[src$="/silver.gif"]: 0.5
+        img[src$="/bronze.gif"]: 0.75
+        img[src$="/platinum.gif"]: 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/piratbit.yml

@@ -75,6 +75,7 @@ caps:
     - {id: 1518, cat: Movies/3D, desc: " |- 3D Мультфильмы"}
     - {id: 1683, cat: Movies/3D, desc: " |- Документальные фильмы 3D"}
     - {id: 9, cat: Movies, desc: "Наши фильмы, Советское кино (DVDrip, WEB-DLRip, HDrip)"}
+    - {id: 1858, cat: Movies, desc: " |- Наши новые фильмы 2020 - 2021"}
     - {id: 1846, cat: Movies, desc: " |- Наши фильмы (мультфильмы) cо спонсором показа (Новинки AVI/M.."}
     - {id: 1847, cat: Movies, desc: " |- Наши новые фильмы 2018-2019"}
     - {id: 1840, cat: Movies, desc: " |- Наши новые фильмы 2017"}

src/Jackett.Common/Definitions/piratbitl.yml

@@ -75,6 +75,7 @@ caps:
     - {id: 1518, cat: Movies/3D, desc: " |- 3D Мультфильмы"}
     - {id: 1683, cat: Movies/3D, desc: " |- Документальные фильмы 3D"}
     - {id: 9, cat: Movies, desc: "Наши фильмы, Советское кино (DVDrip, WEB-DLRip, HDrip)"}
+    - {id: 1858, cat: Movies, desc: " |- Наши новые фильмы 2020 - 2021"}
     - {id: 1846, cat: Movies, desc: " |- Наши фильмы (мультфильмы) cо спонсором показа (Новинки AVI/M.."}
     - {id: 1847, cat: Movies, desc: " |- Наши новые фильмы 2018-2019"}
     - {id: 1840, cat: Movies, desc: " |- Наши новые фильмы 2017"}

src/Jackett.Common/Definitions/pirateiro.yml

@@ -48,6 +48,10 @@ settings:
       enviado: created
       seeders: seeders
       tamanho: size
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
 
 search:
   paths:

src/Jackett.Common/Definitions/prostylex.yml

@@ -105,6 +105,10 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
 
 login:
   path: account-login.php

src/Jackett.Common/Definitions/sktorrent.yml

@@ -80,7 +80,7 @@ search:
       args: replace
 
   rows:
-    selector: table.lista > tbody > tr > td:has(a[href^="details.php?name="])
+    selector: table.lista > tbody > tr > td > table.lista > tbody > tr > td:has(a[href^="details.php?name="])
 
   fields:
     category:
@@ -113,10 +113,8 @@ search:
     size:
       selector: div > div
       filters:
-        - name: split
-          args: ["|", 0]
         - name: regexp
-          args: "Velkost (.+?) ?$"
+          args: "Velkost (.+?) \\|"
     date:
       selector: div > div
       filters:

src/Jackett.Common/Definitions/takeabyte.yml

@@ -1,185 +0,0 @@
----
-id: takeabyte
-name: TakeaByte
-description: "TakeaByte is a NORDIC Private Torrent Tracker for 0DAY / GENERAL"
-language: en-us
-type: private
-encoding: UTF-8
-links:
-  - https://takeabyte-nordic.org/
-certificates:
-  - 4a558e562fa0fb01b17ea9e5842bbd96b9093192 # NET::ERR_CERT_AUTHORITY_INVALID
-
-caps:
-  categorymappings:
-    - {id: 9, cat: Movies/3D, desc: "Movies 3D"}
-    - {id: 56, cat: Movies, desc: "Movies"}
-    - {id: 47, cat: Movies/BluRay, desc: "Movies BD 1080p"}
-    - {id: 54, cat: Movies/BluRay, desc: "Movies BD Remux"}
-    - {id: 43, cat: Movies, desc: "Movies TBN"}
-    - {id: 40, cat: Movies, desc: "Movies Danish"}
-    - {id: 34, cat: Movies/DVD, desc: "Movies DVD-R"}
-    - {id: 11, cat: Movies/HD, desc: "HD 1080p"}
-    - {id: 14, cat: Movies/HD, desc: "HD-720p"}
-    - {id: 19, cat: Movies, desc: "Movies Kids"}
-    - {id: 21, cat: Movies/Other, desc: "Movies Boxset"}
-    - {id: 20, cat: Movies, desc: "Movies MP4"}
-    - {id: 49, cat: Movies, desc: "Movies Nordisk"}
-    - {id: 42, cat: Movies, desc: "Movies Norway"}
-    - {id: 41, cat: Movies, desc: "Movies Swedish"}
-    - {id: 10, cat: Movies/SD, desc: "Movies XviD"}
-    - {id: 28, cat: TV, desc: "TV-Series"}
-    - {id: 27, cat: TV/Other, desc: "TV Boxset"}
-    - {id: 30, cat: PC/Mac, desc: "Apps Mac"}
-    - {id: 31, cat: PC/Mobile-Other, desc: "Apps Mobile"}
-    - {id: 1, cat: PC/0day, desc: "Apps Windows"}
-    - {id: 35, cat: Audio/Lossless, desc: "Music Flac"}
-    - {id: 22, cat: Audio/MP3, desc: "Music MP3"}
-    - {id: 24, cat: Audio/Video, desc: "Music Video"}
-    - {id: 23, cat: Audio/Other, desc: "Music Boxset"}
-    - {id: 7, cat: Console/Wii, desc: "Games Console"}
-    - {id: 8, cat: PC/Games, desc: "Games PC"}
-    - {id: 32, cat: Audio/Audiobook, desc: "Audio-Books"}
-    - {id: 33, cat: Books/EBook, desc: "E-Books"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
-    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: 4
-    options:
-      4: created
-      7: seeders
-      5: size
-      1: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  path: takelogin.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    returnto: "/"
-  error:
-    - selector: h2:contains("Login failed!")
-      message:
-        selector: table tr td.colhead2
-  test:
-    path: /
-    selector: a[href^="logout.php?hash_please="]
-
-search:
-  paths:
-    # http://takeabyte-nordic.org/browse.php?c9=1&c26=1&c3=1&search=%22first+man%22&searchin=title&incldead=0
-    # https://takeabyte-nordic.org/browse.php?search=&searchin=title&incldead=0&audio=0&subs=0&only_free=1
-    # https://takeabyte-nordic.org/browse.php?search=tt2702920&searchin=imdb&incldead=1&audio=0&subs=0
-    - path: browse.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    # title, descr, genre, imdb, all
-    searchin: "{{ if .Query.IMDBID }}imdb{{ else }}title{{ end }}"
-    # 0 active, 1 incldead, 2 onlydead
-    incldead: 1
-    # 0 all, 2 English, etc.
-    audio: 0
-    # 0 all, 2 Eng, etc
-    subs: 0
-    only_free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-    sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
-
-  rows:
-    selector: table tr:has(a[href^="browse.php?cat="]):has(a[href^="details.php?id="])
-    filters:
-      - name: andmatch
-
-  fields:
-    title:
-      selector: a[href^="details.php?id="] b
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    category:
-      selector: a[href^="browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    download:
-      selector: a[href^="details.php?id="]
-      attribute: href
-      filters:
-        - name: replace
-          args: ["details.php?id=", "download.php?torrent="]
-    imdb:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    size:
-      selector: td:nth-last-child(4)
-    files:
-      selector: td:nth-last-child(7)
-    grabs:
-      selector: td:nth-last-child(3)
-      filters:
-        - name: regexp
-          args: (\d+)
-    # 2 flavours of dates
-    date:
-      # Today<br />13:20:59
-      # Yesterday<br />08:03:01
-      optional: true
-      selector: td:nth-last-child(5):contains("day")
-    date:
-      # Feb 14 2019<br />14:20:12
-      optional: true
-      selector: td:nth-last-child(5):not(:contains("day"))
-      filters:
-        - name: regex # drop break in between date and time
-          args: ["(.+?)<[^>]*>(.+?)", "$1 $2"]
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: dateparse
-          args: "Jan 2 2006 15:04:05 -07:00"
-    seeders:
-      selector: td:nth-last-child(2)
-    leechers:
-      selector: td:nth-last-child(1)
-    downloadvolumefactor:
-      case:
-        "b:contains(\"[Free and Double]\")": 0
-        "*": 1
-    uploadvolumefactor:
-      case:
-        "b:contains(\"[Free and Double]\")": 2
-        "*": 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-# U-232 V4

src/Jackett.Common/Definitions/torrentbomb.yml

@@ -6,9 +6,10 @@ language: ko-KR
 type: public
 encoding: UTF-8
 links:
-  - https://torrent.movie/
+  - https://torrentb.site/
 legacylinks:
   - https://torrent.vet/
+  - https://torrent.movie/
 
 caps:
   categorymappings:
@@ -41,7 +42,11 @@ caps:
     movie-search: [q]
     music-search: [q]
 
-settings: []
+settings:
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
 
 download:
   # https://lngui.xyz/magnetgo.php?magnet:?xt=urn:btih:6d9551ec2c62c4ae8eef6709adc6be9b3fd7a709
@@ -73,7 +78,7 @@ search:
     keyword: "{{ if .Keywords }}{{ .Keywords }}{{ else }}-{{ end }}"
 
   rows:
-    selector: section.sch_res_list > ul > li:has(span.sch_datetime:contains(":"))
+    selector: section.sch_res_list > ul > li:has(span.sch_datetime:contains(":")):not(:has(a[href^="bbs/./board.php?bo_table=out_"]))
 
   fields:
     category:

src/Jackett.Common/Definitions/torrentccf.yml

@@ -12,27 +12,20 @@ legacylinks:
 
 caps:
   categorymappings:
-    - {id: 601, cat: Movies, desc: "Movies"}
-    - {id: 602, cat: TV/Anime, desc: "Animations"}
-    - {id: 603, cat: TV/Sport, desc: "Sports"}
-    - {id: 604, cat: TV/Documentary, desc: "Documentaries"}
-    - {id: 605, cat: Books, desc: "EDU"}
-    - {id: 606, cat: TV, desc: "TV/Cn"}
-    - {id: 607, cat: TV, desc: "TV/Western"}
-    - {id: 608, cat: TV, desc: "TV/hk_tw"}
-    - {id: 609, cat: TV, desc: "TV/Japan_korea"}
-    - {id: 610, cat: TV, desc: "TV Shows"}
-    - {id: 611, cat: Audio, desc: "Music/Cn"}
-    - {id: 612, cat: Audio, desc: "Music/Western"}
-    - {id: 613, cat: Audio, desc: "Music/Asia"}
-    - {id: 614, cat: Audio, desc: "Music/Classic"}
-    - {id: 615, cat: Audio/Video, desc: "MusicVideo"}
-    - {id: 616, cat: PC, desc: "Appz"}
-    - {id: 617, cat: PC/Games, desc: "PC Games"}
-    - {id: 618, cat: Console/PS4, desc: "Playstation"}
-    - {id: 619, cat: Console/XBox, desc: "Xbox"}
-    - {id: 620, cat: Console/Wii, desc: "Wii"}
-    - {id: 621, cat: Other, desc: "Others"}
+    - {id: 622, cat: Movies, desc: "Movies.电影"}
+    - {id: 623, cat: TV, desc: "TV.电视剧"}
+    - {id: 624, cat: TV/Documentary, desc: "Documentaries.纪录片"}
+    - {id: 625, cat: PC, desc: "Appz.软件"}
+    - {id: 626, cat: Audio, desc: "Music & MusicVideos.音乐及MV"}
+    - {id: 627, cat: Other, desc: "Others.其他(非学习类)"}
+    - {id: 628, cat: Books/Other, desc: "Elearning - 杂项学习"}
+    - {id: 629, cat: Books/EBook, desc: "Elearning - 电子书/小说"}
+    - {id: 630, cat: Books/EBook, desc: "Elearning - 电子书/非小说"}
+    - {id: 631, cat: Books/Mags, desc: "Elearning - 杂志"}
+    - {id: 632, cat: Books/Comics, desc: "Elearning - 漫画"}
+    - {id: 633, cat: Audio/Audiobook, desc: "Elearning - 有声书"}
+    - {id: 634, cat: Books, desc: "Elearning - 公开课"}
+    - {id: 635, cat: Books, desc: "Elearning - 视频教程"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/torrentkitty.yml

@@ -22,6 +22,10 @@ caps:
     movie-search: [q]
 
 settings:
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
   - name: info_8000
     type: info
     label: About TorrentKitty Categories

src/Jackett.Common/Definitions/torrentparadise.yml

@@ -25,6 +25,7 @@ caps:
     ANDROID: PC
     ANIME: TV/Anime
     ANIMEDUBBEDSUBBED: TV/Anime
+    ANIMEOTHERS: TV/Anime
     APPLICATIONS: PC
     APPLICATIONSANDROID: PC
     APPLICATIONSHANDHELD: PC/Mobile-Other

src/Jackett.Common/Definitions/torrentproject.yml

@@ -60,6 +60,10 @@ settings:
       seeders: seeders
       sizebg: "size desc"
       sizesm: "size asc"
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
 
 search:
   paths:

src/Jackett.Common/Definitions/torrentz2k.yml

@@ -31,7 +31,11 @@ caps:
     music-search: [q]
     book-search: [q]
 
-settings: []
+settings:
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
 
 search:
   # https://torrentz2k.xyz/search/

src/Jackett.Common/Definitions/turkseed.yml

@@ -107,7 +107,7 @@ search:
     # does not return imdb link in results
 
   rows:
-    selector: "table.sortable tr:has(a[href*=\"/download.php?id=\"]){{ if .Config.freeleech }}:has(img[src$=\"/freedownload.gif\"]){{ else }}{{ end }}"
+    selector: "table.sortable tr:has(a[href*=\"/details.php?id=\"]){{ if .Config.freeleech }}:has(img[src$=\"/freedownload.gif\"]){{ else }}{{ end }}"
 
   fields:
     category:
@@ -117,15 +117,10 @@ search:
         - name: querystring
           args: category
     title:
-      # abbreviated title
       selector: a[href*="/details.php?id="]
-    title:
-      selector: div.tooltip-content > div
-      optional: true
     details:
       selector: a[href*="/details.php?id="]
       attribute: href
-    # rows have download but site requires thanks so we use dl from details
     download:
       selector: a[href*="/details.php?id="]
       attribute: href

src/Jackett.Common/Definitions/yggcookie.yml

@@ -8,7 +8,7 @@ encoding: UTF-8
 followredirect: true
 links:
   - https://www.yggtorrent.si/
-  # don't forget to also change bellow in settings !
+  # don't forget to also change below in settings !
 legacylinks:
   - https://yggtorrent.com/
   - https://ww1.yggtorrent.com/
@@ -178,6 +178,10 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
 
 login:
   method: cookie

src/Jackett.Common/Definitions/yggtorrent.yml

@@ -8,7 +8,7 @@ encoding: UTF-8
 followredirect: true
 links:
   - https://www.yggtorrent.si/
-  # don't forget to also change bellow in settings !
+  # don't forget to also change below in settings !
 legacylinks:
   - https://yggtorrent.com/
   - https://ww1.yggtorrent.com/
@@ -169,6 +169,10 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
 
 login:
   method: form

src/Jackett.Common/Definitions/zetorrents.yml

@@ -6,11 +6,12 @@ language: fr-fr
 type: public
 encoding: UTF-8
 links:
-  - https://vww.zetorrents.io/
+  - https://wwv.zetorrents.io/
 legacylinks:
   - https://www.zetorrents.co/
   - https://www.zetorrents.io/
   - https://wvw.zetorrents.io/
+  - https://vww.zetorrents.io/
 
 caps:
   categories:

src/Jackett.Common/Indexers/Cinecalidad.cs

@@ -27,8 +27,12 @@ namespace Jackett.Common.Indexers
 
         public override string[] AlternativeSiteLinks { get; protected set; } = {
             "https://www.cinecalidad.is/",
-            "https://www.cinecalidad.to/",
-            "https://www.cinecalidad.eu/"
+            "https://www.cinecalidad.eu/",
+            "https://www.cinecalidad.im/"
+        };
+
+        public override string[] LegacySiteLinks { get; protected set; } = {
+            "https://www.cinecalidad.to/"
         };
 
         public Cinecalidad(IIndexerConfigurationService configService, WebClient wc, Logger l, IProtectionService ps,

src/Jackett.Common/Indexers/MejorTorrent.cs

@@ -36,6 +36,7 @@ namespace Jackett.Common.Indexers
         private const string SearchUrl = "secciones.php";
 
         public override string[] LegacySiteLinks { get; protected set; } = {
+            "https://www.mejortorrentt.net/",
             "http://www.mejortorrent.org/",
             "http://www.mejortorrent.tv/",
             "http://www.mejortorrentt.com/",
@@ -48,7 +49,7 @@ namespace Jackett.Common.Indexers
             : base(id: "mejortorrent",
                    name: "MejorTorrent",
                    description: "MejorTorrent - Hay veces que un torrent viene mejor! :)",
-                   link: "https://www.mejortorrentt.net/",
+                   link: "https://www.mejortorrents.net/",
                    caps: new TorznabCapabilities
                    {
                        TvSearchParams = new List<TvSearchParam>
@@ -78,6 +79,8 @@ namespace Jackett.Common.Indexers
             var matchWords = new BoolItem { Name = "Match words in title", Value = true };
             configData.AddDynamic("MatchWords", matchWords);
 
+            configData.AddDynamic("flaresolverr", new DisplayItem("This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href=\"https://github.com/Jackett/Jackett#configuring-flaresolverr\" target=\"_blank\">FlareSolver</a> to access it."){ Name = "FlareSolverr"});
+
             AddCategoryMapping(MejorTorrentCatType.Pelicula, TorznabCatType.Movies, "Pelicula");
             AddCategoryMapping(MejorTorrentCatType.Serie, TorznabCatType.TVSD, "Serie");
             AddCategoryMapping(MejorTorrentCatType.SerieHd, TorznabCatType.TVHD, "Serie HD");

src/Jackett.Common/Indexers/TVVault.cs

@@ -57,6 +57,9 @@ namespace Jackett.Common.Indexers
 
             AddCategoryMapping(1, TorznabCatType.TV);
             AddCategoryMapping(2, TorznabCatType.Movies);
+            // as returned by TvCategoryParser.ParseTvShowQuality these two TV cats are required
+            AddCategoryMapping(3, TorznabCatType.TVHD);
+            AddCategoryMapping(4, TorznabCatType.TVSD);
         }
 
         public override async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
@@ -168,7 +171,7 @@ namespace Jackett.Common.Indexers
         private string StripSearchString(string term)
         {
             // Search does not support searching with episode numbers so strip it if we have one
-            // Ww AND filter the result later to archive the proper result
+            // AND filter the result later to achieve the proper result
             term = Regex.Replace(term, @"[S|E]\d\d", string.Empty);
             return term.Trim();
         }

src/Jackett.Common/Jackett.Common.csproj

@@ -14,7 +14,7 @@
     <PackageReference Include="Autofac" Version="5.2.0" />
     <PackageReference Include="AutoMapper" Version="8.1.1" />
     <PackageReference Include="BencodeNET" Version="3.1.4" />
-    <PackageReference Include="CloudflareSolverReNgosang" Version="1.0.7.3" />
+    <PackageReference Include="FlareSolverrSharp" Version="1.2.1" />
     <PackageReference Include="CommandLineParser" Version="2.8.0" />
     <PackageReference Include="DotNet4.SocksProxy" Version="1.4.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />

src/Jackett.Common/Models/Config/ServerConfig.cs

@@ -42,6 +42,7 @@ namespace Jackett.Common.Models.Config
         public bool CacheEnabled { get; set; }
         public long CacheTtl { get; set; }
         public long CacheMaxResultsPerIndexer { get; set; }
+        public string FlareSolverrUrl { get; set; }
         public string OmdbApiKey { get; set; }
         public string OmdbApiUrl { get; set; }
 

src/Jackett.Common/Models/DTO/ServerConfig.cs

@@ -34,6 +34,8 @@ namespace Jackett.Common.Models.DTO
         [DataMember]
         public long cache_max_results_per_indexer { get; set; }
         [DataMember]
+        public string flaresolverrurl { get; set; }
+        [DataMember]
         public string omdbkey { get; set; }
         [DataMember]
         public string omdburl { get; set; }
@@ -70,6 +72,7 @@ namespace Jackett.Common.Models.DTO
             cache_enabled = config.CacheEnabled;
             cache_ttl = config.CacheTtl;
             cache_max_results_per_indexer = config.CacheMaxResultsPerIndexer;
+            flaresolverrurl = config.FlareSolverrUrl;
             omdbkey = config.OmdbApiKey;
             omdburl = config.OmdbApiUrl;
             app_version = version;

src/Jackett.Common/Services/CacheService.cs

@@ -8,7 +8,6 @@ using Jackett.Common.Indexers;
 using Jackett.Common.Models;
 using Jackett.Common.Models.Config;
 using Jackett.Common.Services.Interfaces;
-using Jint.Parser;
 using NLog;
 
 namespace Jackett.Common.Services
@@ -98,12 +97,17 @@ namespace Jackett.Common.Services
  
                 var trackerCache = _cache[indexer.Id];
                 var queryHash = GetQueryHash(query);
-                if (!trackerCache.Queries.ContainsKey(queryHash))
+                var cacheHit = trackerCache.Queries.ContainsKey(queryHash);
+
+                if (_logger.IsDebugEnabled)
+                    _logger.Debug($"CACHE Search / Indexer: {trackerCache.TrackerId} / CacheHit: {cacheHit} / Query: {GetSerializedQuery(query)}");
+
+                if (!cacheHit)
                     return null;
 
                 var releases = trackerCache.Queries[queryHash].Results;
-                _logger.Debug($"CACHE Search / Indexer: {trackerCache.TrackerId} / Found: {releases.Count} releases");
- 
+                _logger.Debug($"CACHE Search Hit / Indexer: {trackerCache.TrackerId} / Found: {releases.Count} releases");
+
                 return releases;
             }
         }
@@ -218,7 +222,9 @@ namespace Jackett.Common.Services
                 var total = resultsPerQuery.Select(q => q.Item2).Sum();
                 if (total <= _serverConfig.CacheMaxResultsPerIndexer)
                     break;
-                trackerCache.Queries.Remove(resultsPerQuery.Pop().Item1); // remove the older
+                var olderQuery = resultsPerQuery.Last();
+                trackerCache.Queries.Remove(olderQuery.Item1); // remove the older
+                resultsPerQuery.Remove(olderQuery);
                 prunedCounter++;
             }
 
@@ -230,14 +236,21 @@ namespace Jackett.Common.Services
         }
 
         private string GetQueryHash(TorznabQuery query)
+        {
+            var json = GetSerializedQuery(query);
+            // Compute the hash
+            return BitConverter.ToString(_sha256.ComputeHash(Encoding.ASCII.GetBytes(json)));
+        }
+
+        private static string GetSerializedQuery(TorznabQuery query)
         {
             var json = Newtonsoft.Json.JsonConvert.SerializeObject(query);
-            _logger.Debug($"CACHE Request query: {json}");
+
             // Changes in the query to improve cache hits
             // Both request must return the same results, if not we are breaking Jackett search
             json = json.Replace("\"SearchTerm\":null", "\"SearchTerm\":\"\"");
-            // Compute the hash
-            return BitConverter.ToString(_sha256.ComputeHash(Encoding.ASCII.GetBytes(json)));
+
+            return json;
         }
 
         private void PrintCacheStatus()

src/Jackett.Common/Services/IndexerManagerService.cs

@@ -39,6 +39,7 @@ namespace Jackett.Common.Services
             {"broadcastthenet", "broadcasthenet"},
             {"cili180", "cilipro"},
             {"icetorrent", "speedapp"},
+            {"leaguehd", "lemonhd"},
             {"liaorencili", "cilipro"},
             {"metaliplayro", "romanianmetaltorrents"},
             {"nnm-club", "noname-club"},

src/Jackett.Common/Utils/BrowserUtil.cs

@@ -7,8 +7,8 @@ namespace Jackett.Common.Utils
         // When updating these make sure they are not detected by the incapsula bot detection engine
         // (e.g. kickasstorrent indexer)
         public static string ChromeUserAgent => Environment.OSVersion.Platform == PlatformID.Unix ?
-            "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.132 Safari/537.36" :
-            "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.132 Safari/537.36";
+            "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36" :
+            "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36";
 
     }
 }

src/Jackett.Common/Utils/Clients/HttpWebClient.cs

@@ -8,7 +8,7 @@ using System.Net.Security;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using System.Threading.Tasks;
-using CloudflareSolverRe;
+using FlareSolverrSharp;
 using Jackett.Common.Helpers;
 using Jackett.Common.Models.Config;
 using Jackett.Common.Services.Interfaces;
@@ -75,11 +75,10 @@ namespace Jackett.Common.Utils.Clients
                     cookies.Add(cookieUrl, new Cookie(kv.Key, kv.Value));
             }
 
-            var userAgent = webRequest.EmulateBrowser.Value ? BrowserUtil.ChromeUserAgent : "Jackett/" + configService.GetVersion();
-
-            using (var clearanceHandlr = new ClearanceHandler(userAgent))
+            using (var clearanceHandlr = new ClearanceHandler(serverConfig.FlareSolverrUrl))
             {
-                clearanceHandlr.MaxTries = 10;
+                clearanceHandlr.UserAgent = BrowserUtil.ChromeUserAgent;
+                clearanceHandlr.MaxTimeout = 50000;
                 using (var clientHandlr = new HttpClientHandler
                 {
                     CookieContainer = cookies,
@@ -93,12 +92,6 @@ namespace Jackett.Common.Utils.Clients
                     clearanceHandlr.InnerHandler = clientHandlr;
                     using (var client = new HttpClient(clearanceHandlr))
                     {
-                        if (webRequest.EmulateBrowser == true)
-                            client.DefaultRequestHeaders.Add("User-Agent", BrowserUtil.ChromeUserAgent);
-                        else
-                            client.DefaultRequestHeaders.Add("User-Agent", "Jackett/" + configService.GetVersion());
-
-                        HttpResponseMessage response = null;
                         using (var request = new HttpRequestMessage())
                         {
                             request.Headers.ExpectContinue = false;
@@ -115,6 +108,15 @@ namespace Jackett.Common.Utils.Clients
                                 }
                             }
 
+                            // The User-Agent can be set by the indexer (in the headers)
+                            if (string.IsNullOrWhiteSpace(request.Headers.UserAgent.ToString()))
+                            {
+                                if (webRequest.EmulateBrowser == true)
+                                    request.Headers.UserAgent.ParseAdd(BrowserUtil.ChromeUserAgent);
+                                else
+                                    request.Headers.UserAgent.ParseAdd("Jackett/" + configService.GetVersion());
+                            }
+
                             if (!string.IsNullOrEmpty(webRequest.Referer))
                                 request.Headers.Referrer = new Uri(webRequest.Referer);
 
@@ -143,6 +145,7 @@ namespace Jackett.Common.Utils.Clients
                                 request.Method = HttpMethod.Get;
                             }
 
+                            HttpResponseMessage response;
                             using (response = await client.SendAsync(request))
                             {
                                 var result = new WebResult

src/Jackett.Common/Utils/Clients/HttpWebClient2.cs

@@ -8,7 +8,7 @@ using System.Net.Security;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using System.Threading.Tasks;
-using CloudflareSolverRe;
+using FlareSolverrSharp;
 using Jackett.Common.Helpers;
 using Jackett.Common.Models.Config;
 using Jackett.Common.Services.Interfaces;
@@ -54,9 +54,10 @@ namespace Jackett.Common.Utils.Clients
 
         public void CreateClient()
         {
-            clearanceHandlr = new ClearanceHandler(BrowserUtil.ChromeUserAgent)
+            clearanceHandlr = new ClearanceHandler(serverConfig.FlareSolverrUrl)
             {
-                MaxTries = 10
+                UserAgent = BrowserUtil.ChromeUserAgent,
+                MaxTimeout = 50000
             };
             clientHandlr = new HttpClientHandler
             {
@@ -103,11 +104,6 @@ namespace Jackett.Common.Utils.Clients
             request.Headers.ExpectContinue = false;
             request.RequestUri = new Uri(webRequest.Url);
 
-            if (webRequest.EmulateBrowser == true)
-                request.Headers.UserAgent.ParseAdd(BrowserUtil.ChromeUserAgent);
-            else
-                request.Headers.UserAgent.ParseAdd("Jackett/" + configService.GetVersion());
-
             // clear cookies from cookiecontainer
             var oldCookies = cookies.GetCookies(request.RequestUri);
             foreach (Cookie oldCookie in oldCookies)
@@ -134,6 +130,15 @@ namespace Jackett.Common.Utils.Clients
                 }
             }
 
+            // The User-Agent can be set by the indexer (in the headers)
+            if (string.IsNullOrWhiteSpace(request.Headers.UserAgent.ToString()))
+            {
+                if (webRequest.EmulateBrowser == true)
+                    request.Headers.UserAgent.ParseAdd(BrowserUtil.ChromeUserAgent);
+                else
+                    request.Headers.UserAgent.ParseAdd("Jackett/" + configService.GetVersion());
+            }
+
             if (!string.IsNullOrEmpty(webRequest.Referer))
                 request.Headers.Referrer = new Uri(webRequest.Referer);
 

src/Jackett.Server/Controllers/ServerConfigurationController.cs

@@ -113,6 +113,13 @@ namespace Jackett.Server.Controllers
             serverConfig.RuntimeSettings.BasePath = serverService.BasePath();
             configService.SaveConfig(serverConfig);
 
+            if (config.flaresolverrurl != serverConfig.FlareSolverrUrl)
+            {
+                serverConfig.FlareSolverrUrl = config.flaresolverrurl;
+                configService.SaveConfig(serverConfig);
+                webHostRestartNeeded = true;
+            }
+
             if (omdbApiKey != serverConfig.OmdbApiKey || omdbApiUrl != serverConfig.OmdbApiUrl)
             {
                 serverConfig.OmdbApiKey = omdbApiKey;

src/Jackett.Server/Services/ServerService.cs

@@ -139,6 +139,8 @@ namespace Jackett.Server.Services
 
                 logger.Info($"Using proxy: {config.ProxyType}");
 
+                logger.Info("Using FlareSolverr: " + (string.IsNullOrEmpty(config.FlareSolverrUrl) ? "No" : config.FlareSolverrUrl));
+
                 var monotype = Type.GetType("Mono.Runtime");
                 if (monotype != null && !DotNetCoreUtil.IsRunningOnDotNetCore)
                 {

src/Jackett.Updater/Program.cs

@@ -331,6 +331,7 @@ namespace Jackett.Updater
                 "Definitions/kikibt.yml",
                 "Definitions/korsar.yml",
                 "Definitions/lapausetorrents.yml",
+                "Definitions/leaguehd.yml", // renamed to lemonhd
                 "Definitions/lemencili.yml",
                 "Definitions/leparadisdunet.yml",
                 "Definitions/leporno.yml",
@@ -378,6 +379,7 @@ namespace Jackett.Updater
                 "Definitions/speed-share.yml",
                 "Definitions/t411.yml",
                 "Definitions/t411v2.yml",
+                "Definitions/takeabyte.yml",
                 "Definitions/tazmaniaden.yml",
                 "Definitions/tbplus.yml",
                 "Definitions/tehconnection.yml",
@@ -516,7 +518,7 @@ namespace Jackett.Updater
                     if (isWindows)
                     {
                         //User didn't initiate the update from Windows service and wasn't running Jackett via the tray, must have started from the console
-                        startInfo.Arguments = $"/K {startInfo.FileName} {startInfo.Arguments}";
+                        startInfo.Arguments = $"/K \"{startInfo.FileName}\" {startInfo.Arguments}";
                         startInfo.FileName = "cmd.exe";
                         startInfo.CreateNoWindow = false;
                         startInfo.WindowStyle = ProcessWindowStyle.Normal;
@@ -524,7 +526,7 @@ namespace Jackett.Updater
 
                     if (variant == Variants.JackettVariant.Mono)
                     {
-                        startInfo.Arguments = startInfo.FileName + " " + startInfo.Arguments;
+                        startInfo.Arguments = $"\"{startInfo.FileName}\" {startInfo.Arguments}";
                         startInfo.FileName = "mono";
                     }
 
@@ -535,7 +537,7 @@ namespace Jackett.Updater
                         startInfo.CreateNoWindow = true;
                     }
 
-                    logger.Info("Starting Jackett: " + startInfo.FileName + " " + startInfo.Arguments);
+                    logger.Info($"Starting Jackett: \"{startInfo.FileName }\" {startInfo.Arguments}");
                     Process.Start(startInfo);
                 }
             }