From 621a47338dcd98ff0b2471b7df99f7995e10a4dd Mon Sep 17 00:00:00 2001 From: ngosang Date: Mon, 21 Sep 2020 18:39:47 +0200 Subject: [PATCH] core: refactor http webclient part 16 #8529 Rename RequestWithCookiesAsync method --- .../Indexers/Abstract/AvistazTracker.cs | 2 +- .../Indexers/Abstract/XtremeZoneTracker.cs | 10 +++---- src/Jackett.Common/Indexers/Anidex.cs | 2 +- src/Jackett.Common/Indexers/Anthelion.cs | 2 +- src/Jackett.Common/Indexers/AwesomeHD.cs | 2 +- src/Jackett.Common/Indexers/BJShare.cs | 8 +++--- src/Jackett.Common/Indexers/BakaBT.cs | 4 +-- src/Jackett.Common/Indexers/BaseIndexer.cs | 4 +-- src/Jackett.Common/Indexers/BitHDTV.cs | 2 +- .../Indexers/CardigannIndexer.cs | 26 +++++++++---------- src/Jackett.Common/Indexers/Cinecalidad.cs | 4 +-- src/Jackett.Common/Indexers/DanishBits.cs | 4 +-- src/Jackett.Common/Indexers/DigitalCore.cs | 2 +- src/Jackett.Common/Indexers/DigitalHive.cs | 2 +- src/Jackett.Common/Indexers/DivxTotal.cs | 6 ++--- src/Jackett.Common/Indexers/EliteTracker.cs | 6 ++--- src/Jackett.Common/Indexers/EpubLibre.cs | 2 +- src/Jackett.Common/Indexers/FileList.cs | 2 +- src/Jackett.Common/Indexers/Fuzer.cs | 6 ++--- src/Jackett.Common/Indexers/GazelleGames.cs | 2 +- src/Jackett.Common/Indexers/GimmePeers.cs | 2 +- src/Jackett.Common/Indexers/HDSpace.cs | 2 +- src/Jackett.Common/Indexers/HDTorrents.cs | 2 +- src/Jackett.Common/Indexers/Hebits.cs | 2 +- src/Jackett.Common/Indexers/Libble.cs | 2 +- src/Jackett.Common/Indexers/LostFilm.cs | 18 ++++++------- src/Jackett.Common/Indexers/MejorTorrent.cs | 10 +++---- src/Jackett.Common/Indexers/Milkie.cs | 2 +- src/Jackett.Common/Indexers/MyAmity.cs | 4 +-- src/Jackett.Common/Indexers/NCore.cs | 2 +- src/Jackett.Common/Indexers/Nebulance.cs | 2 +- src/Jackett.Common/Indexers/NewPCT.cs | 2 +- src/Jackett.Common/Indexers/NewRealWorld.cs | 4 +-- src/Jackett.Common/Indexers/NorBits.cs | 2 +- src/Jackett.Common/Indexers/NordicBits.cs | 2 +- src/Jackett.Common/Indexers/Partis.cs | 4 +-- src/Jackett.Common/Indexers/PirateTheNet.cs | 2 +- src/Jackett.Common/Indexers/PixelHD.cs | 8 +++--- src/Jackett.Common/Indexers/PornoLab.cs | 10 +++---- src/Jackett.Common/Indexers/PreToMe.cs | 4 +-- src/Jackett.Common/Indexers/RevolutionTT.cs | 2 +- src/Jackett.Common/Indexers/RuTracker.cs | 8 +++--- src/Jackett.Common/Indexers/SceneTime.cs | 4 +-- src/Jackett.Common/Indexers/Shazbat.cs | 2 +- src/Jackett.Common/Indexers/SolidTorrents.cs | 2 +- src/Jackett.Common/Indexers/SuperBits.cs | 2 +- src/Jackett.Common/Indexers/TVStore.cs | 2 +- src/Jackett.Common/Indexers/TVVault.cs | 2 +- src/Jackett.Common/Indexers/Toloka.cs | 4 +-- src/Jackett.Common/Indexers/TorrenTech.cs | 6 ++--- src/Jackett.Common/Indexers/TorrentBytes.cs | 2 +- src/Jackett.Common/Indexers/TorrentHeaven.cs | 8 +++--- src/Jackett.Common/Indexers/TorrentLeech.cs | 2 +- src/Jackett.Common/Indexers/TorrentNetwork.cs | 2 +- src/Jackett.Common/Indexers/TorrentSeeds.cs | 2 +- .../Indexers/TorrentSyndikat.cs | 2 +- src/Jackett.Common/Indexers/XSpeeds.cs | 6 ++--- .../Utils/Clients/HttpWebClient.cs | 2 ++ 58 files changed, 123 insertions(+), 121 deletions(-) diff --git a/src/Jackett.Common/Indexers/Abstract/AvistazTracker.cs b/src/Jackett.Common/Indexers/Abstract/AvistazTracker.cs index 4caaab8a2..400c92293 100644 --- a/src/Jackett.Common/Indexers/Abstract/AvistazTracker.cs +++ b/src/Jackett.Common/Indexers/Abstract/AvistazTracker.cs @@ -149,7 +149,7 @@ without this configuration the torrent download does not work.
You can find { "password", configData.Password.Value.Trim() }, { "pid", configData.Pid.Value.Trim() } }; - var result = await WebRequestWithCookiesAsync(AuthUrl, method: RequestType.POST, data: body, headers: AuthHeaders); + var result = await RequestWithCookiesAsync(AuthUrl, method: RequestType.POST, data: body, headers: AuthHeaders); var json = JObject.Parse(result.ContentString); _token = json.Value("token"); if (_token == null) diff --git a/src/Jackett.Common/Indexers/Abstract/XtremeZoneTracker.cs b/src/Jackett.Common/Indexers/Abstract/XtremeZoneTracker.cs index 7d7aa779c..f045d3336 100644 --- a/src/Jackett.Common/Indexers/Abstract/XtremeZoneTracker.cs +++ b/src/Jackett.Common/Indexers/Abstract/XtremeZoneTracker.cs @@ -75,7 +75,7 @@ namespace Jackett.Common.Indexers.Abstract { "password", configData.Password.Value.Trim() } }; var jsonData = JsonConvert.SerializeObject(body); - var result = await WebRequestWithCookiesAsync( + var result = await RequestWithCookiesAsync( LoginUrl, method: RequestType.POST, headers: ApiHeaders, rawbody: jsonData); var json = JObject.Parse(result.ContentString); _token = json.Value("token"); @@ -107,11 +107,11 @@ namespace Jackett.Common.Indexers.Abstract await RenewalTokenAsync(); var searchUrl = SearchUrl + "?" + qc.GetQueryString(); - var response = await WebRequestWithCookiesAsync(searchUrl, headers: GetSearchHeaders()); + var response = await RequestWithCookiesAsync(searchUrl, headers: GetSearchHeaders()); if (response.Status == HttpStatusCode.Unauthorized) { await RenewalTokenAsync(); // re-login - response = await WebRequestWithCookiesAsync(searchUrl, headers: GetSearchHeaders()); + response = await RequestWithCookiesAsync(searchUrl, headers: GetSearchHeaders()); } else if (response.Status != HttpStatusCode.OK) throw new Exception($"Unknown error in search: {response.ContentString}"); @@ -169,11 +169,11 @@ namespace Jackett.Common.Indexers.Abstract public override async Task Download(Uri link) { - var response = await WebRequestWithCookiesAsync(link.ToString(), headers: GetSearchHeaders()); + var response = await RequestWithCookiesAsync(link.ToString(), headers: GetSearchHeaders()); if (response.Status == HttpStatusCode.Unauthorized) { await RenewalTokenAsync(); - response = await WebRequestWithCookiesAsync(link.ToString(), headers: GetSearchHeaders()); + response = await RequestWithCookiesAsync(link.ToString(), headers: GetSearchHeaders()); } else if (response.Status != HttpStatusCode.OK) throw new Exception($"Unknown error in download: {response.ContentBytes}"); diff --git a/src/Jackett.Common/Indexers/Anidex.cs b/src/Jackett.Common/Indexers/Anidex.cs index 79b957eea..775eb23dc 100644 --- a/src/Jackett.Common/Indexers/Anidex.cs +++ b/src/Jackett.Common/Indexers/Anidex.cs @@ -217,7 +217,7 @@ namespace Jackett.Common.Indexers private async Task ConfigureDDoSGuardCookie() { const string ddosPostUrl = "https://check.ddos-guard.net/check.js"; - var response = await WebRequestWithCookiesAsync(ddosPostUrl, string.Empty); + var response = await RequestWithCookiesAsync(ddosPostUrl, string.Empty); if (response.Status != System.Net.HttpStatusCode.OK) throw new WebException($"Unexpected DDOS Guard response: Status: {response.Status}", WebExceptionStatus.ProtocolError); if (response.IsRedirect) diff --git a/src/Jackett.Common/Indexers/Anthelion.cs b/src/Jackett.Common/Indexers/Anthelion.cs index 2f2335afc..31d45d762 100644 --- a/src/Jackett.Common/Indexers/Anthelion.cs +++ b/src/Jackett.Common/Indexers/Anthelion.cs @@ -94,7 +94,7 @@ namespace Jackett.Common.Indexers qc.Add($"filter_cat[{cat}]", "1"); var searchUrl = BrowseUrl + "?" + qc.GetQueryString(); - var results = await WebRequestWithCookiesAsync(searchUrl); + var results = await RequestWithCookiesAsync(searchUrl); try { var parser = new HtmlParser(); diff --git a/src/Jackett.Common/Indexers/AwesomeHD.cs b/src/Jackett.Common/Indexers/AwesomeHD.cs index d91888d7d..2e524874b 100644 --- a/src/Jackett.Common/Indexers/AwesomeHD.cs +++ b/src/Jackett.Common/Indexers/AwesomeHD.cs @@ -100,7 +100,7 @@ namespace Jackett.Common.Indexers } var searchUrl = SearchUrl + "?" + qc.GetQueryString(); - var results = await WebRequestWithCookiesAsync(searchUrl); + var results = await RequestWithCookiesAsync(searchUrl); if (string.IsNullOrWhiteSpace(results.ContentString)) throw new Exception("Empty response. Please, check the Passkey."); diff --git a/src/Jackett.Common/Indexers/BJShare.cs b/src/Jackett.Common/Indexers/BJShare.cs index e05405426..508947d61 100644 --- a/src/Jackett.Common/Indexers/BJShare.cs +++ b/src/Jackett.Common/Indexers/BJShare.cs @@ -257,12 +257,12 @@ namespace Jackett.Common.Indexers foreach (var cat in MapTorznabCapsToTrackers(query)) queryCollection.Add("filter_cat[" + cat + "]", "1"); searchUrl += "?" + queryCollection.GetQueryString(); - var results = await WebRequestWithCookiesAsync(searchUrl); + var results = await RequestWithCookiesAsync(searchUrl); if (IsSessionIsClosed(results)) { // re-login await ApplyConfiguration(null); - results = await WebRequestWithCookiesAsync(searchUrl); + results = await RequestWithCookiesAsync(searchUrl); } try @@ -389,12 +389,12 @@ namespace Jackett.Common.Indexers private async Task> ParseLast24HoursAsync() { var releases = new List(); - var results = await WebRequestWithCookiesAsync(TodayUrl); + var results = await RequestWithCookiesAsync(TodayUrl); if (IsSessionIsClosed(results)) { // re-login await ApplyConfiguration(null); - results = await WebRequestWithCookiesAsync(TodayUrl); + results = await RequestWithCookiesAsync(TodayUrl); } try diff --git a/src/Jackett.Common/Indexers/BakaBT.cs b/src/Jackett.Common/Indexers/BakaBT.cs index 29f66a070..490a80644 100644 --- a/src/Jackett.Common/Indexers/BakaBT.cs +++ b/src/Jackett.Common/Indexers/BakaBT.cs @@ -247,7 +247,7 @@ namespace Jackett.Common.Indexers public override async Task Download(Uri link) { - var downloadPage = await WebRequestWithCookiesAsync(link.ToString()); + var downloadPage = await RequestWithCookiesAsync(link.ToString()); var parser = new HtmlParser(); var dom = parser.ParseDocument(downloadPage.ContentString); var downloadLink = dom.QuerySelectorAll(".download_link").First().GetAttribute("href"); @@ -255,7 +255,7 @@ namespace Jackett.Common.Indexers if (string.IsNullOrWhiteSpace(downloadLink)) throw new Exception("Unable to find download link."); - var response = await WebRequestWithCookiesAsync(SiteLink + downloadLink); + var response = await RequestWithCookiesAsync(SiteLink + downloadLink); return response.ContentBytes; } } diff --git a/src/Jackett.Common/Indexers/BaseIndexer.cs b/src/Jackett.Common/Indexers/BaseIndexer.cs index 859669c82..f39932254 100644 --- a/src/Jackett.Common/Indexers/BaseIndexer.cs +++ b/src/Jackett.Common/Indexers/BaseIndexer.cs @@ -422,7 +422,7 @@ namespace Jackett.Common.Indexers { try { - return await WebRequestWithCookiesAsync( + return await RequestWithCookiesAsync( url, cookieOverride, method, referer, data, headers, rawbody, emulateBrowser); } catch (Exception e) @@ -438,7 +438,7 @@ namespace Jackett.Common.Indexers throw lastException; } - protected virtual async Task WebRequestWithCookiesAsync( + protected virtual async Task RequestWithCookiesAsync( string url, string cookieOverride = null, RequestType method = RequestType.GET, string referer = null, IEnumerable> data = null, Dictionary headers = null, string rawbody = null, bool? emulateBrowser = null) diff --git a/src/Jackett.Common/Indexers/BitHDTV.cs b/src/Jackett.Common/Indexers/BitHDTV.cs index b34808e6a..dcd6f1e9f 100644 --- a/src/Jackett.Common/Indexers/BitHDTV.cs +++ b/src/Jackett.Common/Indexers/BitHDTV.cs @@ -63,7 +63,7 @@ namespace Jackett.Common.Indexers public override async Task GetConfigurationForSetup() { var result = configData; - var loginPage = await WebRequestWithCookiesAsync(LoginUrl, configData.CookieHeader.Value); + var loginPage = await RequestWithCookiesAsync(LoginUrl, configData.CookieHeader.Value); if (loginPage.IsRedirect) return result; // already logged in var parser = new HtmlParser(); diff --git a/src/Jackett.Common/Indexers/CardigannIndexer.cs b/src/Jackett.Common/Indexers/CardigannIndexer.cs index b29d5de58..80f2126c5 100644 --- a/src/Jackett.Common/Indexers/CardigannIndexer.cs +++ b/src/Jackett.Common/Indexers/CardigannIndexer.cs @@ -532,12 +532,12 @@ namespace Jackett.Common.Indexers ["g-recaptcha-response"] = CaptchaConfigItem.Value }; var ClearanceUrl = resolvePath("/cdn-cgi/l/chk_captcha?" + CloudFlareQueryCollection.GetQueryString()); - var ClearanceResult = await WebRequestWithCookiesAsync(ClearanceUrl.ToString(), referer: SiteLink); + var ClearanceResult = await RequestWithCookiesAsync(ClearanceUrl.ToString(), referer: SiteLink); if (ClearanceResult.IsRedirect) // clearance successfull { // request real login page again - landingResult = await WebRequestWithCookiesAsync(LoginUrl, referer: SiteLink); + landingResult = await RequestWithCookiesAsync(LoginUrl, referer: SiteLink); var htmlParser = new HtmlParser(); landingResultDocument = htmlParser.ParseDocument(landingResult.ContentString); } @@ -653,7 +653,7 @@ namespace Jackett.Common.Indexers if (simpleCaptchaPresent != null) { var captchaUrl = resolvePath("simpleCaptcha.php?numImages=1"); - var simpleCaptchaResult = await WebRequestWithCookiesAsync(captchaUrl.ToString(), referer: LoginUrl); + var simpleCaptchaResult = await RequestWithCookiesAsync(captchaUrl.ToString(), referer: LoginUrl); var simpleCaptchaJSON = JObject.Parse(simpleCaptchaResult.ContentString); var captchaSelection = simpleCaptchaJSON["images"][0]["hash"].ToString(); pairs["captchaSelection"] = captchaSelection; @@ -722,7 +722,7 @@ namespace Jackett.Common.Indexers headers.Add("Content-Type", "multipart/form-data; boundary=" + boundary); var body = string.Join("\r\n", bodyParts); - loginResult = await WebRequestWithCookiesAsync( + loginResult = await RequestWithCookiesAsync( submitUrl.ToString(), configData.CookieHeader.Value, RequestType.POST, SiteLink, pairs, headers, body); } @@ -750,7 +750,7 @@ namespace Jackett.Common.Indexers var LoginUrl = resolvePath(Login.Path + "?" + queryCollection.GetQueryString()).ToString(); configData.CookieHeader.Value = null; - var loginResult = await WebRequestWithCookiesAsync(LoginUrl, referer: SiteLink); + var loginResult = await RequestWithCookiesAsync(LoginUrl, referer: SiteLink); configData.CookieHeader.Value = loginResult.Cookies; checkForError(loginResult, Definition.Login.Error); @@ -760,7 +760,7 @@ namespace Jackett.Common.Indexers var OneUrl = applyGoTemplateText(Definition.Login.Inputs["oneurl"]); var LoginUrl = resolvePath(Login.Path + OneUrl).ToString(); configData.CookieHeader.Value = null; - var loginResult = await WebRequestWithCookiesAsync(LoginUrl, referer: SiteLink); + var loginResult = await RequestWithCookiesAsync(LoginUrl, referer: SiteLink); configData.CookieHeader.Value = loginResult.Cookies; checkForError(loginResult, Definition.Login.Error); @@ -794,7 +794,7 @@ namespace Jackett.Common.Indexers // test if login was successful var LoginTestUrl = resolvePath(Login.Test.Path).ToString(); - var testResult = await WebRequestWithCookiesAsync(LoginTestUrl); + var testResult = await RequestWithCookiesAsync(LoginTestUrl); if (testResult.IsRedirect) { @@ -887,7 +887,7 @@ namespace Jackett.Common.Indexers configData.CookieHeader.Value = null; if (Login.Cookies != null) configData.CookieHeader.Value = string.Join("; ", Login.Cookies); - landingResult = await WebRequestWithCookiesAsync(LoginUrl.AbsoluteUri, referer: SiteLink); + landingResult = await RequestWithCookiesAsync(LoginUrl.AbsoluteUri, referer: SiteLink); var htmlParser = new HtmlParser(); landingResultDocument = htmlParser.ParseDocument(landingResult.ContentString); @@ -930,7 +930,7 @@ namespace Jackett.Common.Indexers hasCaptcha = true; var CaptchaUrl = resolvePath(captchaElement.GetAttribute("src"), LoginUrl); - var captchaImageData = await WebRequestWithCookiesAsync( + var captchaImageData = await RequestWithCookiesAsync( CaptchaUrl.ToString(), landingResult.Cookies, referer: LoginUrl.AbsoluteUri); var CaptchaImage = new ImageItem { Name = "Captcha Image" }; var CaptchaText = new StringItem { Name = "Captcha Text" }; @@ -1345,7 +1345,7 @@ namespace Jackett.Common.Indexers headers.Add(header.Key, header.Value[0]); } - var response = await WebRequestWithCookiesAsync( + var response = await RequestWithCookiesAsync( searchUrl, method: method, headers: headers, data: queryCollection); if (response.IsRedirect && SearchPath.Followredirect) @@ -1368,7 +1368,7 @@ namespace Jackett.Common.Indexers if (!LoginResult) throw new Exception(string.Format("Relogin failed")); await TestLogin(); - response = await WebRequestWithCookiesAsync(searchUrl, method: method, data: queryCollection); + response = await RequestWithCookiesAsync(searchUrl, method: method, data: queryCollection); if (response.IsRedirect && SearchPath.Followredirect) await FollowIfRedirect(response); @@ -1792,9 +1792,9 @@ namespace Jackett.Common.Indexers if (Download.Selector != null) { var selector = applyGoTemplateText(Download.Selector, variables); - var response = await WebRequestWithCookiesAsync(link.ToString()); + var response = await RequestWithCookiesAsync(link.ToString()); if (response.IsRedirect) - response = await WebRequestWithCookiesAsync(response.RedirectingTo); + response = await RequestWithCookiesAsync(response.RedirectingTo); var results = response.ContentString; var searchResultParser = new HtmlParser(); var searchResultDocument = searchResultParser.ParseDocument(results); diff --git a/src/Jackett.Common/Indexers/Cinecalidad.cs b/src/Jackett.Common/Indexers/Cinecalidad.cs index 9dfb654f7..e5d4c18b9 100644 --- a/src/Jackett.Common/Indexers/Cinecalidad.cs +++ b/src/Jackett.Common/Indexers/Cinecalidad.cs @@ -120,7 +120,7 @@ namespace Jackett.Common.Indexers public override async Task Download(Uri link) { - var results = await WebRequestWithCookiesAsync(link.ToString()); + var results = await RequestWithCookiesAsync(link.ToString()); try { @@ -129,7 +129,7 @@ namespace Jackett.Common.Indexers var preotectedLink = dom.QuerySelector("a[service=BitTorrent]").GetAttribute("href"); preotectedLink = SiteLink + preotectedLink.TrimStart('/'); - results = await WebRequestWithCookiesAsync(preotectedLink); + results = await RequestWithCookiesAsync(preotectedLink); dom = parser.ParseDocument(results.ContentString); var magnetUrl = dom.QuerySelector("a[href^=magnet]").GetAttribute("href"); return await base.Download(new Uri(magnetUrl)); diff --git a/src/Jackett.Common/Indexers/DanishBits.cs b/src/Jackett.Common/Indexers/DanishBits.cs index 14343eefa..70271e6a6 100644 --- a/src/Jackett.Common/Indexers/DanishBits.cs +++ b/src/Jackett.Common/Indexers/DanishBits.cs @@ -65,13 +65,13 @@ namespace Jackett.Common.Indexers return searchString; } - protected override async Task WebRequestWithCookiesAsync( + protected override async Task RequestWithCookiesAsync( string url, string cookieOverride = null, RequestType method = RequestType.GET, string referer = null, IEnumerable> data = null, Dictionary headers = null, string rawbody = null, bool? emulateBrowser = null) { CookieHeader = null; // Download fill fail with cookies set - return await base.WebRequestWithCookiesAsync(url, cookieOverride, method, referer, data, headers); + return await base.RequestWithCookiesAsync(url, cookieOverride, method, referer, data, headers); } } } diff --git a/src/Jackett.Common/Indexers/DigitalCore.cs b/src/Jackett.Common/Indexers/DigitalCore.cs index ea016a4e4..c5d495116 100644 --- a/src/Jackett.Common/Indexers/DigitalCore.cs +++ b/src/Jackett.Common/Indexers/DigitalCore.cs @@ -136,7 +136,7 @@ namespace Jackett.Common.Indexers searchUrl += "?" + queryCollection.GetQueryString(); foreach (var cat in MapTorznabCapsToTrackers(query)) searchUrl += "&categories[]=" + cat; - var results = await WebRequestWithCookiesAsync(searchUrl, referer: SiteLink); + var results = await RequestWithCookiesAsync(searchUrl, referer: SiteLink); try { diff --git a/src/Jackett.Common/Indexers/DigitalHive.cs b/src/Jackett.Common/Indexers/DigitalHive.cs index c1bd3672c..f5da72e46 100644 --- a/src/Jackett.Common/Indexers/DigitalHive.cs +++ b/src/Jackett.Common/Indexers/DigitalHive.cs @@ -93,7 +93,7 @@ namespace Jackett.Common.Indexers public override async Task GetConfigurationForSetup() { - var loginPage = await WebRequestWithCookiesAsync(LoginUrl, configData.CookieHeader.Value); + var loginPage = await RequestWithCookiesAsync(LoginUrl, configData.CookieHeader.Value); var parser = new HtmlParser(); var cq = parser.ParseDocument(loginPage.ContentString); var recaptchaSiteKey = cq.QuerySelector(".g-recaptcha")?.GetAttribute("data-sitekey"); diff --git a/src/Jackett.Common/Indexers/DivxTotal.cs b/src/Jackett.Common/Indexers/DivxTotal.cs index 097df53f8..fea075fd3 100644 --- a/src/Jackett.Common/Indexers/DivxTotal.cs +++ b/src/Jackett.Common/Indexers/DivxTotal.cs @@ -100,7 +100,7 @@ namespace Jackett.Common.Indexers do { var url = SiteLink + "page/" + page + "/?" + qc.GetQueryString(); - var result = await WebRequestWithCookiesAsync(url); + var result = await RequestWithCookiesAsync(url); if (result.Status != HttpStatusCode.OK) throw new ExceptionWithConfigData(result.ContentString, configData); @@ -153,7 +153,7 @@ namespace Jackett.Common.Indexers // for other categories we have to do another step if (!downloadUrl.Contains(DownloadLink)) { - var result = await WebRequestWithCookiesAsync(downloadUrl); + var result = await RequestWithCookiesAsync(downloadUrl); if (result.Status != HttpStatusCode.OK) throw new ExceptionWithConfigData(result.ContentString, configData); @@ -205,7 +205,7 @@ namespace Jackett.Common.Indexers private async Task ParseSeriesRelease(ICollection releases, TorznabQuery query, string commentsLink, string cat, DateTime publishDate) { - var result = await WebRequestWithCookiesAsync(commentsLink); + var result = await RequestWithCookiesAsync(commentsLink); if (result.Status != HttpStatusCode.OK) throw new ExceptionWithConfigData(result.ContentString, configData); diff --git a/src/Jackett.Common/Indexers/EliteTracker.cs b/src/Jackett.Common/Indexers/EliteTracker.cs index 51091b265..aa7bc4d06 100644 --- a/src/Jackett.Common/Indexers/EliteTracker.cs +++ b/src/Jackett.Common/Indexers/EliteTracker.cs @@ -151,7 +151,7 @@ namespace Jackett.Common.Indexers { "password", configData.Password.Value } }; - var result = await WebRequestWithCookiesAsync(LoginUrl, "", RequestType.POST, data: pairs); + var result = await RequestWithCookiesAsync(LoginUrl, "", RequestType.POST, data: pairs); await ConfigureIfOK(result.Cookies, result.Cookies != null, () => { @@ -174,12 +174,12 @@ namespace Jackett.Common.Indexers {"category", "0"} // multi cat search not supported }; - var results = await WebRequestWithCookiesAsync(BrowseUrl, method: RequestType.POST, data: pairs); + var results = await RequestWithCookiesAsync(BrowseUrl, method: RequestType.POST, data: pairs); if (results.IsRedirect) { // re-login await ApplyConfiguration(null); - results = await WebRequestWithCookiesAsync(BrowseUrl, method: RequestType.POST, data: pairs); + results = await RequestWithCookiesAsync(BrowseUrl, method: RequestType.POST, data: pairs); } try diff --git a/src/Jackett.Common/Indexers/EpubLibre.cs b/src/Jackett.Common/Indexers/EpubLibre.cs index feca335c6..c1f62fc1b 100644 --- a/src/Jackett.Common/Indexers/EpubLibre.cs +++ b/src/Jackett.Common/Indexers/EpubLibre.cs @@ -86,7 +86,7 @@ namespace Jackett.Common.Indexers for (var page = 0; page < maxPages; page++) { var searchUrl = string.Format(SearchUrl, page * MaxItemsPerPage, searchString); - var result = await WebRequestWithCookiesAsync(searchUrl, headers: _apiHeaders); + var result = await RequestWithCookiesAsync(searchUrl, headers: _apiHeaders); try { diff --git a/src/Jackett.Common/Indexers/FileList.cs b/src/Jackett.Common/Indexers/FileList.cs index d0cdf8107..84718f976 100644 --- a/src/Jackett.Common/Indexers/FileList.cs +++ b/src/Jackett.Common/Indexers/FileList.cs @@ -188,7 +188,7 @@ namespace Jackett.Common.Indexers { {"Authorization", "Basic " + auth} }; - var response = await WebRequestWithCookiesAsync(searchUrl, headers: headers); + var response = await RequestWithCookiesAsync(searchUrl, headers: headers); return response.ContentString; } catch (Exception inner) diff --git a/src/Jackett.Common/Indexers/Fuzer.cs b/src/Jackett.Common/Indexers/Fuzer.cs index 2e58bdb38..03826e0a6 100644 --- a/src/Jackett.Common/Indexers/Fuzer.cs +++ b/src/Jackett.Common/Indexers/Fuzer.cs @@ -108,7 +108,7 @@ namespace Jackett.Common.Indexers public override async Task GetConfigurationForSetup() { - var loginPage = await WebRequestWithCookiesAsync(LoginUrl, string.Empty); + var loginPage = await RequestWithCookiesAsync(LoginUrl, string.Empty); var parser = new HtmlParser(); var cq = parser.ParseDocument(loginPage.ContentString); var captcha = cq.QuerySelector(".g-recaptcha"); // invisible recaptcha @@ -154,7 +154,7 @@ namespace Jackett.Common.Indexers } } - var loginPage = await WebRequestWithCookiesAsync(LoginUrl, string.Empty); + var loginPage = await RequestWithCookiesAsync(LoginUrl, string.Empty); var pairs = new Dictionary { {"vb_login_username", configData.Username.Value}, @@ -277,7 +277,7 @@ namespace Jackett.Common.Indexers Path = "index.php", Query = queryString.GetQueryString() }; - var results = await WebRequestWithCookiesAsync(site.ToString()); + var results = await RequestWithCookiesAsync(site.ToString()); var parser = new HtmlParser(); var dom = parser.ParseDocument(results.ContentString); var rows = dom.QuerySelectorAll("#listtable > tbody > tr"); diff --git a/src/Jackett.Common/Indexers/GazelleGames.cs b/src/Jackett.Common/Indexers/GazelleGames.cs index 8b4f80935..e066d325a 100644 --- a/src/Jackett.Common/Indexers/GazelleGames.cs +++ b/src/Jackett.Common/Indexers/GazelleGames.cs @@ -225,7 +225,7 @@ namespace Jackett.Common.Indexers searchUrl += "?" + queryCollection.GetQueryString(); - var results = await WebRequestWithCookiesAsync(searchUrl); + var results = await RequestWithCookiesAsync(searchUrl); if (results.IsRedirect && results.RedirectingTo.EndsWith("login.php")) { throw new Exception("relogin needed, please update your cookie"); diff --git a/src/Jackett.Common/Indexers/GimmePeers.cs b/src/Jackett.Common/Indexers/GimmePeers.cs index 943ad2d22..fbfc13d8b 100644 --- a/src/Jackett.Common/Indexers/GimmePeers.cs +++ b/src/Jackett.Common/Indexers/GimmePeers.cs @@ -88,7 +88,7 @@ namespace Jackett.Common.Indexers { "login", "Log in!" } }; - var loginPage = await WebRequestWithCookiesAsync(SiteLink, string.Empty); + var loginPage = await RequestWithCookiesAsync(SiteLink, string.Empty); var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, loginPage.Cookies, true, SiteLink, SiteLink); await ConfigureIfOK(result.Cookies, result.ContentString?.Contains("logout.php") == true, () => diff --git a/src/Jackett.Common/Indexers/HDSpace.cs b/src/Jackett.Common/Indexers/HDSpace.cs index 549fa49bb..290baec23 100644 --- a/src/Jackett.Common/Indexers/HDSpace.cs +++ b/src/Jackett.Common/Indexers/HDSpace.cs @@ -77,7 +77,7 @@ namespace Jackett.Common.Indexers public override async Task ApplyConfiguration(JToken configJson) { LoadValuesFromJson(configJson); - var loginPage = await WebRequestWithCookiesAsync(LoginUrl, string.Empty); + var loginPage = await RequestWithCookiesAsync(LoginUrl, string.Empty); var pairs = new Dictionary { {"uid", configData.Username.Value}, diff --git a/src/Jackett.Common/Indexers/HDTorrents.cs b/src/Jackett.Common/Indexers/HDTorrents.cs index 39a046950..ef0bd8075 100644 --- a/src/Jackett.Common/Indexers/HDTorrents.cs +++ b/src/Jackett.Common/Indexers/HDTorrents.cs @@ -104,7 +104,7 @@ namespace Jackett.Common.Indexers { LoadValuesFromJson(configJson); - var loginPage = await WebRequestWithCookiesAsync(LoginUrl, string.Empty); + var loginPage = await RequestWithCookiesAsync(LoginUrl, string.Empty); var pairs = new Dictionary { { "uid", configData.Username.Value }, diff --git a/src/Jackett.Common/Indexers/Hebits.cs b/src/Jackett.Common/Indexers/Hebits.cs index 0d329112e..b40da6246 100644 --- a/src/Jackett.Common/Indexers/Hebits.cs +++ b/src/Jackett.Common/Indexers/Hebits.cs @@ -105,7 +105,7 @@ namespace Jackett.Common.Indexers var cats = MapTorznabCapsToTrackers(query); if (cats.Count > 0) searchUrl = cats.Aggregate(searchUrl, (url, cat) => $"{url}&c{cat}=1"); - var response = await WebRequestWithCookiesAsync(searchUrl); + var response = await RequestWithCookiesAsync(searchUrl); try { var parser = new HtmlParser(); diff --git a/src/Jackett.Common/Indexers/Libble.cs b/src/Jackett.Common/Indexers/Libble.cs index 105a6c31a..7cf98c808 100644 --- a/src/Jackett.Common/Indexers/Libble.cs +++ b/src/Jackett.Common/Indexers/Libble.cs @@ -83,7 +83,7 @@ namespace Jackett.Common.Indexers public override async Task GetConfigurationForSetup() { - await WebRequestWithCookiesAsync(LandingUrl); + await RequestWithCookiesAsync(LandingUrl); return configData; } diff --git a/src/Jackett.Common/Indexers/LostFilm.cs b/src/Jackett.Common/Indexers/LostFilm.cs index 9aad1eb02..ab5b1ed4f 100644 --- a/src/Jackett.Common/Indexers/LostFilm.cs +++ b/src/Jackett.Common/Indexers/LostFilm.cs @@ -113,14 +113,14 @@ namespace Jackett.Common.Indexers public override async Task GetConfigurationForSetup() { // looks like after some failed login attempts there's a captcha - var loginPage = await WebRequestWithCookiesAsync(LoginUrl, string.Empty); + var loginPage = await RequestWithCookiesAsync(LoginUrl, string.Empty); var parser = new HtmlParser(); var document = parser.ParseDocument(loginPage.ContentString); var qCaptchaImg = document.QuerySelector("img#captcha_pictcha"); if (qCaptchaImg != null) { var captchaUrl = SiteLink + qCaptchaImg.GetAttribute("src"); - var captchaImage = await WebRequestWithCookiesAsync(captchaUrl, loginPage.Cookies); + var captchaImage = await RequestWithCookiesAsync(captchaUrl, loginPage.Cookies); configData.CaptchaImage.Value = captchaImage.ContentBytes; } else @@ -183,7 +183,7 @@ namespace Jackett.Common.Indexers { "type", "logout" } }; - var response = await WebRequestWithCookiesAsync(ApiUrl, method: RequestType.POST, data: data); + var response = await RequestWithCookiesAsync(ApiUrl, method: RequestType.POST, data: data); logger.Debug("Logout result: " + response.ContentString); var isOK = response.Status == System.Net.HttpStatusCode.OK; @@ -214,7 +214,7 @@ namespace Jackett.Common.Indexers private async Task RequestStringAndRelogin(string url) { - var results = await WebRequestWithCookiesAsync(url); + var results = await RequestWithCookiesAsync(url); if (results.ContentString.Contains("503 Service")) { throw new ExceptionWithConfigData(results.ContentString, configData); @@ -223,7 +223,7 @@ namespace Jackett.Common.Indexers { // Re-login await ApplyConfiguration(null); - return await WebRequestWithCookiesAsync(url); + return await RequestWithCookiesAsync(url); } else { @@ -287,7 +287,7 @@ namespace Jackett.Common.Indexers { "val", searchString } }; logger.Debug("> Searching: " + searchString); - var response = await WebRequestWithCookiesAsync(ApiUrl, method: RequestType.POST, data: data); + var response = await RequestWithCookiesAsync(ApiUrl, method: RequestType.POST, data: data); if (response.ContentString == null) { logger.Debug("> Empty series response for query: " + searchString); @@ -471,7 +471,7 @@ namespace Jackett.Common.Indexers logger.Debug("FetchSeriesReleases: " + url + " S: " + query.Season.ToString() + " E: " + query.Episode + " Filter: " + filter); var releases = new List(); - var results = await WebRequestWithCookiesAsync(url); + var results = await RequestWithCookiesAsync(url); try { @@ -626,7 +626,7 @@ namespace Jackett.Common.Indexers logger.Debug("FetchTrackerReleases: " + url); // Get redirection page with generated link on it. This link can't be constructed manually as it contains Hash field and hashing algo is unknown. - var results = await WebRequestWithCookiesAsync(url); + var results = await RequestWithCookiesAsync(url); if (results.ContentString == null) { throw new ExceptionWithConfigData("Empty response from " + url, configData); @@ -659,7 +659,7 @@ namespace Jackett.Common.Indexers private async Task> FollowTrackerRedirection(string url, TrackerUrlDetails details) { logger.Debug("FollowTrackerRedirection: " + url); - var results = await WebRequestWithCookiesAsync(url); + var results = await RequestWithCookiesAsync(url); var releases = new List(); try diff --git a/src/Jackett.Common/Indexers/MejorTorrent.cs b/src/Jackett.Common/Indexers/MejorTorrent.cs index 6ad562d8b..2673327e7 100644 --- a/src/Jackett.Common/Indexers/MejorTorrent.cs +++ b/src/Jackett.Common/Indexers/MejorTorrent.cs @@ -101,14 +101,14 @@ namespace Jackett.Common.Indexers var downloadUrl = link.ToString(); // Eg https://www.mejortorrentt.net/peli-descargar-torrent-11995-Harry-Potter-y-la-piedra-filosofal.html - var result = await WebRequestWithCookiesAsync(downloadUrl); + var result = await RequestWithCookiesAsync(downloadUrl); if (result.Status != HttpStatusCode.OK) throw new ExceptionWithConfigData(result.ContentString, configData); var dom = parser.ParseDocument(result.ContentString); downloadUrl = SiteLink + dom.QuerySelector("a[href*=\"sec=descargas\"]").GetAttribute("href"); // Eg https://www.mejortorrentt.net/secciones.php?sec=descargas&ap=contar&tabla=peliculas&id=11995&link_bajar=1 - result = await WebRequestWithCookiesAsync(downloadUrl); + result = await RequestWithCookiesAsync(downloadUrl); if (result.Status != HttpStatusCode.OK) throw new ExceptionWithConfigData(result.ContentString, configData); dom = parser.ParseDocument(result.ContentString); @@ -123,7 +123,7 @@ namespace Jackett.Common.Indexers { var releases = new List(); var url = SiteLink + NewTorrentsUrl; - var result = await WebRequestWithCookiesAsync(url); + var result = await RequestWithCookiesAsync(url); if (result.Status != HttpStatusCode.OK) throw new ExceptionWithConfigData(result.ContentString, configData); try @@ -180,7 +180,7 @@ namespace Jackett.Common.Indexers var searchTerm = GetLongestWord(query.SearchTerm); var qc = new NameValueCollection { { "sec", "buscador" }, { "valor", searchTerm } }; var url = SiteLink + SearchUrl + "?" + qc.GetQueryString(); - var result = await WebRequestWithCookiesAsync(url); + var result = await RequestWithCookiesAsync(url); if (result.Status != HttpStatusCode.OK) throw new ExceptionWithConfigData(result.ContentString, configData); @@ -259,7 +259,7 @@ namespace Jackett.Common.Indexers private async Task ParseSeriesRelease(ICollection releases, TorznabQuery query, string title, string commentsLink, string cat, DateTime publishDate) { - var result = await WebRequestWithCookiesAsync(commentsLink); + var result = await RequestWithCookiesAsync(commentsLink); if (result.Status != HttpStatusCode.OK) throw new ExceptionWithConfigData(result.ContentString, configData); diff --git a/src/Jackett.Common/Indexers/Milkie.cs b/src/Jackett.Common/Indexers/Milkie.cs index 43cb15b95..35d79bf75 100644 --- a/src/Jackett.Common/Indexers/Milkie.cs +++ b/src/Jackett.Common/Indexers/Milkie.cs @@ -87,7 +87,7 @@ namespace Jackett.Common.Indexers { { "x-milkie-auth", configData.Key.Value } }; - var jsonResponse = await WebRequestWithCookiesAsync(endpoint, headers: headers); + var jsonResponse = await RequestWithCookiesAsync(endpoint, headers: headers); var releases = new List(); diff --git a/src/Jackett.Common/Indexers/MyAmity.cs b/src/Jackett.Common/Indexers/MyAmity.cs index 0b60daced..21f85ce33 100644 --- a/src/Jackett.Common/Indexers/MyAmity.cs +++ b/src/Jackett.Common/Indexers/MyAmity.cs @@ -119,12 +119,12 @@ namespace Jackett.Common.Indexers } searchUrl += "?" + queryCollection.GetQueryString(); - var response = await WebRequestWithCookiesAsync(searchUrl); + var response = await RequestWithCookiesAsync(searchUrl); if (response.IsRedirect || response.Cookies != null && response.Cookies.Contains("pass=deleted;")) { // re-login await ApplyConfiguration(null); - response = await WebRequestWithCookiesAsync(searchUrl); + response = await RequestWithCookiesAsync(searchUrl); } var results = response.ContentString; diff --git a/src/Jackett.Common/Indexers/NCore.cs b/src/Jackett.Common/Indexers/NCore.cs index f1c4b5443..1ac71ac05 100644 --- a/src/Jackett.Common/Indexers/NCore.cs +++ b/src/Jackett.Common/Indexers/NCore.cs @@ -99,7 +99,7 @@ namespace Jackett.Common.Indexers LoadValuesFromJson(configJson); if (configData.Hungarian.Value == false && configData.English.Value == false) throw new ExceptionWithConfigData("Please select at least one language.", configData); - var loginPage = await WebRequestWithCookiesAsync(LoginUrl, string.Empty); + var loginPage = await RequestWithCookiesAsync(LoginUrl, string.Empty); var pairs = new Dictionary { {"nev", configData.Username.Value}, diff --git a/src/Jackett.Common/Indexers/Nebulance.cs b/src/Jackett.Common/Indexers/Nebulance.cs index 19255a185..e6205f7f6 100644 --- a/src/Jackett.Common/Indexers/Nebulance.cs +++ b/src/Jackett.Common/Indexers/Nebulance.cs @@ -75,7 +75,7 @@ namespace Jackett.Common.Indexers protected override async Task> PerformQuery(TorznabQuery query) { - var loggedInCheck = await WebRequestWithCookiesAsync(SearchUrl); + var loggedInCheck = await RequestWithCookiesAsync(SearchUrl); if (!loggedInCheck.ContentString.Contains("logout.php")) // re-login await DoLogin(); diff --git a/src/Jackett.Common/Indexers/NewPCT.cs b/src/Jackett.Common/Indexers/NewPCT.cs index 6dbc9b776..ce17fb7cb 100644 --- a/src/Jackett.Common/Indexers/NewPCT.cs +++ b/src/Jackett.Common/Indexers/NewPCT.cs @@ -464,7 +464,7 @@ namespace Jackett.Common.Indexers {"pg", pg.ToString()} }; - var results = await WebRequestWithCookiesAsync(searchJsonUrl, method: RequestType.POST, data: queryCollection); + var results = await RequestWithCookiesAsync(searchJsonUrl, method: RequestType.POST, data: queryCollection); var items = ParseSearchJsonContent(results.ContentString, year); if (!items.Any()) break; diff --git a/src/Jackett.Common/Indexers/NewRealWorld.cs b/src/Jackett.Common/Indexers/NewRealWorld.cs index 721913354..dc61af9a7 100644 --- a/src/Jackett.Common/Indexers/NewRealWorld.cs +++ b/src/Jackett.Common/Indexers/NewRealWorld.cs @@ -150,12 +150,12 @@ namespace Jackett.Common.Indexers searchUrl += "?" + queryCollection.GetQueryString(); - var response = await WebRequestWithCookiesAsync(searchUrl); + var response = await RequestWithCookiesAsync(searchUrl); if (response.IsRedirect) { // re-login await ApplyConfiguration(null); - response = await WebRequestWithCookiesAsync(searchUrl); + response = await RequestWithCookiesAsync(searchUrl); } try diff --git a/src/Jackett.Common/Indexers/NorBits.cs b/src/Jackett.Common/Indexers/NorBits.cs index fd9ff8c30..9ec2a99ef 100644 --- a/src/Jackett.Common/Indexers/NorBits.cs +++ b/src/Jackett.Common/Indexers/NorBits.cs @@ -204,7 +204,7 @@ namespace Jackett.Common.Indexers { // Checking ... Output("\n-> Checking logged-in state...."); - var loggedInCheck = await WebRequestWithCookiesAsync(SearchUrl); + var loggedInCheck = await RequestWithCookiesAsync(SearchUrl); if (!loggedInCheck.ContentString.Contains("logout.php")) { // Cookie expired, renew session on provider diff --git a/src/Jackett.Common/Indexers/NordicBits.cs b/src/Jackett.Common/Indexers/NordicBits.cs index 6f4f3b6e7..2dcb6e66b 100644 --- a/src/Jackett.Common/Indexers/NordicBits.cs +++ b/src/Jackett.Common/Indexers/NordicBits.cs @@ -259,7 +259,7 @@ namespace Jackett.Common.Indexers { // Checking ... Output("\n-> Checking logged-in state...."); - var loggedInCheck = await WebRequestWithCookiesAsync(SearchUrl); + var loggedInCheck = await RequestWithCookiesAsync(SearchUrl); if (!loggedInCheck.ContentString.Contains("logout.php")) { // Cookie expired, renew session on provider diff --git a/src/Jackett.Common/Indexers/Partis.cs b/src/Jackett.Common/Indexers/Partis.cs index a2597125e..a6638c1a7 100644 --- a/src/Jackett.Common/Indexers/Partis.cs +++ b/src/Jackett.Common/Indexers/Partis.cs @@ -141,7 +141,7 @@ namespace Jackett.Common.Indexers }; //get results and follow redirect - results = await WebRequestWithCookiesAsync(searchUrl, referer: SearchUrl, headers: header); + results = await RequestWithCookiesAsync(searchUrl, referer: SearchUrl, headers: header); await FollowIfRedirect(results, null, null, null, true); // are we logged in? @@ -150,7 +150,7 @@ namespace Jackett.Common.Indexers await ApplyConfiguration(null); } // another request with specific query - NEEDED for succesful response - return data - results = await WebRequestWithCookiesAsync( + results = await RequestWithCookiesAsync( SiteLink + "brskaj/?rs=false&offset=0", referer: SearchUrl, headers: header); await FollowIfRedirect(results, null, null, null, true); diff --git a/src/Jackett.Common/Indexers/PirateTheNet.cs b/src/Jackett.Common/Indexers/PirateTheNet.cs index e7797cdea..1e165d407 100644 --- a/src/Jackett.Common/Indexers/PirateTheNet.cs +++ b/src/Jackett.Common/Indexers/PirateTheNet.cs @@ -76,7 +76,7 @@ namespace Jackett.Common.Indexers LoadValuesFromJson(configJson); CookieHeader = ""; // clear old cookies - var result1 = await WebRequestWithCookiesAsync(CaptchaUrl); + var result1 = await RequestWithCookiesAsync(CaptchaUrl); var json1 = JObject.Parse(result1.ContentString); var captchaSelection = json1["images"][0]["hash"]; diff --git a/src/Jackett.Common/Indexers/PixelHD.cs b/src/Jackett.Common/Indexers/PixelHD.cs index 784e7be5a..617433e90 100644 --- a/src/Jackett.Common/Indexers/PixelHD.cs +++ b/src/Jackett.Common/Indexers/PixelHD.cs @@ -57,7 +57,7 @@ namespace Jackett.Common.Indexers public override async Task GetConfigurationForSetup() { - var loginPage = await WebRequestWithCookiesAsync(LoginUrl, string.Empty); + var loginPage = await RequestWithCookiesAsync(LoginUrl, string.Empty); var LoginParser = new HtmlParser(); var LoginDocument = LoginParser.ParseDocument(loginPage.ContentString); @@ -69,7 +69,7 @@ namespace Jackett.Common.Indexers var catchaInput = LoginDocument.QuerySelector("input[maxlength=\"6\"]"); input_captcha = catchaInput.GetAttribute("name"); - var captchaImage = await WebRequestWithCookiesAsync(SiteLink + catchaImg.GetAttribute("src"), loginPage.Cookies, RequestType.GET, LoginUrl); + var captchaImage = await RequestWithCookiesAsync(SiteLink + catchaImg.GetAttribute("src"), loginPage.Cookies, RequestType.GET, LoginUrl); configData.CaptchaImage.Value = captchaImage.ContentBytes; } else @@ -137,13 +137,13 @@ namespace Jackett.Common.Indexers var searchUrl = BrowseUrl + "?" + queryCollection.GetQueryString(); - var results = await WebRequestWithCookiesAsync(searchUrl); + var results = await RequestWithCookiesAsync(searchUrl); if (results.IsRedirect) { // re login await GetConfigurationForSetup(); await ApplyConfiguration(null); - results = await WebRequestWithCookiesAsync(searchUrl); + results = await RequestWithCookiesAsync(searchUrl); } var IMDBRegEx = new Regex(@"tt(\d+)", RegexOptions.Compiled); diff --git a/src/Jackett.Common/Indexers/PornoLab.cs b/src/Jackett.Common/Indexers/PornoLab.cs index 65e8a12cd..7b4f00bfd 100644 --- a/src/Jackett.Common/Indexers/PornoLab.cs +++ b/src/Jackett.Common/Indexers/PornoLab.cs @@ -183,13 +183,13 @@ namespace Jackett.Common.Indexers public override async Task GetConfigurationForSetup() { configData.CookieHeader.Value = null; - var response = await WebRequestWithCookiesAsync(LoginUrl); + var response = await RequestWithCookiesAsync(LoginUrl); var LoginResultParser = new HtmlParser(); var LoginResultDocument = LoginResultParser.ParseDocument(response.ContentString); var captchaimg = LoginResultDocument.QuerySelector("img[src*=\"/captcha/\"]"); if (captchaimg != null) { - var captchaImage = await WebRequestWithCookiesAsync("https:" + captchaimg.GetAttribute("src")); + var captchaImage = await RequestWithCookiesAsync("https:" + captchaimg.GetAttribute("src")); configData.CaptchaImage.Value = captchaImage.ContentBytes; var codefield = LoginResultDocument.QuerySelector("input[name^=\"cap_code_\"]"); @@ -260,12 +260,12 @@ namespace Jackett.Common.Indexers } var searchUrl = SearchUrl + "?" + queryCollection.GetQueryString(); - var results = await WebRequestWithCookiesAsync(searchUrl); + var results = await RequestWithCookiesAsync(searchUrl); if (!results.ContentString.Contains("Вы зашли как:")) { // re login await ApplyConfiguration(null); - results = await WebRequestWithCookiesAsync(searchUrl); + results = await RequestWithCookiesAsync(searchUrl); } try { @@ -337,7 +337,7 @@ namespace Jackett.Common.Indexers public override async Task Download(Uri link) { var downloadlink = link; - var response = await WebRequestWithCookiesAsync(link.ToString()); + var response = await RequestWithCookiesAsync(link.ToString()); var results = response.ContentString; var SearchResultParser = new HtmlParser(); var SearchResultDocument = SearchResultParser.ParseDocument(results); diff --git a/src/Jackett.Common/Indexers/PreToMe.cs b/src/Jackett.Common/Indexers/PreToMe.cs index 297a5d97b..3348a4e54 100644 --- a/src/Jackett.Common/Indexers/PreToMe.cs +++ b/src/Jackett.Common/Indexers/PreToMe.cs @@ -123,7 +123,7 @@ namespace Jackett.Common.Indexers { LoadValuesFromJson(configJson); - var loginPage = await WebRequestWithCookiesAsync(LoginUrl, string.Empty); + var loginPage = await RequestWithCookiesAsync(LoginUrl, string.Empty); var pairs = new Dictionary { { "returnto", "%2F" }, @@ -134,7 +134,7 @@ namespace Jackett.Common.Indexers }; // Send Post - var result = await WebRequestWithCookiesAsync(LoginUrl, loginPage.Cookies, RequestType.POST, data: pairs); + var result = await RequestWithCookiesAsync(LoginUrl, loginPage.Cookies, RequestType.POST, data: pairs); if (result.RedirectingTo == null) throw new ExceptionWithConfigData("Login failed. Did you use the PIN number that pretome emailed you?", configData); diff --git a/src/Jackett.Common/Indexers/RevolutionTT.cs b/src/Jackett.Common/Indexers/RevolutionTT.cs index 8f6799c50..9e7547a25 100644 --- a/src/Jackett.Common/Indexers/RevolutionTT.cs +++ b/src/Jackett.Common/Indexers/RevolutionTT.cs @@ -208,7 +208,7 @@ namespace Jackett.Common.Indexers var rssParams = new Dictionary { { "feed", "dl" } }; - var rssPage = await WebRequestWithCookiesAsync( + var rssPage = await RequestWithCookiesAsync( GetRSSKeyUrl, result.Cookies, RequestType.POST, data: rssParams); var match = Regex.Match(rssPage.ContentString, "(?<=passkey\\=)([a-zA-z0-9]*)"); configData.RSSKey.Value = match.Success ? match.Value : string.Empty; diff --git a/src/Jackett.Common/Indexers/RuTracker.cs b/src/Jackett.Common/Indexers/RuTracker.cs index e9ba74c43..9f943ede3 100644 --- a/src/Jackett.Common/Indexers/RuTracker.cs +++ b/src/Jackett.Common/Indexers/RuTracker.cs @@ -1510,13 +1510,13 @@ namespace Jackett.Common.Indexers try { configData.CookieHeader.Value = null; - var response = await WebRequestWithCookiesAsync(LoginUrl); + var response = await RequestWithCookiesAsync(LoginUrl); var parser = new HtmlParser(); var doc = parser.ParseDocument(response.ContentString); var captchaimg = doc.QuerySelector("img[src^=\"https://static.t-ru.org/captcha/\"]"); if (captchaimg != null) { - var captchaImage = await WebRequestWithCookiesAsync(captchaimg.GetAttribute("src")); + var captchaImage = await RequestWithCookiesAsync(captchaimg.GetAttribute("src")); configData.CaptchaImage.Value = captchaImage.ContentBytes; var codefield = doc.QuerySelector("input[name^=\"cap_code_\"]"); @@ -1591,12 +1591,12 @@ namespace Jackett.Common.Indexers } var searchUrl = SearchUrl + "?" + queryCollection.GetQueryString(); - var results = await WebRequestWithCookiesAsync(searchUrl); + var results = await RequestWithCookiesAsync(searchUrl); if (!results.ContentString.Contains("id=\"logged-in-username\"")) { // re login await ApplyConfiguration(null); - results = await WebRequestWithCookiesAsync(searchUrl); + results = await RequestWithCookiesAsync(searchUrl); } try { diff --git a/src/Jackett.Common/Indexers/SceneTime.cs b/src/Jackett.Common/Indexers/SceneTime.cs index 382c31655..624968652 100644 --- a/src/Jackett.Common/Indexers/SceneTime.cs +++ b/src/Jackett.Common/Indexers/SceneTime.cs @@ -107,7 +107,7 @@ namespace Jackett.Common.Indexers WebResult loginPage; try { - loginPage = await WebRequestWithCookiesAsync(StartPageUrl, string.Empty); + loginPage = await RequestWithCookiesAsync(StartPageUrl, string.Empty); } catch (Exception) { @@ -198,7 +198,7 @@ namespace Jackett.Common.Indexers qParams.Add("freeleech", "on"); var searchUrl = SearchUrl + "?" + qParams.GetQueryString(); - var results = await WebRequestWithCookiesAsync(searchUrl); + var results = await RequestWithCookiesAsync(searchUrl); // response without results (the message is misleading) if (results.ContentString?.Contains("slow down geek!!!") == true) diff --git a/src/Jackett.Common/Indexers/Shazbat.cs b/src/Jackett.Common/Indexers/Shazbat.cs index c7336d801..85f39663a 100644 --- a/src/Jackett.Common/Indexers/Shazbat.cs +++ b/src/Jackett.Common/Indexers/Shazbat.cs @@ -108,7 +108,7 @@ namespace Jackett.Common.Indexers { foreach (var searchUrl in searchUrls) { - results = await WebRequestWithCookiesAsync(searchUrl); + results = await RequestWithCookiesAsync(searchUrl); results = await ReloginIfNecessary(results); var parser = new HtmlParser(); var dom = parser.ParseDocument(results.ContentString); diff --git a/src/Jackett.Common/Indexers/SolidTorrents.cs b/src/Jackett.Common/Indexers/SolidTorrents.cs index 868dd3725..541124776 100644 --- a/src/Jackett.Common/Indexers/SolidTorrents.cs +++ b/src/Jackett.Common/Indexers/SolidTorrents.cs @@ -103,7 +103,7 @@ namespace Jackett.Common.Indexers {"fuv", "no"} }; var fullSearchUrl = SearchUrl + "?" + queryCollection.GetQueryString(); - var result = await WebRequestWithCookiesAsync(fullSearchUrl, headers: APIHeaders); + var result = await RequestWithCookiesAsync(fullSearchUrl, headers: APIHeaders); return CheckResponse(result); } diff --git a/src/Jackett.Common/Indexers/SuperBits.cs b/src/Jackett.Common/Indexers/SuperBits.cs index 504b09753..094bad85f 100644 --- a/src/Jackett.Common/Indexers/SuperBits.cs +++ b/src/Jackett.Common/Indexers/SuperBits.cs @@ -128,7 +128,7 @@ namespace Jackett.Common.Indexers searchUrl += "?" + queryCollection.GetQueryString(); foreach (var cat in MapTorznabCapsToTrackers(query)) searchUrl += "&categories[]=" + cat; - var results = await WebRequestWithCookiesAsync(searchUrl, referer: SiteLink); + var results = await RequestWithCookiesAsync(searchUrl, referer: SiteLink); try { diff --git a/src/Jackett.Common/Indexers/TVStore.cs b/src/Jackett.Common/Indexers/TVStore.cs index ce285b28c..3ecff334b 100644 --- a/src/Jackett.Common/Indexers/TVStore.cs +++ b/src/Jackett.Common/Indexers/TVStore.cs @@ -66,7 +66,7 @@ namespace Jackett.Common.Indexers public override async Task ApplyConfiguration(JToken configJson) { LoadValuesFromJson(configJson); - var loginPage = await WebRequestWithCookiesAsync(LoginPageUrl, string.Empty); + var loginPage = await RequestWithCookiesAsync(LoginPageUrl, string.Empty); var pairs = new Dictionary { {"username", configData.Username.Value}, diff --git a/src/Jackett.Common/Indexers/TVVault.cs b/src/Jackett.Common/Indexers/TVVault.cs index 2df4a7d9f..e16ef8ff5 100644 --- a/src/Jackett.Common/Indexers/TVVault.cs +++ b/src/Jackett.Common/Indexers/TVVault.cs @@ -94,7 +94,7 @@ namespace Jackett.Common.Indexers qc.Add("searchstr", StripSearchString(query.GetQueryString())); var searchUrl = BrowseUrl + "?" + qc.GetQueryString(); - var results = await WebRequestWithCookiesAsync(searchUrl); + var results = await RequestWithCookiesAsync(searchUrl); try { var seasonRegEx = new Regex(@$"Season\s+0*{query.Season}[^\d]", RegexOptions.IgnoreCase); diff --git a/src/Jackett.Common/Indexers/Toloka.cs b/src/Jackett.Common/Indexers/Toloka.cs index a183f3e6a..a4660568c 100644 --- a/src/Jackett.Common/Indexers/Toloka.cs +++ b/src/Jackett.Common/Indexers/Toloka.cs @@ -232,12 +232,12 @@ namespace Jackett.Common.Indexers } var searchUrl = SearchUrl + "?" + queryCollection.GetQueryString(); - var results = await WebRequestWithCookiesAsync(searchUrl); + var results = await RequestWithCookiesAsync(searchUrl); if (!results.ContentString.Contains("logout=true")) { // re login await ApplyConfiguration(null); - results = await WebRequestWithCookiesAsync(searchUrl); + results = await RequestWithCookiesAsync(searchUrl); } try { diff --git a/src/Jackett.Common/Indexers/TorrenTech.cs b/src/Jackett.Common/Indexers/TorrenTech.cs index 3bc2f7972..b39bba993 100644 --- a/src/Jackett.Common/Indexers/TorrenTech.cs +++ b/src/Jackett.Common/Indexers/TorrenTech.cs @@ -100,10 +100,10 @@ namespace Jackett.Common.Indexers } var searchUrl = IndexUrl + "?" + queryCollection.GetQueryString(); - results = await WebRequestWithCookiesAsync(searchUrl); + results = await RequestWithCookiesAsync(searchUrl); if (results.IsRedirect && results.RedirectingTo.Contains("CODE=show")) { - results = await WebRequestWithCookiesAsync(results.RedirectingTo); + results = await RequestWithCookiesAsync(results.RedirectingTo); } try { @@ -203,7 +203,7 @@ namespace Jackett.Common.Indexers public override async Task Download(Uri link) { - var response = await WebRequestWithCookiesAsync(link.ToString()); + var response = await RequestWithCookiesAsync(link.ToString()); var results = response.ContentString; var SearchResultParser = new HtmlParser(); var SearchResultDocument = SearchResultParser.ParseDocument(results); diff --git a/src/Jackett.Common/Indexers/TorrentBytes.cs b/src/Jackett.Common/Indexers/TorrentBytes.cs index f826ada7a..97520ef8e 100644 --- a/src/Jackett.Common/Indexers/TorrentBytes.cs +++ b/src/Jackett.Common/Indexers/TorrentBytes.cs @@ -89,7 +89,7 @@ namespace Jackett.Common.Indexers {"returnto", "/"}, {"login", "Log in!"} }; - var loginPage = await WebRequestWithCookiesAsync(SiteLink, string.Empty); + var loginPage = await RequestWithCookiesAsync(SiteLink, string.Empty); var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, loginPage.Cookies, true, SiteLink, SiteLink); await ConfigureIfOK( result.Cookies, result.ContentString?.Contains("my.php") == true, () => diff --git a/src/Jackett.Common/Indexers/TorrentHeaven.cs b/src/Jackett.Common/Indexers/TorrentHeaven.cs index aceab8235..b4635524d 100644 --- a/src/Jackett.Common/Indexers/TorrentHeaven.cs +++ b/src/Jackett.Common/Indexers/TorrentHeaven.cs @@ -119,7 +119,7 @@ namespace Jackett.Common.Indexers throw new ExceptionWithConfigData(errorMessage, configData); } - var result2 = await WebRequestWithCookiesAsync(LoginCompleteUrl, result.Cookies); + var result2 = await RequestWithCookiesAsync(LoginCompleteUrl, result.Cookies); await ConfigureIfOK( result2.Cookies, result2.Cookies?.Contains("pass") == true, () => throw new ExceptionWithConfigData("Didn't get a user/pass cookie", configData)); @@ -128,14 +128,14 @@ namespace Jackett.Common.Indexers public override async Task GetConfigurationForSetup() { - var loginPage = await WebRequestWithCookiesAsync(IndexUrl, string.Empty); + var loginPage = await RequestWithCookiesAsync(IndexUrl, string.Empty); var parser = new HtmlParser(); var dom = parser.ParseDocument(loginPage.ContentString); var qCaptchaImg = dom.QuerySelector("td.tablea > img"); if (qCaptchaImg != null) { var captchaUrl = SiteLink + qCaptchaImg.GetAttribute("src"); - var captchaImage = await WebRequestWithCookiesAsync(captchaUrl, loginPage.Cookies); + var captchaImage = await RequestWithCookiesAsync(captchaUrl, loginPage.Cookies); configData.CaptchaImage.Value = captchaImage.ContentBytes; } else @@ -182,7 +182,7 @@ namespace Jackett.Common.Indexers foreach (var cat in MapTorznabCapsToTrackers(query)) queryCollection.Add("dirs" + cat, "1"); searchUrl += "?" + queryCollection.GetQueryString(); - var response = await WebRequestWithCookiesAsync(searchUrl); + var response = await RequestWithCookiesAsync(searchUrl); var titleRegexp = new Regex(@"^return buildTable\('(.*?)',\s+"); try { diff --git a/src/Jackett.Common/Indexers/TorrentLeech.cs b/src/Jackett.Common/Indexers/TorrentLeech.cs index e5bc21bd7..31f223a96 100644 --- a/src/Jackett.Common/Indexers/TorrentLeech.cs +++ b/src/Jackett.Common/Indexers/TorrentLeech.cs @@ -108,7 +108,7 @@ namespace Jackett.Common.Indexers public override async Task GetConfigurationForSetup() { - var loginPage = await WebRequestWithCookiesAsync(LoginUrl, string.Empty); + var loginPage = await RequestWithCookiesAsync(LoginUrl, string.Empty); var parser = new HtmlParser(); var dom = parser.ParseDocument(loginPage.ContentString); var captcha = dom.QuerySelector(".g-recaptcha"); diff --git a/src/Jackett.Common/Indexers/TorrentNetwork.cs b/src/Jackett.Common/Indexers/TorrentNetwork.cs index f6e31f81d..3574ac4b2 100644 --- a/src/Jackett.Common/Indexers/TorrentNetwork.cs +++ b/src/Jackett.Common/Indexers/TorrentNetwork.cs @@ -124,7 +124,7 @@ namespace Jackett.Common.Indexers private async Task SendAPIRequest(string endpoint, object data) { var jsonData = JsonConvert.SerializeObject(data); - var result = await WebRequestWithCookiesAsync( + var result = await RequestWithCookiesAsync( APIUrl + endpoint, method: RequestType.POST, referer: SiteLink, headers: APIHeaders, rawbody: jsonData); if (!result.ContentString.StartsWith("{")) // not JSON => error throw new ExceptionWithConfigData(result.ContentString, configData); diff --git a/src/Jackett.Common/Indexers/TorrentSeeds.cs b/src/Jackett.Common/Indexers/TorrentSeeds.cs index c79826b3a..3521b26e7 100644 --- a/src/Jackett.Common/Indexers/TorrentSeeds.cs +++ b/src/Jackett.Common/Indexers/TorrentSeeds.cs @@ -105,7 +105,7 @@ namespace Jackett.Common.Indexers public override async Task ApplyConfiguration(JToken configJson) { LoadValuesFromJson(configJson); - var loginPage = await WebRequestWithCookiesAsync(TokenUrl); + var loginPage = await RequestWithCookiesAsync(TokenUrl); var parser = new HtmlParser(); var dom = parser.ParseDocument(loginPage.ContentString); var token = dom.QuerySelector("form.form-horizontal > span"); diff --git a/src/Jackett.Common/Indexers/TorrentSyndikat.cs b/src/Jackett.Common/Indexers/TorrentSyndikat.cs index 20fc1aab4..e286f68c7 100644 --- a/src/Jackett.Common/Indexers/TorrentSyndikat.cs +++ b/src/Jackett.Common/Indexers/TorrentSyndikat.cs @@ -111,7 +111,7 @@ namespace Jackett.Common.Indexers LoadValuesFromJson(configJson); CookieHeader = ""; - var result1 = await WebRequestWithCookiesAsync(CaptchaUrl); + var result1 = await RequestWithCookiesAsync(CaptchaUrl); var json1 = JObject.Parse(result1.ContentString); var captchaSelection = json1["images"][0]["hash"]; diff --git a/src/Jackett.Common/Indexers/XSpeeds.cs b/src/Jackett.Common/Indexers/XSpeeds.cs index 72341f0ff..a2b9de0f9 100644 --- a/src/Jackett.Common/Indexers/XSpeeds.cs +++ b/src/Jackett.Common/Indexers/XSpeeds.cs @@ -132,14 +132,14 @@ namespace Jackett.Common.Indexers public override async Task GetConfigurationForSetup() { - var loginPage = await WebRequestWithCookiesAsync(LandingUrl); + var loginPage = await RequestWithCookiesAsync(LandingUrl); var parser = new HtmlParser(); var dom = parser.ParseDocument(loginPage.ContentString); var qCaptchaImg = dom.QuerySelector("img#regimage"); if (qCaptchaImg != null) { var captchaUrl = qCaptchaImg.GetAttribute("src"); - var captchaImageResponse = await WebRequestWithCookiesAsync(captchaUrl, loginPage.Cookies, RequestType.GET, LandingUrl); + var captchaImageResponse = await RequestWithCookiesAsync(captchaUrl, loginPage.Cookies, RequestType.GET, LandingUrl); var captchaText = new StringItem { Name = "Captcha Text" }; var captchaImage = new ImageItem {Name = "Captcha Image", Value = captchaImageResponse.ContentBytes}; @@ -189,7 +189,7 @@ namespace Jackett.Common.Indexers {"timezone", "0"}, {"showrows", "50"} }; - var rssPage = await WebRequestWithCookiesAsync( + var rssPage = await RequestWithCookiesAsync( GetRSSKeyUrl, result.Cookies, RequestType.POST, data: rssParams); var match = Regex.Match(rssPage.ContentString, "(?<=secret_key\\=)([a-zA-z0-9]*)"); configData.RSSKey.Value = match.Success ? match.Value : string.Empty; diff --git a/src/Jackett.Common/Utils/Clients/HttpWebClient.cs b/src/Jackett.Common/Utils/Clients/HttpWebClient.cs index 6013d9142..223a88965 100644 --- a/src/Jackett.Common/Utils/Clients/HttpWebClient.cs +++ b/src/Jackett.Common/Utils/Clients/HttpWebClient.cs @@ -16,6 +16,8 @@ using NLog; namespace Jackett.Common.Utils.Clients { + // This implementation is legacy and it's used only by Mono version + // TODO: Merge with HttpWebClient2 or remove when we drop support for Mono 5.x public class HttpWebClient : WebClient { public HttpWebClient(IProcessService p, Logger l, IConfigurationService c, ServerConfig sc)