vanila: correct date selector, update categories.

plus additional changes to the login form.

README.md

@@ -29,6 +29,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * AniRena
  * AudioBook Bay (ABB)
  * BigFANGroup
+ * BitRu
  * BTDB
  * BTDIGG
  * ConCen
@@ -36,13 +37,13 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * cpasbien
  * cpasbienClone
  * Demonoid
- * DIGBT
  * dmhy
  * ETTV
  * EliteTorrent.biz
  * ExtraTorrent.ag
  * EXT Torrents
  * EZTV
+ * FireBit
  * Frozen Layer
  * GamesTorrents
  * GkTorrent
@@ -57,6 +58,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * iTorrent
  * KickAssTorrent (KATcr)
  * KickAssTorrent (kat.li)
+ * Legit Torrents
  * LePorno
  * LimeTorrents
  * MacTorrents
@@ -89,14 +91,15 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Tokyo Tosho
  * Torlock
  * Torrent Downloads (TD)
+ * Torrent9
+ * Torrent9Clone
  * TorrentFunk
  * TorrentGalaxy (TGx)
+ * TorrentParadise
  * TorrentProject2
  * TorrentQuest
  * Torrents.csv
  * TorrentWal
- * Torrent9
- * Torrent9Clone
  * Torrentz2
  * Underverse
  * YourBittorrent
@@ -114,6 +117,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Crazy's Corner
  * CzTorrent
  * Deildu
+ * DXP (Deaf Experts)
  * EniaHD
  * Film-Paleis
  * Gay-Torrents.net
@@ -127,6 +131,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * MVGroup Forum
  * MVGroup Main
  * NetHD (VietTorrent)
+ * RiperAM
  * RockBox
  * RuTracker
  * Sharewood

src/Jackett.Common/Definitions/bitru.yml

@@ -0,0 +1,147 @@
+---
+  site: bitru
+  name: BitRu
+  description: "BitRu is a RUSSIAN Public Torrent Tracker for MOVIES / TV / GENERAL"
+  language: ru-ru
+  type: public
+  encoding: UTF-8
+  links:
+    - http://bitru.org/
+
+  caps:
+    categories:
+      "movie": Movies
+      "serial": TV
+      "music": Audio
+      "game": PC/Games
+      "soft": PC
+      "literature": Books
+      "audiobook": Audio/Audiobook
+      "video": Movies
+      "image": Other
+      "xxx": XXX
+
+    modes:
+      search: [q]
+
+  settings:
+    - name: adverts
+      type: select
+      label: Include Advertising
+      default: "yes"
+      options:
+        yes: yes
+        no: no
+
+  search:
+    paths:
+      - path: browse.php
+    inputs:
+      s: "{{ .Keywords }}"
+      rek: "{{ .Config.adverts }}"
+
+    rows:
+      selector: table.browse-list > tbody > tr
+    fields:
+      category:
+        selector: td:nth-child(1) a
+        attribute: href
+        filters:
+          - name: querystring
+            args: tmp
+      title:
+        selector: a[href^="details.php?id="]
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      download:
+        selector: a[href^="details.php?id="]
+        attribute: href
+        filters:
+          - name: replace
+            args: ["details", "download"]
+      description:
+        selector: img[src="styles/images/adwarn.png"]
+        optional: true
+        attribute: title
+        filters:
+          - name: replace
+            args: ["Присутствует реклама", "Contains Adverts"]
+      banner:
+        selector: a[href^="details.php?id="]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "src=(.*?) "
+      date:
+        # Сегодня в 09:09 от 
+        # Вчера в 22:47 от 
+        selector: td:nth-child(2) div.b-info div span:nth-child(2):contains("Сегодня"),  td:nth-child(2) div.b-info div span:nth-child(2):contains("Вчера")
+        optional: true
+        filters:
+          - name: regexp
+            args: "(.*?) от "
+          - name: replace
+            args: ["Сегодня в", "Today"]
+          - name: replace
+            args: ["Вчера в", "Yesterday"]
+      date:
+        # 08 ноября 2019 в 23:53 от 
+        selector: td:nth-child(2) div.b-info div span:nth-child(2):not(:contains("Сегодня")):not(:contains("Вчера"))
+        optional: true
+        filters:
+          - name: regexp
+            args: "(.*?) от "
+          - name: replace
+            args: [" в ", " "]
+          - name: replace
+            args: ["января", "January"]
+          - name: replace
+            args: ["февраля", "February"]
+          - name: replace
+            args: ["марта ", "March"]
+          - name: replace
+            args: ["апреля", "April"]
+          - name: replace
+            args: ["мая", "May"]
+          - name: replace
+            args: ["июня", "June"]
+          - name: replace
+            args: ["июля", "July"]
+          - name: replace
+            args: ["августа", "August"]
+          - name: replace
+            args: ["сентября", "September"]
+          - name: replace
+            args: ["октября", "October"]
+          - name: replace
+            args: ["ноября", "November"]
+          - name: replace
+            args: ["декабря", "December"]
+          - name: dateparse
+            args: "02 January 2006 15:04"
+      size:
+        selector: td:nth-child(3)
+        filters:
+          - name: replace
+            args: ["ТБ", "TB"] 
+          - name: replace
+            args: ["ГБ", "GB"]
+          - name: replace
+            args: ["МБ", "MB"]
+          - name: replace
+            args: ["КБ", "KB"]
+      seeders:
+        selector: td:nth-child(4)
+        filters:
+          - name: replace
+            args: ["?", "1"] 
+      leechers:
+        selector: td:nth-child(5) 
+        filters:
+          - name: replace
+            args: ["?", "0"] 
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"

