Rename kisssub.yml to miobt.yml

also add flaresolverr info

README.md

@@ -83,7 +83,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * JAV-Torrent
  * kickasstorrents.ws
  * kickasstorrents.to
- * KissSub
  * Legit Torrents
  * LePorno.info
  * LimeTorrents
@@ -93,6 +92,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * MegaPeer
  * MejorTorrent
  * Mikan
+ * MioBT
  * MixTapeTorrent
  * MoviesDVDR
  * MovieTorrent
@@ -533,6 +533,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TellyTorrent
  * teracod (Movie Zone)
  * The-Crazy-Ones
+ * The-New-Fun
  * The Falling Angels (TFA) [![(invite needed)][inviteneeded]](#)
  * The Geeks
  * The Horror Charnel (THC)

src/Jackett.Common/Definitions/1337x.yml

@@ -8,7 +8,6 @@ encoding: UTF-8
 followredirect: true
 links:
   - https://1337x.to/
-  - https://1337x.gd/
   - https://1337x.st/
   - https://x1337x.ws/
   - https://x1337x.eu/
@@ -36,6 +35,7 @@ legacylinks:
   - https://1337x.unblockit.how/
   - https://1337x.unblockit.cam/
   - https://1337x.nocensor.biz/
+  - https://1337x.gd/
 
 caps:
   categorymappings:
@@ -128,6 +128,10 @@ caps:
     book-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: downloadlink
     type: select
     label: Download link

src/Jackett.Common/Definitions/miobt.yml

@@ -1,11 +1,12 @@
 ---
-id: kisssub
-name: KissSub
-description: "KissSub is a CHINESE Public torrent index"
+id: miobt
+name: MioBT
+description: "MioBT is a CHINESE Public torrent index"
 language: zh-CN
 type: public
 encoding: UTF-8
 links:
+  - https://miobt.com/
   - https://kisssub.org/
 
 caps:
@@ -28,7 +29,7 @@ settings: []
 
 search:
   paths:
-    # https://kisssub.org/search.php?keyword=moon+720p
+    # https://miobt.com/search.php?keyword=moon+720p
     - path: "{{ if .Keywords }}search.php?keyword={{ .Keywords }}{{ else }}{{ end }}"
 
   rows:
@@ -51,20 +52,20 @@ search:
     date_today:
        # 今天 00:35	 (Today)
       optional: true
-      selector: td:nth-child(1):contains("昨天")
+      selector: td:nth-child(1):contains("今天")
       filters:
         - name: replace
-          args: ["昨天", "Today"]
+          args: ["今天", "Today"]
         - name: append
           args: " +08:00" # CST
         - name: fuzzytime
     date_yday:
       # 昨天 22:50	 (Yesterday)
       optional: true
-      selector: td:nth-child(1):contains("今天")
+      selector: td:nth-child(1):contains("昨天")
       filters:
         - name: replace
-          args: ["今天", "Yesterday"]
+          args: ["昨天", "Yesterday"]
         - name: append
           args: " +08:00" # CST
         - name: fuzzytime

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

@@ -101,8 +101,8 @@ search:
       selector: meta.total
 
   fields:
-    categorydesc:
-      selector: category
+    category:
+      selector: category_id
     title:
       selector: name
       filters:
@@ -179,4 +179,4 @@ search:
     minimumseedtime:
       # 7 day (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 6.0.4
+# json UNIT3D 6.0.6

src/Jackett.Common/Definitions/thenewfun.yml

@@ -0,0 +1,168 @@
+---
+id: thenewfun
+name: The-New-Fun
+description: "The-New-Fun is a GERMAN Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: de-DE
+type: private
+encoding: UTF-8
+links:
+  - https://the-new-fun.spdns.eu/
+
+caps:
+  categorymappings:
+    - {id: 119, cat: Other, desc: "Bilder"}
+    - {id: 139, cat: TV/Documentary, desc: "Doku - HD"}
+    - {id: 141, cat: TV/Documentary, desc: "Doku - Pack"}
+    - {id: 140, cat: TV/Documentary, desc: "Doku - SD"}
+    - {id: 142, cat: TV/Documentary, desc: "Doku - Sonstige"}
+    - {id: 120, cat: Books, desc: "Ebook"}
+    - {id: 131, cat: TV/Anime, desc: "Filme - Animie"}
+    - {id: 101, cat: Movies/BluRay, desc: "Filme - Blue Ray"}
+    - {id: 102, cat: Movies/Other, desc: "Filme - Bollywood"}
+    - {id: 103, cat: Movies/DVD, desc: "Filme - DVD"}
+    - {id: 104, cat: Movies/DVD, desc: "Filme - DVD-R"}
+    - {id: 135, cat: Movies/HD, desc: "Filme - HD"}
+    - {id: 130, cat: Movies, desc: "Filme - Klassiker"}
+    - {id: 134, cat: Movies/SD, desc: "Filme - SD"}
+    - {id: 136, cat: Movies/UHD, desc: "Filme - UHD"}
+    - {id: 105, cat: Movies/HD, desc: "Filme - x264/x265"}
+    - {id: 106, cat: Movies/SD, desc: "Filme - XviD / DivX"}
+    - {id: 127, cat: Movies, desc: "Für Unsere kleinsten"}
+    - {id: 121, cat: PC/Mobile-Other, desc: "Handy Stuff"}
+    - {id: 124, cat: Audio, desc: "Musik - Alben"}
+    - {id: 123, cat: Audio, desc: "Musik - Discography"}
+    - {id: 122, cat: Audio/Audiobook, desc: "Musik - Hörbuch"}
+    - {id: 133, cat: Audio/MP3, desc: "Musik - MP3/Mp4"}
+    - {id: 146, cat: Audio, desc: "Musik - Pack"}
+    - {id: 125, cat: Audio/Video, desc: "Musik - Video"}
+    - {id: 113, cat: PC, desc: "Programme - Linux"}
+    - {id: 114, cat: PC/Mac, desc: "Programme - Mac"}
+    - {id: 115, cat: PC/0day, desc: "Programme - Windows"}
+    - {id: 137, cat: TV/HD, desc: "Serien - HD"}
+    - {id: 116, cat: TV, desc: "Serien - Pack"}
+    - {id: 138, cat: TV/SD, desc: "Serien - SD"}
+    - {id: 143, cat: TV/Other, desc: "Serien - Sonstige"}
+    - {id: 144, cat: TV/UHD, desc: "Serien - UHD"}
+    - {id: 129, cat: Other, desc: "Sonstiges"}
+    - {id: 109, cat: PC/Mobile-Other, desc: "Spiele - Handy"}
+    - {id: 112, cat: Console, desc: "Spiele - Konsolen"}
+    - {id: 111, cat: PC/Games, desc: "Spiele - Mac / Linux"}
+    - {id: 110, cat: PC/Games, desc: "Spiele - PC"}
+    - {id: 118, cat: TV/Sport, desc: "WWE - Sport"}
+    - {id: 69, cat: XXX, desc: "XXX"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: onlyupload
+    type: checkbox
+    label: Filter OnlyUpload only
+    default: false
+  - name: info_free
+    type: info
+    label: About OnlyUpload at T-N-F
+    default: <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>
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: added
+    options:
+      added: created
+      seeds: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents pro Seite:</b> setting to <b>100</b> on your Control Panel. The default is <i>15</i>.
+
+login:
+  path: takelogin.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: td.tabletitle:contains("fehlgeschlagen")
+  test:
+    path: /
+    selector: a[href="logout.php"]
+
+search:
+  # https://the-new-fun.spdns.eu/browse.php?showsearch=1&c140=1&c142=1&search=2022+1080p&incldead=1&orderby=added&sort=desc
+  path: browse.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    showsearch: 1
+    search: "{{ .Keywords }}"
+    # 0 active, 1 all, 2 dead
+    incldead: 1
+    orderby: "{{ .Config.sort }}"
+    sort: "{{ .Config.type }}"
+    # site does not support imdbid search from the browse.php page or return imdb links in results
+
+  rows:
+    selector: "table.tableinborder[cellspacing=\"1\"][cellpadding=\"0\"]:not(:has(a[href=\"index.php\"])) > tbody > tr:has(a[href^=\"download.php\"]){{ if .Config.onlyupload }}:has(img[src=\"pic/oupic.gif\"]){{ else }}{{ end }}"
+
+  fields:
+    category:
+      selector: a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="details.php"]
+    details:
+      selector: a[href^="details.php"]
+      attribute: href
+    download:
+      selector: a[href^="download.php"]
+      attribute: href
+    poster:
+      selector: img[id="img-1"]
+      attribute: src
+    size:
+      selector: td.tablea table tbody tr:nth-child(2) td:nth-child(1) b:nth-child(1)
+    files:
+      selector: td.tablea table tbody tr:nth-child(2) td:nth-child(1) b:nth-child(2)
+    seeders:
+      selector: td.tablea table tbody tr:nth-child(2) td:nth-child(2) b:nth-child(1)
+    leechers:
+      selector: td.tablea table tbody tr:nth-child(2) td:nth-child(2) > b:nth-of-type(2)
+    grabs:
+      selector: td.tablea table tbody tr:nth-child(2) td:nth-child(3) b:nth-child(1)
+    date:
+      selector: td.tablea table tbody tr:nth-child(2) td:nth-child(5)
+      filters:
+        - name: append
+          args: " +01:00" # CET
+        - name: replace
+          args: ["\xA0", " "]
+        - name: dateparse
+          args: "02.01.2006 15:04:05 -07:00"
+    downloadvolumefactor:
+      case:
+        img[src="pic/oupic.gif"]: 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Services/IndexerManagerService.cs

@@ -46,6 +46,7 @@ namespace Jackett.Common.Services
             {"casatorrent", "teamctgame"},
             {"icetorrent", "speedapp"},
             {"kickasstorrent-kathow", "kickasstorrents-ws"},
+            {"kisssub", "miobt"},
             {"leaguehd", "lemonhd"},
             {"legacyhd", "reelflix"},
             {"metaliplayro", "romanianmetaltorrents"},

src/Jackett.Updater/Program.cs

@@ -388,6 +388,7 @@ namespace Jackett.Updater
                 "Definitions/kickasstorrent.yml",
                 "Definitions/kickasstorrent-kathow.yml", // renamed to kickasstorrents-ws
                 "Definitions/kikibt.yml",
+                "Definitions/kisssub.yml",
                 "Definitions/lapausetorrents.yml",
                 "Definitions/lat-team.yml", // switch to *-API #8682
                 "Definitions/latinop2p.yml",