diff --git a/src/Jackett/Content/logos/transmithenet.png b/src/Jackett/Content/logos/transmithenet.png new file mode 100644 index 000000000..69f11cb56 Binary files /dev/null and b/src/Jackett/Content/logos/transmithenet.png differ diff --git a/src/Jackett/Controllers/PotatoController.cs b/src/Jackett/Controllers/PotatoController.cs index dff0f7021..b7e45ab40 100644 --- a/src/Jackett/Controllers/PotatoController.cs +++ b/src/Jackett/Controllers/PotatoController.cs @@ -99,7 +99,8 @@ namespace Jackett.Controllers { ApiKey = request.passkey, Categories = MOVIE_CATS, - SearchTerm = request.search + SearchTerm = request.search, + ImdbID = request.imdbid }; IEnumerable releases = new List(); diff --git a/src/Jackett/Indexers/Freshon.cs b/src/Jackett/Indexers/Freshon.cs index e786c1a88..ced6c9cb5 100644 --- a/src/Jackett/Indexers/Freshon.cs +++ b/src/Jackett/Indexers/Freshon.cs @@ -1,4 +1,6 @@ -using Jackett.Models; +using CsQuery; +using Jackett.Indexers; +using Jackett.Models; using Jackett.Services; using Jackett.Utils; using Jackett.Utils.Clients; @@ -8,10 +10,14 @@ using System; using System.Collections.Generic; using System.Globalization; using System.Linq; +using System.Net; +using System.Net.Http; +using System.Net.Http.Headers; +using System.Text; using System.Threading.Tasks; using System.Web; +using System.Web.UI.WebControls; using Jackett.Models.IndexerConfig; -using AngleSharp; namespace Jackett.Indexers { @@ -36,7 +42,7 @@ namespace Jackett.Indexers 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 FreshOn webpage.")) + configData: new ConfigurationDataBasicLogin()) { } @@ -54,32 +60,15 @@ namespace Jackett.Indexers await ConfigureIfOK(response.Cookies, response.Content != null && response.Content.Contains("/logout.php"), () => { - var parser = new AngleSharp.Parser.Html.HtmlParser(); - var document = parser.Parse(response.Content); - var messageEl = document.QuerySelector(".error_text"); - var errorMessage = messageEl.TextContent.Trim(); + CQ dom = response.Content; + var messageEl = dom[".error_text"]; + var errorMessage = messageEl.Text().Trim(); throw new ExceptionWithConfigData(errorMessage, configData); }); return IndexerConfigurationStatus.RequiresTesting; } public async Task> 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 releases = ParseResponse(response.Content); - - return releases; - } - - private List ParseResponse(string htmlResponse) { 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); @@ -88,40 +77,53 @@ namespace Jackett.Indexers 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); - List releases = new List(); + var releases = new List(); + 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 { - var parser = new AngleSharp.Parser.Html.HtmlParser(); - var document = parser.Parse(htmlResponse); - var rows = document.QuerySelectorAll("#highlight > tbody > tr:not(:First-child)"); + CQ dom = results.Content; - foreach (var row in rows) + var rows = dom["#highlight > tbody > tr"]; + + foreach (var row in rows.Skip(1)) { 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.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; - var dateString = row.QuerySelector("td.table_added").TextContent.Trim(); + var dateString = qRow.Find("td.table_added").Text().Trim(); 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 ")) - { pubDateRomania = DateTime.SpecifyKind(DateTime.UtcNow.Date, DateTimeKind.Unspecified) + TimeSpan.Parse(dateString.Split(' ')[1]) - TimeSpan.FromDays(1); } + { pubDateRomania = DateTime.SpecifyKind(DateTime.UtcNow.Date, DateTimeKind.Unspecified) + TimeSpan.Parse(dateString.Split(' ')[1]) - TimeSpan.FromDays(1); } else - { pubDateRomania = DateTime.SpecifyKind(DateTime.ParseExact(dateString, "d-MMM-yyyy HH:mm:ss", CultureInfo.InvariantCulture), DateTimeKind.Unspecified); } + { pubDateRomania = DateTime.SpecifyKind(DateTime.ParseExact(dateString, "d-MMM-yyyy HH:mm:ss", CultureInfo.InvariantCulture), DateTimeKind.Unspecified); } DateTime pubDateUtc = TimeZoneInfo.ConvertTimeToUtc(pubDateRomania, romaniaTz); release.PublishDate = pubDateUtc.ToLocalTime(); @@ -131,7 +133,7 @@ namespace Jackett.Indexers } catch (Exception ex) { - OnParseError(htmlResponse, ex); + OnParseError(results.Content, ex); } return releases; diff --git a/src/Jackett/Indexers/TehConnection.cs b/src/Jackett/Indexers/TehConnection.cs index e62ab5f19..8290852bd 100644 --- a/src/Jackett/Indexers/TehConnection.cs +++ b/src/Jackett/Indexers/TehConnection.cs @@ -104,7 +104,14 @@ namespace Jackett.Indexers movieListSearchUrl = SearchUrl; else { - movieListSearchUrl = string.Format("{0}?action=basic&searchstr={1}", SearchUrl, HttpUtility.UrlEncode(query.GetQueryString())); + 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())); + } } var results = await RequestStringWithCookiesAndRetry(movieListSearchUrl); diff --git a/src/Jackett/Indexers/TransmitheNet.cs b/src/Jackett/Indexers/TransmitheNet.cs new file mode 100644 index 000000000..e3b0f84c6 --- /dev/null +++ b/src/Jackett/Indexers/TransmitheNet.cs @@ -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 ApplyConfiguration(JToken configJson) + { + configData.LoadValuesFromJson(configJson); + var pairs = new Dictionary { + { "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> 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 releases = ParseResponse(response.Content); + + return releases; + } + + public List ParseResponse(string htmlResponse) + { + List releases = new List(); + + 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; + } + } +} diff --git a/src/Jackett/Jackett.csproj b/src/Jackett/Jackett.csproj index 6ce060367..8bcc96cc7 100644 --- a/src/Jackett/Jackett.csproj +++ b/src/Jackett/Jackett.csproj @@ -215,6 +215,7 @@ + @@ -577,6 +578,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest diff --git a/src/Jackett/Models/TorznabQuery.cs b/src/Jackett/Models/TorznabQuery.cs index 3df1a1cad..a976f8e80 100644 --- a/src/Jackett/Models/TorznabQuery.cs +++ b/src/Jackett/Models/TorznabQuery.cs @@ -18,6 +18,7 @@ namespace Jackett.Models public int Limit { get; set; } public int Offset { get; set; } public int RageID { get; set; } + public string ImdbID { get; set; } public int Season { get; set; } public string Episode { get; set; } diff --git a/src/Jackett/Utils/TorznabCapsUtil.cs b/src/Jackett/Utils/TorznabCapsUtil.cs index 954355d33..bbc760ddf 100644 --- a/src/Jackett/Utils/TorznabCapsUtil.cs +++ b/src/Jackett/Utils/TorznabCapsUtil.cs @@ -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. return 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)