diff --git a/src/Jackett.Common/Definitions/nbtorrents-api.yml b/src/Jackett.Common/Definitions/nbtorrents-api.yml
new file mode 100644
index 000000000..67502689a
--- /dev/null
+++ b/src/Jackett.Common/Definitions/nbtorrents-api.yml
@@ -0,0 +1,148 @@
+---
+id: nbtorrents-api
+name: NBTorrents (API)
+description: "NBTorrents is an INDIAN Private site for MOVIES / TV / MUSIC"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+ - https://www.nbtorrents.com/
+
+caps:
+ categorymappings:
+ - {id: 1, cat: Movies, desc: "Movies"}
+ - {id: 2, cat: TV, desc: "TV"}
+ - {id: 3, cat: Audio, desc: "Music"}
+ - {id: 4, cat: PC/Games, desc: "Game"}
+ - {id: 5, cat: PC/0day, desc: "Application"}
+
+ 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 NBTorrents 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
+ inputs:
+ api_token: "{{ .Config.apikey }}"
+ error:
+ - selector: a[href*="/login"]
+ message:
+ text: "The API key was not accepted by {{ .Config.sitelink }}."
+
+search:
+ paths:
+ # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
+ # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+ - path: "/api/torrents/filter"
+ response:
+ type: json
+
+ inputs:
+ # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6. Else pass S/E Params for UNIT3D >= v6
+ api_token: "{{ .Config.apikey }}"
+ name: "{{ .Keywords }}"
+ $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+ sortField: "{{ .Config.sort }}"
+ sortDirection: "{{ .Config.type }}"
+ perPage: 100
+ page: 1
+
+ keywordsfilters:
+ - name: re_replace
+ args: ["\\.", " "]
+
+ rows:
+ selector: data
+ attribute: attributes
+ count:
+ selector: meta.total
+
+ fields:
+ category:
+ selector: category_id
+ title:
+ selector: name
+ details:
+ selector: details_link
+ download:
+ selector: download_link
+ poster:
+ selector: poster
+ filters:
+ - name: replace
+ args: ["https://via.placeholder.com/90x135", ""]
+ 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:
+ # 2021-10-18T00:34:50.000000Z"
+ selector: created_at
+ size:
+ selector: size
+ downloadvolumefactor:
+ # api returns 0%, 25%, 50%, 75%, 100%
+ selector: freeleech
+ case:
+ 0%: 1 # not free
+ 25%: 0.75
+ 50%: 0.5
+ 75%: 0.25
+ 100%: 0 # freeleech
+ "*": 0 # catch errors
+ 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:
+ # 2 days (as seconds = 2 x 24 x 60 x 60)
+ text: 172800
+# json UNIT3D 6.3.0
diff --git a/src/Jackett.Common/Definitions/nbtorrents.yml b/src/Jackett.Common/Definitions/nbtorrents.yml
deleted file mode 100644
index 17ecca8e4..000000000
--- a/src/Jackett.Common/Definitions/nbtorrents.yml
+++ /dev/null
@@ -1,150 +0,0 @@
----
-id: nbtorrents
-name: NBTorrents
-description: "NBTorrents is an INDIAN Private site for MOVIES / TV / MUSIC"
-language: en-US
-type: private
-encoding: UTF-8
-links:
- - https://www.nbtorrents.com/
-
-caps:
- categorymappings:
- - {id: 22, cat: TV/Anime, desc: "Anime & Cartoon"}
- - {id: 26, cat: TV/Documentary, desc: "Documentaries"}
- - {id: 1, cat: Movies/UHD, desc: "Movies UHD & BluRay"}
- - {id: 3, cat: Movies/BluRay, desc: "Movies BDRips"}
- - {id: 6, cat: Movies/DVD, desc: "Movies DVD"}
- - {id: 7, cat: Movies/DVD, desc: "Movies DVDRip"}
- - {id: 8, cat: Movies, desc: "Movies Pre"}
- - {id: 2, cat: Movies, desc: "Movies Remux"}
- - {id: 4, cat: Movies/WEB-DL, desc: "Movies Web"}
- - {id: 5, cat: Movies/WEB-DL, desc: "Movies WebRip"}
- - {id: 15, cat: Audio/Lossless, desc: "Music CD & FLAC"}
- - {id: 17, cat: Audio/MP3, desc: "Music MP3"}
- - {id: 18, cat: Audio, desc: "Music Pack"}
- - {id: 20, cat: Audio, desc: "Music Podcast"}
- - {id: 19, cat: Audio/Video, desc: "Music Video"}
- - {id: 16, cat: Audio, desc: "Music Web"}
- - {id: 25, cat: TV/Sport, desc: "Sports"}
- - {id: 10, cat: TV/UHD, desc: "TV UHD & BluRay"}
- - {id: 11, cat: TV, desc: "TV BDRips"}
- - {id: 14, cat: TV, desc: "TV packs"}
- - {id: 12, cat: TV/WEB-DL, desc: "TV Web"}
- - {id: 13, cat: TV/WEB-DL, desc: "TV WebRips"}
-
- modes:
- search: [q]
- tv-search: [q, season, ep]
- movie-search: [q]
- music-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: 4
- options:
- 4: created
- 7: seeders
- 5: size
- 1: title
- - name: type
- type: select
- label: Order requested from site
- default: desc
- options:
- desc: desc
- asc: asc
-
-login:
- path: login.php
- method: form
- form: form[action="takelogin.php"]
- inputs:
- username: "{{ .Config.username }}"
- password: "{{ .Config.password }}"
- error:
- - selector: td.colhead:contains("failed")
- message:
- selector: table tr td.text
- test:
- path: browse.php
- selector: a[href*="logout.php?hash_insert="]
-
-search:
- paths:
- - path: browse.php
- inputs:
- $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
- search: "{{ .Keywords }}"
- searchin: title
- incldead: 1
- only_free: "{{ if .Config.freeleech }}1{{ else }}0{{ end }}"
- sort: "{{ .Config.sort }}"
- type: "{{ .Config.type }}"
-
- rows:
- selector: table.mainouter tr table tr:has(a[href^="download.php?torrent="])
- filters:
- - name: andmatch
-
- fields:
- category:
- selector: td a[href^="browse.php?cat="]
- attribute: href
- filters:
- - name: querystring
- args: cat
- title:
- selector: td a[href^="details.php?id="]
- details:
- selector: td a[href^="details.php?id="]
- attribute: href
- poster:
- selector: td a[href^="details.php?id="]
- attribute: onmouseover
- filters:
- - name: regexp
- args: "src=\\\\'(.*?)\\\\' "
- download:
- selector: td a[href^="download.php?torrent="]
- attribute: href
- imdbid:
- selector: td a[href*="imdb.com/title/tt"]
- attribute: href
- files:
- selector: td:nth-of-type(5)
- date:
- selector: td:nth-of-type(7)
- filters:
- - name: append
- args: " +05:30" # IST
- - name: dateparse
- args: "Jan 2 2006 03:04 PM -07:00"
- size:
- selector: td:nth-of-type(8)
- grabs:
- selector: td:nth-of-type(9)
- seeders:
- selector: td:nth-of-type(10)
- leechers:
- selector: td:nth-of-type(11)
- downloadvolumefactor:
- case:
- "img[title=\"Free Torrent\"]": 0 # torrent specific free leech (icon)?
- "a.info:contains(\"Free\")": 0 # global freeleech note?
- "*": 1
- uploadvolumefactor:
- text: 1
-# engine n/a
diff --git a/src/Jackett.Updater/Program.cs b/src/Jackett.Updater/Program.cs
index 8d4233b54..4c41d8909 100644
--- a/src/Jackett.Updater/Program.cs
+++ b/src/Jackett.Updater/Program.cs
@@ -426,6 +426,7 @@ namespace Jackett.Updater
"Definitions/moviezone.yml", // migrated to teracod #9743
"Definitions/music-master.yml",
"Definitions/nachtwerk.yml",
+ "Definitions/nbtorrents.yml",
"Definitions/netlab.yml",
"Definitions/nexttorrent.yml",
"Definitions/nforce.yml",