From 9a4c5ffe5c67d1bbfb509d65d541dcdd175c3e8e Mon Sep 17 00:00:00 2001 From: zone117x Date: Sat, 25 Apr 2015 13:37:03 -0600 Subject: [PATCH] Added getstrike.net --- src/Jackett/IndexerInterface.cs | 13 +++++++------ src/Jackett/Indexers/ThePirateBay.cs | 13 +++++++------ src/Jackett/Jackett.csproj | 4 ++++ src/Jackett/ReleaseInfo.cs | 2 +- src/Jackett/ResultPage.cs | 6 +++--- src/Jackett/WebContent/logos/strike.png | Bin 0 -> 22479 bytes 6 files changed, 22 insertions(+), 16 deletions(-) create mode 100644 src/Jackett/WebContent/logos/strike.png diff --git a/src/Jackett/IndexerInterface.cs b/src/Jackett/IndexerInterface.cs index e421d25d3..5027c9b32 100644 --- a/src/Jackett/IndexerInterface.cs +++ b/src/Jackett/IndexerInterface.cs @@ -10,22 +10,23 @@ namespace Jackett { public interface IndexerInterface { + + // Invoked when the indexer configuration has been applied and verified so the cookie needs to be saved + event Action OnSaveConfigurationRequested; + string DisplayName { get; } string DisplayDescription { get; } Uri SiteLink { get; } + // Whether this indexer has been configured, verified and saved in the past and has the settings required for functioning + bool IsConfigured { get; } + // Retrieved for starting setup for the indexer via web API Task GetConfigurationForSetup(); // Called when web API wants to apply setup configuration via web API, usually this is where login and storing cookie happens Task ApplyConfiguration(JToken configJson); - // Invoked when the indexer configuration has been applied and verified so the cookie needs to be saved - event Action OnSaveConfigurationRequested; - - // Whether this indexer has been configured, verified and saved in the past and has the settings required for functioning - bool IsConfigured { get; } - // Called on startup when initializing indexers from saved configuration void LoadFromSavedConfiguration(JToken jsonConfig); diff --git a/src/Jackett/Indexers/ThePirateBay.cs b/src/Jackett/Indexers/ThePirateBay.cs index e141187d0..443f2c173 100644 --- a/src/Jackett/Indexers/ThePirateBay.cs +++ b/src/Jackett/Indexers/ThePirateBay.cs @@ -22,7 +22,7 @@ namespace Jackett.Indexers public ThePirateBayConfig() { - Url = new StringItem { Name = "Url", Value = "https://thepiratebay.se" }; + Url = new StringItem { Name = "Url", Value = DefaultUrl }; } public override Item[] GetItems() @@ -37,12 +37,13 @@ namespace Jackett.Indexers public string DisplayDescription { get { return "The worlds largest bittorrent indexer"; } } - public Uri SiteLink { get { return new Uri("https://thepiratebay.se"); } } + public Uri SiteLink { get { return new Uri(DefaultUrl); } } public bool IsConfigured { get; private set; } - static string SearchUrl = "/s/?q=\"{0}\"&category=205&page=0&orderby=99"; - static string SwitchSingleViewUrl = "/switchview.php?view=s"; + const string DefaultUrl = "https://thepiratebay.se"; + const string SearchUrl = "/s/?q=\"{0}\"&category=205&page=0&orderby=99"; + const string SwitchSingleViewUrl = "/switchview.php?view=s"; string BaseUrl; @@ -169,8 +170,8 @@ namespace Jackett.Indexers } var downloadCol = row.ChildElements.ElementAt(3).Cq().Find("a"); - release.MagnetUrl = new Uri(downloadCol.Attr("href")); - release.InfoHash = release.MagnetUrl.ToString().Split(':')[3].Split('&')[0]; + release.MagnetUri = new Uri(downloadCol.Attr("href")); + release.InfoHash = release.MagnetUri.ToString().Split(':')[3].Split('&')[0]; var sizeString = row.ChildElements.ElementAt(4).Cq().Text().Split(' '); var sizeVal = float.Parse(sizeString[0]); diff --git a/src/Jackett/Jackett.csproj b/src/Jackett/Jackett.csproj index defff711b..bfd48e2df 100644 --- a/src/Jackett/Jackett.csproj +++ b/src/Jackett/Jackett.csproj @@ -94,6 +94,7 @@ + Form @@ -195,6 +196,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest diff --git a/src/Jackett/ReleaseInfo.cs b/src/Jackett/ReleaseInfo.cs index 4e9add6ba..da77ce505 100644 --- a/src/Jackett/ReleaseInfo.cs +++ b/src/Jackett/ReleaseInfo.cs @@ -24,7 +24,7 @@ namespace Jackett public Uri ConverUrl { get; set; } public Uri BannerUrl { get; set; } public string InfoHash { get; set; } - public Uri MagnetUrl { get; set; } + public Uri MagnetUri { get; set; } public double? MinimumRatio { get; set; } public long? MinimumSeedTime { get; set; } diff --git a/src/Jackett/ResultPage.cs b/src/Jackett/ResultPage.cs index 1cd80b923..9514e036c 100644 --- a/src/Jackett/ResultPage.cs +++ b/src/Jackett/ResultPage.cs @@ -73,15 +73,15 @@ namespace Jackett new XElement("pubDate", xmlDateFormat(r.PublishDate)), new XElement("size", r.Size), new XElement("description", r.Description), - new XElement("link", r.Link ?? r.MagnetUrl), + new XElement("link", r.Link ?? r.MagnetUri), r.Category == null ? null : new XElement("category", r.Category), new XElement( "enclosure", - new XAttribute("url", r.Link ?? r.MagnetUrl), + new XAttribute("url", r.Link ?? r.MagnetUri), new XAttribute("length", r.Size), new XAttribute("type", "application/x-bittorrent") ), - getTorznabElement("magneturl", r.MagnetUrl), + getTorznabElement("magneturl", r.MagnetUri), getTorznabElement("rageid", r.RageID), getTorznabElement("seeders", r.Seeders), getTorznabElement("peers", r.Peers), diff --git a/src/Jackett/WebContent/logos/strike.png b/src/Jackett/WebContent/logos/strike.png new file mode 100644 index 0000000000000000000000000000000000000000..44a1b63aaceb4873e072b8563dde33fc92449a3d GIT binary patch literal 22479 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 phKWn-Rk%OPzux%