Compare commits

...

11 Commits

Author SHA1 Message Date
Garfield69
871a1af512 tellytorrent: -> 6.5.0 2023-03-26 15:25:18 +13:00
Garfield69
4f3c754fd0 52pt: expired CA 2023-03-26 15:24:51 +13:00
Bogdan
db39ec3229 beyond-hd-api: fix flags count condition (#14191) 2023-03-24 20:03:21 +02:00
Bogdan
fc4f4eaf23 beyond-hd-api: minor cleanup (#14190) 2023-03-24 19:58:52 +02:00
Garfield69
510168e43c add thorsland a private French site. resolves #14187 2023-03-24 21:50:12 +13:00
Garfield69
2f821ae413 jptv: drop MR 2023-03-24 15:53:07 +13:00
Garfield69
30a0cc7afb torrentqq: bump domian 2023-03-24 14:32:37 +13:00
Bogdan
018bff2cc8 assorted: set limit 100 to get more results from default 20 (#14186) 2023-03-24 01:26:32 +02:00
Bogdan
a701234a57 superbits: fix searching by episode in combo with imdbid (#14185) 2023-03-23 20:55:05 +00:00
Garfield69
94ae0cad43 hdtorrentsit: allowEmptyInputs. resolves #14184 2023-03-24 07:00:54 +13:00
Garfield69
300852a417 happyfappy: new cats
update category selector
2023-03-23 08:52:40 +13:00
12 changed files with 391 additions and 29 deletions

View File

@@ -539,6 +539,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
* TheEmpire (TE)
* TheLeachZone (TLZ)
* TheScenePlace (TSP)
* Thor's Land
* TJUPT
* TLFBits [![(invite needed)][inviteneeded]](#)
* TmGHuB

View File

@@ -5,6 +5,8 @@ description: "52PT is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
language: zh-CN
type: private
encoding: UTF-8
certificates:
- a66dce17f30d8b03be18502265e3dc09ec50b83b # expired 26-Mar-2023
links:
- https://52pt.site/

View File

@@ -5,6 +5,7 @@ description: "BitSearch is a Public torrent meta-search engine"
language: en-US
type: public
encoding: UTF-8
requestDelay: 2
links:
- https://bitsearch.to/
- https://bitsearch.mrunblock.guru/
@@ -77,6 +78,7 @@ search:
q: "{{ .Keywords }}"
sort: "{{ .Config.sort }}"
order: "{{ .Config.type }}"
limit: 100
keywordsfilters:
- name: re_replace

View File

@@ -10,7 +10,13 @@ links:
caps:
categorymappings:
- {id: 1, cat: XXX, desc: "PRON"}
- {id: 3, cat: XXX, desc: "Gay"}
- {id: 4, cat: XXX, desc: "Interracial"}
- {id: 5, cat: XXX, desc: "Lesbian"}
- {id: 6, cat: XXX, desc: "Onlyfans"}
- {id: 1, cat: XXX, desc: "Pron"}
- {id: 8, cat: XXX, desc: "Retro"}
- {id: 7, cat: XXX, desc: "VR"}
modes:
search: [q]
@@ -66,21 +72,22 @@ search:
- path: torrents.php
inputs:
$raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
searchtext: ""
title: "{{ .Keywords }}"
order_by: "{{ .Config.sort }}"
order_way: "{{ .Config.type }}"
action: advanced
filter_freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
filelist: ""
taglist: ""
rows:
selector: table#torrent_table > tbody > tr[class^="torrent row"]
fields:
category:
text: 1
selector: a[href^="/torrents.php?filter_cat["]
attribute: href
filters:
- name: regexp
args: \[(\d+)\]
title:
selector: a[href^="/torrents.php?id="]
details:

View File

@@ -48,6 +48,7 @@ search:
paths:
- path: browse.php
method: post
allowEmptyInputs: true
keywordsfilters:
- name: re_replace
args: ["[^a-zA-Z0-9]+", "%"]
@@ -60,6 +61,7 @@ search:
inputs:
ajax: false
search: "{{ .Keywords }}"
# 0 active 1 incldead 2 onlydead 3 gold 4 no seeders
incldead: 0
rows:

View File

@@ -198,8 +198,9 @@ search:
i[class*="fa-globe text-green"]: 2 # Global Double Upload
i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
"*": 1
minimumratio:
text: 0.4
# 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

View File

@@ -5,6 +5,7 @@ description: "Solid Torrents is a Public torrent meta-search engine"
language: en-US
type: public
encoding: UTF-8
requestDelay: 2
links:
- https://solidtorrents.to/
legacylinks:
@@ -73,6 +74,7 @@ search:
q: "{{ .Keywords }}"
sort: "{{ .Config.sort }}"
order: "{{ .Config.type }}"
limit: 100
rows:
selector: li.search-result:has(a[class="dl-torrent"])

View File

@@ -103,7 +103,7 @@ search:
nosub: false
order: "{{ .Config.type }}"
page: search
searchText: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
searchText: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }} {{ else }}{{ end }}{{ .Keywords }}"
section: all
sort: "{{ .Config.sort }}"
stereoscopic: false

View File

@@ -86,7 +86,7 @@ search:
imdbId: "{{ .Query.IMDBIDShort }}"
tmdbId: "{{ .Query.TMDBID }}"
tvdbId: "{{ .Query.TVDBID }}"
free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
"free[]": "{{ if .Config.freeleech }}100{{ else }}{{ end }}"
sortField: "{{ .Config.sort }}"
sortDirection: "{{ .Config.type }}"
perPage: 100
@@ -111,8 +111,10 @@ search:
selector: details_link
download:
selector: download_link
infohash:
selector: info_hash
poster:
selector: poster
selector: meta.poster
filters:
- name: replace
args: ["https://via.placeholder.com/90x135", ""]
@@ -122,6 +124,17 @@ search:
selector: tmdb_id
tvdbid:
selector: tvdb_id
genre:
selector: meta.genres
filters:
- name: re_replace
args: ["(?i)(Science Fiction)", "Science_Fiction"]
- name: re_replace
args: ["(?i)(TV Movie)", "TV_Movie"]
- name: replace
args: [" & ", "_&_"]
description:
text: "{{ .Result.genre }}"
files:
selector: num_file
seeders:
@@ -162,4 +175,4 @@ search:
minimumseedtime:
# 7 day (as seconds = 7 x 24 x 60 x 60)
text: 604800
# json UNIT3D 6.3.0
# json UNIT3D 6.5.0

View File

@@ -0,0 +1,309 @@
---
id: thorsland
name: Thor's Land
description: "Thor's Land is a FRENCH Private site for TV / MOVIES / GENERAL"
language: fr-FR
type: private
encoding: UTF-8
links:
- https://ethor.tk/
caps:
categorymappings:
# APPLICATIONS
- {id: 66, cat: PC/Mobile-Android, desc: "ANDROID"}
- {id: 68, cat: PC/Mobile-Other, desc: "HarmonyOS"}
- {id: 67, cat: PC/Mac, desc: "iOS"}
# AUTRES
- {id: 104, cat: Other, desc: "AUTRES"}
# DOCUMENTAIRES
- {id: 72, cat: TV/Documentary, desc: "4K UHD"}
- {id: 70, cat: TV/Documentary, desc: "HD 1080p"}
- {id: 71, cat: TV/Documentary, desc: "HD 720p"}
- {id: 81, cat: TV/Documentary, desc: "PACK 4K"}
- {id: 80, cat: TV/Documentary, desc: "PACK HD"}
- {id: 79, cat: TV/Documentary, desc: "PACK SD"}
- {id: 69, cat: TV/Documentary, desc: "SD"}
- {id: 75, cat: TV/Documentary, desc: "SÉRIES 4K"}
- {id: 74, cat: TV/Documentary, desc: "SÉRIES HD"}
- {id: 73, cat: TV/Documentary, desc: "SÉRIES SD"}
- {id: 78, cat: TV/Documentary, desc: "V.O.S.T. 4K"}
- {id: 77, cat: TV/Documentary, desc: "V.O.S.T. HD"}
- {id: 76, cat: TV/Documentary, desc: "V.O.S.T. SD"}
# FILMS
- {id: 11, cat: Movies/3D, desc: "3D"}
- {id: 12, cat: Movies/UHD, desc: "4K UHD"}
- {id: 2, cat: Movies/BluRay, desc: "BD-Rip"}
- {id: 10, cat: Movies/BluRay, desc: "Blu-Ray"}
- {id: 16, cat: Movies/DVD, desc: "DVD-R"}
- {id: 3, cat: Movies/DVD, desc: "DVD-Rip"}
- {id: 5, cat: Movies/HD, desc: "HD 1080p"}
- {id: 4, cat: Movies/HD, desc: "HD 720p"}
- {id: 7, cat: Movies/HD, desc: "mHD 1080p"}
- {id: 6, cat: Movies/HD, desc: "mHD 720p"}
- {id: 15, cat: Movies/UHD, desc: "Québec 4K"}
- {id: 14, cat: Movies/HD, desc: "Québec HD"}
- {id: 13, cat: Movies/SD, desc: "Québec SD"}
- {id: 9, cat: Movies, desc: "Remux"}
- {id: 22, cat: Movies/UHD, desc: "V.O. 4K"}
- {id: 21, cat: Movies/HD, desc: "V.O. HD"}
- {id: 20, cat: Movies/SD, desc: "V.O. SD"}
- {id: 19, cat: Movies/UHD, desc: "V.O.S.T. 4K"}
- {id: 18, cat: Movies/HD, desc: "V.O.S.T. HD"}
- {id: 17, cat: Movies/SD, desc: "V.O.S.T. SD"}
- {id: 1, cat: Movies/WEB-DL, desc: "WEB-DL"}
- {id: 8, cat: Movies/HD, desc: "x265"}
# JEUX VIDÉO
- {id: 55, cat: PC/Games, desc: "ÉMULATEURS"}
- {id: 40, cat: PC/Games, desc: "LINUX"}
- {id: 39, cat: PC/Mac, desc: "MAC"}
- {id: 45, cat: Console/3DS, desc: "3DS"}
- {id: 44, cat: Console/NDS, desc: "NDS"}
- {id: 42, cat: Console/Other, desc: "NES"}
- {id: 41, cat: Movies/Other, desc: "SWITCH"}
- {id: 38, cat: PC/Games, desc: "PC"}
- {id: 46, cat: Console/PS3, desc: "PSX"}
- {id: 47, cat: Console/PS3, desc: "PS2"}
- {id: 48, cat: Console/PS3, desc: "PS3"}
- {id: 49, cat: Console/PS4, desc: "PS4"}
- {id: 50, cat: Console/PS4, desc: "PS5"}
- {id: 56, cat: Console/Other, desc: "ROMS"}
- {id: 43, cat: Console/Other, desc: "SNES"}
- {id: 51, cat: Console/XBox, desc: "XBOX"}
- {id: 52, cat: Console/XBox 360, desc: "XBOX 360"}
- {id: 53, cat: Console/XBox One, desc: "XBOX ONE"}
- {id: 54, cat: Console/XBox, desc: "XBOX SERIES"}
# LIVRES
- {id: 96, cat: Audio/Audiobook, desc: "AUDIO"}
- {id: 98, cat: Books, desc: "B.D."}
- {id: 100, cat: Books/Comics, desc: "COMICS"}
- {id: 97, cat: Books/Mags, desc: "MAGAZINES"}
- {id: 101, cat: Books, desc: "MANGAS"}
- {id: 95, cat: Books, desc: "ROMANS"}
- {id: 99, cat: Books, desc: "JEUNESSE"}
# LOGICIELS
- {id: 65, cat: PC, desc: "LINUX"}
- {id: 64, cat: PC/Mac, desc: "MAC"}
- {id: 63, cat: PC/0day, desc: "WINDOWS"}
# MUSIQUE
- {id: 59, cat: Audio, desc: "AAC"}
- {id: 61, cat: Audio, desc: "DSD"}
- {id: 58, cat: Audio/Lossless, desc: "FLAC"}
- {id: 57, cat: Audio/MP3, desc: "MP3"}
- {id: 60, cat: Audio, desc: "OGG"}
- {id: 62, cat: Audio, desc: "WAV"}
# SÉRIES ANIMÉES
- {id: 89, cat: TV/Anime, desc: "HD 1080p"}
- {id: 90, cat: TV/Anime, desc: "HD 720p"}
- {id: 94, cat: TV/Anime, desc: "PACK HD"}
- {id: 93, cat: TV/Anime, desc: "PACK SD"}
- {id: 88, cat: TV/Anime, desc: "Québec HD"}
- {id: 87, cat: TV/Anime, desc: "Québec SD"}
- {id: 92, cat: TV/Anime, desc: "V.O.S.T. HD"}
- {id: 91, cat: TV/Anime, desc: "V.O.S.T. SD"}
# SÉRIES TV
- {id: 112, cat: TV/UHD, desc: "4K UHD"}
- {id: 32, cat: TV/HD, desc: "Blu-Ray"}
- {id: 35, cat: TV, desc: "DVD-R"}
- {id: 31, cat: TV/HD, desc: "Émissions HD"}
- {id: 30, cat: TV/SD, desc: "Émissions SD"}
- {id: 25, cat: TV/HD, desc: "HD 1080p"}
- {id: 24, cat: TV/HD, desc: "HD 720p"}
- {id: 27, cat: TV/HD, desc: "PACK HD"}
- {id: 34, cat: TV/HD, desc: "PACK HD QC"}
- {id: 26, cat: TV/SD, desc: "PACK SD"}
- {id: 33, cat: TV/SD, desc: "PACK SD QC"}
- {id: 29, cat: TV/HD, desc: "Québec HD"}
- {id: 28, cat: TV/SD, desc: "Québec SD"}
- {id: 23, cat: TV/SD, desc: "SD"}
- {id: 37, cat: TV/HD, desc: "V.O.S.T. HD"}
- {id: 36, cat: TV/SD, desc: "V.O.S.T. SD"}
# SPECTACLES
- {id: 85, cat: Audio/Video, desc: "ART/MAGIE"}
- {id: 83, cat: Audio/Video, desc: "HUMOUR"}
- {id: 86, cat: Audio/Video, desc: "LIVE"}
- {id: 82, cat: Audio/Video, desc: "MUSIQUE"}
- {id: 84, cat: Audio/Video, desc: "THÉATRE"}
# SPORTS
- {id: 103, cat: TV/Sport, desc: "ANGLAIS"}
- {id: 102, cat: TV/Sport, desc: "FRANÇAIS"}
# XXX
- {id: 105, cat: XXX, desc: "FILMS"}
- {id: 108, cat: XXX, desc: "GAYS"}
- {id: 110, cat: XXX, desc: "HENTAI"}
- {id: 109, cat: XXX, desc: "LESBIENNES"}
- {id: 111, cat: XXX, desc: "MAGAZINES"}
- {id: 106, cat: XXX, desc: "SÉRIES"}
- {id: 107, cat: XXX, desc: "VR"}
modes:
search: [q]
tv-search: [q, season, ep]
movie-search: [q]
music-search: [q]
book-search: [q]
settings:
- name: cookie
type: text
label: Cookie
- name: info
type: info
label: How to get the Cookie
default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
- name: freeleech
type: checkbox
label: Search freeleech only
default: false
- name: multilang
type: checkbox
label: Replace MULTi by another language in release name
default: false
- name: multilanguage
type: select
label: Replace MULTi by this language
default: FRENCH
options:
FRENCH: FRENCH
MULTi FRENCH: MULTi FRENCH
ENGLISH: ENGLISH
MULTi ENGLISH: MULTi ENGLISH
VOSTFR: VOSTFR
MULTi VOSTFR: MULTi VOSTFR
- name: vostfr
type: checkbox
label: Replace VOSTFR and SUBFRENCH with ENGLISH
default: false
- name: sort
type: select
label: Sort requested from site
default: id
options:
id: created
seeders: seeders
size: size
name: title
- name: order
type: select
label: Order requested from site
default: desc
options:
desc: desc
asc: asc
login:
method: cookie
inputs:
cookie: "{{ .Config.cookie }}"
test:
path: /
selector: a[href="account-logout"]
download:
before:
path: thanks
inputs:
id: "{{ .DownloadUri.Query.id }}"
to: give
torrent: "{{ .DownloadUri.Query.id }}"
selectors:
- selector: a[href^="download?id="]
attribute: href
search:
paths:
- path: torrents-search
inputs:
$raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
search: "{{ .Keywords }}"
# 0 active, 1 incldead, 2 onlydead
incldead: 1
# 0 all, 1 notfree, 2 onlyfree
freeleech: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
# 0 any etc
lang: 0
sort: "{{ .Config.sort}}"
order: "{{ .Config.order}}"
rows:
selector: table.ttable_headinner > tbody > tr[class^="t-row"]
fields:
category:
selector: a[href^="/torrents?cat="]
attribute: href
filters:
- name: querystring
args: cat
title_phase1:
selector: a[href^="/download?id="]
attribute: href
filters:
- name: regexp
args: name=(.+?)\.torrent
- name: urldecode
title_vostfr:
text: "{{ .Result.title_phase1 }}"
filters:
- name: re_replace
args: ["(?i)\\b(vostfr|subfrench)\\b", "ENGLISH"]
title_phase2:
text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
title_multilang:
text: "{{ .Result.title_phase2 }}"
filters:
- name: re_replace
args: ["(?i)\\b(MULTI(?!.*(?:FRENCH|ENGLISH|VOSTFR)))\\b", "{{ .Config.multilanguage }}"]
title:
text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
details:
selector: a[href^="/torrents-details?id="]
attribute: href
download:
selector: a[href^="/torrents-details?id="]
attribute: href
magnet:
selector: a[href^="magnet:?xt="]
attribute: href
poster:
selector: img[src^="uploads/images/"]
attribute: src
size:
selector: td:nth-child(10)
remove: div.bottom
grabs:
selector: td:nth-child(9)
remove: div.bottom
seeders:
selector: td:nth-child(11)
remove: div.bottom
leechers:
selector: td:nth-child(12)
remove: div.bottom
date:
selector: td.tor_name_outline > font
filters:
- name: replace
args: ["il y a ", ""]
- name: replace
args: ["seconde", "second"]
- name: replace
args: ["heure", "hour"]
- name: replace
args: ["jour", "day"]
- name: replace
args: ["mois", "month"]
- name: replace
args: ["an", "year"]
- name: append
args: " ago"
downloadvolumefactor:
case:
"button:contains(\"FREELEECH\")": 0
"*": 1
uploadvolumefactor:
text: 1
minimumseedtime:
# 2 days (as seconds = 2 x 24 x 60 x 60)
text: 172800
# engine n/a

View File

@@ -7,9 +7,8 @@ type: public
encoding: UTF-8
followredirect: true
links:
- https://torrentqq248.com/
- https://torrentqq249.com/
legacylinks:
- https://torrentqq233.com/
- https://torrentqq234.com/
- https://torrentqq235.com/
- https://torrentqq236.com/
@@ -25,6 +24,7 @@ legacylinks:
- https://torrentqq245.com/
- https://torrentqq246.com/
- https://torrentqq247.com/
- https://torrentqq248.com/
caps:
categorymappings:

View File

@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using System.Threading.Tasks;
using Jackett.Common.Extensions;
using Jackett.Common.Models;
using Jackett.Common.Models.IndexerConfig.Bespoke;
using Jackett.Common.Services.Interfaces;
@@ -71,12 +72,21 @@ namespace Jackett.Common.Indexers
{
LoadValuesFromJson(configJson);
if (configData.ApiKey.Value.IsNullOrWhiteSpace())
{
throw new Exception("Missing API Key.");
}
IsConfigured = false;
try
{
var results = await PerformQuery(new TorznabQuery());
if (results.Count() == 0)
if (!results.Any())
{
throw new Exception("Testing returned no results!");
}
IsConfigured = true;
SaveConfig();
}
@@ -93,7 +103,7 @@ namespace Jackett.Common.Indexers
var apiKey = configData.ApiKey.Value;
var apiUrl = $"{APIBASE}{apiKey}";
Dictionary<string, string> postData = new Dictionary<string, string>
var postData = new Dictionary<string, string>
{
{ BHDParams.action, "search" },
{ BHDParams.rsskey, configData.RSSKey.Value },
@@ -167,24 +177,37 @@ namespace Jackett.Common.Indexers
private string getTitle(BHDResult bhdResult)
{
var title = bhdResult.name;
var title = bhdResult.name.Trim();
if (!configData.AddHybridFeaturesToTitle.Value)
return title;
var featureCount = bhdResult.dv + bhdResult.hdr10 + bhdResult.hdr10plus + bhdResult.hlg;
if (featureCount > 1)
{
var features = new List<string>();
return title;
}
if (bhdResult.dv == 1)
features.Add("Dolby Vision");
if (bhdResult.hdr10 == 1)
features.Add("HDR10");
if (bhdResult.hdr10plus == 1)
features.Add("HDR10+");
if (bhdResult.hlg == 1)
features.Add("HLG");
var features = new List<string>();
if (bhdResult.dv == 1)
{
features.Add("Dolby Vision");
}
if (bhdResult.hdr10 == 1)
{
features.Add("HDR10");
}
if (bhdResult.hdr10plus == 1)
{
features.Add("HDR10+");
}
if (bhdResult.hlg == 1)
{
features.Add("HLG");
}
if (features.Count > 1)
{
title += $" ({string.Join(" / ", features)})";
}