Compare commits

...

28 Commits

Author SHA1 Message Date
Garfield69
9d68ca86da ilcorsaronero: domain change and fix for invalid CA. #3968 2018-10-14 20:07:08 +13:00
Garfield69
5b9165cd2f nnm-club: bypass invalid CA 2018-10-14 12:44:01 +13:00
LuisMi
8a48874b42 Add definition for EliteTorrent.biz (#3990) resolves #1293 2018-10-14 10:17:12 +13:00
Garfield69
b0132da030 ilcorsaroblu: adjustments for their recent changes 2018-10-14 08:23:08 +13:00
3744111
175d7f5379 hdtorrent-uploader-support (#3985)
Adds support for higher user classes like uploader
2018-10-13 18:10:46 +13:00
Garfield69
dc8023afe1 prostylex: public 0day and general tracker. resolves #3966 2018-10-12 21:15:08 +13:00
xfouloux
d956872d95 Rockbox: back to semi-private (#3975) 2018-10-12 17:15:19 +13:00
Garfield69
35defc04e0 katcrs: domain change. resolves #3965 2018-10-12 17:01:57 +13:00
garfield69
a2f5e5a5aa rockbox is semi-private 2018-10-12 16:56:09 +13:00
garfield69
ec5a8e6e33 Romanian Metal Torrent 2018-10-12 16:44:17 +13:00
xfouloux
f00aa5faca metaliplayro: Romanian Metal Torrent, a private music tracker (#3963) resolves #2587 2018-10-12 16:43:16 +13:00
Garfield69
51ece1726c ilcorsaroblu: #3970
they have been playing with the search page, and appear to have dropped the size field.
now defaulting to 500MB unless it pops up again
2018-10-12 11:43:22 +13:00
Garfield69
579190b4bd RockBox: public heavy metal music tracker. resolves #3009 2018-10-12 10:31:18 +13:00
xfouloux
fd4d8d490a Create rockbox.yml (#3964)
#3009
2018-10-12 10:08:33 +13:00
Garfield69
e2fe43b3a7 horriblesubs: cleanup plus ensure guid is always created 2018-10-12 09:47:07 +13:00
Gerdus van Zyl
bedde1a3db Fix for #3957 (#3967)
* Initial Version

* Episode number filtering

* fix for issue #3957
handle case where result has no torrent file link
2018-10-12 06:55:30 +13:00
xfouloux
da638ad712 Update yts.cs (#3962) resolves #3182
add [YTS] in front of movie name
2018-10-11 15:40:59 +13:00
CodeMonkey
10ae5e9d5d Make sure release title contains "[HorribleSubs]" (#3947)
* This is needed for things like configuring tag restrictions in Sonarr
2018-10-10 08:01:25 +13:00
Garfield69
71749ba8db Merge branch 'master' of https://github.com/Jackett/Jackett 2018-10-10 07:59:54 +13:00
Garfield69
4373c38869 yts: yes, the domain changed back to .am again. resolves #3948 2018-10-10 07:59:47 +13:00
morpheus133
2a17783a9c - Add pagination support for ncore (#3943)
- Correct handling of Descriptions
- Add hun tag to torrent title if it contains hungarian audio but not visible in title
2018-10-10 06:30:00 +13:00
Jorman
a184ad4d7c Fix some rows for ilcorsaroblu (#3942) 2018-10-10 06:29:08 +13:00
Garfield69
acc1e7e65a gktorremt: they are forcing to https 2018-10-09 15:22:37 +13:00
Garfield69
95ffd0caa3 btdb: fix test #3851 2018-10-09 15:19:39 +13:00
Garfield69
b0e788788f cpabien: domain changed again 2018-10-09 15:14:16 +13:00
Garfield69
80f0c1b7da yggtorrent: domain change. resolves #3935 2018-10-08 20:59:52 +13:00
Garfield69
7abdd0d817 resolve #3914
sites that don't provide seeders now default to 1 instead of 999
2018-10-08 15:37:25 +13:00
Garfield69
736330bea3 torrentcouch: new domain. resolves #3924 2018-10-07 07:09:55 +13:00
20 changed files with 572 additions and 114 deletions

View File

@@ -30,6 +30,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
* BTDB
* cpasbien
* ETTV
* EliteTorrent.biz
* ExtraTorrent.ag
* ExtraTorrentClone
* EZTV
@@ -50,6 +51,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
* Nyaa.si
* Nyaa-Pantsu
* Nyoo
* ProStyleX
* RARBG
* RuTor
* ShowRSS
@@ -84,6 +86,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
* Newstudio
* NetHD
* NoName Club
* RockBox
* RuTracker
* SkTorrent
* Union Fansub
@@ -239,6 +242,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
* RevolutionTT
* RGU
* RoDVD
* Romanian Metal Torrent
* SceneFZ
* SceneReactor
* SceneTime

View File

@@ -54,9 +54,9 @@
grabs:
selector: .sbar span:nth-of-type(6) b
seeders:
text: "999"
text: "1"
leechers:
text: "999"
text: "1"
downloadvolumefactor:
text: "0"
uploadvolumefactor:

View File

@@ -25,7 +25,7 @@
search:
paths:
- path: "{{if .Keywords}}q/{{ .Keywords}}/?sort=time{{else}}recent{{end}}"
- path: "{{if .Keywords}}q/{{ .Keywords}}/?sort=time{{else}}q/test/{{end}}"
- path: "{{if .Keywords}}q/{{ .Keywords}}/2?sort=time{{else}}{{end}}"
- path: "{{if .Keywords}}q/{{ .Keywords}}/3?sort=time{{else}}{{end}}"
- path: "{{if .Keywords}}q/{{ .Keywords}}/4?sort=time{{else}}{{end}}"

View File

@@ -6,7 +6,7 @@
type: public
encoding: UTF-8
links:
- https://ww1.cpabien.io/
- https://www.cpabien.io/
legacylinks:
- http://www.cpasbiens.cc/
- http://www.cpabien.cm/
@@ -22,6 +22,7 @@
- http://cpabien.la/
- http://cpabien.club/
- http://www.cpabien.io/
- https://ww1.cpabien.io/
caps:
categorymappings:

View File

@@ -0,0 +1,75 @@
---
site: elitetorrent-biz
name: EliteTorrent.biz
description: "EliteTorrent.biz is a Public torrent site for TV, movies and documentaries"
language: es-es
type: public
encoding: UTF-8
links:
- https://www.elitetorrent.biz/
caps:
categories:
"series": TV
"peliculas": Movies
modes:
search: [q]
tv-search: [q, season, ep]
movie-search: [q]
settings: []
download:
selector: a[href^="magnet:?"]
attribute: href
search:
path: index.php
keywordsfilters:
# most ES/ITA TV torrents are in XXxYY format, so we search without S/E prefixes and filter later
- name: re_replace
args: ["S0?(\\d{1,2})", " $1 "]
- name: re_replace
args: ["E(\\d{2,3})", " $1 "]
inputs:
s: "{{ .Keywords }}"
$raw: "&x=0&y=0"
rows:
selector: "#principal .miniboxs-ficha li"
fields:
title:
selector: .meta a
# normalize to SXXEYY format
filters:
- name: re_replace
args: ["(\\d{2})×(\\d{2})", "S$1E$2"]
- name: re_replace
args: ["(\\d{1})×(\\d{2})", "S0$1E$2"]
details:
selector: .meta a
attribute: href
download:
selector: .meta a
attribute: href
category:
selector: .meta a
attribute: href
filters:
- name: split
args: ["/", 3]
size:
selector: .voto1
filters:
- name: replace
args: ["s", ""]
date:
text: now
seeders:
text: "1"
leechers:
text: "1"
downloadvolumefactor:
text: "0"
uploadvolumefactor:
text: "1"

View File

@@ -6,7 +6,7 @@
type: public
encoding: UTF-8
links:
- http://www.gktorrent.net/
- https://www.gktorrent.net/
legacylinks:
- https://www.gktorrent.org/
- https://www.gktorrent.com/
@@ -15,6 +15,7 @@
- http://ww2.gktorrent.com/
- https://ww2.gktorrent.com/
- https://ww3.gktorrent.com/
- http://www.gktorrent.net/
caps:
categorymappings:

View File

@@ -96,9 +96,9 @@
size:
selector: div[class="resultdivbotton"] div[class="resultlength"] div[class="resultdivbottonlength"]
seeders:
text: "999"
text: "1"
leechers:
text: "999"
text: "1"
downloadvolumefactor:
text: "0"
uploadvolumefactor:

View File

@@ -136,26 +136,30 @@
details:
selector: td:nth-child(2) > a
attribute: href
banner:
optional: true
selector: td:nth-child(2) > a
attribute: onmouseover
filters:
- name: regexp
args: "src=(.+?) "
# banner:
# optional: true
# selector: td:nth-child(2) > a
# attribute: onmouseover
# filters:
# - name: regexp
# args: "src=(.+?) "
size:
selector: td:nth-child(10)
selector: td:nth-last-child(3)
date:
selector: td:nth-child(6)
selector: td:nth-last-child(7)
filters:
- name: dateparse
args: "02/01/2006"
grabs:
selector: td:nth-child(9)
selector: td:nth-last-child(4)
filters:
- name: replace
args: ["---", "0"]
seeders:
selector: td:nth-child(7)
selector: td:nth-last-child(6)
leechers:
selector: td:nth-child(8)
selector: td:nth-last-child(5)
downloadvolumefactor:
text: "0"
uploadvolumefactor:
text: "1"

View File

@@ -6,12 +6,15 @@
type: public
encoding: UTF-8
links:
- https://ilcorsaronero.ch/
legacylinks:
- https://ilcorsaronero.info/
certificates:
- 89c12d4a080b5aeec00acbb269dc9b44584b1b3f # incomplete CA chain
- aa7c40aa360a1cec8a9687312fd50402b912e618 # incomplete CA chain
- 83174ec1f92fa13cdef9d51888ea1dfba2166e17 # incomplete CA chain
- c414bf4ad6c69841693c147849f4c314aa200bdf # incomplete CA chain
- 3a402766ce22fd1aa24bfc1a4fd47e9309eb8c98 # incomplete CA chain
caps:
categorymappings:

View File

@@ -6,9 +6,10 @@
type: public
encoding: UTF-8
links:
- https://kickasskatcr.stream/
- https://kickassextratorrent.xyz/
legacylinks:
- https://kickasskatcr.website/
- https://kickasskatcr.stream/
caps:
categories:

View File

@@ -0,0 +1,112 @@
---
site: metaliplayro
name: Romanian Metal Torrent
description: "Romanian Metal Torrent is a Private site dedicated to METAL MUSIC. This definition is for the English site."
language: en-us
type: private
encoding: UTF-8
links:
- https://metal.stream.bike/
caps:
categories:
"Music": Audio
modes:
search: [q]
music-search: [q, album, artist, label, year]
login:
path: login.php
method: form
form: form[action="takelogin.php"]
captcha:
type: image
selector: img
input: vImageCodP
inputs:
username: "{{ .Config.username }}"
password: "{{ .Config.password }}"
error:
- selector: div.errorSummary
message:
selector: div.errorSummary ul li
test:
path: browse.php
selector: a[href="logout.php"]
ratio:
path: browse.php
selector: img:contains("Ratio =") > img
download:
method: get
before:
path: "login.php"
method: "post"
inputs:
username: "{{ .Config.username }}"
password: "{{ .Config.password }}"
search:
paths:
- path: browse.php
method: get
inputs:
"search": "{{if .Query.Artist}}{{ .Query.Artist }}{{else}}{{ .Keywords }}{{end}}"
rows:
selector: table.torrents_table tbody tr
fields:
title:
selector: td a[href^="details.php?id="]
details:
selector: td a[href^="details.php?id="]
attribute: href
download:
selector: td a[href^="download2.php?id="]
attribute: href
filters:
- name: replace
args: ["download2.php?id=", "download.php/"]
- name: append
args: "/{{ .Result.title }}.torrent"
banner:
optional: true
selector: td:nth-child(2) a
attribute: onmouseover
filters:
- name: regexp
args: 'img src=(.+?) >'
- name: replace
args: ["./pic/noposter.jpg", ""]
date:
selector: td:nth-child(8) > span
attribute: title
size:
selector: td:nth-child(6)
seeders:
selector: td:nth-child(7)
filters:
- name: regexp
args: '([\d]+) seeders'
leechers:
selector: td:nth-child(7)
filters:
- name: regexp
args: '([\d]+) leechers'
grabs:
selector: td:nth-child(6)
filters:
- name: regexp
args: '([\d]+) times'
category:
text: "Music"
downloadvolumefactor:
case:
img[src$="pic/freedownload.gif"]: "0"
img[src$="pic/half.gif"]: "0.5"
"*": "1"
uploadvolumefactor:
case:
img[src$="pic/sticky2.gif"]: "1.5"
"*": "1"

View File

@@ -9,6 +9,8 @@
- https://nnm-club.me/
legacylinks:
- https://nnm-club.name/
certificates:
- 7877113458e90f3643dd28424657a29469f5dc55
caps:
categorymappings:

View File

@@ -0,0 +1,107 @@
---
site: prostylex
name: ProStyleX
description: "ProStyleX is a Public torrent site for 0Day and General"
language: en-us
type: public
encoding: UTF-8
links:
- http://prostylex.com/
caps:
categorymappings:
- {id: 1, cat: Movies/SD, desc: "Movies - Divx/Xvid"}
- {id: 2, cat: Movies/WEBDL, desc: "Movies - h.264/x264"}
- {id: 3, cat: Movies/HD, desc: "Movies - HD"}
- {id: 4, cat: Movies/DVD, desc: "Movies - DVD"}
- {id: 5, cat: Movies/Other, desc: "Movies - Cam/TS"}
- {id: 6, cat: Movies/Foreign, desc: "Movies - Non-English"}
- {id: 7, cat: Movies/3D, desc: "Movies - 3D"}
- {id: 8, cat: Movies/UHD, desc: "Movies - 4K"}
- {id: 9, cat: Movies/Other, desc: "Movies - Dubs/Dual Audio"}
- {id: 12, cat: TV/WEB-DL, desc: "TV - x264"}
- {id: 13, cat: TV/SD, desc: "TV - Xvid"}
- {id: 14, cat: TV/HD, desc: "TV - HD"}
- {id: 15, cat: TV/OTHER, desc: "TV - Packs"}
- {id: 20, cat: Audio/MP3, desc: "Music - Audio"}
- {id: 21, cat: Audio/Video, desc: "Music - Video"}
- {id: 22, cat: Audio/Other, desc: "Music - Other"}
- {id: 40, cat: XXX, desc: "XXX - Video"}
- {id: 42, cat: XXX, desc: "XXX - HD Video"}
- {id: 43, cat: XXX, desc: "XXX - Movie"}
- {id: 44, cat: XXX, desc: "XXX - Anime/Hentai"}
- {id: 45, cat: XXX, desc: "XXX - Pics/Comix/Book"}
- {id: 46, cat: XXX, desc: "XXX - Games"}
- {id: 53, cat: Audio/Audiobook, desc: "Books - Audio books"}
- {id: 54, cat: Books/Comics, desc: "Books - Comics"}
- {id: 55, cat: Books/Ebook, desc: "Books - Ebooks"}
- {id: 56, cat: Books/Magazines, desc: "Books - Magazines"}
- {id: 57, cat: Books/Other, desc: "Books - Other"}
- {id: 58, cat: Other, desc: "Pictures - Other"}
- {id: 59, cat: Other, desc: "Pictures - Wallpapers"}
- {id: 65, cat: TV/Anime, desc: "Anime - All"}
- {id: 90, cat: PC/ISO, desc: "Games - PC-ISO"}
- {id: 91, cat: Console, desc: "Games - PS2"}
- {id: 92, cat: Console/PSP, desc: "Games - PSP"}
- {id: 93, cat: Console/PS3, desc: "Games - PS3"}
- {id: 94, cat: PC/Games, desc: "Games - PC-RIP"}
- {id: 95, cat: Console/Xbox 360, desc: "Games - Xbox360"}
- {id: 96, cat: Console/Other, desc: "Games - Other"}
- {id: 97, cat: Console/Wii, desc: "Games - Wii"}
- {id: 98, cat: Console/NDS, desc: "Games - Nintendo DS"}
- {id: 99, cat: PC/Phone-Android, desc: "Games - Android"}
- {id: 120, cat: PC/0day, desc: "Apps - Windows"}
- {id: 121, cat: PC, desc: "Apps - Linux"}
- {id: 122, cat: PC/Phone-Android, desc: "Apps - Android"}
- {id: 123, cat: PC/Mac, desc: "Apps - Mac"}
- {id: 124, cat: PC, desc: "Apps - Other"}
- {id: 130, cat: Other, desc: "Other - Other"}
- {id: 134, cat: Other, desc: "Other - Tutorials"}
modes:
search: [q]
tv-search: [q, season, ep]
movie-search: [q]
settings: []
download:
selector: a[href^="magnet:?"]
search:
paths:
# http://prostylex.com/torrents-search.php?search=
# http://prostylex.com/torrents-search.php?c1=1&c2=1&c3=1&search=expanse&cat=0&incldead=0&freeleech=0&inclexternal=0&lang=0
- path: "torrents-search.php?{{range .Categories}}c{{.}}=1&{{end}}{{if .Keywords}}&search={{ .Keywords}}&cat=0&incldead=0&freeleech=0&inclexternal=0&lang=0{{else}}search={{end}}"
rows:
# selector: tr:has(a[href^="/torrent/"])
selector: tr.t-row
fields:
title:
selector: td a[href^="torrents-details.php?id="]
category:
selector: td a[href^="torrents.php?cat="]
attribute: href
filters:
- name: querystring
args: cat
details:
selector: td a[href^="torrents-details.php?id="]
attribute: href
download:
selector: td a[href^="torrents-details.php?id="]
attribute: href
date:
selector: th:nth-child(5)
filters:
- name: timeago
size:
selector: th:nth-child(4)
seeders:
selector: th:nth-child(6)
leechers:
selector: th:nth-child(7)
downloadvolumefactor:
text: "0"
uploadvolumefactor:
text: "1"

View File

@@ -0,0 +1,69 @@
---
site: RockBox
name: RockBox Rock/Metal Tracker
description: "RockBox Semi-Private site dedicated to HEAVY METAL/ROCK MUSIC. This definition is for the English site."
language: en-us
type: semi-private
encoding: UTF-8
links:
- https://rawkbawx.rocks/
caps:
categories:
"Music": Audio
modes:
search: [q]
music-search: [q, album, artist, label, year]
login:
path: login.php
method: form
form: form[action="login.php?returnto=index.php"]
inputs:
uid: "{{ .Config.username }}"
pwd: "{{ .Config.password }}"
error:
- selector: div.errorSummary
message:
selector: div.errorSummary ul li
test:
path: index.php
selector: a[href="logout.php"]
search:
paths:
- path: torrents.php
method: get
inputs:
search: "{{if .Query.Artist}}{{ .Query.Artist }}{{else}}{{ .Keywords }}{{end}}"
rows:
selector: body:nth-child(2) tbody tr td:nth-child(2) table.lista tbody tr:nth-child(2) table.lista tbody tr
fields:
title:
selector: td a[href^="details.php?id="]
details:
selector: td a[href^="details.php?id="]
attribute: href
comments: # link to the comments of the torrent
selector: td a[href^="details.php?id="]
attribute: href
download:
selector: td a[href^="download.php?id="]
attribute: href
date:
selector: td:nth-child(6)
size: # size of the torrent (units are handled automatically)
selector: td:nth-child(7)
seeders:
selector: td:nth-child(9)
leechers:
selector: td:nth-child(10)
grabs: # number of downloads
selector: td:nth-child(11)
category:
text: "Music"
downloadvolumefactor:
text: "1"
uploadvolumefactor:
text: "1"

View File

@@ -6,6 +6,8 @@
type: public
encoding: UTF-8
links:
- https://torrentcouch.net/
legacylinks:
- https://torrentcouch.com/
caps:
@@ -23,10 +25,12 @@
search:
# https://torrentcouch.com/?s=expanse
# https://torrentcouch.net/page/3/?s=expanse
paths:
- path: /
inputs:
s: "{{.Keywords}}"
- path: "{{if .Keywords}}/?s={{ .Keywords}}{{else}}/{{end}}"
- path: "{{if .Keywords}}/page/2/?s={{ .Keywords}}{{else}}{{end}}"
- path: "{{if .Keywords}}/page/3/?s={{ .Keywords}}{{else}}{{end}}"
- path: "{{if .Keywords}}/page/4/?s={{ .Keywords}}{{else}}{{end}}"
rows:
selector: article
fields:
@@ -45,9 +49,9 @@
size:
text: "500 MB"
seeders:
text: "999"
text: "1"
leechers:
text: "999"
text: "1"
date:
text: now
downloadvolumefactor:

View File

@@ -6,7 +6,7 @@
type: semi-private
encoding: UTF-8
links:
- https://yggtorrent.to/
- https://www3.yggtorrent.to/
legacylinks:
- https://yggtorrent.is/
- https://yggtorrent.com/
@@ -16,6 +16,7 @@
- https://ww2.yggtorrent.is/
- https://ww3.yggtorrent.is/
- https://ww4.yggtorrent.is/
- https://yggtorrent.to/
caps:
categorymappings:

View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Collections.Specialized;
using System.Globalization;
@@ -155,19 +155,22 @@ namespace Jackett.Common.Indexers
release.MinimumRatio = 1;
release.MinimumSeedTime = 172800;
int tdIndex = 0;
if(qRow.Find("td:nth-last-child(1)").Text() == "Edit") tdIndex = 1;
// Sometimes the uploader column is missing
int seeders, peers;
if (ParseUtil.TryCoerceInt(qRow.Find("td:nth-last-child(3)").Text(), out seeders))
if (ParseUtil.TryCoerceInt(qRow.Find($"td:nth-last-child({tdIndex + 3})").Text(), out seeders))
{
release.Seeders = seeders;
if (ParseUtil.TryCoerceInt(qRow.Find("td:nth-last-child(2)").Text(), out peers))
if (ParseUtil.TryCoerceInt(qRow.Find($"td:nth-last-child({tdIndex + 2})").Text(), out peers))
{
release.Peers = peers + release.Seeders;
}
}
release.Grabs = ParseUtil.CoerceLong(qRow.Find("td:nth-last-child(1)").Text());
release.Grabs = ParseUtil.CoerceLong(qRow.Find($"td:nth-last-child({tdIndex + 1})").Text());
string fullSize = qRow.Find("td.mainblockcontent").Get(6).InnerText;
release.Size = ReleaseInfo.GetBytes(fullSize);

View File

@@ -135,6 +135,13 @@ namespace Jackett.Common.Indexers
continue;
}
// Ensure fansub group name is present in the title
// This is needed for things like configuring tag restrictions in Sonarr
if (title.Contains("[HorribleSubs]") == false)
{
title = "[HorribleSubs] " + title;
}
DateTime releasedate;
if (dateStr == "Today")
{
@@ -148,25 +155,33 @@ namespace Jackett.Common.Indexers
{
releasedate = DateTime.SpecifyKind(DateTime.ParseExact(dateStr, "MM/dd/yy", CultureInfo.InvariantCulture), DateTimeKind.Utc).ToLocalTime();
}
var p480 = releaserow.QuerySelector(".link-480p");
if (p480 != null)
{
var release = new ReleaseInfo();
var release = new ReleaseInfo
{
PublishDate = releasedate,
Files = 1,
Category = new List<int> { TorznabCatType.TVAnime.ID },
Size = 524288000,
Seeders = 1,
Peers = 2,
DownloadVolumeFactor = 0,
UploadVolumeFactor = 1
};
release.Title = string.Format("{0} [480p]", title);
release.PublishDate = releasedate;
var torrentlink = new Uri(p480.QuerySelector(".hs-torrent-link > a").GetAttribute("href"));
release.Link = torrentlink;
release.Guid = torrentlink;
release.MagnetUri = new Uri(p480.QuerySelector(".hs-magnet-link > a").GetAttribute("href"));
release.Files = 1;
release.Category = new List<int> { TorznabCatType.TVAnime.ID };
release.Size = 524288000;
release.Seeders = 999;
release.Peers = 1998;
release.DownloadVolumeFactor = 0;
release.UploadVolumeFactor = 1;
if (p480.QuerySelector(".hs-torrent-link > a") != null)
{
release.Link = new Uri(p480.QuerySelector(".hs-torrent-link > a").GetAttribute("href"));
release.Guid = release.Link;
}
if (p480.QuerySelector(".hs-magnet-link > a") != null)
{
release.MagnetUri = new Uri(p480.QuerySelector(".hs-magnet-link > a").GetAttribute("href"));
release.Guid = release.MagnetUri;
}
releases.Add(release);
}
@@ -174,20 +189,28 @@ namespace Jackett.Common.Indexers
if (p720 != null)
{
var release = new ReleaseInfo();
var release = new ReleaseInfo
{
PublishDate = releasedate,
Files = 1,
Category = new List<int> { TorznabCatType.TVAnime.ID },
Size = 524288000,
Seeders = 1,
Peers = 2,
DownloadVolumeFactor = 0,
UploadVolumeFactor = 1
};
release.Title = string.Format("{0} [720p]", title);
release.PublishDate = releasedate;
var torrentlink = new Uri(p720.QuerySelector(".hs-torrent-link > a").GetAttribute("href"));
release.Link = torrentlink;
release.Guid = torrentlink;
release.MagnetUri = new Uri(p720.QuerySelector(".hs-magnet-link > a").GetAttribute("href"));
release.Files = 1;
release.Category = new List<int> { TorznabCatType.TVAnime.ID };
release.Size = 524288000;
release.Seeders = 999;
release.Peers = 1998;
release.DownloadVolumeFactor = 0;
release.UploadVolumeFactor = 1;
if (p720.QuerySelector(".hs-torrent-link > a") != null)
{
release.Link = new Uri(p720.QuerySelector(".hs-torrent-link > a").GetAttribute("href"));
release.Guid = release.Link;
}
if (p720.QuerySelector(".hs-magnet-link > a") != null)
{
release.MagnetUri = new Uri(p720.QuerySelector(".hs-magnet-link > a").GetAttribute("href"));
release.Guid = release.MagnetUri;
}
releases.Add(release);
}
@@ -195,23 +218,30 @@ namespace Jackett.Common.Indexers
if (p1080 != null)
{
var release = new ReleaseInfo();
var release = new ReleaseInfo
{
PublishDate = releasedate,
Files = 1,
Category = new List<int> { TorznabCatType.TVAnime.ID },
Size = 524288000,
Seeders = 1,
Peers = 2,
DownloadVolumeFactor = 0,
UploadVolumeFactor = 1
};
release.Title = string.Format("{0} [1080p]", title);
release.PublishDate = releasedate;
var torrentlink = new Uri(p1080.QuerySelector(".hs-torrent-link > a").GetAttribute("href"));
release.Link = torrentlink;
release.Guid = torrentlink;
release.MagnetUri = new Uri(p1080.QuerySelector(".hs-magnet-link > a").GetAttribute("href"));
release.Files = 1;
release.Category = new List<int> { TorznabCatType.TVAnime.ID };
release.Size = 524288000;
release.Seeders = 999;
release.Peers = 1998;
release.DownloadVolumeFactor = 0;
release.UploadVolumeFactor = 1;
if (p1080.QuerySelector(".hs-torrent-link > a") != null)
{
release.Link = new Uri(p1080.QuerySelector(".hs-torrent-link > a").GetAttribute("href"));
release.Guid = release.Link;
}
if (p1080.QuerySelector(".hs-magnet-link > a") != null)
{
release.MagnetUri = new Uri(p1080.QuerySelector(".hs-magnet-link > a").GetAttribute("href"));
release.Guid = release.MagnetUri;
}
releases.Add(release);
}
}
}
catch (Exception ex)

View File

@@ -117,45 +117,9 @@ namespace Jackett.Common.Indexers
return IndexerConfigurationStatus.RequiresTesting;
}
protected async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query, String seasonep)
List<ReleaseInfo> parseTorrents(WebClientStringResult results, String seasonep, TorznabQuery query, int already_founded)
{
var releases = new List<ReleaseInfo>();
var searchString = query.GetQueryString();
var pairs = new List<KeyValuePair<string, string>>();
if (seasonep != null)
{
searchString = query.SanitizedSearchTerm;
}
pairs.Add(new KeyValuePair<string, string>("nyit_sorozat_resz", "true"));
pairs.Add(new KeyValuePair<string, string>("miben", "name"));
pairs.Add(new KeyValuePair<string, string>("tipus", "kivalasztottak_kozott"));
pairs.Add(new KeyValuePair<string, string>("submit.x", "1"));
pairs.Add(new KeyValuePair<string, string>("submit.y", "1"));
pairs.Add(new KeyValuePair<string, string>("submit", "Ok"));
pairs.Add(new KeyValuePair<string, string>("mire", searchString));
var cats = MapTorznabCapsToTrackers(query);
if (cats.Count == 0)
cats = GetAllTrackerCategories();
foreach (var lcat in LanguageCats)
{
if (!configData.Hungarian.Value)
cats.Remove(lcat + "_hun");
if (!configData.English.Value)
cats.Remove(lcat);
}
foreach (var cat in cats)
{
pairs.Add(new KeyValuePair<string, string>("kivalasztott_tipus[]", cat));
}
var results = await PostDataWithCookiesAndRetry(SearchUrl, pairs);
try
{
CQ dom = results.Content;
@@ -163,9 +127,10 @@ namespace Jackett.Common.Indexers
ReleaseInfo release;
var rows = dom[".box_torrent_all"].Find(".box_torrent");
foreach (var row in rows)
// Check torrents only till we reach the query Limit
for(int i=0; (i<rows.Length && (already_founded + releases.Count) < query.Limit); i++)
{
CQ qRow = row.Cq();
CQ qRow = rows[i].Cq();
var key = dom["link[rel=alternate]"].First().Attr("href").Split('=').Last();
@@ -173,7 +138,8 @@ namespace Jackett.Common.Indexers
var torrentTxt = qRow.Find(".torrent_txt, .torrent_txt2").Find("a").Get(0);
//if (torrentTxt == null) continue;
release.Title = torrentTxt.GetAttribute("title");
release.Description = qRow.Find("div.siterank").Text();
release.Description = qRow.Find("span").Get(0).GetAttribute("title") + " " + qRow.Find("a.infolink").Text();
release.MinimumRatio = 1;
release.MinimumSeedTime = 172800;
release.DownloadVolumeFactor = 0;
@@ -203,6 +169,11 @@ namespace Jackett.Common.Indexers
string catlink = qRow.Find("a:has(img[class='categ_link'])").First().Attr("href");
string cat = ParseUtil.GetArgumentFromQueryString(catlink, "tipus");
release.Category = MapTrackerCatToNewznab(cat);
/* if the release name not contains the language we add it because it is know from category */
if (cat.Contains("hun") && !release.Title.Contains("hun"))
release.Title += ".hun";
if (seasonep == null)
releases.Add(release);
@@ -252,6 +223,76 @@ namespace Jackett.Common.Indexers
return releases;
}
protected async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query, String seasonep)
{
var releases = new List<ReleaseInfo>();
var searchString = query.GetQueryString();
var pairs = new List<KeyValuePair<string, string>>();
if (seasonep != null)
{
searchString = query.SanitizedSearchTerm;
}
pairs.Add(new KeyValuePair<string, string>("nyit_sorozat_resz", "true"));
pairs.Add(new KeyValuePair<string, string>("miben", "name"));
pairs.Add(new KeyValuePair<string, string>("tipus", "kivalasztottak_kozott"));
pairs.Add(new KeyValuePair<string, string>("submit.x", "1"));
pairs.Add(new KeyValuePair<string, string>("submit.y", "1"));
pairs.Add(new KeyValuePair<string, string>("submit", "Ok"));
pairs.Add(new KeyValuePair<string, string>("mire", searchString));
var cats = MapTorznabCapsToTrackers(query);
if (cats.Count == 0)
cats = GetAllTrackerCategories();
foreach (var lcat in LanguageCats)
{
if (!configData.Hungarian.Value)
cats.Remove(lcat + "_hun");
if (!configData.English.Value)
cats.Remove(lcat);
}
foreach (var cat in cats)
{
pairs.Add(new KeyValuePair<string, string>("kivalasztott_tipus[]", cat));
}
var results = await PostDataWithCookiesAndRetry(SearchUrl, pairs);
CQ dom = results.Content;
int numVal = 0;
// find pagelinks in the bottom
var pagelinks = dom["div[id=pager_bottom]"].Find("a");
if (pagelinks.Length > 0)
{
// If there are several pages find the link for the latest one
var last_page_link = (pagelinks[pagelinks.Length - 1].Cq().Attr("href")).Trim();
// find out the number of the last page from the link
Match match = Regex.Match(last_page_link, @"(?<=[\?,&]oldal=)(\d+)(?=&)");
numVal = Int32.Parse(match.Value);
}
releases = parseTorrents(results, seasonep, query, releases.Count);
// Check all the pages for the torrents.
// The starting index is 2. (the first one is the original where we parse out the pages.)
for (int i=2; (i<= numVal && releases.Count < query.Limit); i++ )
{
pairs.Add(new KeyValuePair<string, string>("oldal", i.ToString()));
results = await PostDataWithCookiesAndRetry(SearchUrl, pairs);
releases.AddRange(parseTorrents(results, seasonep, query, releases.Count));
pairs.Remove(new KeyValuePair<string, string>("oldal", i.ToString()));
}
return releases;
}
protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
{
var results = await PerformQuery(query, null);

View File

@@ -18,7 +18,7 @@ namespace Jackett.Common.Indexers
public class Yts : BaseWebIndexer
{
public override string[] LegacySiteLinks { get; protected set; } = new string[] {
"https://yts.am/",
"https://yts.ag/",
};
private string ApiEndpoint { get { return SiteLink + "api/v2/list_movies.json"; } }
@@ -32,7 +32,7 @@ namespace Jackett.Common.Indexers
public Yts(IIndexerConfigurationService configService, WebClient wc, Logger l, IProtectionService ps)
: base(name: "YTS",
description: "YTS is a Public torrent site specialising in HD movies of small size",
link: "https://yts.ag/",
link: "https://yts.am/",
caps: new TorznabCapabilities(),
configService: configService,
client: wc,
@@ -142,7 +142,7 @@ namespace Jackett.Common.Indexers
// Append the quality to the title because thats how radarr seems to be determining the quality?
// All releases are BRRips, see issue #2200
release.Title = movie_item.Value<string>("title_long") + " " + torrent_info.Value<string>("quality") + " BRRip";
release.Title = "[YTS] " + movie_item.Value<string>("title_long") + " " + torrent_info.Value<string>("quality") + " BRRip";
var imdb = movie_item.Value<string>("imdb_code");
release.Imdb = ParseUtil.GetImdbID(imdb);