assorted thx: tidy up and updates

src/Jackett.Common/Definitions/dark-shadow.yml

@@ -1,7 +1,7 @@
 ---
 id: dark-shadow
 name: Dark-Shadow
-description: "Dark-Shadow is a GERMAN Private site for TV / MOVIES / GENERAL"
+description: "Dark-Shadow (D-S) is a GERMAN Private Torrent Tracker for TV / MOVIES / GENERAL"
 language: de-DE
 type: private
 encoding: UTF-8
@@ -59,25 +59,25 @@ settings:
   - name: info_password
     type: info
     label: About Password Expiry
-    default: "Dark Shadow has an <b>8 week Password Expiry</b> regime. So if the Indexer has stopped working then the first thing you should do is check if your password has expired by login in at <a href=\"https://dark-shadow.me/login.php\" target=\"_blank\">Dark-Shadow</a>,  and if necessary use the <b>Passwort anfordern</b> (<i>Request password</i>) button to renew it."
+    default: "D-S has an <b>8 week Password Expiry</b> regime. So if the Indexer has stopped working then the first thing you should do is check if your password has expired by login in at <a href=\"https://dark-shadow.me/login.php\" target=\"_blank\">Dark-Shadow</a>,  and if necessary use the <b>Passwort anfordern</b> (<i>Request password</i>) button to renew it."
   - name: username
     type: text
     label: Username
   - name: password
     type: password
     label: Password
-  - name: info_activity
-    type: info
-    label: Account Inactivity
-    default: "Inactive accounts will be deactivated after 7 weeks and deleted after another 3 weeks."
   - name: onlyupload
     type: checkbox
     label: Search OnlyUpload
     default: false
   - name: info_free
     type: info
-    label: About OnlyUpload at Dark-Shadow
+    label: About OnlyUpload at D-S
     default: "OnlyUpload are torrents where download is not counted but upload is. Good for building your Ratio up. (On the Jackett dashboard search results these are tagged as Freeleech)."
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Inactive accounts will be deactivated after 7 weeks and deleted after another 3 weeks."
 
 login:
   path: login.php
@@ -117,16 +117,9 @@ search:
     categorydesc:
       selector: category
       filters:
-        - name: replace
+        - name: htmldecode
-          args: ["&gt;", ">"]
-        - name: replace
-          args: ["&#039;", "'"]
     title:
       selector: name
-      filters:
-        # remove [REQ] and anything else in [] that prefixes titles
-        - name: re_replace
-          args: ["^(\\[.*\\])(.*)", "$2"]
     _id:
       selector: id
     details:
@@ -159,6 +152,6 @@ search:
     minimumratio:
       text: 1.0
     minimumseedtime:
-      # 36 hours (as seconds = 36 x 60 x 60)
+      # 1.5 days (as seconds = 1.5 x 24 x 60 x 60)
       text: 129600
-# 3xT JSON
+# THX JSON

src/Jackett.Common/Definitions/dasunerwartete.yml

@@ -10,52 +10,42 @@ links:
 
 caps:
   categorymappings:
-    # Filme
     - {id: 28, cat: Movies/SD, desc: "Filme > SD"}
     - {id: 32, cat: Movies/HD, desc: "Filme > HD"}
     - {id: 114, cat: Movies/UHD, desc: "Filme > UHD"}
     - {id: 140, cat: Movies/BluRay, desc: "Filme > BluRay"}
     - {id: 143, cat: TV/Anime, desc: "Filme > Anime"}
     - {id: 138, cat: Movies, desc: "Filme > Packs"}
-    # Serien
     - {id: 60, cat: TV/SD, desc: "Serien > SD"}
     - {id: 57, cat: TV/HD, desc: "Serien > HD"}
     - {id: 139, cat: TV/UHD, desc: "Serien > UHD"}
     - {id: 144, cat: TV/Anime, desc: "Serien > Anime"}
     - {id: 59, cat: TV, desc: "Serien > Packs"}
-    # Audio
     - {id: 110, cat: Audio/MP3, desc: "Audio > MP3"}
     - {id: 48, cat: Audio/Lossless, desc: "Audio > Flac"}
     - {id: 52, cat: Audio, desc: "Audio > Pack"}
     - {id: 63, cat: Audio/Audiobook, desc: "Audio > Hörbuch"}
     - {id: 120, cat: Audio/Video, desc: "Audio > Videos"}
