shpaq/Jackett-Jackett
1
0
Fork 0
mirror of https://github.com/Jackett/Jackett.git synced 2025-09-29 13:27:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Resolve Merge conflict

Browse Source
This commit is contained in:
KZ
2015-07-25 10:26:01 +01:00
parent ef0948f005 45e8900b94
commit e9e8d29697
16 changed files with 54 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Jackett/Indexers/AlphaRatio.cs
View File

@@ -37,10 +37,10 @@ namespace Jackett.Indexers
manager: i,
logger: l)
{
LoginUrl = SiteLink + "/login.php";
SearchUrl = SiteLink + "/ajax.php?action=browse&searchstr=";
DownloadUrl = SiteLink + "/torrents.php?action=download&id=";
GuidUrl = SiteLink + "/torrents.php?torrentid=";
LoginUrl = SiteLink + "login.php";
SearchUrl = SiteLink + "ajax.php?action=browse&searchstr=";
DownloadUrl = SiteLink + "torrents.php?action=download&id=";
GuidUrl = SiteLink + "torrents.php?torrentid=";
cookies = new CookieContainer();
handler = new HttpClientHandler

4
src/Jackett/Indexers/AnimeBytes.cs
View File

@@ -57,8 +57,8 @@ namespace Jackett.Indexers
{
TorznabCaps.Categories.Clear();
TorznabCaps.Categories.Add(new TorznabCategory { ID = "5070", Name = "TV/Anime" });
LoginUrl = SiteLink + "/user/login";
SearchUrl = SiteLink + "/torrents.php?filter_cat[1]=1";
LoginUrl = SiteLink + "user/login";
SearchUrl = SiteLink + "torrents.php?filter_cat[1]=1";
webclient = client;
}

4
src/Jackett/Indexers/BeyondHD.cs
View File

@@ -32,8 +32,8 @@ namespace Jackett.Indexers
manager: i,
logger: l)
{
SearchUrl = SiteLink + "/browse.php?c40=1&c44=1&c48=1&c89=1&c46=1&c45=1&searchin=title&incldead=0&search={0}";
DownloadUrl = SiteLink + "/download.php?torrent={0}";
SearchUrl = SiteLink + "browse.php?c40=1&c44=1&c48=1&c89=1&c46=1&c45=1&searchin=title&incldead=0&search={0}";
DownloadUrl = SiteLink + "download.php?torrent={0}";
cookies = new CookieContainer();
handler = new HttpClientHandler

6
src/Jackett/Indexers/BitHdtv.cs
View File

@@ -34,9 +34,9 @@ namespace Jackett.Indexers
manager: i,
logger: l)
{
LoginUrl = SiteLink + "/takelogin.php";
SearchUrl = SiteLink + "/torrents.php?cat=0&search=";
DownloadUrl = SiteLink + "/download.php?/{0}/dl.torrent";
LoginUrl = SiteLink + "takelogin.php";
SearchUrl = SiteLink + "torrents.php?cat=0&search=";
DownloadUrl = SiteLink + "download.php?/{0}/dl.torrent";
cookies = new CookieContainer();
handler = new HttpClientHandler

8
src/Jackett/Indexers/BitMeTV.cs
View File

@@ -60,10 +60,10 @@ namespace Jackett.Indexers
manager: i,
logger: l)
{
LoginUrl = SiteLink + "/login.php";
LoginPost = SiteLink + "/takelogin.php";
CaptchaUrl = SiteLink + "/visual.php";
SearchUrl = SiteLink + "/browse.php";
LoginUrl = SiteLink + "login.php";
LoginPost = SiteLink + "takelogin.php";
CaptchaUrl = SiteLink + "visual.php";
SearchUrl = SiteLink + "browse.php";
cookies = new CookieContainer();
handler = new HttpClientHandler

8
src/Jackett/Indexers/Freshon.cs
View File

@@ -32,15 +32,15 @@ namespace Jackett.Indexers
public Freshon(IIndexerManagerService i, Logger l)
: base(name: "FreshOnTV",
description: "Our goal is to provide the latest stuff in the TV show domain",
link: new Uri("https://www.bit-hdtv.com"),
link: new Uri("https://freshon.tv"),
caps: TorznabCapsUtil.CreateDefaultTorznabTVCaps(),
manager: i,
logger: l)
{
LoginUrl = SiteLink + "/login.php";
LoginPostUrl = SiteLink + "/login.php?action=makelogin";
SearchUrl = SiteLink + "/browse.php";
LoginUrl = SiteLink + "login.php";
LoginPostUrl = SiteLink + "login.php?action=makelogin";
SearchUrl = SiteLink + "browse.php";
cookies = new CookieContainer();
handler = new HttpClientHandler

4
src/Jackett/Indexers/HDTorrents.cs
View File

@@ -34,8 +34,8 @@ namespace Jackett.Indexers
manager: i,
logger: l)
{
SearchUrl = SiteLink + "/torrents.php?search={0}&active=1&options=0&category%5B%5D=59&category%5B%5D=60&category%5B%5D=30&category%5B%5D=38&page={1}";
LoginUrl = SiteLink + "/login.php";
SearchUrl = SiteLink + "torrents.php?search={0}&active=1&options=0&category%5B%5D=59&category%5B%5D=60&category%5B%5D=30&category%5B%5D=38&page={1}";
LoginUrl = SiteLink + "login.php";
cookies = new CookieContainer();
handler = new HttpClientHandler

8
src/Jackett/Indexers/MoreThanTV.cs
View File

@@ -35,10 +35,10 @@ namespace Jackett.Indexers
manager: i,
logger: l)
{
LoginUrl = SiteLink + "/login.php";
SearchUrl = SiteLink + "/ajax.php?action=browse&searchstr=";
DownloadUrl = SiteLink + "/torrents.php?action=download&id=";
GuidUrl = SiteLink + "/torrents.php?torrentid=";
LoginUrl = SiteLink + "login.php";
SearchUrl = SiteLink + "ajax.php?action=browse&searchstr=";
DownloadUrl = SiteLink + "torrents.php?action=download&id=";
GuidUrl = SiteLink + "torrents.php?torrentid=";
client = c;
}

6
src/Jackett/Indexers/SceneAccess.cs
View File

@@ -26,13 +26,13 @@ namespace Jackett.Indexers
public SceneAccess(IIndexerManagerService i, IWebClient c, Logger l)
: base(name: "SceneAccess",
description: "Your gateway to the scene",
link: new Uri("https://sceneaccess.eu"),
link: new Uri("https://sceneaccess.eu/"),
caps: TorznabCapsUtil.CreateDefaultTorznabTVCaps(),
manager: i,
logger: l)
{
LoginUrl = SiteLink + "/login";
SearchUrl = SiteLink + "/{0}?method=1&c{1}=1&search={2}";
LoginUrl = SiteLink + "login";
SearchUrl = SiteLink + "{0}?method=1&c{1}=1&search={2}";
webclient = c;
}

15
src/Jackett/Indexers/SceneTime.cs
View File

@@ -34,9 +34,9 @@ namespace Jackett.Indexers
manager: i,
logger: l)
{
LoginUrl = SiteLink + "/takelogin.php";
SearchUrl = SiteLink + "/browse_API.php";
DownloadUrl = SiteLink + "/download.php/{0}/download.torrent";
LoginUrl = SiteLink + "takelogin.php";
SearchUrl = SiteLink + "browse_API.php";
DownloadUrl = SiteLink + "download.php/{0}/download.torrent";
cookies = new CookieContainer();
handler = new HttpClientHandler
@@ -133,16 +133,17 @@ namespace Jackett.Indexers
var dateStr = descCol.ChildNodes.Last().NodeValue.Trim();
var euDate = DateTime.ParseExact(dateStr, "yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture);
var localDate = TimeZoneInfo.ConvertTimeToUtc(euDate, TimeZoneInfo.FindSystemTimeZoneById("Central European Standard Time")).ToLocalTime();
var timezoneString = Environment.OSVersion.Platform == PlatformID.Unix ? "Europe/Berlin" : "Central European Standard Time";
var localDate = TimeZoneInfo.ConvertTimeToUtc(euDate, TimeZoneInfo.FindSystemTimeZoneById(timezoneString)).ToLocalTime();
release.PublishDate = localDate;
var sizeNodes = row.ChildElements.ElementAt(3).ChildNodes;
var sizeNodes = row.ChildElements.ElementAt(5).ChildNodes;
var sizeVal = sizeNodes.First().NodeValue;
var sizeUnit = sizeNodes.Last().NodeValue;
release.Size = ReleaseInfo.GetBytes(sizeUnit, ParseUtil.CoerceFloat(sizeVal));
release.Seeders = ParseUtil.CoerceInt(row.ChildElements.ElementAt(4).Cq().Text().Trim());
release.Peers = ParseUtil.CoerceInt(row.ChildElements.ElementAt(5).Cq().Text().Trim()) + release.Seeders;
release.Seeders = ParseUtil.CoerceInt(row.ChildElements.ElementAt(6).Cq().Text().Trim());
release.Peers = ParseUtil.CoerceInt(row.ChildElements.ElementAt(7).Cq().Text().Trim()) + release.Seeders;
releases.Add(release);
}

2
src/Jackett/Indexers/ShowRSS.cs
View File

@@ -33,7 +33,7 @@ namespace Jackett.Indexers
manager: i,
logger: l)
{
searchAllUrl = SiteLink + "/feeds/all.rss";
searchAllUrl = SiteLink + "feeds/all.rss";
cookies = new CookieContainer();
handler = new HttpClientHandler

8
src/Jackett/Indexers/SpeedCD.cs
View File

@@ -37,10 +37,10 @@ namespace Jackett.Indexers
manager: i,
logger: l)
{
LoginUrl = SiteLink + "/take_login.php";
SearchUrl = SiteLink + "/V3/API/API.php";
CommentsUrl = SiteLink + "/t/{0}";
DownloadUrl = SiteLink + "/download.php?torrent={0}";
LoginUrl = SiteLink + "take_login.php";
SearchUrl = SiteLink + "V3/API/API.php";
CommentsUrl = SiteLink + "t/{0}";
DownloadUrl = SiteLink + "download.php?torrent={0}";
cookies = new CookieContainer();
handler = new HttpClientHandler

6
src/Jackett/Indexers/TorrentDay.cs
View File

@@ -34,9 +34,9 @@ namespace Jackett.Indexers
manager: i,
logger: l)
{
StartPageUrl = SiteLink + "/login.php";
LoginUrl = SiteLink + "/tak3login.php";
SearchUrl = SiteLink + "/browse.php?search={0}&cata=yes&c2=1&c7=1&c14=1&c24=1&c26=1&c31=1&c32=1&c33=1";
StartPageUrl = SiteLink + "login.php";
LoginUrl = SiteLink + "tak3login.php";
SearchUrl = SiteLink + "browse.php?search={0}&cata=yes&c2=1&c7=1&c14=1&c24=1&c26=1&c31=1&c32=1&c33=1";
cookies = new CookieContainer();
handler = new HttpClientHandler

4
src/Jackett/Indexers/TorrentLeech.cs
View File

@@ -33,8 +33,8 @@ namespace Jackett.Indexers
manager: i,
logger: l)
{
LoginUrl = SiteLink + "/user/account/login/";
SearchUrl = SiteLink + "/torrents/browse/index/query/{0}/categories/2%2C26%2C27%2C32/orderby/added?";
LoginUrl = SiteLink + "user/account/login/";
SearchUrl = SiteLink + "torrents/browse/index/query/{0}/categories/2%2C26%2C27%2C32/orderby/added?";
cookies = new CookieContainer();
handler = new HttpClientHandler

4
src/Jackett/Indexers/TorrentShack.cs
View File

@@ -33,8 +33,8 @@ namespace Jackett.Indexers
manager: i,
logger: l)
{
LoginUrl = SiteLink + "/login.php";
SearchUrl = SiteLink + "/torrents.php?searchstr={0}&release_type=both&searchtags=&tags_type=0&order_by=s3&order_way=desc&torrent_preset=all&filter_cat%5B600%5D=1&filter_cat%5B620%5D=1&filter_cat%5B700%5D=1&filter_cat%5B981%5D=1&filter_cat%5B980%5D=1";
LoginUrl = SiteLink + "login.php";
SearchUrl = SiteLink + "torrents.php?searchstr={0}&release_type=both&searchtags=&tags_type=0&order_by=s3&order_way=desc&torrent_preset=all&filter_cat%5B600%5D=1&filter_cat%5B620%5D=1&filter_cat%5B700%5D=1&filter_cat%5B981%5D=1&filter_cat%5B980%5D=1";
cookies = new CookieContainer();
handler = new HttpClientHandler
{

2
src/Jackett/Indexers/Torrentz.cs
View File

@@ -33,7 +33,7 @@ namespace Jackett.Indexers
logger: l)
{
SearchUrl = SiteLink + "/feed_verifiedP?f={0}";
SearchUrl = SiteLink + "feed_verifiedP?f={0}";
cookies = new CookieContainer();
handler = new HttpClientHandler
{