src/Jackett.Common/Definitions/channelx.yml

@@ -44,7 +44,7 @@
 
   search:
     paths:
-      - path: filterTorrents
+      - path: torrents/filter
     inputs:
       $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
       search: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}"
@@ -66,7 +66,7 @@
         attribute: href
         filters:
           - name: regexp
-            args: "/categories/.*?\\.(\\d+)"
+            args: "/categories/(\\d+)"
       title:
         selector: a.view-torrent
       download:
@@ -142,4 +142,4 @@
           i[class*="fa-globe text-green"]: 2 # Global Double Upload
           i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
           "*": 1
-# UNIT3D 1.9.4
+# UNIT3D 2.2.5

src/Jackett.Common/Definitions/digbt.yml

@@ -1,74 +0,0 @@
----
-  site: digbt
-  name: DIGBT
-  description: "DIGBT is a Public BitTorrent DHT search engine"
-  language: en-us
-  type: public
-  encoding: UTF-8
-  links:
-    - https://www.digbt.org/
-
-  caps:
-    categories:
-    # DIGBT does not support categories
-      1: Other
-
-    modes:
-      search: [q]
-
-  settings: []
-
-  search:
-  # DIGBT does not support a default empty search or provide trending/latest/new pages
-  # attempt to fetch up to 50 results (10 per page)
-    paths:
-      - path: "search/{{if .Keywords}}{{.Keywords}}{{else}}test{{end}}?c=&s=time&u=y"
-      - path: "search/{{if .Keywords}}{{.Keywords}}-time-2/{{else}}test-time-2/{{end}}?c=&s=time&u=y"
-      - path: "search/{{if .Keywords}}{{.Keywords}}-time-3/{{else}}test-time-3/{{end}}?c=&s=time&u=y"
-      - path: "search/{{if .Keywords}}{{.Keywords}}-time-4/{{else}}test-time-4/{{end}}?c=&s=time&u=y"
-      - path: "search/{{if .Keywords}}{{.Keywords}}-time-5/{{else}}test-time-5/{{end}}?c=&s=time&u=y"
-    rows:
-      selector: tr td.x-item
-    fields:
-      title:
-        selector: div a
-      category:
-        text: "1"
-      details:
-        selector: div a
-        attribute: href
-      download:
-        selector: div.tail a[href^="magnet:?"]
-        attribute: href
-      magnet:
-        selector: div.tail a[href^="magnet:?"]
-        attribute: href
-      date:
-        selector: div span.ctime
-        filters:
-          - name: replace
-            args: ["yesterday", "1 day"]
-          - name: timeago
-      size:
-        selector: div.tail
-        filters:
-          - name: regexp
-            args: "Size: (.+?) Downloads:"
-      files:
-        selector: div.tail
-        filters:
-          - name: regexp
-            args: "Files: (.+?) Size:"
-      seeders:
-        text: "1"
-      leechers:
-        text: "1"
-      grabs:
-        selector: div.tail
-        filters:
-          - name: regexp
-            args: "Downloads: (.+?) Updated:"
-      downloadvolumefactor:
-        text: "0"
-      uploadvolumefactor:
-        text: "1"

src/Jackett.Common/Definitions/dxp.yml