-    # Apps
     - {id: 12, cat: PC/0day, desc: "Apps > Windows"}
     - {id: 125, cat: PC/Mac, desc: "Apps > Mac-OSX"}
     - {id: 11, cat: PC/Mobile-Other, desc: "Apps > Mobil"}
     - {id: 141, cat: PC, desc: "Apps > Other"}
-    # Doku
     - {id: 15, cat: TV/Documentary, desc: "Doku > SD"}
     - {id: 14, cat: TV/Documentary, desc: "Doku > HD"}
     - {id: 123, cat: TV/Documentary, desc: "Doku > Reihe"}
-    # Spiel
     - {id: 126, cat: PC/Mobile-Other, desc: "Spiel > Mobil"}
     - {id: 17, cat: PC/Games, desc: "Spiel > PC"}
     - {id: 24, cat: Console, desc: "Spiel > Konsole"}
     - {id: 121, cat: Console, desc: "Spiel > Wimmelbild"}
-    # Sport
     - {id: 61, cat: TV/Sport, desc: "Sport > HD"}
     - {id: 62, cat: TV/Sport, desc: "Sport > SD"}
-    # ePaper
     - {id: 96, cat: Books/Mags, desc: "ePaper > Zeitungen"}
     - {id: 136, cat: Books/EBook, desc: "ePaper > E-Book"}
     - {id: 137, cat: Books/Comics, desc: "ePaper > Comics"}
-    # XXX
     - {id: 76, cat: XXX/SD, desc: "XXX > SD"}
     - {id: 73, cat: XXX/x264, desc: "XXX > HD"}
     - {id: 75, cat: XXX/Pack, desc: "XXX > Pack"}
     - {id: 142, cat: XXX/ImageSet, desc: "XXX > Pic´s"}
-    # Internal
     - {id: 129, cat: Movies/SD, desc: "Internal > Film SD"}
     - {id: 128, cat: Movies/HD, desc: "Internal > Film HD"}
     - {id: 131, cat: TV/SD, desc: "Internal > Serie SD"}
@@ -70,6 +60,10 @@ caps:
     book-search: [q]
 
 settings:
+  - name: info_password
+    type: info
+    label: About Password Expiry
+    default: "D-U has an <b>20 week Password Expiry</b> regime. So if the Indexer has stopped working then the first thing you should do is check if your password has expired by login in at <a href=\"https://dasunerwartete.biz/login.php\" target=\"_blank\">Das Unerwartete</a>, and if necessary use the <b>Passwort anfordern</b> (<i>Request password</i>) button to renew it."
   - name: username
     type: text
     label: Username
@@ -78,12 +72,12 @@ settings:
     label: Password
   - name: onlyupload
     type: checkbox
-    label: Search OnlyUpload only
+    label: Search OnlyUpload
     default: false
   - name: info_free
     type: info
     label: About OnlyUpload at D-U
-    default: "<ul><li>OnlyUpload are torrents where download is not counted but upload is. Good for building your Ratio up. (On the Jackett dashboard search results these are tagged as Freeleech).</li></ul>"
+    default: "OnlyUpload are torrents where download is not counted but upload is. Good for building your Ratio up. (On the Jackett dashboard search results these are tagged as Freeleech)."
   - name: info_tpp
     type: info
     label: Results Per Page
@@ -108,21 +102,25 @@ login:
     selector: a[href="logout.php"]
 
 search:
-  # https://dasunerwartete.biz/torrents_search.php?ajax=true&search=1080p&page=1&imdb=1034320&free=yes&c32=1
   paths:
+    # https://dasunerwartete.biz/torrents_search.php?ajax=true&search=1080p&page=1&imdb=1034320&free=yes&c32=1
     - path: torrents_search.php
       response:
         type: json
+
   inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     ajax: true
     search: "{{ .Keywords }}"
+    page: 1
     imdb: "{{ .Query.IMDBIDShort }}"
+    # all=active+inactive, yes=active, no=inactive (the default is all, which ajax simply drops the parm)
+    # visible: all
+    # all=all+onlyup, yes=onlyup, no=without onlyup (the default is all, which ajax simply drops the parm)
     free: "{{ if .Config.onlyupload }}yes{{ else }}{{ end }}"
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
 
   rows:
     selector: $
