diff --git a/src/Jackett.Common/Definitions/jptv-api.yml b/src/Jackett.Common/Definitions/jptv-api.yml
new file mode 100644
index 000000000..b198cb543
--- /dev/null
+++ b/src/Jackett.Common/Definitions/jptv-api.yml
@@ -0,0 +1,146 @@
+---
+id: jptv-api
+name: JPTV (API)
+description: "JPTV is a JAPANESE Private Torrent Tracker for JAPANESE TV / MOVIES / GENERAL"
+language: ja-JP
+type: private
+encoding: UTF-8
+links:
+ - https://jptv.club/
+
+caps:
+ categorymappings:
+ - {id: 1, cat: Movies, desc: "Movies"}
+ - {id: 2, cat: TV, desc: "TV Shows"}
+ - {id: 6, cat: TV, desc: "TS Firehose"}
+ - {id: 7, cat: Movies/Other, desc: "Anime Movies"}
+ - {id: 9, cat: TV/Anime, desc: "Anime Series"}
+ - {id: 8, cat: Audio, desc: "Audio"}
+ - {id: 10, cat: Books, desc: "Book"}
+
+ modes:
+ search: [q]
+ tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
+ movie-search: [q, imdbid, tmdbid]
+ music-search: [q]
+ book-search: [q]
+
+settings:
+ - name: apikey
+ type: text
+ label: APIKey
+ - name: info_key
+ type: info
+ label: About your API key
+ default: "Find or Generate a new API Token by accessing your JPTV account My Security page and clicking on the API Token tab."
+ - name: freeleech
+ type: checkbox
+ label: Search freeleech only
+ default: false
+ - name: sort
+ type: select
+ label: Sort requested from site
+ default: created_at
+ options:
+ created_at: created
+ seeders: seeders
+ size: size
+ name: title
+ - name: type
+ type: select
+ label: Order requested from site
+ default: desc
+ options:
+ desc: desc
+ asc: asc
+
+login:
+ path: /api/torrents
+ method: get
+ error:
+ - selector: a[href*="/login"]
+ message:
+ text: "The API key was not accepted by {{ .Config.sitelink }}."
+
+search:
+ paths:
+ # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
+ # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+ - path: "/api/torrents/filter"
+ response:
+ type: json
+
+ headers:
+ Authorization: ["Bearer {{ .Config.apikey }}"]
+
+ inputs:
+ $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
+ name: "{{ .Keywords }}"
+ imdb: "{{ .Query.IMDBIDShort }}"
+ tmdb: "{{ .Query.TMDBID }}"
+ tvdb: "{{ .Query.TVDBID }}"
+ freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+ sorting: "{{ .Config.sort }}"
+ direction: "{{ .Config.type }}"
+ qty: 100
+
+ keywordsfilters:
+ - name: re_replace
+ args: ["\\.", " "]
+
+ rows:
+ selector: data
+ attribute: attributes
+
+ fields:
+ categorydesc:
+ selector: category
+ title:
+ selector: name
+ details:
+ selector: details_link
+ download:
+ selector: download_link
+ imdbid:
+ selector: imdb_id
+ tmdbid:
+ selector: tmdb_id
+ tvdbid:
+ selector: tvdb_id
+ files:
+ selector: num_file
+ seeders:
+ selector: seeders
+ leechers:
+ selector: leechers
+ grabs:
+ selector: times_completed
+ date:
+ # "created_at": "2021-10-18T00:34:50.000000Z" is returned by Newtonsoft.Json.Linq as 18/10/2021 00:34:50
+ selector: created_at
+ filters:
+ - name: append
+ args: " +00:00" # GMT
+ - name: dateparse
+ args: "MM/dd/yyyy HH:mm:ss zzz"
+ size:
+ selector: size
+ downloadvolumefactor:
+ # api returns 0=false, 1=true
+ selector: freeleech
+ case:
+ 0: 1 # not free
+ 1: 0 # freeleech
+ uploadvolumefactor:
+ # api returns 0=false, 1=true
+ selector: double_upload
+ case:
+ 0: 1 # normal
+ 1: 2 # double
+# global MR is 0.4 but torrents must be seeded for 7 days regardless of ratio
+# minimumratio:
+# text: 0.4
+ minimumseedtime:
+ # 7 days (as seconds = 7 x 24 x 60 x 60)
+ text: 604800
+# json UNIT3D 5.2.0
diff --git a/src/Jackett.Common/Definitions/jptv.yml b/src/Jackett.Common/Definitions/jptv.yml
deleted file mode 100644
index 89a62e3d7..000000000
--- a/src/Jackett.Common/Definitions/jptv.yml
+++ /dev/null
@@ -1,207 +0,0 @@
----
-id: jptv
-name: JPTV
-description: "JPTV is a JAPANESE Private Torrent Tracker for JAPANESE TV / MOVIES"
-language: ja-JP
-type: private
-encoding: UTF-8
-links:
- - https://jptv.club/
-
-caps:
- categorymappings:
- - {id: 1, cat: Movies, desc: "Movies"}
- - {id: 2, cat: TV, desc: "TV Shows"}
- - {id: 6, cat: TV, desc: "TS Firehose"}
- - {id: 7, cat: Movies/Other, desc: "Anime Movies"}
- - {id: 9, cat: TV/Anime, desc: "Anime Series"}
- - {id: 8, cat: Audio, desc: "Audio"}
- - {id: 10, cat: Books, desc: "Book"}
-
- modes:
- search: [q]
- tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
- movie-search: [q, imdbid, tmdbid]
- 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: created_at
- options:
- created_at: created
- seeders: seeders
- size: size
- name: title
- - name: type
- type: select
- label: Order requested from site
- default: desc
- options:
- desc: desc
- asc: asc
-
-login:
- path: login
- method: form
- form: form[action$="/login"]
- inputs:
- username: "{{ .Config.username }}"
- password: "{{ .Config.password }}"
- remember: on
- selectorinputs:
- _token:
- selector: input[name="_token"]
- attribute: value
- error:
- - selector: div#ERROR_COPY
-# test:
-# path: /
-# selector: a[href$="/logout"]
-
-search:
- paths:
- - path: torrents/filter
- inputs:
- $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
- search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
- imdb: "{{ .Query.IMDBIDShort }}"
- tvdb: "{{ .Query.TVDBID }}"
- tmdb: "{{ .Query.TMDBID }}"
- sorting: "{{ .Config.sort }}"
- direction: "{{ .Config.type }}"
- qty: 100
- page: 0
- view: list
- freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
- # can search for genre but you need to know the id. &genres[]=10765 for Sci-Fi & Fantasy
-
- rows:
- selector: table > tbody > tr
-
- fields:
- category:
- selector: a[href*="/categories/"]
- attribute: href
- filters:
- - name: regexp
- args: "/categories/(\\d+)"
- title:
- selector: a.view-torrent
- download:
- selector: a[href*="/download/"]
- attribute: href
- details:
- selector: a.view-torrent
- attribute: href
- poster:
- selector: div.torrent-poster img
- attribute: src
- filters:
- - name: replace
- args: ["https://via.placeholder.com/90x135", ""]
- - name: replace
- args: ["https://via.placeholder.com/400x600", ""]
- genre:
- selector: td:nth-last-child(8)
- filters:
- - name: replace
- args: ["\n", ""]
- - name: replace
- args: [" & ", "_&_"]
- - name: re_replace
- args: ["(?i)(Science Fiction)", "Science_Fiction"]
- - name: re_replace
- args: ["(?i)(TV Movie)", "TV_Movie"]
- - name: validate
- args: "Action, Action_&_Adventure, Adventure, Animation, Comedy, Crime, Documentary, Drama, Family, Fantasy, History, Horror, Kids, Music, Mystery, News, Reality, Romance, Sci-Fi_&_Fantasy, Science_Fiction, Soap, TV_Movie, Talk, Thriller, War, War_&_Politics, Western"
- description:
- text: "{{ .Result.genre }}"
- size:
- selector: td:nth-last-child(4)
- seeders:
- selector: td:nth-last-child(3)
- leechers:
- selector: td:nth-last-child(2)
- grabs:
- selector: td:nth-last-child(1)
- imdbid:
- selector: a[href*="imdb.com/title/tt"]
- attribute: href
- tmdbid:
- selector: a[href*="themoviedb.org/movie/"], a[href*="themoviedb.org/tv/"]
- attribute: href
- date:
- selector: time
- filters:
- # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish
- - name: re_replace
- args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前|sedan)", " ago"]
- - name: re_replace
- args: ["(?i)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
- - name: re_replace
- args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten|minuter)", "minutes"]
- - name: re_replace
- args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
- - name: re_replace
- args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden|timmar)", "hours"]
- - name: re_replace
- args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間|timme)", " hour"]
- - name: re_replace
- args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen|dagar)", "days"]
- - name: re_replace
- args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
- - name: re_replace
- args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken|veckor)", "weeks"]
- - name: re_replace
- args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間|vecka)", " week"]
- - name: re_replace
- args: ["(?i) (ay)", "month"]
- - name: re_replace
- args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden|månader)", "months"]
- - name: re_replace
- args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月|månad)", " month"]
- - name: re_replace
- args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
- - name: re_replace
- args: ["(?i)(yil|aasta|år|anno|rok|ano|год|año|Jahr|година|jaar|年)", " year"]
- - name: re_replace
- args: ["(?i) (an)", "year"]
- - name: re_replace
- args: ["(?i)(För |und)", ""] # Misc removals
- - name: timeago
- downloadvolumefactor:
- case:
- i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
- i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
- 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*="fa-certificate text-pink"]: 0 # Featured Torrent
- "*": 1
- uploadvolumefactor:
- case:
- i[class*="fa-gem text-green"]: 2 # Single Torrent Double Upload
- i[class*="fa-globe text-green"]: 2 # Global Double Upload
- i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
- "*": 1
- # overall ratio of 0.4 but must seed for 7 days regardless of ratio
- # minimumratio:
- # text: 0.4
- minimumseedtime:
- # 7 days (as seconds = 7 x 24 x 60 x 60)
- text: 604800
-# UNIT3D 5.1.0
diff --git a/src/Jackett.Updater/Program.cs b/src/Jackett.Updater/Program.cs
index a1323cc02..80517746c 100644
--- a/src/Jackett.Updater/Program.cs
+++ b/src/Jackett.Updater/Program.cs
@@ -447,6 +447,7 @@ namespace Jackett.Updater
"Definitions/isohunt.yml",
"Definitions/iv-torrents.yml",
"Definitions/jme-reunit3d.yml", // switch to -API #13043
+ "Definitions/jptv.yml", // switch to -API #9242
"Definitions/kapaki.yml",
"Definitions/katcrs.yml",
"Definitions/kaztorka.yml",