@@ -0,0 +1,112 @@
+---
+  site: dxp
+  name: DXP
+  description: "Deaf Experts (DXP) is a RUSSIAN Semi-Private Torrent Tracker for MOVIES / TV with Russian Subtitles."
+  language: ru-ru
+  type: semi-private
+  encoding: windows-1251
+  links:
+    - https://dxp.ru/
+
+  caps:
+    categorymappings:
+      - {id: 14, cat: Movies/HD, desc: "Фильмы HDTV"}
+      - {id: 15, cat: Movies/DVD, desc: "Фильмы DVD"}
+      - {id: 13, cat: Movies/SD, desc: "Фильмы XviD"}
+      - {id: 12, cat: Movies/Other, desc: "Мультфильмы"}
+      - {id: 9, cat: TV/Documentary, desc: "Документальные"}
+      - {id: 11, cat: TV, desc: "Сериалы"}
+
+      - {id: 10, cat: Audio, desc: "Музыка"}
+      - {id: 16, cat: Books, desc: "Книги"}
+      - {id: 22, cat: Other, desc: "Картинки"}
+
+      - {id: 1, cat: PC, desc: "Приложения Windows"}
+      - {id: 3, cat: PC, desc: "Приложения Unix/Linux"}
+      - {id: 4, cat: PC/Mac, desc: "Приложения Mac"}
+      - {id: 2, cat: PC/Phone-Other, desc: "Приложения PDA"}
+
+      - {id: 5, cat: PC/Games, desc: "Игры PC"}
+      - {id: 23, cat: PC/Games, desc: "Игры Unix/Linux"}
+      - {id: 6, cat: Console/PS3, desc: "Игры PlayStation 3"}
+      - {id: 7, cat: Console/Xbox, desc: "Игры X-Box"}
+      - {id: 8, cat: Console/PSP, desc: "Игры PSP"}
+
+      - {id: 18, cat: Other, desc: "Эксклюзивы"}
+      - {id: 21, cat: Other, desc: "Лавка субтитров"}
+      - {id: 20, cat: Other, desc: "DEMO"}
+      - {id: 17, cat: Other/Misc, desc: "VIP"}
+      - {id: 24, cat: Other/Misc, desc: "SuperVIP"}
+
+    modes:
+      search: [q]
+
+  login:
+    path: takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      login: submit
+    error:
+      - selector: div.error
+    test:
+      path: index.php
+      selector: a[href="logout.php"]
+
+  download:
+    selector: a[href^="download.php?id="]
+
+  search:
+    # https://dxp.ru/torrents.php?search=&sort=4&type=desc
+    paths:
+      - path: torrents.php
+    inputs:
+      search: "{{ .Keywords }}"
+      sort: 4
+      type: desc
+
+    rows:
+      selector: table#loading-table tbody#highlighted tr:has(a[href^="torrents.php?cat="]), table#loading-table tbody#highlighted tr:has(a[href^="details.php?id="])
+      after: 1
+    fields:
+      category:
+        selector: a[href^="torrents.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      download:
+        selector: a[href^="torrent-"]
+        attribute: href
+      title:
+        selector: a[href^="torrent-"]
+      details:
+        selector: a[href^="torrent-"]
+        attribute: href
+      date:
+        selector: i
+        filters:
+          - name: dateparse
+            args: "2006-01-02 15:04:05"
+      files:
+        selector: td:nth-child(4)
+      size:
+        selector: td:nth-child(6)
+      seeders:
+        selector: td:nth-child(7)
+        filters:
+          - name: split
+            args: ["|", 0]
+      leechers:
+        selector: td:nth-child(7)
+        filters:
+          - name: split
+            args: ["|", 1]
+      downloadvolumefactor:
+        case:
+          a[href="torrents.php?cat=17"]: 1 # vip 
+          a[href="torrents.php?cat=24"]: 1 # super vip 
+          "*": 0
+      uploadvolumefactor:
+        text: 1

src/Jackett.Common/Definitions/film-paleis.yml

@@ -6,9 +6,9 @@
   type: semi-private
   encoding: UTF-8
   links:
-    - http://www.film-paleis.me/
-  legacylinks:
     - https://www.film-paleis.me/
+  legacylinks:
+    - http://www.film-paleis.me/
 
   caps:
     categorymappings:

src/Jackett.Common/Definitions/firebit.yml

@@ -0,0 +1,73 @@
+---
+  site: firebit
+  name: FireBit
+  description: "FireBit is an UKRAINIAN / RUSSIAN Public Torrent Tracker for MOVIES / TV / GENERAL"
+  language: ru-ru
+  type: public
+  encoding: UTF-8
+  links:
+    - http://firebit.net/
+    - http://firebit.info/
+    - http://firebit.name/
+    - http://firebit.pro/
+    - http://firebit.club/
+    - http://firebit.biz/
+
+  caps:
+    categories:
+      "Мультфильмы": TV/Anime
+      "Программы": PC
+      "Литература": Books
+      "Игры": PC/Games
+      "Фильмы": Movies
+      "Видео": Movies
+      "Музыка": Audio 
+      "Другие категории": Other
+      "Новинки": Other/Misc
+      "Сериалы": TV
+
+    modes:
+      search: [q]
+
+  settings: []
+
+  download:
+    selector: a[href^="/download.php?id="]
+
+  search:
+    # http://firebit.net/index.php?do=search&type=simple&q=2019
+    # http://firebit.net/%D1%84%D0%B8%D0%BB%D1%8C%D0%BC/  # movies
+    # http://firebit.net/%D1%81%D0%B5%D1%80%D0%B8%D0%B0%D0%BB/ # tv
+    paths:
+      - path: "{{ if .Keywords }}index.php?do=search&type=simple&q={{ .Keywords }}{{ else }}%D1%84%D0%B8%D0%BB%D1%8C%D0%BC/{{ end }}"
+      - path: "{{ if .Keywords }}{{ else }}%D1%81%D0%B5%D1%80%D0%B8%D0%B0%D0%BB/{{ end }}"
+    rows:
+      selector: "{{ if .Keywords }}table.torrents tbody tr{{ else }}div[id^=\"post-id-\"]{{ end }}"
+      filters:
+        - name: andmatch
+    fields:
+      category:
+        selector: td:nth-child(1), div.article-indent div b a
+      title:
+        selector: td:nth-child(2), span.article-title
+      details:
+        selector: td:nth-child(2) a, span.article-title a
+        attribute: href
+      download:
+        selector: td:nth-child(2) a, span.article-title a
+        attribute: href
+      size:
+        selector: td.td-size, li.meta-size
+      date:
+        selector: td:nth-child(5), li.meta-date
+        filters:
+          - name: dateparse
+            args: "02.01.2006 15:04:05"
+      seeders:
+        selector: td.l1, li.meta-sead
+      leechers:
+        selector: td.l2, li.meta-leech
+      downloadvolumefactor:
+        text: 0
+      uploadvolumefactor:
+        text: 1

src/Jackett.Common/Definitions/gktorrent.yml

@@ -45,7 +45,7 @@
   settings: []
 
   download:
-    selector: a[href^="/download/"]
+    selector: a[href^="magnet:?xt="]
 
   search:
     paths:

src/Jackett.Common/Definitions/greeklegends.yml

@@ -51,7 +51,7 @@
 
   search:
     paths:
-      - path: filterTorrents
+      - path: torrents/filter
     inputs:
       $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
       search: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}"