-    missingAttributeEqualsNoResults: true
 
   fields:
     categorydesc:
@@ -134,32 +132,30 @@ search:
     _id:
       selector: id
     details:
-      text: "{{ .Config.sitelink }}details.php?id={{ .Result._id }}"
+      text: "details.php?id={{ .Result._id }}"
     download:
-      text: "{{ .Config.sitelink }}download.php?torrent={{ .Result._id }}"
+      selector: download_link
     poster:
       selector: cover
-      filters:
-        - name: prepend
-          args: "{{ .Config.sitelink }}"
     size:
       selector: size
-    seeders:
-      selector: seeders
-    leechers:
-      selector: leechers
     date:
+      # 25.12.2024 16:02
       selector: added
       filters:
         - name: append
           args: " +01:00" # CET
         - name: dateparse
           args: "dd.MM.yyyy HH:mm zzz"
+    seeders:
+      selector: seeders
+    leechers:
+      selector: leechers
+    _onlyup:
+      selector: free_button:contains(Only Upload)
+      optional: true
     downloadvolumefactor:
-      selector: free_button
+      text: "{{ if .Result._onlyup }}0{{ else }}1{{ end }}"
-      case:
-        "<button style='background-color: green; color: white; border: none; padding: 5px 10px; border-radius: 5px; cursor: default;'>Only Upload<\/button>": 0
-        "*": 1
     uploadvolumefactor:
       text: 1
     minimumratio:
@@ -167,4 +163,4 @@ search:
     minimumseedtime:
       # 1.5 days (as seconds = 1.5 x 24 x 60 x 60)
       text: 129600
-# THX custom
+# THX JSON (custom)

src/Jackett.Common/Definitions/torrent-explosiv.yml

@@ -1,7 +1,7 @@
 ---
 id: torrent-explosiv
 name: Torrent-Explosiv
-description: "Torrent-Explosiv is a German Private site for TV / MOVIES / GENERAL"
+description: "Torrent-Explosiv (T-E) is a German Private Torrent Tracker for TV / MOVIES / GENERAL"
 language: de-DE
 type: private
 encoding: UTF-8
@@ -76,7 +76,7 @@ settings:
   - name: info_password
     type: info
     label: About Password Expiry
-    default: "Torrent-Explosiv has an <b>8 week Password Expiry</b> regime. So if the Indexer has stopped working then the first thing you should do is check if your password has expired by login in at <a href=\"https://torrent-explosiv.me/login.php\" target=\"_blank\">Torrent-Explosiv</a>, and if necessary use the <b>Passwort anfordern</b> (<i>Request password</i>) button to renew it."
+    default: "T-E has an <b>8 week Password Expiry</b> regime. So if the Indexer has stopped working then the first thing you should do is check if your password has expired by login in at <a href=\"https://torrent-explosiv.me/login.php\" target=\"_blank\">Torrent-Explosiv</a>, and if necessary use the <b>Passwort anfordern</b> (<i>Request password</i>) button to renew it."
   - name: username
     type: text
     label: Username
@@ -89,14 +89,13 @@ settings:
     default: false
   - name: info_free
     type: info
-    label: About OnlyUpload at Torrent-Explosiv
+    label: About OnlyUpload at T-E
     default: "OnlyUpload are torrents where download is not counted but upload is. Good for building your Ratio up. (On the Jackett dashboard search results these are tagged as Freeleech)."
 
 login:
   path: login.php
   method: form
-  form: form[action="/login.php"]
+  form: form
-  cookies: ["JAVA=OK"] # avoid jscheck redirect
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
@@ -130,14 +129,9 @@ search:
     categorydesc:
       selector: category
       filters:
-        - name: replace
+        - name: htmldecode
-          args: ["&gt;", ">"]
     title:
       selector: name
-      filters:
-        # remove [REQ] and anything else in [] that prefixes titles
-        - name: re_replace
-          args: ["^(\\[.*\\])(.*)", "$2"]
     _id:
       selector: id
     details:
@@ -172,4 +166,4 @@ search:
     minimumseedtime:
       # 2 days (as seconds = 2 x 24 x 60 x 60)
       text: 172800
-# 3xT JSON
+# THX JSON (custom)