mirror of https://github.com/Jackett/Jackett
This commit is contained in:
commit
75f4342499
Binary file not shown.
After Width: | Height: | Size: 17 KiB |
|
@ -99,7 +99,8 @@ namespace Jackett.Controllers
|
||||||
{
|
{
|
||||||
ApiKey = request.passkey,
|
ApiKey = request.passkey,
|
||||||
Categories = MOVIE_CATS,
|
Categories = MOVIE_CATS,
|
||||||
SearchTerm = request.search
|
SearchTerm = request.search,
|
||||||
|
ImdbID = request.imdbid
|
||||||
};
|
};
|
||||||
|
|
||||||
IEnumerable<ReleaseInfo> releases = new List<ReleaseInfo>();
|
IEnumerable<ReleaseInfo> releases = new List<ReleaseInfo>();
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
using Jackett.Models;
|
using CsQuery;
|
||||||
|
using Jackett.Indexers;
|
||||||
|
using Jackett.Models;
|
||||||
using Jackett.Services;
|
using Jackett.Services;
|
||||||
using Jackett.Utils;
|
using Jackett.Utils;
|
||||||
using Jackett.Utils.Clients;
|
using Jackett.Utils.Clients;
|
||||||
|
@ -8,10 +10,14 @@ using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using System.Net;
|
||||||
|
using System.Net.Http;
|
||||||
|
using System.Net.Http.Headers;
|
||||||
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using System.Web;
|
using System.Web;
|
||||||
|
using System.Web.UI.WebControls;
|
||||||
using Jackett.Models.IndexerConfig;
|
using Jackett.Models.IndexerConfig;
|
||||||
using AngleSharp;
|
|
||||||
|
|
||||||
namespace Jackett.Indexers
|
namespace Jackett.Indexers
|
||||||
{
|
{
|
||||||
|
@ -36,7 +42,7 @@ namespace Jackett.Indexers
|
||||||
client: c,
|
client: c,
|
||||||
logger: l,
|
logger: l,
|
||||||
p: ps,
|
p: ps,
|
||||||
configData: new ConfigurationDataBasicLogin("For best results, change the 'Torrents per page' setting to 100 in your profile on the FreshOn webpage."))
|
configData: new ConfigurationDataBasicLogin())
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -54,32 +60,15 @@ namespace Jackett.Indexers
|
||||||
|
|
||||||
await ConfigureIfOK(response.Cookies, response.Content != null && response.Content.Contains("/logout.php"), () =>
|
await ConfigureIfOK(response.Cookies, response.Content != null && response.Content.Contains("/logout.php"), () =>
|
||||||
{
|
{
|
||||||
var parser = new AngleSharp.Parser.Html.HtmlParser();
|
CQ dom = response.Content;
|
||||||
var document = parser.Parse(response.Content);
|
var messageEl = dom[".error_text"];
|
||||||
var messageEl = document.QuerySelector(".error_text");
|
var errorMessage = messageEl.Text().Trim();
|
||||||
var errorMessage = messageEl.TextContent.Trim();
|
|
||||||
throw new ExceptionWithConfigData(errorMessage, configData);
|
throw new ExceptionWithConfigData(errorMessage, configData);
|
||||||
});
|
});
|
||||||
return IndexerConfigurationStatus.RequiresTesting;
|
return IndexerConfigurationStatus.RequiresTesting;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
|
public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
|
||||||
{
|
|
||||||
string Url;
|
|
||||||
if (string.IsNullOrEmpty(query.GetQueryString()))
|
|
||||||
Url = SearchUrl;
|
|
||||||
else
|
|
||||||
{
|
|
||||||
Url = $"{SearchUrl}?search={HttpUtility.UrlEncode(query.GetQueryString())}&cat=0";
|
|
||||||
}
|
|
||||||
|
|
||||||
var response = await RequestStringWithCookiesAndRetry(Url);
|
|
||||||
List<ReleaseInfo> releases = ParseResponse(response.Content);
|
|
||||||
|
|
||||||
return releases;
|
|
||||||
}
|
|
||||||
|
|
||||||
private List<ReleaseInfo> ParseResponse(string htmlResponse)
|
|
||||||
{
|
{
|
||||||
TimeZoneInfo.TransitionTime startTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 3, 0, 0), 3, 5, DayOfWeek.Sunday);
|
TimeZoneInfo.TransitionTime startTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 3, 0, 0), 3, 5, DayOfWeek.Sunday);
|
||||||
TimeZoneInfo.TransitionTime endTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 4, 0, 0), 10, 5, DayOfWeek.Sunday);
|
TimeZoneInfo.TransitionTime endTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 4, 0, 0), 10, 5, DayOfWeek.Sunday);
|
||||||
|
@ -88,34 +77,47 @@ namespace Jackett.Indexers
|
||||||
TimeZoneInfo.AdjustmentRule[] adjustments = { adjustment };
|
TimeZoneInfo.AdjustmentRule[] adjustments = { adjustment };
|
||||||
TimeZoneInfo romaniaTz = TimeZoneInfo.CreateCustomTimeZone("Romania Time", new TimeSpan(2, 0, 0), "(GMT+02:00) Romania Time", "Romania Time", "Romania Daylight Time", adjustments);
|
TimeZoneInfo romaniaTz = TimeZoneInfo.CreateCustomTimeZone("Romania Time", new TimeSpan(2, 0, 0), "(GMT+02:00) Romania Time", "Romania Time", "Romania Daylight Time", adjustments);
|
||||||
|
|
||||||
List<ReleaseInfo> releases = new List<ReleaseInfo>();
|
var releases = new List<ReleaseInfo>();
|
||||||
|
string episodeSearchUrl;
|
||||||
|
|
||||||
|
if (string.IsNullOrEmpty(query.GetQueryString()))
|
||||||
|
episodeSearchUrl = SearchUrl;
|
||||||
|
else
|
||||||
|
{
|
||||||
|
episodeSearchUrl = $"{SearchUrl}?search={HttpUtility.UrlEncode(query.GetQueryString())}&cat=0";
|
||||||
|
}
|
||||||
|
|
||||||
|
var results = await RequestStringWithCookiesAndRetry(episodeSearchUrl);
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var parser = new AngleSharp.Parser.Html.HtmlParser();
|
CQ dom = results.Content;
|
||||||
var document = parser.Parse(htmlResponse);
|
|
||||||
var rows = document.QuerySelectorAll("#highlight > tbody > tr:not(:First-child)");
|
|
||||||
|
|
||||||
foreach (var row in rows)
|
var rows = dom["#highlight > tbody > tr"];
|
||||||
|
|
||||||
|
foreach (var row in rows.Skip(1))
|
||||||
{
|
{
|
||||||
var release = new ReleaseInfo();
|
var release = new ReleaseInfo();
|
||||||
|
|
||||||
var linkNameElement = row.QuerySelector("a.torrent_name_link");
|
var qRow = row.Cq();
|
||||||
|
var qLink = qRow.Find("a.torrent_name_link").First();
|
||||||
|
|
||||||
release.Title = linkNameElement.GetAttribute("title");
|
|
||||||
release.Description = release.Title;
|
|
||||||
release.Guid = new Uri(SiteLink + linkNameElement.GetAttribute("href"));
|
|
||||||
release.Comments = release.Guid;
|
|
||||||
release.Link = new Uri(SiteLink + row.QuerySelector("td.table_links > a").GetAttribute("href"));
|
|
||||||
release.Category = TvCategoryParser.ParseTvShowQuality(release.Title);
|
|
||||||
release.Seeders = ParseUtil.CoerceInt(row.QuerySelector("td.table_seeders").TextContent.Trim());
|
|
||||||
release.Peers = ParseUtil.CoerceInt(row.QuerySelector("td.table_leechers").TextContent.Trim()) + release.Seeders;
|
|
||||||
release.Size = ReleaseInfo.GetBytes(row.QuerySelector("td.table_size").TextContent);
|
|
||||||
release.MinimumRatio = 1;
|
release.MinimumRatio = 1;
|
||||||
release.MinimumSeedTime = 172800;
|
release.MinimumSeedTime = 172800;
|
||||||
|
release.Title = qLink.Attr("title");
|
||||||
|
release.Description = release.Title;
|
||||||
|
release.Guid = new Uri(SiteLink + qLink.Attr("href"));
|
||||||
|
release.Comments = release.Guid;
|
||||||
|
release.Link = new Uri(SiteLink + qRow.Find("td.table_links > a").First().Attr("href"));
|
||||||
|
release.Category = TvCategoryParser.ParseTvShowQuality(release.Title);
|
||||||
|
|
||||||
|
release.Seeders = ParseUtil.CoerceInt(qRow.Find("td.table_seeders").Text().Trim());
|
||||||
|
release.Peers = ParseUtil.CoerceInt(qRow.Find("td.table_leechers").Text().Trim()) + release.Seeders;
|
||||||
|
|
||||||
|
var sizeStr = qRow.Find("td.table_size")[0].Cq().Text();
|
||||||
|
release.Size = ReleaseInfo.GetBytes(sizeStr);
|
||||||
|
|
||||||
DateTime pubDateRomania;
|
DateTime pubDateRomania;
|
||||||
var dateString = row.QuerySelector("td.table_added").TextContent.Trim();
|
var dateString = qRow.Find("td.table_added").Text().Trim();
|
||||||
if (dateString.StartsWith("Today "))
|
if (dateString.StartsWith("Today "))
|
||||||
{ pubDateRomania = DateTime.SpecifyKind(DateTime.UtcNow.Date, DateTimeKind.Unspecified) + TimeSpan.Parse(dateString.Split(' ')[1]); }
|
{ pubDateRomania = DateTime.SpecifyKind(DateTime.UtcNow.Date, DateTimeKind.Unspecified) + TimeSpan.Parse(dateString.Split(' ')[1]); }
|
||||||
else if (dateString.StartsWith("Yesterday "))
|
else if (dateString.StartsWith("Yesterday "))
|
||||||
|
@ -131,7 +133,7 @@ namespace Jackett.Indexers
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
OnParseError(htmlResponse, ex);
|
OnParseError(results.Content, ex);
|
||||||
}
|
}
|
||||||
|
|
||||||
return releases;
|
return releases;
|
||||||
|
|
|
@ -103,9 +103,16 @@ namespace Jackett.Indexers
|
||||||
if (string.IsNullOrEmpty(query.GetQueryString()))
|
if (string.IsNullOrEmpty(query.GetQueryString()))
|
||||||
movieListSearchUrl = SearchUrl;
|
movieListSearchUrl = SearchUrl;
|
||||||
else
|
else
|
||||||
|
{
|
||||||
|
if (!string.IsNullOrEmpty(query.ImdbID))
|
||||||
|
{
|
||||||
|
movieListSearchUrl = string.Format("{0}?action=basic&searchstr={1}", SearchUrl, HttpUtility.UrlEncode(query.ImdbID));
|
||||||
|
}
|
||||||
|
else
|
||||||
{
|
{
|
||||||
movieListSearchUrl = string.Format("{0}?action=basic&searchstr={1}", SearchUrl, HttpUtility.UrlEncode(query.GetQueryString()));
|
movieListSearchUrl = string.Format("{0}?action=basic&searchstr={1}", SearchUrl, HttpUtility.UrlEncode(query.GetQueryString()));
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
var results = await RequestStringWithCookiesAndRetry(movieListSearchUrl);
|
var results = await RequestStringWithCookiesAndRetry(movieListSearchUrl);
|
||||||
try
|
try
|
||||||
|
|
|
@ -0,0 +1,133 @@
|
||||||
|
using Jackett.Models;
|
||||||
|
using Jackett.Services;
|
||||||
|
using Jackett.Utils;
|
||||||
|
using Jackett.Utils.Clients;
|
||||||
|
using Newtonsoft.Json.Linq;
|
||||||
|
using NLog;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Globalization;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using System.Web;
|
||||||
|
using Jackett.Models.IndexerConfig;
|
||||||
|
using AngleSharp.Parser.Html;
|
||||||
|
using System.Text.RegularExpressions;
|
||||||
|
|
||||||
|
namespace Jackett.Indexers
|
||||||
|
{
|
||||||
|
public class TransmitheNet : BaseIndexer, IIndexer
|
||||||
|
{
|
||||||
|
private string LoginUrl { get { return SiteLink + "login.php"; } }
|
||||||
|
private string SearchUrl { get { return SiteLink + "torrents.php"; } }
|
||||||
|
|
||||||
|
new ConfigurationDataBasicLogin configData
|
||||||
|
{
|
||||||
|
get { return (ConfigurationDataBasicLogin)base.configData; }
|
||||||
|
set { base.configData = value; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public TransmitheNet(IIndexerManagerService i, Logger l, IWebClient c, IProtectionService ps)
|
||||||
|
: base(name: "TransmitTheNet",
|
||||||
|
description: " At Transmithe.net we will change the way you think about TV",
|
||||||
|
link: "https://transmithe.net/",
|
||||||
|
caps: TorznabUtil.CreateDefaultTorznabTVCaps(),
|
||||||
|
manager: i,
|
||||||
|
client: c,
|
||||||
|
logger: l,
|
||||||
|
p: ps,
|
||||||
|
configData: new ConfigurationDataBasicLogin("For best results, change the 'Torrents per page' setting to 100 in your profile on the TTN webpage."))
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
|
||||||
|
{
|
||||||
|
configData.LoadValuesFromJson(configJson);
|
||||||
|
var pairs = new Dictionary<string, string> {
|
||||||
|
{ "username", configData.Username.Value },
|
||||||
|
{ "password", configData.Password.Value },
|
||||||
|
{ "keeplogged", "on" },
|
||||||
|
{ "login", "Login" }
|
||||||
|
};
|
||||||
|
|
||||||
|
CookieHeader = string.Empty;
|
||||||
|
var response = await RequestLoginAndFollowRedirect(LoginUrl, pairs, CookieHeader, true, null, LoginUrl);
|
||||||
|
|
||||||
|
await ConfigureIfOK(response.Cookies, response.Content != null && response.Content.Contains("logout.php"), () =>
|
||||||
|
{
|
||||||
|
var parser = new HtmlParser();
|
||||||
|
var document = parser.Parse(response.Content);
|
||||||
|
var messageEl = document.QuerySelector("form > span[class='warning']");
|
||||||
|
var errorMessage = messageEl.TextContent.Trim();
|
||||||
|
throw new ExceptionWithConfigData(errorMessage, configData);
|
||||||
|
});
|
||||||
|
return IndexerConfigurationStatus.RequiresTesting;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
|
||||||
|
{
|
||||||
|
string Url;
|
||||||
|
if (string.IsNullOrEmpty(query.GetQueryString()))
|
||||||
|
Url = SearchUrl;
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Url = $"{SearchUrl}?searchtext={HttpUtility.UrlEncode(query.GetQueryString())}";
|
||||||
|
}
|
||||||
|
|
||||||
|
var response = await RequestStringWithCookiesAndRetry(Url);
|
||||||
|
List<ReleaseInfo> releases = ParseResponse(response.Content);
|
||||||
|
|
||||||
|
return releases;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<ReleaseInfo> ParseResponse(string htmlResponse)
|
||||||
|
{
|
||||||
|
List<ReleaseInfo> releases = new List<ReleaseInfo>();
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var parser = new HtmlParser();
|
||||||
|
var document = parser.Parse(htmlResponse);
|
||||||
|
var rows = document.QuerySelectorAll(".torrent_table > tbody > tr:not(:First-child)");
|
||||||
|
|
||||||
|
foreach (var row in rows)
|
||||||
|
{
|
||||||
|
var release = new ReleaseInfo();
|
||||||
|
|
||||||
|
string title = row.QuerySelector("a[data-src]").GetAttribute("data-src");
|
||||||
|
if (string.IsNullOrEmpty(title) || title == "0")
|
||||||
|
{
|
||||||
|
title = row.QuerySelector("a[data-src]").TextContent;
|
||||||
|
title = Regex.Replace(title, @"[\[\]\/]", "");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
title = title.Remove(title.LastIndexOf("."));
|
||||||
|
}
|
||||||
|
|
||||||
|
release.Title = title;
|
||||||
|
release.Description = release.Title;
|
||||||
|
release.Guid = new Uri(SiteLink + row.QuerySelector("a[data-src]").GetAttribute("href"));
|
||||||
|
release.Comments = release.Guid;
|
||||||
|
release.Link = new Uri(SiteLink + row.QuerySelector("a[href*='action=download']").GetAttribute("href"));
|
||||||
|
release.Category = TvCategoryParser.ParseTvShowQuality(release.Title);
|
||||||
|
|
||||||
|
var timeAnchor = row.QuerySelector("span[class='time']");
|
||||||
|
release.PublishDate = DateTime.ParseExact(timeAnchor.GetAttribute("title"), "MMM dd yyyy, HH:mm", CultureInfo.InvariantCulture, DateTimeStyles.AssumeLocal);
|
||||||
|
release.Seeders = ParseUtil.CoerceInt(timeAnchor.ParentElement.NextElementSibling.NextElementSibling.TextContent.Trim());
|
||||||
|
release.Peers = ParseUtil.CoerceInt(timeAnchor.ParentElement.NextElementSibling.NextElementSibling.NextElementSibling.TextContent.Trim()) + release.Seeders;
|
||||||
|
release.Size = ReleaseInfo.GetBytes(timeAnchor.ParentElement.PreviousElementSibling.TextContent);
|
||||||
|
release.MinimumRatio = 1;
|
||||||
|
release.MinimumSeedTime = 172800;
|
||||||
|
|
||||||
|
releases.Add(release);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
OnParseError(htmlResponse, ex);
|
||||||
|
}
|
||||||
|
|
||||||
|
return releases;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -215,6 +215,7 @@
|
||||||
<Compile Include="Indexers\FileList.cs" />
|
<Compile Include="Indexers\FileList.cs" />
|
||||||
<Compile Include="Indexers\Abstract\AvistazTracker.cs" />
|
<Compile Include="Indexers\Abstract\AvistazTracker.cs" />
|
||||||
<Compile Include="Indexers\FrenchADN.cs" />
|
<Compile Include="Indexers\FrenchADN.cs" />
|
||||||
|
<Compile Include="Indexers\TransmitheNet.cs" />
|
||||||
<Compile Include="Indexers\WiHD.cs" />
|
<Compile Include="Indexers\WiHD.cs" />
|
||||||
<Compile Include="Indexers\XSpeeds.cs" />
|
<Compile Include="Indexers\XSpeeds.cs" />
|
||||||
<Compile Include="Models\GitHub\Asset.cs" />
|
<Compile Include="Models\GitHub\Asset.cs" />
|
||||||
|
@ -577,6 +578,9 @@
|
||||||
<Content Include="Content\logos\torrentleech.png">
|
<Content Include="Content\logos\torrentleech.png">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
|
<Content Include="Content\logos\transmithenet.png">
|
||||||
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
|
</Content>
|
||||||
<Content Include="Content\logos\tvchaosuk.png">
|
<Content Include="Content\logos\tvchaosuk.png">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
|
|
|
@ -18,6 +18,7 @@ namespace Jackett.Models
|
||||||
public int Limit { get; set; }
|
public int Limit { get; set; }
|
||||||
public int Offset { get; set; }
|
public int Offset { get; set; }
|
||||||
public int RageID { get; set; }
|
public int RageID { get; set; }
|
||||||
|
public string ImdbID { get; set; }
|
||||||
|
|
||||||
public int Season { get; set; }
|
public int Season { get; set; }
|
||||||
public string Episode { get; set; }
|
public string Episode { get; set; }
|
||||||
|
|
|
@ -74,7 +74,7 @@ namespace Jackett.Utils
|
||||||
// Filter out releases that do have a valid imdb ID, that is not equal to the one we're searching for.
|
// Filter out releases that do have a valid imdb ID, that is not equal to the one we're searching for.
|
||||||
return
|
return
|
||||||
results.Where(
|
results.Where(
|
||||||
result => !result.Imdb.HasValue || result.Imdb.Value == 0 || ("tt" + result.Imdb.Value).Equals(imdb));
|
result => !result.Imdb.HasValue || result.Imdb.Value == 0 || ("tt" + result.Imdb.Value.ToString("D7")).Equals(imdb));
|
||||||
}
|
}
|
||||||
|
|
||||||
private static string CleanTitle(string title)
|
private static string CleanTitle(string title)
|
||||||
|
|
Loading…
Reference in New Issue