mirror of
https://github.com/Jackett/Jackett.git
synced 2025-12-15 03:41:12 +01:00
Compare commits
108 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5045b3f07d | ||
|
|
39539efa51 | ||
|
|
adaa5b7cb6 | ||
|
|
3ead938788 | ||
|
|
f9781dcee5 | ||
|
|
8fed3a0ee4 | ||
|
|
a815ad1361 | ||
|
|
68f06565b6 | ||
|
|
d6ca844550 | ||
|
|
5c8047659a | ||
|
|
f4981623f6 | ||
|
|
255995f5a3 | ||
|
|
7a58b2ede9 | ||
|
|
96a5e66da5 | ||
|
|
205cf83789 | ||
|
|
f64f4b10ba | ||
|
|
5a9e735e54 | ||
|
|
f736ac6e32 | ||
|
|
2bc401e1eb | ||
|
|
96cbc37919 | ||
|
|
50026d456e | ||
|
|
387758f2dd | ||
|
|
c14a95e182 | ||
|
|
a0d1131ec4 | ||
|
|
218306fdf8 | ||
|
|
e93b8c32a5 | ||
|
|
98f3df5ffd | ||
|
|
a0f47761cc | ||
|
|
37d5526afb | ||
|
|
57676f6f85 | ||
|
|
5e560554fd | ||
|
|
5735caf11c | ||
|
|
7b116f24f3 | ||
|
|
bb2c656f85 | ||
|
|
9491d40061 | ||
|
|
02523164b1 | ||
|
|
02bb0db7ac | ||
|
|
6db76043d4 | ||
|
|
2808319912 | ||
|
|
9cff2d01d4 | ||
|
|
7ec9cc046e | ||
|
|
34a4bab4dd | ||
|
|
5af713d70f | ||
|
|
ab63facd0d | ||
|
|
93cfb32bad | ||
|
|
90e9dd4ed5 | ||
|
|
3f552d8c8f | ||
|
|
1987555dc5 | ||
|
|
410d0a5ab3 | ||
|
|
6ba4a83948 | ||
|
|
2563792909 | ||
|
|
1f725b078e | ||
|
|
a80a42b46f | ||
|
|
b8283d0982 | ||
|
|
f07af5dc54 | ||
|
|
8bf22fb3c3 | ||
|
|
05c6991783 | ||
|
|
2402ef6c6f | ||
|
|
d5f1f63486 | ||
|
|
c357a9f4a7 | ||
|
|
0097d823e6 | ||
|
|
798a4b160f | ||
|
|
b0dbd475dc | ||
|
|
14b132e4f3 | ||
|
|
5e78223cdc | ||
|
|
4cd883d432 | ||
|
|
a1a98f9836 | ||
|
|
0c9c144e5a | ||
|
|
a2da916252 | ||
|
|
8d85708721 | ||
|
|
a00ff4703e | ||
|
|
fcf7694ae7 | ||
|
|
503030045f | ||
|
|
5f53bea74a | ||
|
|
855d89296a | ||
|
|
7800813aee | ||
|
|
2151dba5d1 | ||
|
|
8e1887a133 | ||
|
|
587bef69d4 | ||
|
|
32863c2aa9 | ||
|
|
6e0a3ea759 | ||
|
|
7de44d8c9e | ||
|
|
53646c28de | ||
|
|
aa0ae46fd9 | ||
|
|
535f199e84 | ||
|
|
64dd9c6897 | ||
|
|
eb3898a961 | ||
|
|
75bf8d7078 | ||
|
|
390b1714f4 | ||
|
|
6254d62c23 | ||
|
|
08773ae3c9 | ||
|
|
7b7f77e06f | ||
|
|
64fc61f777 | ||
|
|
dee082ead3 | ||
|
|
6347fdff66 | ||
|
|
cdeac3c0ef | ||
|
|
6d568a4059 | ||
|
|
3dd5b1e5f0 | ||
|
|
fb9845d1e3 | ||
|
|
70b0aa1f67 | ||
|
|
368afcfc5a | ||
|
|
29d28e2607 | ||
|
|
b023e8fe6d | ||
|
|
d51752f682 | ||
|
|
ec40699cdc | ||
|
|
3c798127c5 | ||
|
|
61b263dd98 | ||
|
|
dd11b7e6cd |
2
.github/workflows/codeql-analysis.yml
vendored
2
.github/workflows/codeql-analysis.yml
vendored
@@ -57,7 +57,7 @@ jobs:
|
||||
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v5
|
||||
uses: actions/checkout@v6
|
||||
|
||||
# Initializes the CodeQL tools for scanning.
|
||||
- name: Initialize CodeQL
|
||||
|
||||
8
.github/workflows/definitions-update.yml
vendored
8
.github/workflows/definitions-update.yml
vendored
@@ -15,7 +15,7 @@ concurrency:
|
||||
jobs:
|
||||
update-rudub:
|
||||
name: Update rudub
|
||||
if: github.repository == 'Jackett/Jackett'
|
||||
if: (github.repository == 'Jackett/Jackett' && github.actor != 'dependabot[bot]')
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
contents: write
|
||||
@@ -34,14 +34,14 @@ jobs:
|
||||
GH_TOKEN: ${{ steps.app-token.outputs.token }}
|
||||
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v5
|
||||
uses: actions/checkout@v6
|
||||
with:
|
||||
token: ${{ steps.app-token.outputs.token }}
|
||||
|
||||
- name: Setup Environment Variables
|
||||
run: |
|
||||
echo "CURRENT_RUDUB_DOMAIN=$(date +'%b%d' | tr '[:upper:]' '[:lower:]').rudub.pics" >> $GITHUB_ENV
|
||||
echo "PREVIOUS_RUDUB_DOMAIN=$(date --date='yesterday' +'%b%d' | tr '[:upper:]' '[:lower:]').rudub.pics" >> $GITHUB_ENV
|
||||
echo "CURRENT_RUDUB_DOMAIN=$(date +'%b%d' | tr '[:upper:]' '[:lower:]').rudub.bet" >> $GITHUB_ENV
|
||||
echo "PREVIOUS_RUDUB_DOMAIN=$(date --date='yesterday' +'%b%d' | tr '[:upper:]' '[:lower:]').rudub.bet" >> $GITHUB_ENV
|
||||
|
||||
- name: Update rudub definition
|
||||
uses: mikefarah/yq@master
|
||||
|
||||
2
.github/workflows/issuebot.yml
vendored
2
.github/workflows/issuebot.yml
vendored
@@ -20,7 +20,7 @@ jobs:
|
||||
steps:
|
||||
# This workflow will run a script that is stored in the repository. This step checks out the repository contents so that the workflow can access the script.
|
||||
- name: Check out repo content
|
||||
uses: actions/checkout@v5
|
||||
uses: actions/checkout@v6
|
||||
|
||||
# This step sets up Node.js. The script that this workflow will run uses Node.js.
|
||||
- name: Setup Node.js
|
||||
|
||||
@@ -104,7 +104,6 @@ Prior versions of Jackett are no longer supported.
|
||||
* PornoTorrent
|
||||
* PornRips
|
||||
* Postman
|
||||
* Qbite (Hubite)
|
||||
* RedeTorrent
|
||||
* RinTorNeT
|
||||
* RuTor
|
||||
@@ -208,7 +207,7 @@ Prior versions of Jackett are no longer supported.
|
||||
* RuTracker.org
|
||||
* seleZen
|
||||
* Sharewood
|
||||
* SkTorrent
|
||||
* Sk-CzTorrent
|
||||
* SkTorrent-org
|
||||
* themixingbowl (TMB)
|
||||
* Toloka
|
||||
@@ -242,7 +241,6 @@ Prior versions of Jackett are no longer supported.
|
||||
* AlphaRatio (AR)
|
||||
* AmigosShareClub (ASC)
|
||||
* AnimeBytes (AB)
|
||||
* AnimeLovers
|
||||
* AnimeTorrents (AnT)
|
||||
* AnimeTorrents.ro (Anime Torrents Romania)
|
||||
* AnimeWorld (AW)
|
||||
@@ -431,7 +429,7 @@ Prior versions of Jackett are no longer supported.
|
||||
* LosslessClub [![(invite needed)][inviteneeded]](#)
|
||||
* LST
|
||||
* LuckPT [![(invite needed)][inviteneeded]](#)
|
||||
* M-Team TP (MTTP) [![(invite needed)][inviteneeded]](#)
|
||||
* M-Team - TP (MTTP)
|
||||
* MaDs Revolution
|
||||
* Majomparádé (TurkDepo)
|
||||
* Making Off
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
---
|
||||
id: 1337x
|
||||
name: 1337x
|
||||
description: "1337X is a Public torrent site that offers verified torrent downloads"
|
||||
description: "1337x is a Public torrent site that offers verified torrent downloads"
|
||||
language: en-US
|
||||
type: public
|
||||
encoding: UTF-8
|
||||
@@ -115,7 +115,7 @@ caps:
|
||||
search: [q]
|
||||
tv-search: [q, season, ep]
|
||||
movie-search: [q]
|
||||
music-search: [q, album, artist]
|
||||
music-search: [q]
|
||||
book-search: [q]
|
||||
allowrawsearch: true
|
||||
|
||||
@@ -147,6 +147,10 @@ settings:
|
||||
type: info
|
||||
label: About the Download links
|
||||
default: As the iTorrents .torrent download link on this site is known to fail from time to time, we suggest using the magnet link as a fallback. The BTCache and Torrage services are not supported because they require additional user interaction (a captcha for BTCache and a download button on Torrage.)
|
||||
- name: disablesort
|
||||
type: checkbox
|
||||
label: Disable sorting - 1337x prevents sorting searches during high server load, which breaks the indexer when performing a keyword search - disable if you get zero results
|
||||
default: false
|
||||
- name: sort
|
||||
type: select
|
||||
label: Sort requested from site
|
||||
@@ -174,10 +178,10 @@ download:
|
||||
search:
|
||||
paths:
|
||||
# present first page of movies tv and music results if there are no search parms supplied (20 hits per page)
|
||||
- path: "{{ if or .Query.Album .Query.Artist .Keywords }}sort-search{{ else }}cat/Movies{{ end }}{{ if or .Query.Album .Query.Artist }}/{{ or .Query.Album .Query.Artist }}{{ else }}/{{ .Keywords }}{{ end }}{{ if or .Query.Album .Query.Artist .Keywords }}/{{ else }}{{ end }}{{ .Config.sort }}/{{ .Config.type }}/1/"
|
||||
- path: "{{ if or .Query.Album .Query.Artist .Keywords }}sort-search{{ else }}cat/TV{{ end }}{{ if or .Query.Album .Query.Artist }}/{{ or .Query.Album .Query.Artist }}{{ else }}/{{ .Keywords }}{{ end }}{{ if or .Query.Album .Query.Artist .Keywords }}/{{ else }}{{ end }}{{ .Config.sort }}/{{ .Config.type }}/{{ if or .Query.Album .Query.Artist .Keywords }}2{{ else }}1{{ end }}/"
|
||||
- path: "{{ if or .Query.Album .Query.Artist .Keywords }}sort-search{{ else }}cat/Music{{ end }}{{ if or .Query.Album .Query.Artist }}/{{ or .Query.Album .Query.Artist }}{{ else }}/{{ .Keywords }}{{ end }}{{ if or .Query.Album .Query.Artist .Keywords }}/{{ else }}{{ end }}{{ .Config.sort }}/{{ .Config.type }}/{{ if or .Query.Album .Query.Artist .Keywords }}3{{ else }}1{{ end }}/"
|
||||
- path: "{{ if or .Query.Album .Query.Artist .Keywords }}sort-search{{ else }}cat/Other{{ end }}{{ if or .Query.Album .Query.Artist }}/{{ or .Query.Album .Query.Artist }}{{ else }}/{{ .Keywords }}{{ end }}{{ if or .Query.Album .Query.Artist .Keywords }}/{{ else }}{{ end }}{{ .Config.sort }}/{{ .Config.type }}/{{ if or .Query.Album .Query.Artist .Keywords }}4{{ else }}1{{ end }}/"
|
||||
- path: "{{ if and (.Keywords) (eq .Config.disablesort .False) }}sort-{{ else }}{{ end }}{{ if .Keywords }}search/{{ .Keywords }}{{ else }}cat/Movies{{ end }}{{ if and (.Keywords) (eq .Config.disablesort .False) }}/{{ .Config.sort }}/{{ .Config.type }}{{ else }}{{ end }}/1/"
|
||||
- path: "{{ if and (.Keywords) (eq .Config.disablesort .False) }}sort-{{ else }}{{ end }}{{ if .Keywords }}search/{{ .Keywords }}{{ else }}cat/TV{{ end }}{{ if and (.Keywords) (eq .Config.disablesort .False)) }}/{{ .Config.sort }}/{{ .Config.type }}{{ else }}{{ end }}/{{ if .Keywords }}2{{ else }}1{{ end }}/"
|
||||
- path: "{{ if and (.Keywords) (eq .Config.disablesort .False) }}sort-{{ else }}{{ end }}{{ if .Keywords }}search/{{ .Keywords }}{{ else }}cat/Music{{ end }}{{ if and (.Keywords) (eq .Config.disablesort .False) }}/{{ .Config.sort }}/{{ .Config.type }}{{ else }}{{ end }}/{{ if .Keywords }}3{{ else }}1{{ end }}/"
|
||||
- path: "{{ if and (.Keywords) (eq .Config.disablesort .False) }}sort-{{ else }}{{ end }}{{ if .Keywords }}search/{{ .Keywords }}{{ else }}cat/Other{{ end }}{{ if and (.Keywords) (eq .Config.disablesort .False) }}/{{ .Config.sort }}/{{ .Config.type }}{{ else }}{{ end }}/{{ if .Keywords }}4{{ else }}1{{ end }}/"
|
||||
|
||||
keywordsfilters:
|
||||
- name: re_replace # daily standard S2023 > 2023
|
||||
|
||||
@@ -182,4 +182,4 @@ search:
|
||||
description:
|
||||
selector: td.rowfollow:nth-child(2)
|
||||
remove: a, b, font, img, span
|
||||
# NexusPHP v1.9.10 2025-10-30
|
||||
# NexusPHP v1.9.11 2025-11-02
|
||||
|
||||
@@ -8,11 +8,9 @@ encoding: UTF-8
|
||||
requestDelay: 2
|
||||
links:
|
||||
# Send any content to 52btbtbt@gmail.com to get the latest address. or visit https://52btbt.icu/
|
||||
- https://www.529069.xyz/
|
||||
- https://www.529067.xyz/
|
||||
- https://www.529070.xyz/
|
||||
- https://www.529071.xyz/
|
||||
legacylinks:
|
||||
- https://www.529052.xyz/
|
||||
- https://www.529053.xyz/
|
||||
- https://www.529055.xyz/
|
||||
- https://www.529057.xyz/
|
||||
- https://www.529056.xyz/
|
||||
@@ -27,6 +25,8 @@ legacylinks:
|
||||
- https://www.529066.xyz/
|
||||
- https://www.529065.xyz/
|
||||
- https://www.529068.xyz/
|
||||
- https://www.529069.xyz/
|
||||
- https://www.529067.xyz/
|
||||
|
||||
caps:
|
||||
categorymappings:
|
||||
|
||||
@@ -128,7 +128,7 @@ search:
|
||||
only_free: "{{ if .Config.freeleech }}1{{ else }}0{{ end }}"
|
||||
|
||||
rows:
|
||||
selector: table.table-striped > tbody > tr:has(a[href^="download.php?torrent="])
|
||||
selector: table.browse.table.striped > tbody > tr:has(a[href^="download.php?torrent="])
|
||||
|
||||
fields: # some users (rank specific?) have an extra column (td:nth-child(4)) with bookmark features
|
||||
categorydesc:
|
||||
|
||||
@@ -1,201 +0,0 @@
|
||||
---
|
||||
id: animelovers-api
|
||||
name: AnimeLovers (API)
|
||||
description: "AnimeLovers is a Private tracker for ANIME / MANGA / DOUNGUA / MANHWA"
|
||||
language: en-US
|
||||
type: private
|
||||
encoding: UTF-8
|
||||
links:
|
||||
- https://animelovers.club/
|
||||
|
||||
caps:
|
||||
categorymappings:
|
||||
- {id: 1, cat: Movies/Other, desc: "Anime Movies"}
|
||||
- {id: 2, cat: TV/Anime, desc: "Anime Series"}
|
||||
- {id: 3, cat: TV/Anime, desc: "Anime OVA"}
|
||||
- {id: 11, cat: TV/Anime, desc: "Donghua Anime"}
|
||||
- {id: 9, cat: XXX, desc: "Doujinshi"}
|
||||
- {id: 4, cat: Books/Comics, desc: "Manhua/Manhwa"}
|
||||
- {id: 8, cat: Books/Comics, desc: "Manga"}
|
||||
- {id: 7, cat: XXX, desc: "Hentai"}
|
||||
- {id: 10, cat: Audio/Lossless, desc: "Lossless Music"}
|
||||
|
||||
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 <a href=\"https://animelovers.club/\" target=\"_blank\">AnimeLovers</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
|
||||
- name: freeleech
|
||||
type: checkbox
|
||||
label: Search freeleech only
|
||||
default: false
|
||||
- name: single_file_release_use_filename
|
||||
type: checkbox
|
||||
label: Use filename as title for single file releases
|
||||
default: true
|
||||
- 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
|
||||
- name: info_activity
|
||||
type: info
|
||||
label: Account Inactivity
|
||||
default: "In order to not be disabled, you are required to login to AnimeLovers at least once every 90 days."
|
||||
|
||||
login:
|
||||
path: /api/torrents
|
||||
method: get
|
||||
error:
|
||||
- selector: a[href*="/login"]
|
||||
message:
|
||||
text: "The API key was not accepted by {{ .Config.sitelink }}."
|
||||
- selector: :root:contains("Account is Banned")
|
||||
|
||||
search:
|
||||
paths:
|
||||
# https://hdinnovations.github.io/UNIT3D/torrent_api.html
|
||||
# https://github.com/HDInnovations/UNIT3D/blob/master/app/Http/Controllers/API/TorrentController.php#L657
|
||||
- path: api/torrents/filter
|
||||
response:
|
||||
type: json
|
||||
|
||||
headers:
|
||||
Authorization: ["Bearer {{ .Config.apikey }}"]
|
||||
|
||||
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
|
||||
$raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
|
||||
name: "{{ .Keywords }}"
|
||||
seasonNumber: "{{ .Query.Season }}"
|
||||
episodeNumber: "{{ .Query.Ep }}"
|
||||
imdbId: "{{ .Query.IMDBIDShort }}"
|
||||
tmdbId: "{{ .Query.TMDBID }}"
|
||||
tvdbId: "{{ .Query.TVDBID }}"
|
||||
"free[]": "{{ if .Config.freeleech }}100{{ else }}{{ end }}"
|
||||
sortField: "{{ .Config.sort }}"
|
||||
sortDirection: "{{ .Config.type }}"
|
||||
perPage: 100
|
||||
|
||||
keywordsfilters:
|
||||
- name: re_replace
|
||||
args: ["\\.", " "]
|
||||
|
||||
rows:
|
||||
selector: data
|
||||
attribute: attributes
|
||||
|
||||
fields:
|
||||
category:
|
||||
selector: category_id
|
||||
title_optional:
|
||||
selector: name
|
||||
title_filename:
|
||||
selector: "files[0].name"
|
||||
optional: true
|
||||
files:
|
||||
selector: num_file
|
||||
title:
|
||||
text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
|
||||
details:
|
||||
selector: details_link
|
||||
download:
|
||||
selector: download_link
|
||||
infohash:
|
||||
selector: info_hash
|
||||
poster:
|
||||
selector: meta.poster
|
||||
filters:
|
||||
- name: replace
|
||||
args: ["https://via.placeholder.com/90x135", ""]
|
||||
imdbid:
|
||||
selector: imdb_id
|
||||
tmdbid:
|
||||
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: [" & ", "_&_"]
|
||||
_internal:
|
||||
selector: internal
|
||||
case:
|
||||
False: "{{ .False }}"
|
||||
True: "{{ .True }}"
|
||||
description:
|
||||
text: "{{ if .Result._internal }}Internal{{ else }}{{ end }}{{ if and .Result._internal .Result.genre }} | {{ else }}{{ end }}{{ .Result.genre }}"
|
||||
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
|
||||
_featured:
|
||||
selector: featured
|
||||
case:
|
||||
False: "{{ .False }}"
|
||||
True: "{{ .True }}"
|
||||
downloadvolumefactor_freeleech:
|
||||
# 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
|
||||
downloadvolumefactor:
|
||||
text: "{{ if .Result._featured }}0{{ else }}{{ .Result.downloadvolumefactor_freeleech }}{{ end }}"
|
||||
uploadvolumefactor_double_upload:
|
||||
# api returns False, True
|
||||
selector: double_upload
|
||||
case:
|
||||
False: 1 # normal
|
||||
True: 2 # double
|
||||
uploadvolumefactor:
|
||||
text: "{{ if .Result._featured }}2{{ else }}{{ .Result.uploadvolumefactor_double_upload }}{{ end }}"
|
||||
# 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 9.1.5
|
||||
@@ -194,4 +194,4 @@ search:
|
||||
minimumseedtime:
|
||||
# 7 days (as seconds = 7 x 24 x 60 x 60)
|
||||
text: 604800
|
||||
# json UNIT3D 9.1.7
|
||||
# json UNIT3D 9.2.0
|
||||
|
||||
@@ -193,4 +193,4 @@ search:
|
||||
minimumseedtime:
|
||||
# 3 days (as seconds = 3 x 24 x 60 x 60)
|
||||
text: 259200
|
||||
# json UNIT3D 9.1.7
|
||||
# json UNIT3D 9.2.0
|
||||
|
||||
@@ -94,8 +94,6 @@ search:
|
||||
selector: details_link
|
||||
download:
|
||||
selector: download_link
|
||||
infohash:
|
||||
selector: info_hash
|
||||
files:
|
||||
selector: num_file
|
||||
seeders:
|
||||
@@ -145,4 +143,4 @@ search:
|
||||
minimumseedtime:
|
||||
# 7 days (as seconds = 7 x 24 x 60 x 60)
|
||||
text: 604800
|
||||
# json UNIT3D 9.1.5 (custom)
|
||||
# json UNIT3D 9.1.7 (custom)
|
||||
|
||||
@@ -194,4 +194,4 @@ search:
|
||||
minimumseedtime:
|
||||
# 6 days (as seconds = 6 x 24 x 60 x 60)
|
||||
text: 518400
|
||||
# json UNIT3D 9.1.7
|
||||
# json UNIT3D 9.2.0
|
||||
|
||||
@@ -6,6 +6,8 @@ language: es-ES
|
||||
type: private
|
||||
encoding: UTF-8
|
||||
links:
|
||||
- https://emuwarez.com/
|
||||
legacylinks:
|
||||
- https://emuwarez.it/
|
||||
|
||||
caps:
|
||||
@@ -30,7 +32,7 @@ settings:
|
||||
- name: info_key
|
||||
type: info
|
||||
label: About your API key
|
||||
default: "Find or Generate a new API Token by accessing your <a href=\"https://emuwarez.it/\" target=\"_blank\">eMuwarez</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
|
||||
default: "Find or Generate a new API Token by accessing your <a href=\"https://emuwarez.com/\" target=\"_blank\">eMuwarez</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
|
||||
- name: freeleech
|
||||
type: checkbox
|
||||
label: Search freeleech only
|
||||
|
||||
@@ -30,6 +30,7 @@ caps:
|
||||
- {id: Dubbed Movies, cat: Movies/Foreign, desc: Movies Dubbed}
|
||||
- {id: Ebooks, cat: Books/EBook, desc: Books Ebook}
|
||||
- {id: English-translated, cat: TV/Anime, desc: Anime English-translated}
|
||||
- {id: Episodes HD, cat: TV/HD, desc: Episodes HD}
|
||||
- {id: Games, cat: XXX/Other, desc: Adult Games}
|
||||
- {id: Hentai, cat: XXX/Other, desc: Adult Hentai}
|
||||
- {id: Highres Movies, cat: Movies/HD, desc: Movies HD}
|
||||
|
||||
@@ -5,6 +5,8 @@ description: "ExtremeBits is a Private Torrent Tracker for EXTREME SPORTS"
|
||||
language: en-US
|
||||
type: private
|
||||
encoding: UTF-8
|
||||
certificates:
|
||||
- 0e7f0e9c468938a43058d72c69ffdb9a98e24eab # Expired 26th Nov 2025
|
||||
links:
|
||||
- https://extremebits.net/
|
||||
|
||||
|
||||
@@ -92,7 +92,7 @@ search:
|
||||
# 0 active, 1 incldead, 2 onlydead
|
||||
incldead: 1
|
||||
# 0 all, 1 notfree, 2 onlyfree
|
||||
freeleech: "{{ if .Config.freeleech }}{{ .Config.freeleech }}2{{ else }}0{{ end }}"
|
||||
freeleech: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
|
||||
lang: "{{ .Config.lang }}"
|
||||
sort: "{{ .Config.sort }}"
|
||||
order: "{{ .Config.type }}"
|
||||
|
||||
@@ -231,4 +231,4 @@ search:
|
||||
filters:
|
||||
- name: prepend
|
||||
args: "{{ .Result.description_verified }} "
|
||||
# NexusPHP v1.9.10 2025-10-30
|
||||
# NexusPHP v1.9.11 2025-11-02
|
||||
|
||||
@@ -53,6 +53,7 @@ caps:
|
||||
- {id: 41, cat: PC/Games, desc: " |-- Pc"}
|
||||
- {id: 42, cat: Console/PS3, desc: " |-- Ps3"}
|
||||
- {id: 43, cat: Console/PS4, desc: " |-- Ps4"}
|
||||
- {id: 67, cat: Console/PS4, desc: " |-- Ps5"}
|
||||
- {id: 44, cat: Console/Wii, desc: " |-- Wii"}
|
||||
- {id: 45, cat: Console/WiiU, desc: " |-- Wii-U"}
|
||||
- {id: 46, cat: Console/XBox, desc: " |-- Xbox"}
|
||||
|
||||
@@ -5,8 +5,6 @@ description: "HDGalaKtik is a RUSSIAN Semi-Private tracker for MOVIES / TV / GEN
|
||||
language: ru-RU
|
||||
type: semi-private
|
||||
encoding: UTF-8
|
||||
certificates:
|
||||
- 89cb539248b0d0cb0e92aa3f286ddfdd8347c3be # CN=mail.trackerpmr.com
|
||||
links:
|
||||
- https://www.trackerpmr.com/
|
||||
- https://freetmd.com/
|
||||
@@ -64,7 +62,7 @@ settings:
|
||||
4: created
|
||||
1: title
|
||||
5: size
|
||||
8: seeders
|
||||
7: seeders
|
||||
- name: type
|
||||
type: select
|
||||
label: Order requested from site
|
||||
@@ -87,22 +85,16 @@ login:
|
||||
selector: a[href="mybonus.php"]
|
||||
|
||||
search:
|
||||
# https://www.trackerpmr.com/browse.php?search=&stype=0&s=0&cat=0&gr=0&kp=0&im=0&incldead=1&sort=0&type=desc
|
||||
# https://www.trackerpmr.com/browse.php?cat[]=0&shw_incl_cats=0&incldead=0&search=the+fix&tag=#results
|
||||
paths:
|
||||
- path: browse.php
|
||||
inputs:
|
||||
$raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
|
||||
search: "{{ .Keywords }}"
|
||||
# 0 title, 1 descr, 2 filename, 4 infohash
|
||||
stype: 0
|
||||
# 0 AND 1 OR
|
||||
s: 0
|
||||
# release group
|
||||
gr: 0
|
||||
# ratings
|
||||
kp: 0
|
||||
# 1 active, 2 dead, 3 gold, 4 sticky, lots of others
|
||||
incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
|
||||
# $raw: "{{ range .Categories }}cat[]={{.}}&{{end}}"
|
||||
cat[]: 0
|
||||
shw_incl_cats: 0
|
||||
# 0 default, 1 active, 2 dead, 3 gold, 4 sticky, lots of others
|
||||
incldead: "{{ if .Config.freeleech }}3{{ else }}0{{ end }}"
|
||||
search: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
|
||||
sort: "{{ .Config.sort }}"
|
||||
type: "{{ .Config.type }}"
|
||||
|
||||
@@ -117,18 +109,25 @@ search:
|
||||
args: ["[^a-zA-Z0-9]+", "%"]
|
||||
|
||||
rows:
|
||||
selector: div.torrent-card
|
||||
selector: div.tr-torrent-card-compact:not(:has(div.tr-sticky-highlight))
|
||||
dateheaders:
|
||||
selector: a[href*="date="]
|
||||
attribute: href
|
||||
filters:
|
||||
- name: querystring
|
||||
args: date
|
||||
- name: dateparse
|
||||
args: "yyyy-MM-dd"
|
||||
|
||||
fields:
|
||||
categorydesc:
|
||||
selector: div.category-badge
|
||||
optional: true
|
||||
default: Другое
|
||||
category:
|
||||
selector: a[href^="browse.php?cat="]
|
||||
attribute: href
|
||||
filters:
|
||||
- name: replace
|
||||
args: ["---", "Другое"]
|
||||
- name: querystring
|
||||
args: cat
|
||||
title:
|
||||
selector: a.torrent-title-link
|
||||
selector: a.tr-title-link-compact
|
||||
attribute: title
|
||||
filters:
|
||||
# normalize to SXXEYY format
|
||||
@@ -189,47 +188,32 @@ search:
|
||||
- name: append
|
||||
args: "{{ if .Config.addrussiantotitle }} RUS{{ else }}{{ end }}"
|
||||
details:
|
||||
selector: a.torrent-title-link
|
||||
selector: a.tr-title-link-compact
|
||||
attribute: href
|
||||
# there is either a magnet or a download link
|
||||
magnet:
|
||||
selector: a[href^="magnet:?xt="]
|
||||
attribute: href
|
||||
optional: true
|
||||
download:
|
||||
selector: a[href^="download.php?id="]
|
||||
attribute: href
|
||||
optional: true
|
||||
optional: true # for users that do not have DL access
|
||||
poster:
|
||||
selector: img.torrent-poster
|
||||
selector: img.tr-main-poster-compact
|
||||
attribute: src
|
||||
imdbid:
|
||||
selector: a[href^="browse.php?imdb="]
|
||||
attribute: href
|
||||
filters:
|
||||
- name: querystring
|
||||
args: imdb
|
||||
size:
|
||||
selector: a.download-link
|
||||
selector: div.tr-stat-block-compact:nth-child(3)
|
||||
seeders:
|
||||
selector: span.peers-seeders
|
||||
selector: div.tr-stat-block-compact:nth-child(4)
|
||||
leechers:
|
||||
selector: span.peers-leechers
|
||||
selector: div.tr-stat-block-compact:nth-child(5)
|
||||
grabs:
|
||||
selector: span:has(i.fa-download)
|
||||
date:
|
||||
selector: div.added-date
|
||||
filters:
|
||||
- name: timeago
|
||||
selector: div.tr-meta-info-compact span:has(i.fa-download)
|
||||
downloadvolumefactor:
|
||||
case:
|
||||
span.bg-success: 0
|
||||
span.tr-badge-free: 0
|
||||
"*": 1
|
||||
uploadvolumefactor:
|
||||
text: 1
|
||||
minimumratio:
|
||||
text: 1.0
|
||||
description:
|
||||
selector: a.tag
|
||||
selector: a.tr-tag-item-compact
|
||||
attribute: title
|
||||
# engine n/a
|
||||
|
||||
@@ -125,6 +125,8 @@ settings:
|
||||
options:
|
||||
DESC: desc
|
||||
ASC: asc
|
||||
- name: info_flaresolverr
|
||||
type: info_flaresolverr
|
||||
- name: info_activity
|
||||
type: info
|
||||
label: Account Inactivity
|
||||
@@ -187,7 +189,7 @@ search:
|
||||
# auto adjusted by site account profile
|
||||
filters:
|
||||
- name: dateparse
|
||||
args: "dd/MM/yyyy HH:mm:ss"
|
||||
args: "dd/MM/yyyyHH:mm:ss"
|
||||
seeders:
|
||||
selector: td:nth-last-child(3)
|
||||
leechers:
|
||||
|
||||
@@ -35,10 +35,12 @@ caps:
|
||||
- {id: Anime, cat: TV/Anime, desc: Anime}
|
||||
- {id: AnimeAudioLossless, cat: Audio/Lossless, desc: "Anime Audio Lossless"}
|
||||
- {id: "AnimeAudio[Lossless]", cat: Audio/Lossless, desc: "Anime Audio Lossless"}
|
||||
- {id: "AnimeAudio[Lossy]", cat: Audio/MP3, desc: "Anime Audio Lossy"}
|
||||
- {id: AnimeEnglish-translated, cat: TV/Anime, desc: "Anime English-translated"}
|
||||
- {id: "AnimeLiveAction[English-translated]", cat: TV/Anime, desc: "Anime Live Action English-translated"}
|
||||
- {id: "AnimeLiveAction[Non-English]", cat: TV/Anime, desc: "Anime Live Action Non-English"}
|
||||
- {id: "AnimeLiveAction[Raw]", cat: TV/Anime, desc: "Anime Live Action Raw"}
|
||||
- {id: AnimePictures, cat: Other, desc: Anime Pictures}
|
||||
- {id: AnimeRaw, cat: TV/Anime, desc: Anime Raw}
|
||||
- {id: AnimeSubs, cat: TV/Anime, desc: Anime Subs}
|
||||
- {id: Apps, cat: PC, desc: Apps}
|
||||
|
||||
@@ -281,6 +281,7 @@ caps:
|
||||
- {id: 2281, cat: PC/ISO, desc: "Web Security Dojo"}
|
||||
- {id: 2246, cat: PC/ISO, desc: "Whonix"}
|
||||
- {id: 2155, cat: PC/ISO, desc: "Wifislax"}
|
||||
- {id: 2229, cat: PC/ISO, desc: "XiVa Studio"}
|
||||
- {id: 2251, cat: PC/ISO, desc: "XigmaNAS"}
|
||||
- {id: 607, cat: PC/ISO, desc: "Xubuntu"}
|
||||
- {id: 612, cat: PC/ISO, desc: "Zen"}
|
||||
|
||||
@@ -182,4 +182,4 @@ search:
|
||||
description:
|
||||
selector: td.rowfollow:nth-child(2)
|
||||
remove: a, b, font, img, span
|
||||
# NexusPHP v1.9.9 2025-10-02
|
||||
# NexusPHP v1.9.11 2025-11-02
|
||||
|
||||
@@ -9,17 +9,12 @@ encoding: UTF-8
|
||||
links:
|
||||
- https://magnetcatcat.com/
|
||||
- https://clmclm.com/
|
||||
- https://www.8800519.xyz/
|
||||
- https://www.8800521.xyz/
|
||||
- https://www.8800522.xyz/
|
||||
- https://www.8800523.xyz/
|
||||
- https://www.8800524.xyz/
|
||||
- https://www.8800525.xyz/
|
||||
- https://www.8800528.xyz/
|
||||
- https://www.8800527.xyz/
|
||||
legacylinks:
|
||||
- https://www.clm472.sbs/
|
||||
- https://www.8800500.xyz/
|
||||
- https://www.8800503.xyz/
|
||||
- https://www.8800504.xyz/
|
||||
- https://www.8800505.xyz/
|
||||
- https://www.8800506.xyz/
|
||||
- https://www.8800507.xyz/
|
||||
- https://www.8800508.xyz/
|
||||
- https://www.8800509.xyz/
|
||||
@@ -31,6 +26,11 @@ legacylinks:
|
||||
- https://www.8800517.xyz/
|
||||
- https://www.8800518.xyz/
|
||||
- https://www.8800520.xyz/
|
||||
- https://www.8800519.xyz/
|
||||
- https://www.8800521.xyz/
|
||||
- https://www.8800522.xyz/
|
||||
- https://www.8800523.xyz/
|
||||
- https://www.8800526.xyz/
|
||||
|
||||
caps:
|
||||
categorymappings:
|
||||
|
||||
@@ -32,7 +32,7 @@ search:
|
||||
paths:
|
||||
- path: search
|
||||
inputs:
|
||||
q: "{{ if .Keywords }}{{ .Keywords }}{{ else }}*{{ end }}"
|
||||
query: "{{ if .Keywords }}{{ .Keywords }}{{ else }}*{{ end }}"
|
||||
|
||||
rows:
|
||||
selector: a.list-group-item
|
||||
|
||||
@@ -15,7 +15,7 @@ caps:
|
||||
- {id: 23, cat: Movies/Other, desc: "Animációk"}
|
||||
# - {id: 61, cat: Movies/Other, desc: "Cam/EN"}
|
||||
- {id: 60, cat: Movies/Other, desc: "Cam/HU"}
|
||||
# - {id: 45, cat: Books/EBook, desc: "eBook/EN"}
|
||||
- {id: 45, cat: Books/EBook, desc: "eBook/EN"}
|
||||
- {id: 40, cat: Books/EBook, desc: "eBook/HU"}
|
||||
# - {id: 20, cat: Movies/DVD, desc: "Film/DVD9"}
|
||||
- {id: 48, cat: Movies/HD, desc: "Film/EN/1080p"}
|
||||
@@ -31,7 +31,7 @@ caps:
|
||||
- {id: 62, cat: Movies/UHD, desc: "Film/HU/UHD"}
|
||||
- {id: 4, cat: PC/Games, desc: "Játékok/ISO"}
|
||||
- {id: 39, cat: PC/Games, desc: "Játékok/Rip/Dox"}
|
||||
# - {id: 47, cat: Other, desc: "Klippek"}
|
||||
- {id: 47, cat: Other, desc: "Klippek"}
|
||||
- {id: 30, cat: Audio/Lossless, desc: "Lossless/EN"}
|
||||
# - {id: 29, cat: Audio/Lossless, desc: "Lossless/HU"}
|
||||
- {id: 25, cat: Audio/MP3, desc: "MP3/EN"}
|
||||
@@ -125,7 +125,7 @@ search:
|
||||
img[src="/pic/categories/cat_anime.gif"]: 23
|
||||
# img[src="/pic/categories/061.png"]: 61
|
||||
img[src="/pic/categories/061.png"]: 60
|
||||
# img[]: 45
|
||||
img[src="/pic/categories/017.png"]: 45
|
||||
img[src="/pic/categories/016.png"]: 40
|
||||
# img[]: 20
|
||||
img[src="/pic/categories/010.png"]: 48
|
||||
@@ -141,7 +141,7 @@ search:
|
||||
img[src="/pic/categories/uhd_hun.png"]: 62
|
||||
img[src="/pic/categories/021.png"]: 4
|
||||
img[src="/pic/categories/cat_games.gif"]: 39
|
||||
# img[]: 47
|
||||
img[src="/pic/categories/026.png"]: 47
|
||||
img[src="/pic/categories/024.png"]: 30
|
||||
# img[]: 29
|
||||
img[src="/pic/categories/023.png"]: 25
|
||||
|
||||
@@ -23,19 +23,11 @@ caps:
|
||||
search: [q]
|
||||
|
||||
settings:
|
||||
- name: username
|
||||
- name: cookie
|
||||
type: text
|
||||
label: Username
|
||||
- name: password
|
||||
type: password
|
||||
label: Password
|
||||
- name: 2facode
|
||||
type: text
|
||||
label: 2FA code
|
||||
- name: info_2fa
|
||||
type: info
|
||||
label: "About 2FA code"
|
||||
default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the NicePT Web Site. Otherwise just leave it empty."
|
||||
label: Cookie
|
||||
- name: info_cookie
|
||||
type: info_cookie
|
||||
- name: freeleech
|
||||
type: checkbox
|
||||
label: Search freeleech only
|
||||
@@ -66,20 +58,10 @@ settings:
|
||||
default: "Account retention rules:<ol><li>Veteran Users users and above will be retained forever</li><li>Elite Users and above will not have their account deleted after parking (in the Control Panel)</li><li>Users with a parked account will be deleted if they do not log in for 400 consecutive days</li><li>Users with a non-parked account will be banned if they do not log in for 40 consecutive days</li><li>Users with no traffic (ie, upload/download data are both 0) will be banned if they do not log in for 7 consecutive days.</li></ol>"
|
||||
|
||||
login:
|
||||
path: login.php
|
||||
method: form
|
||||
form: form[action="takelogin.php"]
|
||||
captcha:
|
||||
type: image
|
||||
selector: img[alt="CAPTCHA"]
|
||||
input: imagestring
|
||||
# using cookie method because site does a JS call to API/Challenge via JQuery to load response parm required for takelogin.php
|
||||
method: cookie
|
||||
inputs:
|
||||
secret: ""
|
||||
username: "{{ .Config.username }}"
|
||||
password: "{{ .Config.password }}"
|
||||
two_step_code: "{{ .Config.2facode }}"
|
||||
error:
|
||||
- selector: td.embedded:has(h2:contains("失败"))
|
||||
cookie: "{{ .Config.cookie }}"
|
||||
test:
|
||||
path: index.php
|
||||
selector: a[href="logout.php"]
|
||||
@@ -187,4 +169,4 @@ search:
|
||||
filters:
|
||||
- name: prepend
|
||||
args: "{{ .Result.description_verified }} "
|
||||
# NexusPHP v1.9.4 2025-06-01
|
||||
# NexusPHP v1.9.11 2025-11-02
|
||||
|
||||
@@ -10,8 +10,7 @@ type: public
|
||||
encoding: UTF-8
|
||||
# to fetch current domain use https://www.rantop.org/
|
||||
links:
|
||||
- https://www.nortorrent.town/
|
||||
- https://nortorrent-proxy.site/
|
||||
- https://ww1-nortorrent.town/
|
||||
legacylinks:
|
||||
# latest domains list
|
||||
- https://www.rantop.org/
|
||||
@@ -27,10 +26,6 @@ legacylinks:
|
||||
- https://www.site-torrent.com/
|
||||
- https://www.rantop.my/
|
||||
# actual legacylinks
|
||||
- https://www.torrent9.run/
|
||||
- https://www.torrent9.cv/
|
||||
- https://www.torrent9.ke/
|
||||
- https://www.torrent9.gdn/
|
||||
- https://www.torrent9.men/
|
||||
- https://www.torrent9.icu/
|
||||
- https://www-torrent9.com/
|
||||
@@ -42,6 +37,10 @@ legacylinks:
|
||||
- https://www.nortorrent5.com/
|
||||
- https://www.nortorrent6.com/
|
||||
- https://www.nortorrent.net/
|
||||
- https://www.nortorrent.town/
|
||||
- https://nortorrent-proxy.site/
|
||||
- https://ww1-nortorrent.me/
|
||||
- https://www.nortorrent.rent/
|
||||
|
||||
caps:
|
||||
categorymappings:
|
||||
|
||||
@@ -183,4 +183,4 @@ search:
|
||||
description:
|
||||
selector: td:nth-child(2)
|
||||
remove: a, b, font, img, span
|
||||
# NexusPHP v1.9.6 2025-06-25
|
||||
# NexusPHP v1.9.11 2025-11-02
|
||||
|
||||
@@ -194,4 +194,4 @@ search:
|
||||
description:
|
||||
selector: td.rowfollow:nth-child(2)
|
||||
remove: a, b, font, img, span
|
||||
# NexusPHP v1.9.6 2025-06-25
|
||||
# NexusPHP v1.9.11 2025-11-02
|
||||
|
||||
@@ -1,71 +0,0 @@
|
||||
---
|
||||
id: qbite
|
||||
name: Qbite (Hubite)
|
||||
description: "Qbite (Hubite) is a Public Torrent Tracker for 3X"
|
||||
language: en-US
|
||||
type: public
|
||||
encoding: UTF-8
|
||||
links:
|
||||
- https://qbite.top/
|
||||
|
||||
caps:
|
||||
categorymappings:
|
||||
- {id: XXX, cat: XXX, desc: "XXX"}
|
||||
|
||||
modes:
|
||||
search: [q]
|
||||
|
||||
settings: []
|
||||
|
||||
download:
|
||||
selectors:
|
||||
- selector: a[href^="magnet:?xt="]
|
||||
attribute: href
|
||||
|
||||
search:
|
||||
paths:
|
||||
# https://qbite.top/?do=search&subaction=search&story=2025
|
||||
- path: /
|
||||
inputs:
|
||||
do: search
|
||||
subaction: search
|
||||
story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
|
||||
|
||||
rows:
|
||||
selector: div.modelCard-box
|
||||
|
||||
fields:
|
||||
category:
|
||||
text: XXX
|
||||
title:
|
||||
selector: a.modelCard-image
|
||||
attribute: title
|
||||
details:
|
||||
selector: a.modelCard-image
|
||||
attribute: href
|
||||
download:
|
||||
selector: a.modelCard-image
|
||||
attribute: href
|
||||
poster:
|
||||
# will often fails with 429 Too Many Request so not sure if its worth including
|
||||
selector: img[src*="/poster/"]
|
||||
attribute: src
|
||||
date:
|
||||
selector: div.media-item > span
|
||||
filters:
|
||||
- name: append
|
||||
args: " +03:00" # MSK
|
||||
- name: dateparse
|
||||
args: "d-MM-yyyy zzz"
|
||||
size:
|
||||
selector: a.modelCard-profileTag
|
||||
seeders:
|
||||
# site uses a JS random number generator 1-1000 for seed/leech
|
||||
text: 1
|
||||
leechers:
|
||||
text: 1
|
||||
downloadvolumefactor:
|
||||
text: 0
|
||||
uploadvolumefactor:
|
||||
text: 1
|
||||
# Engine n/a
|
||||
@@ -227,4 +227,4 @@ search:
|
||||
filters:
|
||||
- name: prepend
|
||||
args: "{{ .Result.description_verified }} "
|
||||
# NexusPHP v1.9.3 2025-05-24
|
||||
# NexusPHP v1.9.11 2025-11-02
|
||||
|
||||
@@ -8,39 +8,40 @@ language: ru-RU
|
||||
type: semi-private
|
||||
encoding: windows-1251
|
||||
followredirect: true
|
||||
# alternate TLDs are: buzz, homes, mom, online, shop, top and xyz
|
||||
links:
|
||||
- https://nov16.rudub.pics/
|
||||
- https://dec09.rudub.bet/
|
||||
legacylinks:
|
||||
- https://nov01.rudub.homes/
|
||||
- http://nov02.rudub.homes/
|
||||
- https://nov02.rudub.homes/
|
||||
- http://nov03.rudub.homes/
|
||||
- https://nov03.rudub.homes/
|
||||
- http://nov04.rudub.homes/
|
||||
- https://nov04.rudub.homes/
|
||||
- http://nov05.rudub.homes/
|
||||
- https://nov05.rudub.homes/
|
||||
- http://nov06.rudub.homes/
|
||||
- https://nov06.rudub.homes/
|
||||
- http://nov07.rudub.pics/
|
||||
- https://nov07.rudub.pics/
|
||||
- http://nov08.rudub.pics/
|
||||
- https://nov08.rudub.pics/
|
||||
- http://nov09.rudub.pics/
|
||||
- https://nov09.rudub.pics/
|
||||
- http://nov10.rudub.pics/
|
||||
- https://nov10.rudub.pics/
|
||||
- http://nov11.rudub.pics/
|
||||
- https://nov11.rudub.pics/
|
||||
- http://nov12.rudub.pics/
|
||||
- https://nov12.rudub.pics/
|
||||
- http://nov13.rudub.pics/
|
||||
- https://nov13.rudub.pics/
|
||||
- http://nov14.rudub.pics/
|
||||
- https://nov14.rudub.pics/
|
||||
- http://nov15.rudub.pics/
|
||||
- https://nov15.rudub.pics/
|
||||
- http://nov16.rudub.pics/
|
||||
- http://nov25.rudub.world/
|
||||
- https://nov25.rudub.world/
|
||||
- http://nov26.rudub.world/
|
||||
- https://nov26.rudub.world/
|
||||
- http://nov27.rudub.world/
|
||||
- https://nov27.rudub.world/
|
||||
- http://nov28.rudub.world/
|
||||
- https://nov28.rudub.world/
|
||||
- http://nov29.rudub.world/
|
||||
- https://nov29.rudub.world/
|
||||
- http://nov30.rudub.world/
|
||||
- https://nov30.rudub.world/
|
||||
- http://dec01.rudub.world/
|
||||
- https://dec01.rudub.world/
|
||||
- http://dec02.rudub.world/
|
||||
- https://dec02.rudub.world/
|
||||
- http://dec03.rudub.world/
|
||||
- https://dec03.rudub.world/
|
||||
- http://dec04.rudub.world/
|
||||
- https://dec04.rudub.world/
|
||||
- http://dec05.rudub.world/
|
||||
- https://dec05.rudub.world/
|
||||
- http://dec06.rudub.world/
|
||||
- https://dec06.rudub.world/
|
||||
- http://dec07.rudub.world/
|
||||
- https://dec07.rudub.world/
|
||||
- http://dec08.rudub.world/
|
||||
- https://dec08.rudub.world/
|
||||
- https://dec08.rudub.bet/
|
||||
- http://dec09.rudub.bet/
|
||||
caps:
|
||||
categorymappings:
|
||||
- {id: 1, cat: TV, desc: "TV"}
|
||||
|
||||
@@ -115,8 +115,6 @@ search:
|
||||
selector: details_link
|
||||
download:
|
||||
selector: download_link
|
||||
infohash:
|
||||
selector: info_hash
|
||||
poster:
|
||||
selector: meta.poster
|
||||
filters:
|
||||
@@ -188,4 +186,4 @@ search:
|
||||
minimumseedtime:
|
||||
# 7 days (as seconds = 7 x 24 x 60 x 60)
|
||||
text: 604800
|
||||
# json UNIT3D 9.1.5
|
||||
# json UNIT3D 9.1.7
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
---
|
||||
id: sktorrent
|
||||
name: SkTorrent
|
||||
description: "SkTorrent is a CZECH/SLOVAK Semi-Private Torrent Tracker for MOVIES / TV / GENERAL"
|
||||
name: Sk-CzTorrent
|
||||
description: "Sk-CzTorrent is a CZECH/SLOVAK Semi-Private Torrent Tracker for MOVIES / TV / GENERAL"
|
||||
language: cs-CZ
|
||||
type: semi-private
|
||||
encoding: UTF-8
|
||||
@@ -74,14 +74,9 @@ login:
|
||||
path: torrent/index.php
|
||||
selector: a[href^="usercp.php"]
|
||||
|
||||
download:
|
||||
selectors:
|
||||
- selector: a[href^="download.php?id="]
|
||||
attribute: href
|
||||
|
||||
search:
|
||||
paths:
|
||||
- path: torrent/torrents_v2.php
|
||||
- path: torrent/torrents.php
|
||||
inputs:
|
||||
search: "{{ .Keywords }}"
|
||||
category: "{{ range .Categories }}{{.}};{{end}}"
|
||||
@@ -93,17 +88,18 @@ search:
|
||||
args: replace
|
||||
|
||||
rows:
|
||||
selector: table.lista > tbody > tr > td > table.lista > tbody > tr > td:has(a[href^="details.php?name="])
|
||||
selector: table.lista > tbody > tr > td > table.lista > tbody > tr:has(a[href^="download.php?id="])
|
||||
|
||||
fields:
|
||||
category:
|
||||
selector: a[href^="torrents_v2.php?category="]
|
||||
selector: a[href^="torrents.php?category="]
|
||||
attribute: href
|
||||
filters:
|
||||
- name: querystring
|
||||
args: category
|
||||
title:
|
||||
selector: a[href^="details.php?name="]
|
||||
selector: a[href^="details.php?id="]
|
||||
attribute: title
|
||||
filters:
|
||||
- name: re_replace
|
||||
args: ["^VA\\s*\\|", "VA -"]
|
||||
@@ -188,39 +184,43 @@ search:
|
||||
- name: re_replace
|
||||
args: ["(?i)komplet (\\d{1})\\-(\\d{1})", "komplet S0$1-S0$2"]
|
||||
details:
|
||||
selector: a[href^="details.php?name="]
|
||||
selector: a[href^="details.php?id="]
|
||||
attribute: href
|
||||
download:
|
||||
selector: a[href^="download.php?id="]
|
||||
attribute: href
|
||||
poster:
|
||||
selector: img[class="lozad"]
|
||||
attribute: data-src
|
||||
download:
|
||||
selector: a[href^="details.php?name="]
|
||||
attribute: href
|
||||
selector: a[href^="#"]
|
||||
attribute: onmouseover
|
||||
filters:
|
||||
- name: regexp
|
||||
args: "src=(.+?) width"
|
||||
- name: prepend
|
||||
args: "https:"
|
||||
size:
|
||||
selector: div:has(a)
|
||||
selector: td:nth-child(3)
|
||||
filters:
|
||||
- name: regexp
|
||||
args: "Velkost (.+?) \\|"
|
||||
date:
|
||||
selector: div:has(a)
|
||||
# auto adjusted by site account profile
|
||||
selector: td:nth-child(3)
|
||||
filters:
|
||||
- name: regexp
|
||||
args: "Pridany (\\d{2}/\\d{2}/\\d{4})"
|
||||
args: "Pridany (\\d{2}/\\d{2}/\\d{4} o \\d{2}:\\d{2})"
|
||||
- name: replace
|
||||
args: [" o ", " "]
|
||||
- name: append
|
||||
args: " +01:00" # CET
|
||||
- name: dateparse
|
||||
args: "dd/MM/yyyy"
|
||||
args: "dd/MM/yyyy HH:mm zzz"
|
||||
seeders:
|
||||
selector: div:has(a)
|
||||
filters:
|
||||
- name: regexp
|
||||
args: "Odosielaju : (\\d+)"
|
||||
selector: td:nth-child(5)
|
||||
leechers:
|
||||
selector: div:has(a)
|
||||
filters:
|
||||
- name: regexp
|
||||
args: "Stahuju : (\\d+)"
|
||||
selector: td:nth-child(6)
|
||||
grabs:
|
||||
selector: td:nth-child(7)
|
||||
genre:
|
||||
selector: div:has(a)
|
||||
selector: td:nth-child(3)
|
||||
filters:
|
||||
- name: replace
|
||||
args: ["\n", ""]
|
||||
|
||||
@@ -6,10 +6,11 @@ language: ru-RU
|
||||
type: public
|
||||
encoding: UTF-8
|
||||
links:
|
||||
- https://sosulki.com/
|
||||
- https://sosulki.hlom.ru/
|
||||
legacylinks:
|
||||
- http://sosulki.net/
|
||||
- http://sosulki.com/ # site forces https
|
||||
- https://sosulki.com/
|
||||
caps:
|
||||
categorymappings:
|
||||
- {id: 12, cat: XXX, desc: "Порно категории"}
|
||||
@@ -46,7 +47,7 @@ search:
|
||||
- path: "{{ if .Keywords }}?do=search&subaction=search&search_start=0&full_search=1&result_from=1&story={{ .Keywords }}&titleonly=3&catlist[]=0&searchdate=0&resorder=desc{{ else }}lastnews/{{ end }}"
|
||||
|
||||
rows:
|
||||
selector: tr.fr_viewn_in:has(td.frs:contains("B"))
|
||||
selector: tr.fr_viewn_in
|
||||
|
||||
fields:
|
||||
category:
|
||||
|
||||
@@ -40,6 +40,10 @@ settings:
|
||||
type: checkbox
|
||||
label: Search freeleech only
|
||||
default: false
|
||||
- name: tmdbidonly
|
||||
type: checkbox
|
||||
label: Disable IMDB and TVDB ID search (only support TMDB ID) to potentially improve Sonarr and Radarr results
|
||||
default: false
|
||||
- name: multilang
|
||||
type: checkbox
|
||||
label: Replace MULTi by another language in release name
|
||||
@@ -110,9 +114,9 @@ search:
|
||||
name: "{{ .Keywords }}"
|
||||
seasonNumber: "{{ .Query.Season }}"
|
||||
episodeNumber: "{{ .Query.Ep }}"
|
||||
imdbId: "{{ .Query.IMDBIDShort }}"
|
||||
imdbId: "{{ if .Config.tmdbidonly }}{{ else }}{{ .Query.IMDBIDShort }}{{ end }}"
|
||||
tmdbId: "{{ .Query.TMDBID }}"
|
||||
tvdbId: "{{ .Query.TVDBID }}"
|
||||
tvdbId: "{{ if .Config.tmdbidonly }}{{ else }}{{ .Query.TVDBID }}{{ end }}"
|
||||
"free[]": "{{ if .Config.freeleech }}100{{ else }}{{ end }}"
|
||||
sortField: "{{ .Config.sort }}"
|
||||
sortDirection: "{{ .Config.type }}"
|
||||
|
||||
@@ -36,7 +36,7 @@ settings:
|
||||
|
||||
search:
|
||||
paths:
|
||||
- path: "search/{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
|
||||
- path: "search/{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}/"
|
||||
|
||||
rows:
|
||||
selector: table#archiveResult tbody tr:has(a[href^="magnet:?xt="])
|
||||
|
||||
@@ -7,16 +7,11 @@ type: public
|
||||
encoding: UTF-8
|
||||
followredirect: true
|
||||
links:
|
||||
- https://torrentqq394.com/
|
||||
- https://torrentegg83.com/
|
||||
- https://torrentqq397.com/
|
||||
- https://torrentegg85.com/
|
||||
legacylinks:
|
||||
- https://torrentegg68.com/
|
||||
- https://torrentegg69.com/
|
||||
- https://torrentqq379.com/
|
||||
- https://torrentegg70.com/
|
||||
- https://torrentqq380.com/
|
||||
- https://torrentegg71.com/
|
||||
- https://torrentqq381.com/
|
||||
- https://torrentqq382.com/
|
||||
- https://torrentegg72.com/
|
||||
- https://torrentegg73.com/
|
||||
@@ -40,6 +35,11 @@ legacylinks:
|
||||
- https://torrentqq392.com/
|
||||
- https://torrentegg82.com/
|
||||
- https://torrentqq393.com/
|
||||
- https://torrentqq394.com/
|
||||
- https://torrentqq395.com/
|
||||
- https://torrentegg83.com/
|
||||
- https://torrentqq396.com/
|
||||
- https://torrentegg84.com/
|
||||
|
||||
caps:
|
||||
categorymappings:
|
||||
|
||||
@@ -9,11 +9,8 @@ followredirect: true
|
||||
requestDelay: 2
|
||||
# to fetch current domain use https://tzip.top/
|
||||
links:
|
||||
- https://torrentsome221.com/
|
||||
- https://torrentsome224.com/
|
||||
legacylinks:
|
||||
- https://torrentsome206.com/
|
||||
- https://torrentsome207.com/
|
||||
- https://torrentsome208.com/
|
||||
- https://torrentsome209.com/
|
||||
- https://torrentsome210.com/
|
||||
- https://torrentsome211.com/
|
||||
@@ -26,6 +23,9 @@ legacylinks:
|
||||
- https://torrentsome218.com/
|
||||
- https://torrentsome219.com/
|
||||
- https://torrentsome220.com/
|
||||
- https://torrentsome221.com/
|
||||
- https://torrentsome222.com/
|
||||
- https://torrentsome223.com/
|
||||
|
||||
caps:
|
||||
categorymappings:
|
||||
|
||||
@@ -9,11 +9,8 @@ followredirect: true
|
||||
requestDelay: 2
|
||||
# to fetch current domain use https://tzip.top/
|
||||
links:
|
||||
- https://torrenttip202.top/
|
||||
- https://torrenttip205.top/
|
||||
legacylinks:
|
||||
- https://torrenttip187.top/
|
||||
- https://torrenttip188.top/
|
||||
- https://torrenttip189.top/
|
||||
- https://torrenttip190.top/
|
||||
- https://torrenttip191.top/
|
||||
- https://torrenttip192.top/
|
||||
@@ -26,6 +23,9 @@ legacylinks:
|
||||
- https://torrenttip199.top/
|
||||
- https://torrenttip200.top/
|
||||
- https://torrenttip201.top/
|
||||
- https://torrenttip202.top/
|
||||
- https://torrenttip203.top/
|
||||
- https://torrenttip204.top/
|
||||
|
||||
caps:
|
||||
categorymappings:
|
||||
|
||||
@@ -171,4 +171,4 @@ search:
|
||||
description:
|
||||
selector: td:nth-child(2)
|
||||
remove: a, b, font, img, span
|
||||
# NexusPHP v1.9.10 2025-10-30
|
||||
# NexusPHP v1.9.11 2025-11-02
|
||||
|
||||
@@ -8,8 +8,8 @@ encoding: UTF-8
|
||||
requestDelay: 2.5 # 2.5 requests per second (2 causes problems)
|
||||
links:
|
||||
# if the primary domain changes then don't forget to update the details, download and poster replace args
|
||||
- https://yts.mx/
|
||||
# official domain list are at https://yifystatus.com/ and official proxies list are at https://ytsproxies.com/
|
||||
- https://yts.lt/
|
||||
# official domain list are at https://yifystatus.com/ and official proxies list are at https://ytsproxies.com/
|
||||
- https://yts.unblockninja.com/
|
||||
- https://yts.ninjaproxy1.com/
|
||||
- https://yts.proxyninja.org/
|
||||
@@ -17,9 +17,9 @@ links:
|
||||
- https://yts.torrentbay.st/
|
||||
- https://yts.torrentsbay.org/
|
||||
legacylinks:
|
||||
- https://yts.lt/
|
||||
- https://yts.am/
|
||||
- https://yts.ag/
|
||||
- https://yts.mx/
|
||||
- https://yts.mrunblock.bond/
|
||||
- https://yts.nocensor.cloud/
|
||||
- https://yts.unblockit.download/
|
||||
@@ -104,19 +104,19 @@ search:
|
||||
selector: ..url
|
||||
filters:
|
||||
- name: re_replace
|
||||
args: ["^https?:\\/\\/yts\\.mx\\/", "{{ .Config.sitelink }}"] # fix for 12494
|
||||
args: ["^https?:\\/\\/yts\\.(mx|lt)\\/", "{{ .Config.sitelink }}"] # fix for 12494
|
||||
download:
|
||||
selector: url
|
||||
filters:
|
||||
- name: re_replace
|
||||
args: ["^https?:\\/\\/yts\\.mx\\/", "{{ .Config.sitelink }}"] # fix for 12494
|
||||
args: ["^https?:\\/\\/yts\\.(mx|lt)\\/", "{{ .Config.sitelink }}"] # fix for 12494
|
||||
infohash:
|
||||
selector: hash
|
||||
poster:
|
||||
selector: ..large_cover_image
|
||||
filters:
|
||||
- name: re_replace
|
||||
args: ["^https?:\\/\\/yts\\.mx\\/", "{{ .Config.sitelink }}"] # fix for 12494
|
||||
args: ["^https?:\\/\\/yts\\.(mx|lt)\\/", "{{ .Config.sitelink }}"] # fix for 12494
|
||||
imdbid:
|
||||
selector: ..imdb_code
|
||||
date:
|
||||
|
||||
@@ -5,6 +5,8 @@ description: "Zelka (Zamunda) is a BULGARIAN Private Torrent Tracker for 0DAY /
|
||||
language: bg-BG
|
||||
type: private
|
||||
encoding: windows-1251
|
||||
certificates:
|
||||
- 996dbb1ef245699bdd5ea796b704c220c684b626 # Expired 29th Nov 2025
|
||||
links:
|
||||
- https://zelka.org/
|
||||
- https://zamunda.se/
|
||||
|
||||
@@ -7,8 +7,7 @@ type: public
|
||||
encoding: UTF-8
|
||||
# to fetch current domain use https://www.rantop.org/
|
||||
links:
|
||||
- https://www.zetorrents.town/
|
||||
- https://zetorrents-proxy.site/
|
||||
- https://ww1-zetorrents.town/
|
||||
legacylinks:
|
||||
# latest domains list
|
||||
- https://www.rantop.org/
|
||||
@@ -23,12 +22,6 @@ legacylinks:
|
||||
- https://www.site-torrent.com/
|
||||
- https://www.rantop.my/
|
||||
# actual legacylinks
|
||||
- https://www.zetorrents.nl/
|
||||
- https://www.zetorrents.biz/
|
||||
- https://www.zetorrents.ch/
|
||||
- https://zetorrents.mrunblock.bond/
|
||||
- https://zetorrents.nocensor.cloud/
|
||||
- https://www.zetorrents.pw/
|
||||
- https://www.zetorrents.tw/
|
||||
- https://www.zetorrents.in/
|
||||
- https://www.zetorrents.vg/
|
||||
@@ -40,6 +33,10 @@ legacylinks:
|
||||
- https://www.zetorrents1.com/
|
||||
- https://www.zetorrents.diy/
|
||||
- https://www.zetorrents2.com/
|
||||
- https://www.zetorrents.town/
|
||||
- https://zetorrents-proxy.site/
|
||||
- https://ww1-zetorrents.me/
|
||||
- https://www.zetorrents.rent/
|
||||
|
||||
caps:
|
||||
categories:
|
||||
|
||||
@@ -9,8 +9,7 @@ type: public
|
||||
encoding: UTF-8
|
||||
# to fetch current domain use https://www.rantop.org/
|
||||
links:
|
||||
- https://www.zktorrent.town/
|
||||
- https://zktorrent-proxy.site/
|
||||
- https://ww1-zktorrent.town/
|
||||
legacylinks:
|
||||
# latest domains list
|
||||
- https://www.rantop.org/
|
||||
@@ -26,10 +25,6 @@ legacylinks:
|
||||
- https://www.site-torrent.com/
|
||||
- https://www.rantop.my/
|
||||
# actual legacylinks
|
||||
- https://www.gktorrent.si/
|
||||
- https://www.gktorrent.my/
|
||||
- https://www.gktorrent.cz/
|
||||
- https://www.gktorrent.ke/
|
||||
- https://www.gktorrent.cv/
|
||||
- https://wvw-gktorrent.com/
|
||||
- https://www-gktorrent.com/
|
||||
@@ -41,6 +36,10 @@ legacylinks:
|
||||
- https://www.zktorrent5.com/
|
||||
- https://www.zktorrent.net/
|
||||
- https://www.zktorrent6.com/
|
||||
- https://www.zktorrent.town/
|
||||
- https://zktorrent-proxy.site/
|
||||
- https://ww1-zktorrent.me/
|
||||
- https://www.zktorrent.rent/
|
||||
|
||||
caps:
|
||||
categorymappings:
|
||||
|
||||
34
src/Jackett.Common/Extensions/HashingExtensions.cs
Normal file
34
src/Jackett.Common/Extensions/HashingExtensions.cs
Normal file
@@ -0,0 +1,34 @@
|
||||
using System.Security.Cryptography;
|
||||
using System.Text;
|
||||
|
||||
namespace Jackett.Common.Extensions
|
||||
{
|
||||
public static class HashingExtensions
|
||||
{
|
||||
public static string SHA1Hash(this string input)
|
||||
{
|
||||
using var hash = SHA1.Create();
|
||||
|
||||
return GetHash(hash.ComputeHash(Encoding.UTF8.GetBytes(input)));
|
||||
}
|
||||
|
||||
public static string SHA256Hash(this string input)
|
||||
{
|
||||
using var hash = SHA256.Create();
|
||||
|
||||
return GetHash(hash.ComputeHash(Encoding.UTF8.GetBytes(input)));
|
||||
}
|
||||
|
||||
private static string GetHash(byte[] bytes)
|
||||
{
|
||||
var stringBuilder = new StringBuilder();
|
||||
|
||||
foreach (var b in bytes)
|
||||
{
|
||||
stringBuilder.Append(b.ToString("x2"));
|
||||
}
|
||||
|
||||
return stringBuilder.ToString();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -8,10 +8,8 @@ using System.Xml.Linq;
|
||||
using Jackett.Common.Extensions;
|
||||
using Jackett.Common.Models;
|
||||
using Jackett.Common.Models.IndexerConfig.Bespoke;
|
||||
using Jackett.Common.Serializer;
|
||||
using Jackett.Common.Services.Interfaces;
|
||||
using Jackett.Common.Utils.Clients;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Newtonsoft.Json;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using NLog;
|
||||
@@ -106,8 +104,16 @@ namespace Jackett.Common.Indexers.Definitions
|
||||
|
||||
foreach (var releaseId in torrentIds)
|
||||
{
|
||||
var torrentsResponse = await RequestWithCookiesAsync($"{ApiBase}anime/torrents/{releaseId}");
|
||||
releases.AddRange(MapToReleaseInfo(torrentsResponse));
|
||||
var url = $"{ApiBase}anime/torrents/{releaseId}";
|
||||
try
|
||||
{
|
||||
var torrentsResponse = await RequestWithCookiesAsync(url);
|
||||
releases.AddRange(MapToReleaseInfo(torrentsResponse));
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger.Error(ex, "Anilibria: Failed to load url [{0}]: {1}", url, ex.Message);
|
||||
}
|
||||
}
|
||||
|
||||
return releases;
|
||||
@@ -123,8 +129,16 @@ namespace Jackett.Common.Indexers.Definitions
|
||||
|
||||
foreach (var releaseId in releaseIds)
|
||||
{
|
||||
var torrentsResponse = await RequestWithCookiesAsync($"{ApiBase}anime/torrents/release/{releaseId}");
|
||||
releases.AddRange(MapToReleaseInfo(torrentsResponse));
|
||||
var url = $"{ApiBase}anime/torrents/release/{releaseId}";
|
||||
try
|
||||
{
|
||||
var torrentsResponse = await RequestWithCookiesAsync(url);
|
||||
releases.AddRange(MapToReleaseInfo(torrentsResponse));
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger.Error(ex, "Anilibria: Failed to load url [{0}]: {1}", url, ex.Message);
|
||||
}
|
||||
}
|
||||
|
||||
return releases;
|
||||
@@ -204,44 +218,36 @@ namespace Jackett.Common.Indexers.Definitions
|
||||
seasonPart = Regex.Replace(seasonPart, @"\b\d{4}\b$", "");
|
||||
var hasPartNumber = Regex.IsMatch(seasonPart, @"\bPart\s+\d+\b", RegexOptions.IgnoreCase);
|
||||
var seasonMatch = Regex.Match(seasonPart,
|
||||
@"\b(?:Season|S|Series)\s*(\d+)|\b(\d+)(?:st|nd|rd|th)?\s*Season\b|\b([IVXLCDM]+)\b|\b(\d+)\b",
|
||||
@"\b(?:Season|S|Series)\s*(?<season_number>\d+)|\b(?<season_number>\d+)(?:st|nd|rd|th)?\s*Season\b|\b(?<roman_number>M{0,4}(CM|CD|D?C{0,3})(XC|XL|L?X{0,3})(IX|IV|V?I{0,3}))\b|\b(?<season_number>\d+)\b",
|
||||
RegexOptions.IgnoreCase);
|
||||
var season = "S01";
|
||||
|
||||
if (seasonMatch.Success && !hasPartNumber)
|
||||
{
|
||||
if (!string.IsNullOrEmpty(seasonMatch.Groups[1].Value))
|
||||
if (seasonMatch.Groups["season_number"].Success
|
||||
&& !string.IsNullOrWhiteSpace(seasonMatch.Groups["season_number"].Value)
|
||||
&& int.TryParse(seasonMatch.Groups["season_number"].Value, out var seasonNumber))
|
||||
{
|
||||
season = $"S{int.Parse(seasonMatch.Groups[1].Value):D2}";
|
||||
season = $"S{seasonNumber:D2}";
|
||||
}
|
||||
else if (!string.IsNullOrEmpty(seasonMatch.Groups[2].Value))
|
||||
{
|
||||
season = $"S{int.Parse(seasonMatch.Groups[2].Value):D2}";
|
||||
}
|
||||
else if (!string.IsNullOrEmpty(seasonMatch.Groups[3].Value))
|
||||
else if (seasonMatch.Groups["roman_number"].Success && !string.IsNullOrWhiteSpace(seasonMatch.Groups["roman_number"].Value))
|
||||
{
|
||||
season = $"S{RomanToArabic(seasonMatch.Groups[3].Value):D2}";
|
||||
}
|
||||
else if (!string.IsNullOrEmpty(seasonMatch.Groups[4].Value))
|
||||
{
|
||||
season = $"S{int.Parse(seasonMatch.Groups[4].Value):D2}";
|
||||
}
|
||||
}
|
||||
|
||||
var episodes = string.Empty;
|
||||
var epMatch = Regex.Match(episodesPart, @"(\d+)(?:[-–—](\d+))?");
|
||||
|
||||
if (epMatch.Success)
|
||||
if (epMatch.Success && int.TryParse(epMatch.Groups[1].Value, out var episodeStartNumber))
|
||||
{
|
||||
var start = int.Parse(epMatch.Groups[1].Value);
|
||||
if (epMatch.Groups[2].Success)
|
||||
{
|
||||
var end = int.Parse(epMatch.Groups[2].Value);
|
||||
episodes = $"E{start:D2}-E{end:D2}";
|
||||
episodes = $"E{episodeStartNumber:D2}-E{int.Parse(epMatch.Groups[2].Value):D2}";
|
||||
}
|
||||
else
|
||||
{
|
||||
episodes = $"E{start:D2}";
|
||||
episodes = $"E{episodeStartNumber:D2}";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -250,11 +256,12 @@ namespace Jackett.Common.Indexers.Definitions
|
||||
|
||||
private static int RomanToArabic(string roman)
|
||||
{
|
||||
int[] values = { 1000, 900, 500, 400, 100, 90, 50, 40, 10, 9, 5, 4, 1 };
|
||||
string[] numerals = { "M", "CM", "D", "CD", "C", "XC", "L", "XL", "X", "IX", "V", "IV", "I" };
|
||||
roman = roman.ToUpperInvariant();
|
||||
|
||||
var values = new[] { 1000, 900, 500, 400, 100, 90, 50, 40, 10, 9, 5, 4, 1 };
|
||||
var numerals = new[] { "M", "CM", "D", "CD", "C", "XC", "L", "XL", "X", "IX", "V", "IV", "I" };
|
||||
var result = 0;
|
||||
var i = 0;
|
||||
roman = roman.ToUpper();
|
||||
while (roman.Length > 0)
|
||||
{
|
||||
if (roman.StartsWith(numerals[i]))
|
||||
|
||||
@@ -249,13 +249,14 @@ namespace Jackett.Common.Indexers.Definitions
|
||||
var details = new Uri(qDetailsLink.GetAttribute("href"));
|
||||
|
||||
var qPosterLink = row.QuerySelector("img[src*=\"/torrents/images/\"]");
|
||||
var qMagnetLink = row.QuerySelector("a[href^=\"magnet:?xt=\"]");
|
||||
var size = ParseUtil.GetBytes(row.QuerySelector("td:nth-last-child(5)").TextContent);
|
||||
var matchDateAdded = Regex.Match(row.QuerySelector(" td:nth-child(2)").TextContent, @"(\d{2}-\d{2}-\d{4} \d{2}:\d{2})", RegexOptions.IgnoreCase);
|
||||
var publishDate = matchDateAdded.Groups[1].Success && DateTime.TryParseExact(matchDateAdded.Groups[1].Value, "dd-MM-yyyy HH:mm", CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal, out var parsedDate) ? parsedDate : DateTime.Now;
|
||||
|
||||
var grabs = ParseUtil.CoerceInt(row.QuerySelector("td:nth-last-child(4)").TextContent);
|
||||
var seeders = ParseUtil.CoerceInt(row.QuerySelector("td:nth-last-child(3)").TextContent);
|
||||
var leechers = ParseUtil.CoerceInt(row.QuerySelector("td:nth-last-child(2)").TextContent) + seeders;
|
||||
var grabs = ParseUtil.CoerceLong(row.QuerySelector("td:nth-last-child(4)").TextContent);
|
||||
var seeders = ParseUtil.CoerceLong(row.QuerySelector("td:nth-last-child(3)").TextContent);
|
||||
var leechers = ParseUtil.CoerceLong(row.QuerySelector("td:nth-last-child(2)").TextContent) + seeders;
|
||||
|
||||
var dlVolumeFactor = 1.0;
|
||||
var upVolumeFactor = 1.0;
|
||||
@@ -287,6 +288,10 @@ namespace Jackett.Common.Indexers.Definitions
|
||||
{
|
||||
release.Poster = new Uri(qPosterLink.GetAttribute("src"));
|
||||
}
|
||||
if (qMagnetLink != null)
|
||||
{
|
||||
release.MagnetUri = new Uri(qMagnetLink.GetAttribute("href"));
|
||||
}
|
||||
|
||||
releases.Add(release);
|
||||
}
|
||||
|
||||
@@ -19,10 +19,11 @@ namespace Jackett.Common.Indexers.Definitions
|
||||
{
|
||||
public override string Id => "bludv";
|
||||
public override string Name => "BluDV";
|
||||
public override string SiteLink { get; protected set; } = "https://bludv.org/";
|
||||
public override string SiteLink { get; protected set; } = "https://bludv-v1.xyz/";
|
||||
|
||||
public override string[] LegacySiteLinks { get; protected set; } = {
|
||||
"https://bludv.xyz/",
|
||||
"https://bludv.org/",
|
||||
};
|
||||
|
||||
public BluDV(IIndexerConfigurationService configService, WebClient wc, Logger l, IProtectionService ps, ICacheService cs)
|
||||
|
||||
@@ -104,7 +104,7 @@ namespace Jackett.Common.Indexers.Definitions
|
||||
var maxPages = 2; // we scrape only 2 pages for recent torrents
|
||||
if (!string.IsNullOrWhiteSpace(query.GetQueryString()))
|
||||
{
|
||||
searchString = Uri.EscapeUriString(query.GetQueryString());
|
||||
searchString = Uri.EscapeDataString(query.GetQueryString());
|
||||
maxPages = MaxSearchPageLimit;
|
||||
}
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@ namespace Jackett.Common.Indexers.Definitions
|
||||
public override string Id => "mteamtp";
|
||||
public override string[] Replaces => new[] { "mteamtp2fa" };
|
||||
public override string Name => "M-Team - TP";
|
||||
public override string Description => "M-Team TP (MTTP) is a CHINESE Private Torrent Tracker for HD MOVIES / TV / 3X";
|
||||
public override string Description => "M-Team - TP (MTTP) is a CHINESE Private Torrent Tracker for MOVIES / TV / GENERAL";
|
||||
public override string SiteLink { get; protected set; } = "https://kp.m-team.cc/";
|
||||
public override string[] AlternativeSiteLinks => new[]
|
||||
{
|
||||
@@ -39,7 +39,7 @@ namespace Jackett.Common.Indexers.Definitions
|
||||
|
||||
public override TorznabCapabilities TorznabCaps => SetCapabilities();
|
||||
|
||||
private readonly int[] _trackerAdultCategories = { 410, 429, 424, 430, 426, 437, 431, 432, 436, 425, 433, 411, 412, 413, 440 };
|
||||
private readonly int[] _trackerAdultCategories = { 410, 424, 437, 431, 429, 430, 426, 432, 436, 440, 425, 433, 411, 412, 413 };
|
||||
|
||||
private new ConfigurationDataMTeamTp configData => (ConfigurationDataMTeamTp)base.configData;
|
||||
|
||||
@@ -83,39 +83,37 @@ namespace Jackett.Common.Indexers.Definitions
|
||||
caps.Categories.AddCategoryMapping(439, TorznabCatType.MoviesHD, "Movie(電影)/Remux");
|
||||
caps.Categories.AddCategoryMapping(403, TorznabCatType.TVSD, "TV Series(影劇/綜藝)/SD");
|
||||
caps.Categories.AddCategoryMapping(402, TorznabCatType.TVHD, "TV Series(影劇/綜藝)/HD");
|
||||
caps.Categories.AddCategoryMapping(435, TorznabCatType.TVSD, "TV Series(影劇/綜藝)/DVDiSo");
|
||||
caps.Categories.AddCategoryMapping(438, TorznabCatType.TVHD, "TV Series(影劇/綜藝)/BD");
|
||||
caps.Categories.AddCategoryMapping(435, TorznabCatType.TVSD, "TV Series(影劇/綜藝)/DVDiSo");
|
||||
caps.Categories.AddCategoryMapping(404, TorznabCatType.TVDocumentary, "紀錄教育");
|
||||
caps.Categories.AddCategoryMapping(434, TorznabCatType.Audio, "Music(無損)");
|
||||
caps.Categories.AddCategoryMapping(406, TorznabCatType.AudioVideo, "MV(演唱)");
|
||||
caps.Categories.AddCategoryMapping(423, TorznabCatType.PCGames, "PCGame(PC遊戲)");
|
||||
caps.Categories.AddCategoryMapping(448, TorznabCatType.ConsoleOther, "TvGame(TV遊戲)");
|
||||
caps.Categories.AddCategoryMapping(405, TorznabCatType.TVAnime, "Anime(動畫)");
|
||||
caps.Categories.AddCategoryMapping(407, TorznabCatType.TVSport, "Sports(運動)");
|
||||
caps.Categories.AddCategoryMapping(422, TorznabCatType.PC0day, "Software(軟體)");
|
||||
caps.Categories.AddCategoryMapping(423, TorznabCatType.PCGames, "PCGame(PC遊戲)");
|
||||
caps.Categories.AddCategoryMapping(427, TorznabCatType.BooksEBook, "Study/Edu ebook(教育書面)");
|
||||
caps.Categories.AddCategoryMapping(441, TorznabCatType.BooksOther, "Study/Edu video(教育影片)");
|
||||
caps.Categories.AddCategoryMapping(422, TorznabCatType.PC0day, "Software(軟體)");
|
||||
caps.Categories.AddCategoryMapping(442, TorznabCatType.AudioAudiobook, "Study/Edu audio(教育音檔)");
|
||||
caps.Categories.AddCategoryMapping(451, TorznabCatType.MoviesOther, "教育影片");
|
||||
caps.Categories.AddCategoryMapping(409, TorznabCatType.Other, "Misc(其他)");
|
||||
|
||||
// music
|
||||
caps.Categories.AddCategoryMapping(406, TorznabCatType.AudioVideo, "MV(演唱)");
|
||||
caps.Categories.AddCategoryMapping(408, TorznabCatType.AudioOther, "Music(AAC/ALAC)");
|
||||
caps.Categories.AddCategoryMapping(434, TorznabCatType.Audio, "Music(無損)");
|
||||
|
||||
// adult
|
||||
caps.Categories.AddCategoryMapping(410, TorznabCatType.XXX, "AV(有碼)/HD Censored");
|
||||
caps.Categories.AddCategoryMapping(429, TorznabCatType.XXX, "AV(無碼)/HD Uncensored");
|
||||
caps.Categories.AddCategoryMapping(424, TorznabCatType.XXXSD, "AV(有碼)/SD Censored");
|
||||
caps.Categories.AddCategoryMapping(430, TorznabCatType.XXXSD, "AV(無碼)/SD Uncensored");
|
||||
caps.Categories.AddCategoryMapping(426, TorznabCatType.XXXDVD, "AV(無碼)/DVDiSo Uncensored");
|
||||
caps.Categories.AddCategoryMapping(437, TorznabCatType.XXXDVD, "AV(有碼)/DVDiSo Censored");
|
||||
caps.Categories.AddCategoryMapping(431, TorznabCatType.XXX, "AV(有碼)/Blu-Ray Censored");
|
||||
caps.Categories.AddCategoryMapping(429, TorznabCatType.XXX, "AV(無碼)/HD Uncensored");
|
||||
caps.Categories.AddCategoryMapping(430, TorznabCatType.XXXSD, "AV(無碼)/SD Uncensored");
|
||||
caps.Categories.AddCategoryMapping(426, TorznabCatType.XXXDVD, "AV(無碼)/DVDiSo Uncensored");
|
||||
caps.Categories.AddCategoryMapping(432, TorznabCatType.XXX, "AV(無碼)/Blu-Ray Uncensored");
|
||||
caps.Categories.AddCategoryMapping(436, TorznabCatType.XXX, "AV(網站)/0Day");
|
||||
caps.Categories.AddCategoryMapping(440, TorznabCatType.XXX, "AV(Gay)/HD");
|
||||
caps.Categories.AddCategoryMapping(425, TorznabCatType.XXX, "IV(寫真影集)/Video Collection");
|
||||
caps.Categories.AddCategoryMapping(433, TorznabCatType.XXXImageSet, "IV(寫真圖集)/Picture Collection");
|
||||
caps.Categories.AddCategoryMapping(411, TorznabCatType.XXX, "H-Game(遊戲)");
|
||||
caps.Categories.AddCategoryMapping(412, TorznabCatType.XXX, "H-Anime(動畫)");
|
||||
caps.Categories.AddCategoryMapping(413, TorznabCatType.XXX, "H-Comic(漫畫)");
|
||||
caps.Categories.AddCategoryMapping(440, TorznabCatType.XXX, "AV(Gay)/HD");
|
||||
|
||||
return caps;
|
||||
}
|
||||
|
||||
@@ -72,38 +72,38 @@ namespace Jackett.Common.Indexers.Definitions
|
||||
}
|
||||
};
|
||||
|
||||
caps.Categories.AddCategoryMapping("23", TorznabCatType.TVAnime);
|
||||
caps.Categories.AddCategoryMapping("22", TorznabCatType.PC0day);
|
||||
caps.Categories.AddCategoryMapping("1", TorznabCatType.PCISO);
|
||||
caps.Categories.AddCategoryMapping("36", TorznabCatType.Books);
|
||||
caps.Categories.AddCategoryMapping("36", TorznabCatType.BooksEBook);
|
||||
caps.Categories.AddCategoryMapping("4", TorznabCatType.PCGames);
|
||||
caps.Categories.AddCategoryMapping("21", TorznabCatType.PCGames);
|
||||
caps.Categories.AddCategoryMapping("16", TorznabCatType.ConsolePS3);
|
||||
caps.Categories.AddCategoryMapping("40", TorznabCatType.ConsoleWii);
|
||||
caps.Categories.AddCategoryMapping("39", TorznabCatType.ConsoleXBox360);
|
||||
caps.Categories.AddCategoryMapping("35", TorznabCatType.ConsoleNDS);
|
||||
caps.Categories.AddCategoryMapping("34", TorznabCatType.ConsolePSP);
|
||||
caps.Categories.AddCategoryMapping("2", TorznabCatType.PCMac);
|
||||
caps.Categories.AddCategoryMapping("10", TorznabCatType.MoviesBluRay);
|
||||
caps.Categories.AddCategoryMapping("20", TorznabCatType.MoviesDVD);
|
||||
caps.Categories.AddCategoryMapping("12", TorznabCatType.MoviesHD);
|
||||
caps.Categories.AddCategoryMapping("44", TorznabCatType.MoviesOther);
|
||||
caps.Categories.AddCategoryMapping("11", TorznabCatType.MoviesSD);
|
||||
caps.Categories.AddCategoryMapping("19", TorznabCatType.MoviesSD);
|
||||
caps.Categories.AddCategoryMapping("6", TorznabCatType.Audio);
|
||||
caps.Categories.AddCategoryMapping("8", TorznabCatType.AudioLossless);
|
||||
caps.Categories.AddCategoryMapping("46", TorznabCatType.AudioOther);
|
||||
caps.Categories.AddCategoryMapping("29", TorznabCatType.AudioVideo);
|
||||
caps.Categories.AddCategoryMapping("43", TorznabCatType.TVOther);
|
||||
caps.Categories.AddCategoryMapping("42", TorznabCatType.TVHD);
|
||||
caps.Categories.AddCategoryMapping("45", TorznabCatType.TVOther);
|
||||
caps.Categories.AddCategoryMapping("41", TorznabCatType.TVSD);
|
||||
caps.Categories.AddCategoryMapping("7", TorznabCatType.TVSD);
|
||||
caps.Categories.AddCategoryMapping("9", TorznabCatType.XXX);
|
||||
caps.Categories.AddCategoryMapping("49", TorznabCatType.XXX);
|
||||
caps.Categories.AddCategoryMapping("47", TorznabCatType.XXXDVD);
|
||||
caps.Categories.AddCategoryMapping("48", TorznabCatType.XXX);
|
||||
caps.Categories.AddCategoryMapping("23", TorznabCatType.TVAnime, "Anime");
|
||||
caps.Categories.AddCategoryMapping("2", TorznabCatType.PCMac, "Appz-Mac/Linux");
|
||||
caps.Categories.AddCategoryMapping("1", TorznabCatType.PCISO, "Appz-Win/PC");
|
||||
caps.Categories.AddCategoryMapping("22", TorznabCatType.AudioAudiobook, "Book-Audio");
|
||||
caps.Categories.AddCategoryMapping("36", TorznabCatType.BooksEBook, "Book-Ebook");
|
||||
caps.Categories.AddCategoryMapping("40", TorznabCatType.ConsoleWii, "Games-Nin");
|
||||
caps.Categories.AddCategoryMapping("16", TorznabCatType.ConsolePS3, "Games-PS");
|
||||
caps.Categories.AddCategoryMapping("4", TorznabCatType.PCGames, "Games-Win");
|
||||
caps.Categories.AddCategoryMapping("39", TorznabCatType.ConsoleXBox360, "Games-XBOX");
|
||||
caps.Categories.AddCategoryMapping("35", TorznabCatType.ConsoleNDS, "Handheld/NDS");
|
||||
caps.Categories.AddCategoryMapping("34", TorznabCatType.PCMobileOther, "Mobile");
|
||||
caps.Categories.AddCategoryMapping("51", TorznabCatType.MoviesUHD, "Movies/4K");
|
||||
caps.Categories.AddCategoryMapping("10", TorznabCatType.MoviesBluRay, "Movies/BluRay");
|
||||
caps.Categories.AddCategoryMapping("20", TorznabCatType.MoviesDVD, "Movies/DVDR");
|
||||
caps.Categories.AddCategoryMapping("12", TorznabCatType.MoviesHD, "Movies/HDx264");
|
||||
caps.Categories.AddCategoryMapping("44", TorznabCatType.MoviesOther, "Movies/Packs");
|
||||
caps.Categories.AddCategoryMapping("11", TorznabCatType.MoviesHD, "Movies/x265");
|
||||
caps.Categories.AddCategoryMapping("19", TorznabCatType.MoviesSD, "Movies/XviD");
|
||||
caps.Categories.AddCategoryMapping("6", TorznabCatType.Audio, "Music");
|
||||
caps.Categories.AddCategoryMapping("8", TorznabCatType.AudioLossless, "Music/FLAC");
|
||||
caps.Categories.AddCategoryMapping("46", TorznabCatType.AudioOther, "Music/Packs");
|
||||
caps.Categories.AddCategoryMapping("29", TorznabCatType.AudioVideo, "MusicVideos");
|
||||
caps.Categories.AddCategoryMapping("21", TorznabCatType.TVSport, "Sports");
|
||||
caps.Categories.AddCategoryMapping("43", TorznabCatType.TVOther, "TV/DVDR");
|
||||
caps.Categories.AddCategoryMapping("42", TorznabCatType.TVHD, "TV/HDx264");
|
||||
caps.Categories.AddCategoryMapping("45", TorznabCatType.TVOther, "TV/Packs");
|
||||
caps.Categories.AddCategoryMapping("41", TorznabCatType.TVSD, "TV/SDx264");
|
||||
caps.Categories.AddCategoryMapping("7", TorznabCatType.TVSD, "TV/XViD");
|
||||
caps.Categories.AddCategoryMapping("9", TorznabCatType.XXX, "XXX");
|
||||
caps.Categories.AddCategoryMapping("49", TorznabCatType.XXX, "XXX/0DAY");
|
||||
caps.Categories.AddCategoryMapping("47", TorznabCatType.XXXDVD, "XXX/DVDR");
|
||||
caps.Categories.AddCategoryMapping("48", TorznabCatType.XXX, "XXX/HDx264");
|
||||
|
||||
return caps;
|
||||
}
|
||||
|
||||
@@ -21,17 +21,19 @@ namespace Jackett.Common.Indexers.Definitions
|
||||
{
|
||||
public override string Id => "torrentdosfilmes";
|
||||
public override string Name => "TorrentDosFilmes";
|
||||
public override string SiteLink { get; protected set; } = "https://torrentdosfilmes.net/";
|
||||
public override string SiteLink { get; protected set; } = "https://torrentdosfilmes1.net/";
|
||||
|
||||
public override string[] AlternativeSiteLinks { get; protected set; } = {
|
||||
"https://torrentdosfilmes.net/",
|
||||
"https://comando4kfilmes.xyz/",
|
||||
"https://torrentdosfilmes1.net/",
|
||||
"https://comando4kfilmes-v1.xyz/",
|
||||
};
|
||||
|
||||
public override string[] LegacySiteLinks { get; protected set; } = {
|
||||
"https://torrentdosfilmes.site/",
|
||||
"https://torrentsdosfilmes.to/",
|
||||
"https://ComandoFilmes.xyz/",
|
||||
"https://torrentdosfilmes.net/",
|
||||
"https://comando4kfilmes.xyz/",
|
||||
};
|
||||
|
||||
public TorrentDosFilmes(IIndexerConfigurationService configService, WebClient wc, Logger l, IProtectionService ps,
|
||||
|
||||
@@ -163,15 +163,18 @@ namespace Jackett.Common.Indexers.Definitions
|
||||
{
|
||||
throw new Exception("Error, the Download link at the requested path does not exist.");
|
||||
}
|
||||
var wmDoc = new HtmlParser().ParseDocument(wmPage.ContentString);
|
||||
|
||||
var wmHtmlParser = new HtmlParser();
|
||||
var wmDoc = await wmHtmlParser.ParseDocumentAsync(wmPage.ContentString);
|
||||
var enlacitoUrl = wmDoc.QuerySelector(".app-message a:not(.buttonPassword)")?.GetAttribute("href");
|
||||
|
||||
var enlacitoPage = await RequestWithCookiesAndRetryAsync(enlacitoUrl, referer: SiteLink);
|
||||
var enlacitoDoc = new HtmlParser().ParseDocument(enlacitoPage.ContentString);
|
||||
|
||||
var enlacitoHtmlParser = new HtmlParser();
|
||||
var enlacitoDoc = await enlacitoHtmlParser.ParseDocumentAsync(enlacitoPage.ContentString);
|
||||
var enlacitoFormUrl = enlacitoDoc.QuerySelector("form").GetAttribute("action");
|
||||
var enlacitoFormLinkser = enlacitoDoc.QuerySelector("input[name=\"linkser\"]").GetAttribute("value");
|
||||
|
||||
|
||||
var body = new Dictionary<string, string>
|
||||
{
|
||||
{ "linkser", enlacitoFormLinkser }
|
||||
@@ -182,7 +185,7 @@ namespace Jackett.Common.Indexers.Definitions
|
||||
|
||||
var linkOut = v.Groups[1].ToString();
|
||||
var slink = Encoding.UTF8.GetString(Convert.FromBase64String(linkOut));
|
||||
var ulink = OpenSSLDecrypt(slink, TorrentLinkEncryptionKey);
|
||||
var ulink = await OpenSSLDecryptAsync(slink, TorrentLinkEncryptionKey);
|
||||
|
||||
var result = await RequestWithCookiesAndRetryAsync(ulink);
|
||||
return result.ContentBytes;
|
||||
@@ -463,7 +466,7 @@ namespace Jackett.Common.Indexers.Definitions
|
||||
}
|
||||
|
||||
// Thanks to https://stackoverflow.com/a/5454692/2078070 !!!
|
||||
private string OpenSSLDecrypt(string encrypted, string passphrase)
|
||||
private async Task<string> OpenSSLDecryptAsync(string encrypted, string passphrase)
|
||||
{
|
||||
// base 64 decode
|
||||
var encryptedBytesWithSalt = Convert.FromBase64String(encrypted);
|
||||
@@ -477,7 +480,7 @@ namespace Jackett.Common.Indexers.Definitions
|
||||
// get key and iv
|
||||
DeriveKeyAndIV(passphrase, salt, out var key, out var iv);
|
||||
|
||||
return DecryptStringFromBytesAes(encryptedBytes, key, iv);
|
||||
return await DecryptStringFromBytesAesAsync(encryptedBytes, key, iv);
|
||||
}
|
||||
|
||||
private void DeriveKeyAndIV(string passphrase, byte[] salt, out byte[] key, out byte[] iv)
|
||||
@@ -518,7 +521,7 @@ namespace Jackett.Common.Indexers.Definitions
|
||||
md5 = null;
|
||||
}
|
||||
|
||||
private string DecryptStringFromBytesAes(byte[] cipherText, byte[] key, byte[] iv)
|
||||
private static async Task<string> DecryptStringFromBytesAesAsync(byte[] cipherText, byte[] key, byte[] iv)
|
||||
{
|
||||
if (cipherText == null || cipherText.Length <= 0)
|
||||
{
|
||||
@@ -535,44 +538,17 @@ namespace Jackett.Common.Indexers.Definitions
|
||||
throw new ArgumentNullException(nameof(iv));
|
||||
}
|
||||
|
||||
// Declare the RijndaelManaged object
|
||||
// used to decrypt the data.
|
||||
RijndaelManaged aesAlg = null;
|
||||
using var aesAlg = Aes.Create();
|
||||
aesAlg.Key = key;
|
||||
aesAlg.IV = iv;
|
||||
|
||||
// Declare the string used to hold
|
||||
// the decrypted text.
|
||||
string plaintext;
|
||||
var decryptor = aesAlg.CreateDecryptor(aesAlg.Key, aesAlg.IV);
|
||||
|
||||
try
|
||||
{
|
||||
// Create a RijndaelManaged object
|
||||
// with the specified key and IV.
|
||||
aesAlg = new RijndaelManaged { Mode = CipherMode.CBC, KeySize = 256, BlockSize = 128, Key = key, IV = iv };
|
||||
using var msDecrypt = new MemoryStream(cipherText);
|
||||
using var csDecrypt = new CryptoStream(msDecrypt, decryptor, CryptoStreamMode.Read);
|
||||
using var srDecrypt = new StreamReader(csDecrypt);
|
||||
|
||||
// Create a decrytor to perform the stream transform.
|
||||
var decryptor = aesAlg.CreateDecryptor(aesAlg.Key, aesAlg.IV);
|
||||
// Create the streams used for decryption.
|
||||
using (var msDecrypt = new MemoryStream(cipherText))
|
||||
{
|
||||
using (var csDecrypt = new CryptoStream(msDecrypt, decryptor, CryptoStreamMode.Read))
|
||||
{
|
||||
using (var srDecrypt = new StreamReader(csDecrypt))
|
||||
{
|
||||
// Read the decrypted bytes from the decrypting stream
|
||||
// and place them in a string.
|
||||
plaintext = srDecrypt.ReadToEnd();
|
||||
srDecrypt.Close();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
finally
|
||||
{
|
||||
// Clear the RijndaelManaged object.
|
||||
aesAlg?.Clear();
|
||||
}
|
||||
|
||||
return plaintext;
|
||||
return await srDecrypt.ReadToEndAsync();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -96,6 +96,7 @@ namespace Jackett.Common.Indexers.Definitions
|
||||
caps.Categories.AddCategoryMapping(112, TorznabCatType.MoviesOther, "Anime Movies");
|
||||
caps.Categories.AddCategoryMapping(111, TorznabCatType.MoviesOther, "Anime TV");
|
||||
caps.Categories.AddCategoryMapping(150, TorznabCatType.PC, "Apps");
|
||||
caps.Categories.AddCategoryMapping(166, TorznabCatType.PCMac, "Apps MacOS");
|
||||
caps.Categories.AddCategoryMapping(153, TorznabCatType.Books, "Books");
|
||||
caps.Categories.AddCategoryMapping(154, TorznabCatType.AudioAudiobook, "Books Audiobooks");
|
||||
caps.Categories.AddCategoryMapping(155, TorznabCatType.Books, "Books eBooks & Magazines");
|
||||
|
||||
@@ -4,12 +4,11 @@ using System.Collections.Specialized;
|
||||
using System.Diagnostics.CodeAnalysis;
|
||||
using System.Globalization;
|
||||
using System.Linq;
|
||||
using System.Security.Cryptography;
|
||||
using System.Text;
|
||||
using System.Text.RegularExpressions;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using AngleSharp.Html.Parser;
|
||||
using Jackett.Common.Extensions;
|
||||
using Jackett.Common.Models;
|
||||
using Jackett.Common.Models.IndexerConfig;
|
||||
using Jackett.Common.Services.Interfaces;
|
||||
@@ -253,11 +252,13 @@ namespace Jackett.Common.Indexers.Definitions
|
||||
if (string.IsNullOrWhiteSpace(sessionId))
|
||||
throw new ExceptionWithConfigData("Error getting the Session ID", configData);
|
||||
|
||||
await Task.Delay(3000);
|
||||
|
||||
// The second page send the login with the hash
|
||||
// The hash is reverse engineering from https://www.zonaq.pw/retorno/2/smf/Themes/smf_ZQ/scripts/script.js
|
||||
// doForm.hash_passwrd.value = hex_sha1(hex_sha1(doForm.user.value.php_to8bit().php_strtolower() + doForm.passwrd.value.php_to8bit()) + cur_session_id);
|
||||
Thread.Sleep(3000);
|
||||
var hashPassword = Sha1Hash(Sha1Hash(configData.Username.Value.ToLower() + configData.Password.Value) + sessionId);
|
||||
var hashPassword = $"{(configData.Username.Value.ToLowerInvariant() + configData.Password.Value).SHA1Hash()}{sessionId}".SHA1Hash();
|
||||
|
||||
var pairs = new Dictionary<string, string> {
|
||||
{ "user", configData.Username.Value },
|
||||
{ "passwrd", configData.Password.Value },
|
||||
@@ -288,11 +289,5 @@ namespace Jackett.Common.Indexers.Definitions
|
||||
Thread.Sleep(3000);
|
||||
await RequestWithCookiesAsync(Login4Url);
|
||||
}
|
||||
|
||||
private static string Sha1Hash(string input)
|
||||
{
|
||||
var hash = new SHA1Managed().ComputeHash(Encoding.UTF8.GetBytes(input));
|
||||
return string.Concat(hash.Select(b => b.ToString("x2")));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@ namespace Jackett.Common.Models.IndexerConfig.Bespoke
|
||||
public ConfigurationDataMTeamTp()
|
||||
{
|
||||
ApiKey = new StringConfigurationItem("API Key");
|
||||
ApiKeyInfo = new DisplayInfoConfigurationItem("ApiKey Info", "The API key can be obtained by accessing your M-Team-TP User Control Panel > Security > Laboratory.");
|
||||
ApiKeyInfo = new DisplayInfoConfigurationItem("ApiKey Info", "The API key can be obtained by accessing your M-Team - TP User CP > Laboratory.");
|
||||
FreeleechOnly = new BoolConfigurationItem("Search freeleech only") { Value = false };
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,13 +1,11 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Security.Cryptography;
|
||||
using System.Text;
|
||||
using Jackett.Common.Extensions;
|
||||
using Jackett.Common.Indexers;
|
||||
using Jackett.Common.Models;
|
||||
using Jackett.Common.Models.Config;
|
||||
using Jackett.Common.Services.Interfaces;
|
||||
using Jackett.Common.Utils;
|
||||
using Newtonsoft.Json;
|
||||
using NLog;
|
||||
|
||||
@@ -36,8 +34,7 @@ namespace Jackett.Common.Services
|
||||
{
|
||||
private readonly Logger _logger;
|
||||
private readonly ServerConfig _serverConfig;
|
||||
private readonly SHA256Managed _sha256 = new SHA256Managed();
|
||||
private readonly Dictionary<string, TrackerCache> _cache = new Dictionary<string, TrackerCache>();
|
||||
private readonly Dictionary<string, TrackerCache> _cache = new();
|
||||
|
||||
public CacheService(Logger logger, ServerConfig serverConfig)
|
||||
{
|
||||
@@ -236,11 +233,11 @@ namespace Jackett.Common.Services
|
||||
}
|
||||
}
|
||||
|
||||
private string GetQueryHash(TorznabQuery query)
|
||||
private static string GetQueryHash(TorznabQuery query)
|
||||
{
|
||||
var json = GetSerializedQuery(query);
|
||||
// Compute the hash
|
||||
return BitConverter.ToString(_sha256.ComputeHash(Encoding.UTF8.GetBytes(json)));
|
||||
|
||||
return json.SHA256Hash();
|
||||
}
|
||||
|
||||
private static string GetSerializedQuery(TorznabQuery query)
|
||||
|
||||
@@ -51,7 +51,8 @@ namespace Jackett.Common.Services
|
||||
if (!Directory.Exists(GetAppDataFolder()))
|
||||
{
|
||||
var dir = Directory.CreateDirectory(GetAppDataFolder());
|
||||
if (Environment.OSVersion.Platform != PlatformID.Unix)
|
||||
|
||||
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
|
||||
{
|
||||
var access = dir.GetAccessControl();
|
||||
var directorySecurity = new DirectorySecurity(GetAppDataFolder(), AccessControlSections.All);
|
||||
@@ -126,7 +127,7 @@ namespace Jackett.Common.Services
|
||||
if (!Directory.Exists(destFolder))
|
||||
{
|
||||
var dir = Directory.CreateDirectory(destFolder);
|
||||
if (Environment.OSVersion.Platform != PlatformID.Unix)
|
||||
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
|
||||
{
|
||||
var directorySecurity = new DirectorySecurity(destFolder, AccessControlSections.All);
|
||||
directorySecurity.AddAccessRule(new FileSystemAccessRule(new SecurityIdentifier(WellKnownSidType.WorldSid, null), FileSystemRights.FullControl, InheritanceFlags.ObjectInherit | InheritanceFlags.ContainerInherit, PropagationFlags.None, AccessControlType.Allow));
|
||||
@@ -137,7 +138,7 @@ namespace Jackett.Common.Services
|
||||
{
|
||||
File.Copy(file, destPath);
|
||||
// The old files were created when running as admin so make sure they are editable by normal users / services.
|
||||
if (Environment.OSVersion.Platform != PlatformID.Unix)
|
||||
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
|
||||
{
|
||||
var fileInfo = new FileInfo(destFolder);
|
||||
var fileSecurity = new FileSecurity(destPath, AccessControlSections.All);
|
||||
|
||||
@@ -74,8 +74,6 @@ namespace Jackett.Common.Services
|
||||
}
|
||||
}
|
||||
|
||||
private bool AcceptCert(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors) => true;
|
||||
|
||||
private async Task CheckForUpdates()
|
||||
{
|
||||
logger.Info($"Checking for updates... Jackett variant: {variant}");
|
||||
@@ -180,14 +178,7 @@ namespace Jackett.Common.Services
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
logger.Error($"Error checking for updates.\n{e}");
|
||||
}
|
||||
finally
|
||||
{
|
||||
if (!isWindows)
|
||||
{
|
||||
System.Net.ServicePointManager.ServerCertificateValidationCallback -= AcceptCert;
|
||||
}
|
||||
logger.Error(e, $"Error checking for updates.\n{e}");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@ using System;
|
||||
using System.Diagnostics;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Runtime.Versioning;
|
||||
using System.ServiceProcess;
|
||||
using Jackett.Common.Services.Interfaces;
|
||||
using Jackett.Common.Utils;
|
||||
@@ -9,6 +10,9 @@ using NLog;
|
||||
|
||||
namespace Jackett.Common.Services
|
||||
{
|
||||
#if NET5_0_OR_GREATER
|
||||
[SupportedOSPlatform("windows")]
|
||||
#endif
|
||||
public class WindowsServiceConfigService : IServiceConfigService
|
||||
{
|
||||
private const string NAME = "Jackett";
|
||||
|
||||
@@ -29,8 +29,13 @@ namespace Jackett.Common.Utils.Clients
|
||||
}
|
||||
|
||||
[DebuggerNonUserCode] // avoid "Exception User-Unhandled" Visual Studio messages
|
||||
public static bool ValidateCertificate(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors)
|
||||
public bool ValidateCertificate(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors)
|
||||
{
|
||||
if (serverConfig.RuntimeSettings.IgnoreSslErrors == true)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
if (sender.GetType() != typeof(HttpWebRequest))
|
||||
return sslPolicyErrors == SslPolicyErrors.None;
|
||||
|
||||
@@ -51,24 +56,11 @@ namespace Jackett.Common.Utils.Clients
|
||||
|
||||
public override void SetTimeout(int seconds) => ClientTimeout = seconds;
|
||||
|
||||
public override void Init()
|
||||
{
|
||||
base.Init();
|
||||
|
||||
// custom handler for our own internal certificates
|
||||
if (serverConfig.RuntimeSettings.IgnoreSslErrors == true)
|
||||
ServicePointManager.ServerCertificateValidationCallback += (sender, certificate, chain, sslPolicyErrors) => true;
|
||||
else
|
||||
ServicePointManager.ServerCertificateValidationCallback += ValidateCertificate;
|
||||
}
|
||||
|
||||
protected override async Task<WebResult> Run(WebRequest webRequest)
|
||||
{
|
||||
ServicePointManager.SecurityProtocol = (SecurityProtocolType)192 | (SecurityProtocolType)768 | (SecurityProtocolType)3072;
|
||||
|
||||
var cookies = new CookieContainer
|
||||
{
|
||||
PerDomainCapacity = 100 // By default only 20 cookies are allowed per domain
|
||||
PerDomainCapacity = 100 // By default, only 20 cookies are allowed per domain
|
||||
};
|
||||
if (!string.IsNullOrWhiteSpace(webRequest.Cookies))
|
||||
{
|
||||
@@ -86,14 +78,17 @@ namespace Jackett.Common.Utils.Clients
|
||||
clearanceHandlr.ProxyUrl = serverConfig.GetProxyUrl(false);
|
||||
clearanceHandlr.ProxyUsername = serverConfig.ProxyUsername;
|
||||
clearanceHandlr.ProxyPassword = serverConfig.ProxyPassword;
|
||||
|
||||
using (var clientHandlr = new HttpClientHandler
|
||||
{
|
||||
CookieContainer = cookies,
|
||||
AllowAutoRedirect = false, // Do not use this - Bugs ahoy! Lost cookies and more.
|
||||
UseCookies = true,
|
||||
Proxy = webProxy,
|
||||
UseProxy = (webProxy != null),
|
||||
AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate
|
||||
UseProxy = webProxy != null,
|
||||
AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate,
|
||||
MaxConnectionsPerServer = 20,
|
||||
ServerCertificateCustomValidationCallback = ValidateCertificate,
|
||||
})
|
||||
{
|
||||
clearanceHandlr.InnerHandler = clientHandlr;
|
||||
|
||||
@@ -33,14 +33,19 @@ namespace Jackett.Common.Utils.Clients
|
||||
{
|
||||
cookies = new CookieContainer
|
||||
{
|
||||
PerDomainCapacity = 100 // By default only 20 cookies are allowed per domain
|
||||
PerDomainCapacity = 100 // By default, only 20 cookies are allowed per domain
|
||||
};
|
||||
CreateClient();
|
||||
}
|
||||
|
||||
[DebuggerNonUserCode] // avoid "Exception User-Unhandled" Visual Studio messages
|
||||
public static bool ValidateCertificate(HttpRequestMessage request, X509Certificate2 certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors)
|
||||
public bool ValidateCertificate(HttpRequestMessage request, X509Certificate2 certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors)
|
||||
{
|
||||
if (serverConfig.RuntimeSettings.IgnoreSslErrors == true)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
var hash = certificate.GetCertHashString();
|
||||
|
||||
trustedCertificates.TryGetValue(hash, out var hosts);
|
||||
@@ -70,16 +75,12 @@ namespace Jackett.Common.Utils.Clients
|
||||
AllowAutoRedirect = false, // Do not use this - Bugs ahoy! Lost cookies and more.
|
||||
UseCookies = true,
|
||||
Proxy = webProxy,
|
||||
UseProxy = (webProxy != null),
|
||||
AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate
|
||||
UseProxy = webProxy != null,
|
||||
AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate,
|
||||
MaxConnectionsPerServer = 20,
|
||||
ServerCertificateCustomValidationCallback = ValidateCertificate,
|
||||
};
|
||||
|
||||
// custom certificate validation handler (netcore version)
|
||||
if (serverConfig.RuntimeSettings.IgnoreSslErrors == true)
|
||||
clientHandlr.ServerCertificateCustomValidationCallback = (sender, certificate, chain, sslPolicyErrors) => true;
|
||||
else
|
||||
clientHandlr.ServerCertificateCustomValidationCallback = ValidateCertificate;
|
||||
|
||||
clearanceHandlr.InnerHandler = clientHandlr;
|
||||
client = new HttpClient(clearanceHandlr);
|
||||
|
||||
@@ -103,13 +104,6 @@ namespace Jackett.Common.Utils.Clients
|
||||
client.Timeout = TimeSpan.FromSeconds(ClientTimeout);
|
||||
}
|
||||
|
||||
public override void Init()
|
||||
{
|
||||
base.Init();
|
||||
|
||||
ServicePointManager.SecurityProtocol = (SecurityProtocolType)192 | (SecurityProtocolType)768 | (SecurityProtocolType)3072;
|
||||
}
|
||||
|
||||
protected override async Task<WebResult> Run(WebRequest webRequest)
|
||||
{
|
||||
var request = new HttpRequestMessage();
|
||||
|
||||
@@ -220,11 +220,7 @@ namespace Jackett.Common.Utils.Clients
|
||||
return result;
|
||||
}
|
||||
|
||||
#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
|
||||
protected virtual async Task<WebResult> Run(WebRequest webRequest) => throw new NotImplementedException();
|
||||
#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
|
||||
|
||||
public virtual void Init() => ServicePointManager.DefaultConnectionLimit = 1000;
|
||||
protected virtual Task<WebResult> Run(WebRequest webRequest) => throw new NotImplementedException();
|
||||
|
||||
public virtual void OnCompleted() => throw new NotImplementedException();
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using System;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Security.Principal;
|
||||
using Jackett.Common.Utils.Clients;
|
||||
|
||||
@@ -75,7 +76,11 @@ namespace Jackett.Common.Utils
|
||||
|
||||
public static bool IsUserAdministrator()
|
||||
{
|
||||
//bool value to hold our return value
|
||||
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
bool isAdmin;
|
||||
try
|
||||
{
|
||||
|
||||
@@ -1,104 +0,0 @@
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Security.Cryptography;
|
||||
using System.Text;
|
||||
|
||||
namespace Jackett.Common.Utils
|
||||
{
|
||||
public static class StringCipher
|
||||
{
|
||||
// This constant is used to determine the keysize of the encryption algorithm in bits.
|
||||
// We divide this by 8 within the code below to get the equivalent number of bytes.
|
||||
private const int Keysize = 256;
|
||||
|
||||
// This constant determines the number of iterations for the password bytes generation function.
|
||||
private const int DerivationIterations = 1000;
|
||||
|
||||
public static string Encrypt(string plainText, string passPhrase)
|
||||
{
|
||||
// Salt and IV is randomly generated each time, but is preprended to encrypted cipher text
|
||||
// so that the same Salt and IV values can be used when decrypting.
|
||||
var saltStringBytes = Generate256BitsOfRandomEntropy();
|
||||
var ivStringBytes = Generate256BitsOfRandomEntropy();
|
||||
var plainTextBytes = Encoding.UTF8.GetBytes(plainText);
|
||||
using (var password = new Rfc2898DeriveBytes(passPhrase, saltStringBytes, DerivationIterations))
|
||||
{
|
||||
var keyBytes = password.GetBytes(Keysize / 8);
|
||||
using (var symmetricKey = new RijndaelManaged())
|
||||
{
|
||||
symmetricKey.BlockSize = 256;
|
||||
symmetricKey.Mode = CipherMode.CBC;
|
||||
symmetricKey.Padding = PaddingMode.PKCS7;
|
||||
using (var encryptor = symmetricKey.CreateEncryptor(keyBytes, ivStringBytes))
|
||||
{
|
||||
using (var memoryStream = new MemoryStream())
|
||||
{
|
||||
using (var cryptoStream = new CryptoStream(memoryStream, encryptor, CryptoStreamMode.Write))
|
||||
{
|
||||
cryptoStream.Write(plainTextBytes, 0, plainTextBytes.Length);
|
||||
cryptoStream.FlushFinalBlock();
|
||||
// Create the final bytes as a concatenation of the random salt bytes, the random iv bytes and the cipher bytes.
|
||||
var cipherTextBytes = saltStringBytes;
|
||||
cipherTextBytes = cipherTextBytes.Concat(ivStringBytes).ToArray();
|
||||
cipherTextBytes = cipherTextBytes.Concat(memoryStream.ToArray()).ToArray();
|
||||
memoryStream.Close();
|
||||
cryptoStream.Close();
|
||||
return Convert.ToBase64String(cipherTextBytes);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static string Decrypt(string cipherText, string passPhrase)
|
||||
{
|
||||
// Get the complete stream of bytes that represent:
|
||||
// [32 bytes of Salt] + [32 bytes of IV] + [n bytes of CipherText]
|
||||
var cipherTextBytesWithSaltAndIv = Convert.FromBase64String(cipherText);
|
||||
// Get the saltbytes by extracting the first 32 bytes from the supplied cipherText bytes.
|
||||
var saltStringBytes = cipherTextBytesWithSaltAndIv.Take(Keysize / 8).ToArray();
|
||||
// Get the IV bytes by extracting the next 32 bytes from the supplied cipherText bytes.
|
||||
var ivStringBytes = cipherTextBytesWithSaltAndIv.Skip(Keysize / 8).Take(Keysize / 8).ToArray();
|
||||
// Get the actual cipher text bytes by removing the first 64 bytes from the cipherText string.
|
||||
var cipherTextBytes = cipherTextBytesWithSaltAndIv.Skip((Keysize / 8) * 2).Take(cipherTextBytesWithSaltAndIv.Length - ((Keysize / 8) * 2)).ToArray();
|
||||
|
||||
using (var password = new Rfc2898DeriveBytes(passPhrase, saltStringBytes, DerivationIterations))
|
||||
{
|
||||
var keyBytes = password.GetBytes(Keysize / 8);
|
||||
using (var symmetricKey = new RijndaelManaged())
|
||||
{
|
||||
symmetricKey.BlockSize = 256;
|
||||
symmetricKey.Mode = CipherMode.CBC;
|
||||
symmetricKey.Padding = PaddingMode.PKCS7;
|
||||
using (var decryptor = symmetricKey.CreateDecryptor(keyBytes, ivStringBytes))
|
||||
{
|
||||
using (var memoryStream = new MemoryStream(cipherTextBytes))
|
||||
{
|
||||
using (var cryptoStream = new CryptoStream(memoryStream, decryptor, CryptoStreamMode.Read))
|
||||
{
|
||||
var plainTextBytes = new byte[cipherTextBytes.Length];
|
||||
var decryptedByteCount = cryptoStream.Read(plainTextBytes, 0, plainTextBytes.Length);
|
||||
memoryStream.Close();
|
||||
cryptoStream.Close();
|
||||
return Encoding.UTF8.GetString(plainTextBytes, 0, decryptedByteCount);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static byte[] Generate256BitsOfRandomEntropy()
|
||||
{
|
||||
var randomBytes = new byte[32]; // 32 Bytes will give us 256 bits.
|
||||
using (var rngCsp = new RNGCryptoServiceProvider())
|
||||
{
|
||||
// Fill the array with cryptographically secure random bytes.
|
||||
rngCsp.GetBytes(randomBytes);
|
||||
}
|
||||
return randomBytes;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -189,16 +189,11 @@ namespace Jackett.Common.Utils
|
||||
{
|
||||
var chars = "abcdefghijklmnopqrstuvwxyz0123456789";
|
||||
var randBytes = new byte[length];
|
||||
using (var rngCsp = new RNGCryptoServiceProvider())
|
||||
{
|
||||
rngCsp.GetBytes(randBytes);
|
||||
var key = "";
|
||||
foreach (var b in randBytes)
|
||||
{
|
||||
key += chars[b % chars.Length];
|
||||
}
|
||||
return key;
|
||||
}
|
||||
|
||||
using var rngCsp = RandomNumberGenerator.Create();
|
||||
rngCsp.GetBytes(randBytes);
|
||||
|
||||
return randBytes.Aggregate(string.Empty, (current, b) => current + chars[b % chars.Length]);
|
||||
}
|
||||
|
||||
public static IEnumerable<int> AllIndexesOf(this string source, char value)
|
||||
|
||||
@@ -29,9 +29,7 @@ namespace Jackett.Server.Services
|
||||
return null;
|
||||
|
||||
var ue = new UnicodeEncoding();
|
||||
#pragma warning disable SYSLIB0021
|
||||
var hashString = new SHA512Managed();
|
||||
#pragma warning restore SYSLIB0021
|
||||
var hashString = SHA512.Create();
|
||||
|
||||
// Append key as salt
|
||||
input += _serverConfig.APIKey;
|
||||
|
||||
@@ -341,7 +341,6 @@ namespace Jackett.Server.Services
|
||||
|
||||
// Load indexers
|
||||
indexerService.InitIndexers(configService.GetCardigannDefinitionsFolders());
|
||||
client.Init();
|
||||
|
||||
updater.CleanupTempDir();
|
||||
updater.CheckUpdaterLock();
|
||||
|
||||
@@ -48,9 +48,5 @@ namespace Jackett.Test.TestHelpers
|
||||
});
|
||||
throw new Exception($"You have to mock the URL {request.Url} with RegisterRequestCallback");
|
||||
}
|
||||
|
||||
public override void Init()
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ using System;
|
||||
using System.Diagnostics;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Runtime.InteropServices;
|
||||
using CommandLine;
|
||||
using CommandLine.Text;
|
||||
using Jackett.Common.Models.Config;
|
||||
@@ -15,7 +16,6 @@ namespace Jackett.Updater
|
||||
public class Program
|
||||
{
|
||||
private IProcessService processService;
|
||||
private IServiceConfigService windowsService;
|
||||
public static Logger logger;
|
||||
private Variants.JackettVariant variant = Variants.JackettVariant.NotFound;
|
||||
|
||||
@@ -27,7 +27,7 @@ namespace Jackett.Updater
|
||||
|
||||
private void Run(string[] args)
|
||||
{
|
||||
var runtimeSettings = new RuntimeSettings()
|
||||
var runtimeSettings = new RuntimeSettings
|
||||
{
|
||||
CustomLogFileName = "updater.txt"
|
||||
};
|
||||
@@ -42,7 +42,8 @@ namespace Jackett.Updater
|
||||
variant = variants.GetVariant();
|
||||
logger.Info("Jackett variant: " + variant.ToString());
|
||||
|
||||
var isWindows = Environment.OSVersion.Platform == PlatformID.Win32NT;
|
||||
var isWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
|
||||
|
||||
if (isWindows)
|
||||
{
|
||||
//The updater starts before Jackett closes
|
||||
@@ -51,18 +52,13 @@ namespace Jackett.Updater
|
||||
}
|
||||
|
||||
processService = new ProcessService(logger);
|
||||
windowsService = new WindowsServiceConfigService(processService, logger);
|
||||
|
||||
var commandLineParser = new Parser(settings => settings.CaseSensitive = false);
|
||||
|
||||
try
|
||||
{
|
||||
var optionsResult = commandLineParser.ParseArguments<UpdaterConsoleOptions>(args);
|
||||
optionsResult.WithParsed(options =>
|
||||
{
|
||||
ProcessUpdate(options);
|
||||
}
|
||||
);
|
||||
optionsResult.WithParsed(ProcessUpdate);
|
||||
optionsResult.WithNotParsed(errors =>
|
||||
{
|
||||
logger.Error(HelpText.AutoBuild(optionsResult));
|
||||
@@ -135,10 +131,10 @@ namespace Jackett.Updater
|
||||
if (options.KillPids != null)
|
||||
{
|
||||
var pidsStr = options.KillPids.Split(',').Where(pid => !string.IsNullOrWhiteSpace(pid)).ToArray();
|
||||
pids = Array.ConvertAll(pidsStr, pid => int.Parse(pid));
|
||||
pids = Array.ConvertAll(pidsStr, int.Parse);
|
||||
}
|
||||
|
||||
var isWindows = Environment.OSVersion.Platform == PlatformID.Win32NT;
|
||||
var isWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
|
||||
var trayRunning = false;
|
||||
var trayProcesses = Process.GetProcessesByName("JackettTray");
|
||||
if (isWindows)
|
||||
@@ -281,6 +277,7 @@ namespace Jackett.Updater
|
||||
"Definitions/anime-timel.yml",
|
||||
"Definitions/animeclipse.yml",
|
||||
"Definitions/animeitalia.yml",
|
||||
"Definitions/animelovers-api.yml",
|
||||
"Definitions/animetime.yml",
|
||||
"Definitions/animetracker.yml",
|
||||
"Definitions/animeworld.yml", // switch to *-API #8682
|
||||
@@ -647,6 +644,7 @@ namespace Jackett.Updater
|
||||
"Definitions/ptorrent.yml", // renamed to pornxlab
|
||||
"Definitions/purovicio.yml",
|
||||
"Definitions/puurhollands.yml",
|
||||
"Definitions/qbite.yml",
|
||||
"Definitions/qctorrent.yml",
|
||||
"Definitions/qxr.yml",
|
||||
"Definitions/racing4everyone.yml", // switch to *-API #12870 #8682
|
||||
@@ -897,7 +895,9 @@ namespace Jackett.Updater
|
||||
|
||||
// kill pids after the update on UNIX
|
||||
if (!isWindows)
|
||||
{
|
||||
KillPids(pids);
|
||||
}
|
||||
|
||||
if (!options.NoRestart)
|
||||
{
|
||||
@@ -913,6 +913,8 @@ namespace Jackett.Updater
|
||||
logger.Info("Starting Tray: " + startInfo.FileName + " " + startInfo.Arguments);
|
||||
Process.Start(startInfo);
|
||||
|
||||
var windowsService = new WindowsServiceConfigService(processService, logger);
|
||||
|
||||
if (!windowsService.ServiceExists())
|
||||
{
|
||||
//User was running the tray icon, but not using the Windows service, starting Tray icon will start JackettConsole as well
|
||||
@@ -920,10 +922,12 @@ namespace Jackett.Updater
|
||||
}
|
||||
}
|
||||
|
||||
if (string.Equals(options.Type, "WindowsService", StringComparison.OrdinalIgnoreCase))
|
||||
if (isWindows && string.Equals(options.Type, "WindowsService", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
logger.Info("Starting Windows service");
|
||||
|
||||
var windowsService = new WindowsServiceConfigService(processService, logger);
|
||||
|
||||
try
|
||||
{
|
||||
windowsService.Start();
|
||||
|
||||
Reference in New Issue
Block a user