@@ -60,6 +60,8 @@
       imdb: "{{ .Query.IMDBIDShort }}"
       tvdb: ""
       tmdb: ""
+      mal: ""
+      igdb: ""
       sort: created_at
       direction: desc
       qty: 100
@@ -71,7 +73,7 @@
         attribute: href
         filters:
           - name: regexp
-            args: "/categories/.*?\\.(\\d+)"
+            args: "/categories/(\\d+)"
       title:
         selector: a.view-torrent
       download:
@@ -147,4 +149,4 @@
           i[class*="fa-globe text-green"]: 2 # Global Double Upload
           i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
           "*": 1
-# UNIT3D 1.9.4
+# UNIT3D 2.2.3

src/Jackett.Common/Definitions/hdcity.yml

@@ -143,11 +143,11 @@
     path: index.php
     keywordsfilters:
       - name: re_replace
-        args: ["S0?(\\d{1,2})E(\\d{1,2})", "$1x$2"]
+        args: ["S(\\d+)E(\\d+)", "$1x$2"]
+      - name: re_replace
+        args: ["(?i)S(\\d+)", " $1 "]
       - name: re_replace
         args: ["[^a-zA-Z0-9]+", " "]
-      - name: re_replace
-        args: ["(?i)\\bS0*(\\d+)\\b", " $1 "]
     inputs:
       page: "torrents"
       $raw: "&category={{range .Categories}}{{.}};{{end}}"
@@ -169,7 +169,7 @@
           - name: append
             args: " [English]"
           - name: re_replace
-            args: ["(?i)T[\\s\\S]?(\\d{1,2})\\b", " S$1 "]
+            args: ["(?i)T[\\s-_]?(\\d{1,2})\\b", " S$1 "]
           - name: re_replace
             args: ["(?i)\\w*Temp\\w*\\b\\s?(\\d{1,2})(ª|\\D)?\\b", " S$1 "]
           - name: re_replace
