Update rudub

necessitates switching to categorydesc
plus new selectors

README.md

@@ -831,7 +831,7 @@ Detailed instructions are available at [Jackett's Wiki](https://github.com/Jacke
 
 
 ## Running Jackett behind a reverse proxy
-When running jackett behind a reverse proxy make sure that the original hostname of the request is passed to Jackett. If HTTPS is used also set the X-Forwarded-Proto header to "https". Don't forget to adjust the "Base path override" Jackett option accordingly.
+When running Jackett behind a reverse proxy make sure that the original hostname of the request is passed to Jackett. If HTTPS is used also set the X-Forwarded-Proto header to "https". Don't forget to adjust the "Base path override" Jackett option accordingly.
 
 Example config for apache:
 ```

src/Jackett.Common/Definitions/hdgalaktik.yml

@@ -16,20 +16,20 @@ legacylinks:
 
 caps:
   categorymappings:
-    - {id: 13, cat: Movies, desc: "Фильмы (Movies)"}
-    - {id: 6, cat: TV, desc: "Мультфильмы (Cartoons)"}
-    - {id: 10, cat: Audio, desc: "Музыка (Music)"}
-    - {id: 26, cat: PC, desc: "Программы (Programs)"}
-    - {id: 5, cat: Console, desc: "Игры (Games)"}
-    - {id: 25, cat: Other, desc: "Картинки (Pictures)"}
-    - {id: 11, cat: TV, desc: "Сериалы (TV Series)"}
-    - {id: 12, cat: TV/Anime, desc: "Аниме (Anime)"}
-    - {id: 16, cat: Books, desc: "Книги (Books)"}
-    - {id: 18, cat: Audio/Video, desc: "Клипы / Ролики (Clips / Trailers)"}
-    - {id: 22, cat: TV, desc: "ТВ / Передачи (TV)"}
-    - {id: 27, cat: PC/Mobile-Other, desc: "Игры - Мобила / КПК (Mobile)"}
-    - {id: 1, cat: PC/ISO, desc: "Образы (ISO)"}
-    - {id: 4, cat: Other, desc: "Другое (Other)"}
+    - {id: 13, cat: Movies, desc: "Фильмы"}
+    - {id: 11, cat: TV, desc: "Сериалы"}
+    - {id: 6, cat: TV, desc: "Мультфильмы"}
+    - {id: 10, cat: Audio, desc: "Музыка"}
+    - {id: 26, cat: PC, desc: "Программы"}
+    - {id: 5, cat: Console, desc: "Игры"}
+    - {id: 25, cat: Other, desc: "Картинки"}
+    - {id: 12, cat: TV/Anime, desc: "Аниме"}
+    - {id: 16, cat: Books, desc: "Книги"}
+    - {id: 18, cat: Audio/Video, desc: "Клипы / Ролики"}
+    - {id: 22, cat: TV, desc: "ТВ / Передачи"}
+    - {id: 27, cat: PC/Mobile-Other, desc: "Игры - Мобила / КПК"}
+    - {id: 1, cat: PC/ISO, desc: "Образы"}
+    - {id: 4, cat: Other, desc: "Другое"}
 
   modes:
     search: [q]
@@ -117,24 +117,20 @@ search:
       args: ["[^a-zA-Z0-9]+", "%"]
 
   rows:
-    selector: table.table > tbody > tr.torcontduo
+    selector: div.torrent-card
 
   fields:
-    category:
-      selector: a[href^="browse.php?cat="]
-      attribute: href
+    categorydesc:
+      selector: div.category-badge
       optional: true
-      default: 4
+      default: Другое
       filters:
-        - name: querystring
-          args: cat
+        - name: replace
+          args: ["---", "Другое"]
     title:
-      selector: a[href^="details.php?id="]
+      selector: a.torrent-title-link
       attribute: title
       filters:
-        - name: regexp
-          args: \'>(.+?)</div
-        - name: htmldecode
         # normalize to SXXEYY format
         - name: re_replace
           args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))[\\s:]*(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)", "S$1E$2 of $3"]
@@ -193,16 +189,19 @@ search:
         - name: append
           args: "{{ if .Config.addrussiantotitle }} RUS{{ else }}{{ end }}"
     details:
-      selector: a[href^="details.php?id="]
+      selector: a.torrent-title-link
       attribute: href
+    # there is either a magnet or a download link
+    magnet:
+      selector: a[href^="magnet:?xt="]
+      attribute: href
+      optional: true
     download:
-      selector: a[href^="details.php?id="]
+      selector: a[href^="download.php?id="]
       attribute: href
-      filters:
-        - name: replace
-          args: ["details", "download"]
+      optional: true
     poster:
-      selector: img.s
+      selector: img.torrent-poster
       attribute: src
     imdbid:
       selector: a[href^="browse.php?imdb="]
@@ -211,46 +210,26 @@ search:
         - name: querystring
           args: imdb
     size:
-      selector: td:nth-child(4)
+      selector: a.download-link
     seeders:
-      selector: span[title="Раздают"]
+      selector: span.peers-seeders
     leechers:
-      selector: span[title="Качают"]
-    date_day:
-      # Сегодня в 18:22
-      # Вчера в 20:52
-      selector: a[href^="browse.php?date="]:contains("Сегодня"), a[href^="browse.php?date="]:contains("Вчера")
-      optional: true
-      filters:
-        - name: regexp
-          args: "((Вчера в|Сегодня в)( \\d{2}:\\d{2}))"
-        - name: replace
-          args: ["Сегодня в", "Today"]
-        - name: replace
-          args: ["Вчера в", "Yesterday"]
-        - name: fuzzytime
-    date_year:
-      # 23:48 24/07
-      selector: a[href^="browse.php?date="]:contains("/")
-      optional: true
-      filters:
-        - name: regexp
-          args: "(\\d{2}:\\d{2} \\d{2}/\\d{2})"
-        - name: append
-          args: " +03:00" # MSK
-        - name: dateparse
-          args: "HH:mm dd/MM zzz"
+      selector: span.peers-leechers
+    grabs:
+      selector: span:has(i.fa-download)
     date:
-      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
+      selector: div.added-date
+      filters:
+        - name: timeago
     downloadvolumefactor:
       case:
-        img[src="/pic/freedownload.gif"]: 0
+        span.bg-success: 0
         "*": 1
     uploadvolumefactor:
       text: 1
     minimumratio:
       text: 1.0
     description:
-      selector: a[href*="?tag="]
+      selector: a.tag
       attribute: title
 # engine n/a

src/Jackett.Common/Definitions/magnetcat.yml

@@ -9,15 +9,12 @@ encoding: UTF-8
 links:
   - https://magnetcatcat.com/
   - https://clmclm.com/
-  - https://www.8800517.xyz/
-  - https://www.8800518.xyz/
   - https://www.8800519.xyz/
-  - https://www.8800520.xyz/
+  - https://www.8800521.xyz/
+  - https://www.8800522.xyz/
+  - https://www.8800523.xyz/
 legacylinks:
   - https://www.clm472.sbs/
-  - https://www.8800498.xyz/
-  - https://www.8800497.xyz/
-  - https://www.8800499.xyz/
   - https://www.8800500.xyz/
   - https://www.8800503.xyz/
   - https://www.8800504.xyz/
@@ -31,6 +28,9 @@ legacylinks:
   - https://www.8800514.xyz/
   - https://www.8800515.xyz/
   - https://www.8800516.xyz/
+  - https://www.8800517.xyz/
+  - https://www.8800518.xyz/
+  - https://www.8800520.xyz/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/mvgroupforum.yml

@@ -26,6 +26,8 @@ settings:
   - name: password
     type: password
     label: Password
+  - name: info_flaresolverr
+    type: info_flaresolverr
   - name: info_category_8000
     type: info_category_8000
   - name: hidef

src/Jackett.Common/Definitions/mvgroupmain.yml

@@ -26,6 +26,8 @@ settings:
   - name: password
     type: password
     label: Password
+  - name: info_flaresolverr
+    type: info_flaresolverr
   - name: info_category_8000
     type: info_category_8000
   - name: hidef

src/Jackett.Common/Definitions/rudub.yml

@@ -9,14 +9,8 @@ type: semi-private
 encoding: windows-1251
 followredirect: true
 links:
-  - https://nov13.rudub.pics/
+  - https://nov16.rudub.pics/
 legacylinks:
-  - https://oct29.rudub.homes/
-  - http://oct30.rudub.homes/
-  - https://oct30.rudub.homes/
-  - http://oct31.rudub.homes/
-  - https://oct31.rudub.homes/
-  - http://nov01.rudub.homes/
   - https://nov01.rudub.homes/
   - http://nov02.rudub.homes/
   - https://nov02.rudub.homes/
@@ -41,6 +35,12 @@ legacylinks:
   - http://nov12.rudub.pics/
   - https://nov12.rudub.pics/
   - http://nov13.rudub.pics/
+  - https://nov13.rudub.pics/
+  - http://nov14.rudub.pics/
+  - https://nov14.rudub.pics/
+  - http://nov15.rudub.pics/
+  - https://nov15.rudub.pics/
+  - http://nov16.rudub.pics/
 caps:
   categorymappings:
     - {id: 1, cat: TV, desc: "TV"}

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

@@ -51,8 +51,10 @@ caps:
     - {id: 41, cat: XXX, desc: "Homemade"}
     - {id: 42, cat: XXX, desc: "Pregnant"}
     - {id: 43, cat: XXX, desc: "Gay"}
-    - {id: 1, cat: Movies, desc: "Movie"}
-    - {id: 2, cat: TV, desc: "TV Show"}
+    - {id: 45, cat: XXX, desc: "Classic"}
+    - {id: 44, cat: XXX, desc: "SiteFan"}
+    - {id: 1, cat: Movies, desc: "Movies"}
+    - {id: 2, cat: TV, desc: "TV"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/torrentqq.yml

@@ -7,11 +7,10 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://torrentqq393.com/
+  - https://torrentqq394.com/
   - https://torrentegg83.com/
 legacylinks:
   - https://torrentegg68.com/
-  - https://torrentqq378.com/
   - https://torrentegg69.com/
   - https://torrentqq379.com/
   - https://torrentegg70.com/
@@ -40,6 +39,7 @@ legacylinks:
   - https://torrentegg81.com/
   - https://torrentqq392.com/
   - https://torrentegg82.com/
+  - https://torrentqq393.com/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/uztracker.yml

@@ -31,10 +31,8 @@ caps:
     - {id: 190, cat: Movies, desc: " |- Фильмы в 4K и 3D"}
     - {id: 34, cat: Movies, desc: " |- Перевод на узбекский"}
     - {id: 25, cat: Movies, desc: "Узбекские кинофильмы"}
-    - {id: 32, cat: Movies, desc: " |- Новинки"}
-    - {id: 30, cat: Movies, desc: " |- Фильмы 2011-2024 годов"}
-    - {id: 29, cat: Movies, desc: " |- Фильмы 2000-2010 годов"}
-    - {id: 26, cat: Movies, desc: " |- Фильмы до 2000 года"}
+    - {id: 32, cat: Movies, desc: " |- Пр-во Узбекфильм (на русском)"}
+    - {id: 30, cat: Movies, desc: " |- Пр-во Узбекфильм (на узбекском языке)"}
     # Сериалы, Видео и ТВ # Series, Videos and TV
     - {id: 97, cat: TV, desc: "Сериалы"}
     - {id: 333, cat: TV, desc: " |- Игра престолов / Game of Thrones"}
@@ -85,6 +83,7 @@ caps:
     - {id: 132, cat: Audio, desc: " |- Классическая музыа"}
     - {id: 125, cat: Audio, desc: " |- New Age, Relax, Meditative & Flamenco"}
     - {id: 124, cat: Audio, desc: " |- Фольклор, Народная и Этническая музыка"}
+    - {id: 338, cat: Audio, desc: " |- Country"}
     - {id: 231, cat: Audio, desc: " |- Сборники и альбомы выходившие неофициальными изданиями."}
     - {id: 144, cat: Audio, desc: "♫ ROCK & METAL ♫"}
     - {id: 201, cat: Audio, desc: " |- Русский Rock, Metal (mp3)"}
@@ -170,6 +169,7 @@ caps:
     - {id: 289, cat: PC/Games, desc: " |- Horror"}
     - {id: 307, cat: PC/Games, desc: " |- Logic"}
     - {id: 304, cat: PC/Games, desc: " |- Lifestyle"}
+    - {id: 336, cat: PC/Games, desc: " |- Sports"}
     - {id: 306, cat: PC/Games, desc: " |- Exploration"}
     - {id: 305, cat: PC/Games, desc: " |- Management"}
     - {id: 115, cat: PC/Games, desc: " |- Аркады"}