@@ -181,7 +181,7 @@
           - name: append
             args: " [Spanish]"
           - name: re_replace
-            args: ["(?i)T[\\s\\S]?(\\d{1,2})\\b", " S$1 "]
+            args: ["(?i)T[\\s-_]?(\\d{1,2})\\b", " S$1 "]
           - name: re_replace
             args: ["(?i)\\w*Temp\\w*\\b\\s?(\\d{1,2})(ª|\\D)?\\b", " S$1 "]
           - name: re_replace

src/Jackett.Common/Definitions/hdturk.yml

@@ -6,6 +6,8 @@
   type: private
   encoding: UTF-8
   links:
+    - https://hdturk.de/
+  legacylinks:
     - http://hdturk.de/
 
   caps:
@@ -81,13 +83,13 @@
   login:
     path: login.php
     method: form
-    form: form[action="takelogin.php"]
+    form: form[action$="takelogin.php"]
     inputs:
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
     captcha:
       type: image
-      selector: img#regimage
+      selector: img#regimage2
       input: imagestring
     error:
       - selector: table:contains("Bir hata oluştu!")

src/Jackett.Common/Definitions/legittorrents.yml

@@ -0,0 +1,72 @@
+---
+  site: legittorrents
+  name: Legit Torrents
+  description: "Legit Torrents is a Public site for free and legal torrents"
+  language: en-us
+  type: public
+  encoding: UTF-8
+  links:
+    - http://www.legittorrents.info/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: Movies, desc: "Movies"}
+      - {id: 2, cat: Audio, desc: "Music"}
+      - {id: 3, cat: PC/Games, desc: "Games"}
+      - {id: 4, cat: Other, desc: "Other"}
+      - {id: 5, cat: TV/Anime, desc: "Anime"}
+      - {id: 6, cat: Books, desc: "Books"}
+      - {id: 7, cat: PC/0day, desc: "Apps Win"}
+      - {id: 8, cat: PC, desc: "Apps Linux"}
+      - {id: 9, cat: PC/Mac, desc: "Apps Mac"}
+      - {id: 13, cat: TV, desc: "TV"}
+      - {id: 14, cat: PC, desc: "Linux Distributions"}
+
+    modes:
+      search: [q]
+
+  settings: []
+
+  search:
+    paths:
+    # http://www.legittorrents.info/index.php?page=torrents&search=windows&category=0&active=0
+      - path: index.php
+    inputs:
+      page: "torrents"
+      search: "{{ .Keywords }}"
+      category: "{{range .Categories}}{{.}};{{end}}"
+      # 0 all 1 active 2 deadonly
+      active: 1
+    rows:
+      selector: table table table.lista > tbody > tr:has(a[href^="download.php?id="])
+    fields:
+      category:
+        selector: a[href^="index.php?page=torrents&category="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: category
+      title:
+        selector: a[title][href^="index.php?page=torrent-details&id="]
+      details:
+        selector: a[title][href^="index.php?page=torrent-details&id="]
+        attribute: href
+      download:
+        selector: a[href^="download.php?id="]
+        attribute: href
+      date:
+        selector: td time
+        attribute: datetime
+        filters:
+          - name: dateparse
+            args: "2006-01-02"
+      seeders:
+        selector: td:nth-of-type(5)
+      leechers:
+        selector: td:nth-of-type(6)
+      grabs:
+        selector: td:nth-of-type(7)
+      downloadvolumefactor:
+        text: 0
+      uploadvolumefactor:
+        text: 1

src/Jackett.Common/Definitions/nostalgic.yml

@@ -46,7 +46,6 @@
       password: "{{ .Config.password }}"
       cinfo: "1536|864|24|-780"
       iplocked: 0
-      keeploggedin: 1
       submit: "login"
     selectorinputs:
       token:

src/Jackett.Common/Definitions/oxtorrent.yml

@@ -30,7 +30,7 @@
   settings: []
 
   download:
-    selector: a[href^="/get_torrent/"]
+    selector: a[href^="magnet:?xt="]
 
   search:
     paths:

src/Jackett.Common/Definitions/piratbit.yml

@@ -657,72 +657,30 @@
           - name: querystring
             args: f
       size:
-        selector: td div a.dLink
-        filters:
-          - name: re_replace
-            args: ["\u2193", ""] # down arrow
+        selector: td > u
       seeders:
         selector: td.seedmed
       leechers:
         selector: td.leechmed
         # Russian and Ukranian and English languages are supported
       grabs:
-        optional: true
-        selector: td[title^="Ответов"]
-      grabs:
-        optional: true
-        selector: td[title^="Відповідей"]
-      grabs:
-        optional: true
-        selector: td[title^="Replies"]
+        selector: td[title^="Ответов"], td[title^="Відповідей"], td[title^="Replies"]
         # 2 date flavours for 3 languages
       date:
       # 15:04
         optional: true
-        selector: td[title="Добавлен"] p:first-of-type:not(:contains("-"))
+        selector: td[title="Добавлен"] p:first-of-type:not(:contains("-")), td[title="Доданий"] p:first-of-type:not(:contains("-")), td[title="Added"] p:first-of-type:not(:contains("-"))
         filters:
           - name: dateparse
             args: "15:04"
       date:
       # 15:04 24-02-19
         optional: true
-        selector: td[title="Добавлен"] p:first-of-type:contains("-")
-        filters:
-          - name: dateparse
-            args: "15:04 2-01-06"
-      date:
-      # 15:04
-        optional: true
-        selector: td[title="Доданий"] p:first-of-type:not(:contains("-"))
-        filters:
-          - name: dateparse
-            args: "15:04"
-      date:
-      # 15:04 24-02-19
-        optional: true
-        selector: td[title="Доданий"] p:first-of-type:contains("-")
-        filters:
-          - name: dateparse
-            args: "15:04 2-01-06"
-      date:
-      # 15:04
-        optional: true
-        selector: td[title="Added"] p:first-of-type:not(:contains("-"))
-        filters:
-          - name: dateparse
-            args: "15:04"
-      date:
-      # 15:04 24-02-19
-        optional: true
-        selector: td[title="Added"] p:first-of-type:contains("-")
+        selector: td[title="Добавлен"] p:first-of-type:contains("-"), td[title="Доданий"] p:first-of-type:contains("-"), td[title="Added"] p:first-of-type:contains("-")
         filters:
           - name: dateparse
             args: "15:04 2-01-06"
       downloadvolumefactor:
-        case:
-          "span.isgold": "0"
-          "span.issilver": "0.5"
-          "*": "1"
+        text: 0
       uploadvolumefactor:
-        case:
-          "*": "1"
+        text: 1

src/Jackett.Common/Definitions/piratbitl.yml

@@ -669,64 +669,26 @@
           - name: querystring
             args: f
       size:
-        selector: td div a.dLink
-        filters:
-          - name: re_replace
-            args: ["\u2193", ""] # down arrow
+        selector: td > u
       seeders:
         selector: td.seedmed
       leechers:
         selector: td.leechmed
         # Russian and Ukranian and English languages are supported
       grabs:
-        optional: true
-        selector: td[title^="Ответов"]
-      grabs:
-        optional: true
-        selector: td[title^="Відповідей"]
-      grabs:
-        optional: true
-        selector: td[title^="Replies"]
+        selector: td[title^="Ответов"], td[title^="Відповідей"], td[title^="Replies"]
         # 2 date flavours for 3 languages
       date:
       # 15:04
         optional: true
-        selector: td[title="Добавлен"] p:first-of-type:not(:contains("-"))
+        selector: td[title="Добавлен"] p:first-of-type:not(:contains("-")), td[title="Доданий"] p:first-of-type:not(:contains("-")), td[title="Added"] p:first-of-type:not(:contains("-"))
         filters:
           - name: dateparse
             args: "15:04"
       date:
       # 15:04 24-02-19
         optional: true
-        selector: td[title="Добавлен"] p:first-of-type:contains("-")
-        filters:
-          - name: dateparse
-            args: "15:04 2-01-06"
-      date:
-      # 15:04
-        optional: true
-        selector: td[title="Доданий"] p:first-of-type:not(:contains("-"))
-        filters:
-          - name: dateparse
-            args: "15:04"
-      date:
-      # 15:04 24-02-19
-        optional: true
-        selector: td[title="Доданий"] p:first-of-type:contains("-")
-        filters:
-          - name: dateparse
-            args: "15:04 2-01-06"
-      date:
-      # 15:04
-        optional: true
-        selector: td[title="Added"] p:first-of-type:not(:contains("-"))
-        filters:
-          - name: dateparse
-            args: "15:04"
-      date:
-      # 15:04 24-02-19
-        optional: true
-        selector: td[title="Added"] p:first-of-type:contains("-")
+        selector: td[title="Добавлен"] p:first-of-type:contains("-"), td[title="Доданий"] p:first-of-type:contains("-"), td[title="Added"] p:first-of-type:contains("-")
         filters:
           - name: dateparse
             args: "15:04 2-01-06"

src/Jackett.Common/Definitions/puntotorrent.yml

@@ -110,7 +110,11 @@
     path: index.php
     keywordsfilters:
       - name: re_replace
-        args: ["S0?(\\d{1,2})E(\\d{1,2})", "T$1 $2"]
+        args: ["(?i)S(\\d+)", " $1 "]
+      - name: re_replace
+        args: ["(?i)E(\\d+)", " $1 "]
+      - name: re_replace
+        args: ["[^a-zA-Z0-9]+", " "]
     inputs:
       page: "torrents"
       $raw: "&category={{range .Categories}}{{.}};{{end}}"
@@ -126,10 +130,39 @@
           - name: querystring
             args: category
       title:
-        selector: td:nth-child(2) a
+        selector: td:nth-child(2) a:contains("VOSE")
+        optional: true
         filters:
           - name: append
-            args: " [spanish]"
+            args: " [English]"
+          - name: re_replace
+            args: ["(?i)T[\\s-_]?(\\d{1,2})(.*)\\[(\\d{1,2})[x|\\/|\\\\](\\d{1,2})\\]", "S$1E$3 $2"]
+          - name: re_replace
+            args: ["(?i)T[\\s-_]?(\\d{1,2})\\b", " S$1 "]
+          - name: re_replace
+            args: ["(?i)\\w*Temp\\w*\\b\\s?(\\d{1,2})(ª|\\D)?\\b", " S$1 "]
+          - name: re_replace
+            args: ["(?i)(\\d{1,2})(ª|\\D)?\\s?\\w*Temp\\w*\\b"," S$1 "]
+          - name: re_replace
+            args: ["(?i)(\\d{1,2})[x|\\/|\\\\](\\d{1,2})", "S$1E$2"]
+      title:
+        selector: td:nth-child(2) a:not(:contains("VOSE"))
+        optional: true
+        filters:
+          - name: append
+            args: " [Spanish]"
+          - name: re_replace
+            args: ["(?i)T[\\s-_]?(\\d{1,2})(.*)\\[(\\d{1,2})[x|\\/|\\\\](\\d{1,2})\\]", "S$1E$3 $2"]
+          - name: re_replace
+            args: ["(?i)T[\\s-_]?(\\d{1,2})\\b", " S$1 "]
+          - name: re_replace
+            args: ["(?i)\\w*Temp\\w*\\b\\s?(\\d{1,2})(ª|\\D)?\\b", " S$1 "]
+          - name: re_replace
+            args: ["(?i)(\\d{1,2})(ª|\\D)?\\s?\\w*Temp\\w*\\b"," S$1 "]
+          - name: re_replace
+            args: ["(?i)(\\d{1,2})(ª|\\D)?\\s?\\w*Temp\\w*\\b"," S$1 "]
+          - name: re_replace
+            args: ["(?i)(\\d{1,2})[x|\\/|\\\\](\\d{1,2})", "S$1E$2"]
       details:
         selector: td:nth-child(3) a
         attribute: href

src/Jackett.Common/Definitions/sktorrent.yml

@@ -32,8 +32,9 @@
       - {id: 18, cat: PC/Games, desc: "Hry na Windows"}
       - {id: 30, cat: PC/Games, desc: "Hry na Konzole"}
       - {id: 37, cat: PC/Games, desc: "Hry na Linux"}
+      - {id: 59, cat: PC/Games, desc: "Hry na Mac"}
       - {id: 2, cat: Audio, desc: "Hudba"}
-      - {id: 55, cat:  Other, desc: "Neschválené"}
+      - {id: 58, cat:  Other, desc: "Neschválené"}
       - {id: 23, cat: Books, desc: "Knihy a Časopisy"}
       - {id: 24, cat: Audio, desc: "Mluvené slovo"}
       - {id: 27, cat: PC/Phone-Other, desc: "Mobil, PDA"}

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

@@ -70,7 +70,7 @@
   login:
     path: ?p=home&pid=1
     method: form
-    form: form#sls_form
+    form: form#loginbox_form
     submitpath: ajax/login.php
     inputs:
       action: "login"

src/Jackett.Common/Definitions/torrent9.yml

@@ -7,7 +7,7 @@
   encoding: UTF-8
   followredirect: true
   links:
-    - https://www.torrent09.uno/
+    - https://www.oxtorrent.me/
 
   legacylinks:
     - http://www.torrent9.ec/
@@ -33,6 +33,7 @@
     - https://ww1.torrent9.to/
     - https://www.torrent9.is/
     - https://www4.torrent9.to/
+    - https://www.torrent09.uno/
 
   caps:
     categorymappings:

src/Jackett.Common/Definitions/torrent9clone.yml

@@ -7,7 +7,7 @@
   encoding: UTF-8
   followredirect: true
   links:
-    - https://www.t9.vc/
+    - https://www.torrent9.so/
 
   legacylinks:
     - https://www.torrents9.pw/
@@ -29,6 +29,8 @@
     - https://www.torrent9.sx/
     - https://ww1.torrent9.sx/
     - https://www.t9.re/
+    - https://www.t9.vc/
+    - https://www.torrent9.ai/
 
   caps:
     categorymappings:

src/Jackett.Common/Definitions/torrentparadise.yml

@@ -0,0 +1,104 @@
+---
+  site: torrentparadise
+  name: TorrentParadise
+  description: "Torrent Paradise is a Public magnet indexer"
+  language: en-us
+  type: public
+  encoding: UTF-8
+  links:
+    - https://torrentparadise.org/
+
+  caps:
+    categories:
+      "ADULT XXX": XXX
+      "ANIME": TV/Anime
+      "APPLICATIONS > MAC": PC/Mac
+      "APPLICATIONS > WINDOWS": PC/0day
+      "APPS": PC
+      "AUDIO > AUDIO BOOKS": Audio/Audiobook
+      "BOOKS": Books
+      "EBOOKS": Books/Ebook
+      "FLAC MUSIC": Audio/Lossless
+      "FLAC": Audio/Lossless
+      "GAMES": PC/Games
+      "GAMES > PC": PC/Games
+      "JUEGOS PS2": Console/PSP
+      "JUEGOS PS3": Console/PS3
+      "JUEGOS PS4": Console/PS4
+      "JUEGOS PSP": Console/PSP
+      "JUEGOS WII": Console/Wii
+      "JUEGOS WIIU": Console/WiiU
+      "JUEGOS XBOX": Console/Xbox
+      "JUEGOS XBOX360": Console/Xbox 360
+      "MOBILE": PC/Phone-Other
+      "MOVIES": Movies
+      "MP3 MUSIC": Audio/MP3
+      "MP3": Audio/MP3
+      "MUSIC > LOSSLESS": Audio/Lossless
+      "MUSIC > MP3": Audio/MP3
+      "MUSIC": Audio
+      "OTHER > E-BOOKS": Other
+      "OTHER": Other
+      "PORN > MOVIE CLIPS": XXX
+      "PORN > MOVIES": XXX
+      "PORN > PICTURES": XXX
+      "SOFTWARE > MAC": PC/Mac
+      "SOFTWARE > WINDOWS": PC/0day
+      "SOFTWARE": PC
+      "TV SHOWS": TV
+      "TV": TV
+      "VIDEO > HD - MOVIES": Movies/HD
+      "VIDEO > HD - TV SHOWS": TV/HD
+      "VIDEO > MOVIES": Movies
+      "VIDEO > SD - MOVIES": Movies/SD
+      "VIDEO > SD - TV SHOWS": TV/SD
+      "VIDEO > UHD - MOVIES": Movies/UHD
+      "VIDEO > UHD - TV SHOWS": TV/UHD
+      "XXX": XXX
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings: []
+
+  download:
+    selector: a[href^="magnet:?xt="]
+
+  search:
+    # https://torrentparadise.org/search.php?f=monday+night
+    # https://torrentparadise.org/recent
+    paths:
+      - path: "{{ if .Keywords }}search.php?f={{ .Keywords }}{{ else }}recent{{ end }}"
+    rows:
+      selector: table.table-bordered > tbody > tr.table-default
+    fields:
+      category:
+        selector: td:nth-child(1) a
+        filters:
+          - name: toupper
+      description:
+        selector: td:nth-child(1) a
+      title:
+        selector: td:nth-child(2) a
+      details:
+        selector: td:nth-child(2) a
+        attribute: href
+      download:
+        selector: td:nth-child(2) a
+        attribute: href
+      size:
+        selector: td:nth-child(3)
+      date:
+        selector: td:nth-child(4)
+        filters:
+          - name: timeago
+      seeders:
+        selector: td:nth-child(5)
+      leechers:
+        selector: td:nth-child(6)
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"

src/Jackett.Updater/Program.cs

@@ -369,6 +369,7 @@ namespace Jackett.Updater
                 "Definitions/hd4free.yml",
                 "Definitions/lemencili.yml",
                 "Definitions/btbit.yml",
+                "Definitions/digbt.yml",
             };
 
             foreach (var oldFile in oldFiles)