diff --git a/src/Jackett.Common/Indexers/Abnormal.cs b/src/Jackett.Common/Indexers/Abnormal.cs index ae8f0da93..941a5a889 100644 --- a/src/Jackett.Common/Indexers/Abnormal.cs +++ b/src/Jackett.Common/Indexers/Abnormal.cs @@ -548,7 +548,7 @@ namespace Jackett.Common.Indexers /// Results from query private async Task queryTracker(string request) { - BaseWebResult results = null; + WebResult results = null; // Cache mode not enabled or cached file didn't exist for our query output("\nQuerying tracker for results...."); diff --git a/src/Jackett.Common/Indexers/AniDUB.cs b/src/Jackett.Common/Indexers/AniDUB.cs index 36f069dce..15181a204 100644 --- a/src/Jackett.Common/Indexers/AniDUB.cs +++ b/src/Jackett.Common/Indexers/AniDUB.cs @@ -509,7 +509,7 @@ namespace Jackett.Common.Indexers return domDate.NodeValue.Trim(); } - private bool IsAuthorized(BaseWebResult result) => + private bool IsAuthorized(WebResult result) => result.ContentString.Contains("index.php?action=logout"); private IEnumerable ParseCategories(Uri showUri) diff --git a/src/Jackett.Common/Indexers/BJShare.cs b/src/Jackett.Common/Indexers/BJShare.cs index 12c106cac..9ea87c84b 100644 --- a/src/Jackett.Common/Indexers/BJShare.cs +++ b/src/Jackett.Common/Indexers/BJShare.cs @@ -219,7 +219,7 @@ namespace Jackett.Common.Indexers return title; } - private bool IsSessionIsClosed(BaseWebResult result) + private bool IsSessionIsClosed(WebResult result) { return result.IsRedirect && result.RedirectingTo.Contains("login.php"); } diff --git a/src/Jackett.Common/Indexers/BaseIndexer.cs b/src/Jackett.Common/Indexers/BaseIndexer.cs index 9fad0e186..5ab118370 100644 --- a/src/Jackett.Common/Indexers/BaseIndexer.cs +++ b/src/Jackett.Common/Indexers/BaseIndexer.cs @@ -412,7 +412,7 @@ namespace Jackett.Common.Indexers return response.ContentBytes; } - protected async Task RequestBytesWithCookiesAndRetry(string url, string cookieOverride = null, RequestType method = RequestType.GET, string referer = null, IEnumerable> data = null) + protected async Task RequestBytesWithCookiesAndRetry(string url, string cookieOverride = null, RequestType method = RequestType.GET, string referer = null, IEnumerable> data = null) { Exception lastException = null; for (var i = 0; i < 3; i++) @@ -432,7 +432,7 @@ namespace Jackett.Common.Indexers throw lastException; } - protected async Task RequestStringWithCookies(string url, string cookieOverride = null, string referer = null, Dictionary headers = null) + protected async Task RequestStringWithCookies(string url, string cookieOverride = null, string referer = null, Dictionary headers = null) { var request = new Utils.Clients.WebRequest() { @@ -452,7 +452,7 @@ namespace Jackett.Common.Indexers return result; } - protected async Task RequestStringWithCookiesAndRetry(string url, string cookieOverride = null, string referer = null, Dictionary headers = null) + protected async Task RequestStringWithCookiesAndRetry(string url, string cookieOverride = null, string referer = null, Dictionary headers = null) { Exception lastException = null; for (var i = 0; i < 3; i++) @@ -472,7 +472,7 @@ namespace Jackett.Common.Indexers throw lastException; } - protected virtual async Task RequestBytesWithCookies(string url, string cookieOverride = null, RequestType method = RequestType.GET, string referer = null, IEnumerable> data = null, Dictionary headers = null) + protected virtual async Task RequestBytesWithCookies(string url, string cookieOverride = null, RequestType method = RequestType.GET, string referer = null, IEnumerable> data = null, Dictionary headers = null) { var request = new Utils.Clients.WebRequest() { @@ -492,7 +492,7 @@ namespace Jackett.Common.Indexers return result; } - protected async Task PostDataWithCookies(string url, IEnumerable> data, string cookieOverride = null, string referer = null, Dictionary headers = null, string rawbody = null, bool? emulateBrowser = null) + protected async Task PostDataWithCookies(string url, IEnumerable> data, string cookieOverride = null, string referer = null, Dictionary headers = null, string rawbody = null, bool? emulateBrowser = null) { var request = new Utils.Clients.WebRequest() { @@ -514,7 +514,7 @@ namespace Jackett.Common.Indexers return result; } - protected async Task PostDataWithCookiesAndRetry(string url, IEnumerable> data, string cookieOverride = null, string referer = null, Dictionary headers = null, string rawbody = null, bool? emulateBrowser = null) + protected async Task PostDataWithCookiesAndRetry(string url, IEnumerable> data, string cookieOverride = null, string referer = null, Dictionary headers = null, string rawbody = null, bool? emulateBrowser = null) { Exception lastException = null; for (var i = 0; i < 3; i++) @@ -534,7 +534,7 @@ namespace Jackett.Common.Indexers throw lastException; } - protected async Task RequestLoginAndFollowRedirect(string url, IEnumerable> data, string cookies, bool returnCookiesFromFirstCall, string redirectUrlOverride = null, string referer = null, bool accumulateCookies = false) + protected async Task RequestLoginAndFollowRedirect(string url, IEnumerable> data, string cookies, bool returnCookiesFromFirstCall, string redirectUrlOverride = null, string referer = null, bool accumulateCookies = false) { var request = new Utils.Clients.WebRequest() { @@ -566,7 +566,7 @@ namespace Jackett.Common.Indexers return response; } - protected void CheckTrackerDown(BaseWebResult response) + protected void CheckTrackerDown(WebResult response) { if (response.Status == System.Net.HttpStatusCode.BadGateway || response.Status == System.Net.HttpStatusCode.GatewayTimeout @@ -584,7 +584,7 @@ namespace Jackett.Common.Indexers } } - protected async Task FollowIfRedirect(BaseWebResult response, string referrer = null, string overrideRedirectUrl = null, string overrideCookies = null, bool accumulateCookies = false) + protected async Task FollowIfRedirect(WebResult response, string referrer = null, string overrideRedirectUrl = null, string overrideCookies = null, bool accumulateCookies = false) { // Follow up to 5 redirects for (var i = 0; i < 5; i++) @@ -629,7 +629,7 @@ namespace Jackett.Common.Indexers } } - private async Task DoFollowIfRedirect(BaseWebResult incomingResponse, string referrer = null, string overrideRedirectUrl = null, string overrideCookies = null, bool accumulateCookies = false) + private async Task DoFollowIfRedirect(WebResult incomingResponse, string referrer = null, string overrideRedirectUrl = null, string overrideCookies = null, bool accumulateCookies = false) { if (incomingResponse.IsRedirect) { diff --git a/src/Jackett.Common/Indexers/BitHDTV.cs b/src/Jackett.Common/Indexers/BitHDTV.cs index 589d5bc64..9a047fd63 100644 --- a/src/Jackett.Common/Indexers/BitHDTV.cs +++ b/src/Jackett.Common/Indexers/BitHDTV.cs @@ -122,7 +122,7 @@ namespace Jackett.Common.Indexers { {"cat", MapTorznabCapsToTrackers(query, true).FirstIfSingleOrDefault("0")} }; - var results = new List(); + var results = new List(); var search = new UriBuilder(SearchUrl); if (query.IsImdbQuery) { diff --git a/src/Jackett.Common/Indexers/CardigannIndexer.cs b/src/Jackett.Common/Indexers/CardigannIndexer.cs index 70bc5923f..df732db6c 100644 --- a/src/Jackett.Common/Indexers/CardigannIndexer.cs +++ b/src/Jackett.Common/Indexers/CardigannIndexer.cs @@ -26,7 +26,7 @@ namespace Jackett.Common.Indexers public class CardigannIndexer : BaseWebIndexer { protected IndexerDefinition Definition; - protected BaseWebResult landingResult; + protected WebResult landingResult; protected IHtmlDocument landingResultDocument; protected List DefaultCategories = new List(); @@ -455,7 +455,7 @@ namespace Jackett.Common.Indexers return template; } - protected bool checkForError(BaseWebResult loginResult, IList errorBlocks) + protected bool checkForError(WebResult loginResult, IList errorBlocks) { if (loginResult.Status == HttpStatusCode.Unauthorized) // e.g. used by YGGtorrent throw new ExceptionWithConfigData("401 Unauthorized, check your credentials", configData); @@ -702,7 +702,7 @@ namespace Jackett.Common.Indexers landingResult = null; landingResultDocument = null; - BaseWebResult loginResult = null; + WebResult loginResult = null; var enctype = form.GetAttribute("enctype"); if (enctype == "multipart/form-data") { @@ -782,7 +782,7 @@ namespace Jackett.Common.Indexers return null; } - protected string getRedirectDomainHint(BaseWebResult result) => getRedirectDomainHint(result.Request.Url, result.RedirectingTo); + protected string getRedirectDomainHint(WebResult result) => getRedirectDomainHint(result.Request.Url, result.RedirectingTo); protected async Task TestLogin() { @@ -826,7 +826,7 @@ namespace Jackett.Common.Indexers return true; } - protected bool CheckIfLoginIsNeeded(BaseWebResult Result, IHtmlDocument document) + protected bool CheckIfLoginIsNeeded(WebResult Result, IHtmlDocument document) { if (Result.IsRedirect) { @@ -1334,7 +1334,7 @@ namespace Jackett.Common.Indexers logger.Info($"Fetching: {searchUrl}"); // send HTTP request - BaseWebResult response = null; + WebResult response = null; Dictionary headers = null; if (Search.Headers != null) { @@ -1721,7 +1721,7 @@ namespace Jackett.Common.Indexers return releases; } - protected async Task handleRequest(requestBlock request, Dictionary variables = null, string referer = null) + protected async Task handleRequest(requestBlock request, Dictionary variables = null, string referer = null) { var requestLinkStr = resolvePath(applyGoTemplateText(request.Path, variables)).ToString(); logger.Debug($"CardigannIndexer ({Id}): handleRequest() requestLinkStr= {requestLinkStr}"); diff --git a/src/Jackett.Common/Indexers/Cinecalidad.cs b/src/Jackett.Common/Indexers/Cinecalidad.cs index 309087804..02b829ddf 100644 --- a/src/Jackett.Common/Indexers/Cinecalidad.cs +++ b/src/Jackett.Common/Indexers/Cinecalidad.cs @@ -142,7 +142,7 @@ namespace Jackett.Common.Indexers return null; } - private List ParseReleases(BaseWebResult response, TorznabQuery query) + private List ParseReleases(WebResult response, TorznabQuery query) { var releases = new List(); diff --git a/src/Jackett.Common/Indexers/CorsaroRed.cs b/src/Jackett.Common/Indexers/CorsaroRed.cs index e94ea6548..54f641591 100644 --- a/src/Jackett.Common/Indexers/CorsaroRed.cs +++ b/src/Jackett.Common/Indexers/CorsaroRed.cs @@ -107,7 +107,7 @@ namespace Jackett.Common.Indexers return IndexerConfigurationStatus.Completed; } - private dynamic CheckResponse(BaseWebResult result) + private dynamic CheckResponse(WebResult result) { try { diff --git a/src/Jackett.Common/Indexers/DanishBits.cs b/src/Jackett.Common/Indexers/DanishBits.cs index 8c9d5c2f5..342a0ed97 100644 --- a/src/Jackett.Common/Indexers/DanishBits.cs +++ b/src/Jackett.Common/Indexers/DanishBits.cs @@ -65,7 +65,7 @@ namespace Jackett.Common.Indexers return searchString; } - protected override async Task RequestBytesWithCookies(string url, string cookieOverride = null, RequestType method = RequestType.GET, string referer = null, IEnumerable> data = null, Dictionary headers = null) + protected override async Task RequestBytesWithCookies(string url, string cookieOverride = null, RequestType method = RequestType.GET, string referer = null, IEnumerable> data = null, Dictionary headers = null) { CookieHeader = null; // Download fill fail with cookies set return await base.RequestBytesWithCookies(url, cookieOverride, method, referer, data, headers); diff --git a/src/Jackett.Common/Indexers/InternetArchive.cs b/src/Jackett.Common/Indexers/InternetArchive.cs index b9c0c2461..62600891b 100644 --- a/src/Jackett.Common/Indexers/InternetArchive.cs +++ b/src/Jackett.Common/Indexers/InternetArchive.cs @@ -150,7 +150,7 @@ namespace Jackett.Common.Indexers return releases; } - private JArray ParseResponse(BaseWebResult result) + private JArray ParseResponse(WebResult result) { try { diff --git a/src/Jackett.Common/Indexers/LostFilm.cs b/src/Jackett.Common/Indexers/LostFilm.cs index 7edd2dc2a..ae496a08e 100644 --- a/src/Jackett.Common/Indexers/LostFilm.cs +++ b/src/Jackett.Common/Indexers/LostFilm.cs @@ -212,7 +212,7 @@ namespace Jackett.Common.Indexers } } - private async Task RequestStringAndRelogin(string url) + private async Task RequestStringAndRelogin(string url) { var results = await RequestStringWithCookies(url); if (results.ContentString.Contains("503 Service")) diff --git a/src/Jackett.Common/Indexers/NCore.cs b/src/Jackett.Common/Indexers/NCore.cs index eb697bc91..9d4095d18 100644 --- a/src/Jackett.Common/Indexers/NCore.cs +++ b/src/Jackett.Common/Indexers/NCore.cs @@ -207,7 +207,7 @@ namespace Jackett.Common.Indexers return releases; } - private List ParseTorrents(BaseWebResult results, string episodeString, TorznabQuery query, + private List ParseTorrents(WebResult results, string episodeString, TorznabQuery query, int alreadyFound, int limit, int previouslyParsedOnPage) { var releases = new List(); diff --git a/src/Jackett.Common/Indexers/NorBits.cs b/src/Jackett.Common/Indexers/NorBits.cs index b8ceb32b8..b3935fd03 100644 --- a/src/Jackett.Common/Indexers/NorBits.cs +++ b/src/Jackett.Common/Indexers/NorBits.cs @@ -459,9 +459,9 @@ namespace Jackett.Common.Indexers /// /// URL created by Query Builder /// Results from query - private async Task QueryExec(string request) + private async Task QueryExec(string request) { - BaseWebResult results; + WebResult results; // Switch in we are in DEV mode with Hard Drive Cache or not if (DevMode && CacheMode) @@ -482,9 +482,9 @@ namespace Jackett.Common.Indexers /// /// URL created by Query Builder /// Results from query - private async Task QueryCache(string request) + private async Task QueryCache(string request) { - BaseWebResult results; + WebResult results; // Create Directory if not exist System.IO.Directory.CreateDirectory(Directory); @@ -500,7 +500,7 @@ namespace Jackett.Common.Indexers { // File exist... loading it right now ! Output("Loading results from hard drive cache ..." + request.GetHashCode() + ".json"); - results = JsonConvert.DeserializeObject(System.IO.File.ReadAllText(file)); + results = JsonConvert.DeserializeObject(System.IO.File.ReadAllText(file)); } else { @@ -519,7 +519,7 @@ namespace Jackett.Common.Indexers /// /// URL created by Query Builder /// Results from query - private async Task QueryTracker(string request) + private async Task QueryTracker(string request) { // Cache mode not enabled or cached file didn't exist for our query Output("\nQuerying tracker for results...."); diff --git a/src/Jackett.Common/Indexers/NordicBits.cs b/src/Jackett.Common/Indexers/NordicBits.cs index d9a11fdb1..1b6a118f7 100644 --- a/src/Jackett.Common/Indexers/NordicBits.cs +++ b/src/Jackett.Common/Indexers/NordicBits.cs @@ -530,9 +530,9 @@ namespace Jackett.Common.Indexers /// /// URL created by Query Builder /// Results from query - private async Task QueryExec(string request) + private async Task QueryExec(string request) { - BaseWebResult results; + WebResult results; // Switch in we are in DEV mode with Hard Drive Cache or not if (DevMode && CacheMode) @@ -553,9 +553,9 @@ namespace Jackett.Common.Indexers /// /// URL created by Query Builder /// Results from query - private async Task QueryCache(string request) + private async Task QueryCache(string request) { - BaseWebResult results; + WebResult results; // Create Directory if not exist System.IO.Directory.CreateDirectory(Directory); @@ -571,7 +571,7 @@ namespace Jackett.Common.Indexers { // File exist... loading it right now ! Output("Loading results from hard drive cache ..." + request.GetHashCode() + ".json"); - results = JsonConvert.DeserializeObject(System.IO.File.ReadAllText(file)); + results = JsonConvert.DeserializeObject(System.IO.File.ReadAllText(file)); } else { @@ -590,7 +590,7 @@ namespace Jackett.Common.Indexers /// /// URL created by Query Builder /// Results from query - private async Task QueryTracker(string request) + private async Task QueryTracker(string request) { // Cache mode not enabled or cached file didn't exist for our query Output("\nQuerying tracker for results...."); diff --git a/src/Jackett.Common/Indexers/Partis.cs b/src/Jackett.Common/Indexers/Partis.cs index 1321035c5..8c4a91c14 100644 --- a/src/Jackett.Common/Indexers/Partis.cs +++ b/src/Jackett.Common/Indexers/Partis.cs @@ -116,7 +116,7 @@ namespace Jackett.Common.Indexers var releases = new List(); //List of releases initialization var searchString = query.GetQueryString(); //get search string from query - BaseWebResult results = null; + WebResult results = null; var queryCollection = new NameValueCollection(); var catList = MapTorznabCapsToTrackers(query); // map categories from query to indexer specific var categ = string.Join(",", catList); diff --git a/src/Jackett.Common/Indexers/SceneTime.cs b/src/Jackett.Common/Indexers/SceneTime.cs index 6e87c9b84..77c6a7476 100644 --- a/src/Jackett.Common/Indexers/SceneTime.cs +++ b/src/Jackett.Common/Indexers/SceneTime.cs @@ -104,7 +104,7 @@ namespace Jackett.Common.Indexers public override async Task GetConfigurationForSetup() { - BaseWebResult loginPage; + WebResult loginPage; try { loginPage = await RequestStringWithCookies(StartPageUrl, string.Empty); diff --git a/src/Jackett.Common/Indexers/Shazbat.cs b/src/Jackett.Common/Indexers/Shazbat.cs index 4f1895ae3..d2ba1a25e 100644 --- a/src/Jackett.Common/Indexers/Shazbat.cs +++ b/src/Jackett.Common/Indexers/Shazbat.cs @@ -81,7 +81,7 @@ namespace Jackett.Common.Indexers { var releases = new List(); var queryString = query.GetQueryString(); - BaseWebResult results = null; + WebResult results = null; var searchUrls = new List(); if (!string.IsNullOrWhiteSpace(query.SanitizedSearchTerm)) { @@ -170,7 +170,7 @@ namespace Jackett.Common.Indexers return releases; } - private async Task ReloginIfNecessary(BaseWebResult response) + private async Task ReloginIfNecessary(WebResult response) { if (response.ContentString.Contains("onclick=\"document.location='logout'\"")) return response; diff --git a/src/Jackett.Common/Indexers/SolidTorrents.cs b/src/Jackett.Common/Indexers/SolidTorrents.cs index ca6e65f9d..ae99b0cbe 100644 --- a/src/Jackett.Common/Indexers/SolidTorrents.cs +++ b/src/Jackett.Common/Indexers/SolidTorrents.cs @@ -76,7 +76,7 @@ namespace Jackett.Common.Indexers return IndexerConfigurationStatus.Completed; } - private JArray CheckResponse(BaseWebResult result) + private JArray CheckResponse(WebResult result) { try { diff --git a/src/Jackett.Common/Indexers/TVStore.cs b/src/Jackett.Common/Indexers/TVStore.cs index eae5d7a4c..494e826cb 100644 --- a/src/Jackett.Common/Indexers/TVStore.cs +++ b/src/Jackett.Common/Indexers/TVStore.cs @@ -119,7 +119,7 @@ namespace Jackett.Common.Indexers /// Number of the already found torrents.(used for limit) /// The limit to the number of torrents to download /// Current position in parsed results - private async Task> ParseTorrentsAsync(BaseWebResult results, int alreadyFound, int limit, + private async Task> ParseTorrentsAsync(WebResult results, int alreadyFound, int limit, int previouslyParsedOnPage) { var releases = new List(); diff --git a/src/Jackett.Common/Indexers/TorrenTech.cs b/src/Jackett.Common/Indexers/TorrenTech.cs index 62cb0873e..c66d55d1c 100644 --- a/src/Jackett.Common/Indexers/TorrenTech.cs +++ b/src/Jackett.Common/Indexers/TorrenTech.cs @@ -76,7 +76,7 @@ namespace Jackett.Common.Indexers var releases = new List(); var searchString = query.GetQueryString(); - BaseWebResult results = null; + WebResult results = null; var queryCollection = new NameValueCollection { { "act", "search" }, diff --git a/src/Jackett.Common/Utils/Clients/HttpWebClient.cs b/src/Jackett.Common/Utils/Clients/HttpWebClient.cs index 024406695..c3bf12499 100644 --- a/src/Jackett.Common/Utils/Clients/HttpWebClient.cs +++ b/src/Jackett.Common/Utils/Clients/HttpWebClient.cs @@ -30,7 +30,7 @@ namespace Jackett.Common.Utils.Clients base.Init(); } - protected override async Task Run(WebRequest webRequest) + protected override async Task Run(WebRequest webRequest) { ServicePointManager.SecurityProtocol = (SecurityProtocolType)192 | (SecurityProtocolType)768 | (SecurityProtocolType)3072; @@ -117,7 +117,7 @@ namespace Jackett.Common.Utils.Clients using (response = await client.SendAsync(request)) { - var result = new WebClientByteResult + var result = new WebResult { ContentBytes = await response.Content.ReadAsByteArrayAsync() }; @@ -147,7 +147,7 @@ namespace Jackett.Common.Utils.Clients redirval = value.Substring(start + 1); result.RedirectingTo = redirval; // normally we don't want a serviceunavailable (503) to be a redirect, but that's the nature - // of this cloudflare approach..don't want to alter BaseWebResult.IsRedirect because normally + // of this cloudflare approach..don't want to alter WebResult.IsRedirect because normally // it shoudln't include service unavailable..only if we have this redirect header. response.StatusCode = System.Net.HttpStatusCode.Redirect; redirtime = int.Parse(value.Substring(0, end)); diff --git a/src/Jackett.Common/Utils/Clients/HttpWebClient2.cs b/src/Jackett.Common/Utils/Clients/HttpWebClient2.cs index 9eef78c2c..44867722e 100644 --- a/src/Jackett.Common/Utils/Clients/HttpWebClient2.cs +++ b/src/Jackett.Common/Utils/Clients/HttpWebClient2.cs @@ -75,7 +75,7 @@ namespace Jackett.Common.Utils.Clients ServicePointManager.SecurityProtocol = (SecurityProtocolType)192 | (SecurityProtocolType)768 | (SecurityProtocolType)3072; } - protected override async Task Run(WebRequest webRequest) + protected override async Task Run(WebRequest webRequest) { HttpResponseMessage response = null; var request = new HttpRequestMessage(); @@ -143,7 +143,7 @@ namespace Jackett.Common.Utils.Clients response = await client.SendAsync(request); - var result = new WebClientByteResult + var result = new WebResult { ContentBytes = await response.Content.ReadAsByteArrayAsync() }; @@ -173,7 +173,7 @@ namespace Jackett.Common.Utils.Clients redirval = value.Substring(start + 1); result.RedirectingTo = redirval; // normally we don't want a serviceunavailable (503) to be a redirect, but that's the nature - // of this cloudflare approach..don't want to alter BaseWebResult.IsRedirect because normally + // of this cloudflare approach..don't want to alter WebResult.IsRedirect because normally // it shoudln't include service unavailable..only if we have this redirect header. response.StatusCode = System.Net.HttpStatusCode.Redirect; redirtime = int.Parse(value.Substring(0, end)); diff --git a/src/Jackett.Common/Utils/Clients/WebByteResult.cs b/src/Jackett.Common/Utils/Clients/WebByteResult.cs deleted file mode 100644 index 5c3890b31..000000000 --- a/src/Jackett.Common/Utils/Clients/WebByteResult.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace Jackett.Common.Utils.Clients -{ - public class WebClientByteResult : BaseWebResult - { - } -} diff --git a/src/Jackett.Common/Utils/Clients/WebClient.cs b/src/Jackett.Common/Utils/Clients/WebClient.cs index c36005dbf..6350e7076 100644 --- a/src/Jackett.Common/Utils/Clients/WebClient.cs +++ b/src/Jackett.Common/Utils/Clients/WebClient.cs @@ -186,7 +186,7 @@ namespace Jackett.Common.Utils.Clients return; } - public virtual async Task GetBytes(WebRequest request) + public virtual async Task GetBytes(WebRequest request) { logger.Debug(string.Format("WebClient({0}).GetBytes(Url:{1})", ClientType, request.Url)); PrepareRequest(request); @@ -198,7 +198,7 @@ namespace Jackett.Common.Utils.Clients return result; } - public virtual async Task GetString(WebRequest request) + public virtual async Task GetString(WebRequest request) { logger.Debug(string.Format("WebClient({0}).GetString(Url:{1})", ClientType, request.Url)); PrepareRequest(request); @@ -206,7 +206,7 @@ namespace Jackett.Common.Utils.Clients var result = await Run(request); lastRequest = DateTime.Now; result.Request = request; - BaseWebResult stringResult = result; + WebResult stringResult = result; logger.Debug(string.Format("WebClient({0}): Returning {1} => {2}", ClientType, result.Status, (result.IsRedirect ? result.RedirectingTo + " " : "") + (stringResult.ContentString ?? ""))); @@ -219,7 +219,7 @@ namespace Jackett.Common.Utils.Clients } #pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously - protected virtual async Task Run(WebRequest webRequest) => throw new NotImplementedException(); + protected virtual async Task Run(WebRequest webRequest) => throw new NotImplementedException(); #pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously public virtual void Init() diff --git a/src/Jackett.Common/Utils/Clients/WebClientResult.cs b/src/Jackett.Common/Utils/Clients/WebClientResult.cs deleted file mode 100644 index 5d0c18a48..000000000 --- a/src/Jackett.Common/Utils/Clients/WebClientResult.cs +++ /dev/null @@ -1,17 +0,0 @@ -namespace Jackett.Common.Utils.Clients -{ - public class WebClientStringResult : BaseWebResult - { - public static implicit operator WebClientStringResult(WebClientByteResult br) => new WebClientStringResult() - { - ContentBytes = br.ContentBytes, - Cookies = br.Cookies, - Encoding = br.Encoding, - Headers = br.Headers, - RedirectingTo = br.RedirectingTo, - Request = br.Request, - Status = br.Status - }; - - } -} diff --git a/src/Jackett.Common/Utils/Clients/BaseWebResult.cs b/src/Jackett.Common/Utils/Clients/WebResult.cs similarity index 98% rename from src/Jackett.Common/Utils/Clients/BaseWebResult.cs rename to src/Jackett.Common/Utils/Clients/WebResult.cs index fbd43feef..893e063e5 100644 --- a/src/Jackett.Common/Utils/Clients/BaseWebResult.cs +++ b/src/Jackett.Common/Utils/Clients/WebResult.cs @@ -6,7 +6,7 @@ using System.Text.RegularExpressions; namespace Jackett.Common.Utils.Clients { - public abstract class BaseWebResult + public class WebResult { private string _contentString; private Encoding _encoding; diff --git a/src/Jackett.Common/Utils/ServerUtil.cs b/src/Jackett.Common/Utils/ServerUtil.cs index 24c132f08..5043488d0 100644 --- a/src/Jackett.Common/Utils/ServerUtil.cs +++ b/src/Jackett.Common/Utils/ServerUtil.cs @@ -95,7 +95,7 @@ namespace Jackett.Common.Utils return isAdmin; } - public static void ResureRedirectIsFullyQualified(WebRequest req, BaseWebResult result) + public static void ResureRedirectIsFullyQualified(WebRequest req, WebResult result) { if (!string.IsNullOrEmpty(result.RedirectingTo)) { diff --git a/src/Jackett.Test/TestUtil.cs b/src/Jackett.Test/TestUtil.cs index c8491c24c..652f8d604 100644 --- a/src/Jackett.Test/TestUtil.cs +++ b/src/Jackett.Test/TestUtil.cs @@ -33,13 +33,13 @@ namespace Jackett.Test public static IContainer Container => testContainer; - public static void RegisterByteCall(WebRequest r, Func f) + public static void RegisterByteCall(WebRequest r, Func f) { var client = testContainer.Resolve() as TestWebClient; client.RegisterByteCall(r, f); } - public static void RegisterStringCall(WebRequest r, Func f) + public static void RegisterStringCall(WebRequest r, Func f) { var client = testContainer.Resolve() as TestWebClient; client.RegisterStringCall(r, f); diff --git a/src/Jackett.Test/TestWebClient.cs b/src/Jackett.Test/TestWebClient.cs index 5048ca4d2..b7a51abad 100644 --- a/src/Jackett.Test/TestWebClient.cs +++ b/src/Jackett.Test/TestWebClient.cs @@ -11,8 +11,8 @@ namespace Jackett.Test { public class TestWebClient : WebClient { - private readonly Dictionary> byteCallbacks = new Dictionary>(); - private readonly Dictionary> stringCallbacks = new Dictionary>(); + private readonly Dictionary> byteCallbacks = new Dictionary>(); + private readonly Dictionary> stringCallbacks = new Dictionary>(); public TestWebClient(IProcessService p, Logger l, IConfigurationService c, ServerConfig sc) : base(p: p, @@ -22,13 +22,13 @@ namespace Jackett.Test { } - public void RegisterByteCall(WebRequest req, Func f) => byteCallbacks.Add(req, f); + public void RegisterByteCall(WebRequest req, Func f) => byteCallbacks.Add(req, f); - public void RegisterStringCall(WebRequest req, Func f) => stringCallbacks.Add(req, f); + public void RegisterStringCall(WebRequest req, Func f) => stringCallbacks.Add(req, f); - public override Task GetBytes(WebRequest request) => Task.FromResult(byteCallbacks.Where(r => r.Key.Equals(request)).First().Value.Invoke(request)); + public override Task GetBytes(WebRequest request) => Task.FromResult(byteCallbacks.Where(r => r.Key.Equals(request)).First().Value.Invoke(request)); - public override Task GetString(WebRequest request) => Task.FromResult(stringCallbacks.Where(r => r.Key.Equals(request)).First().Value.Invoke(request)); + public override Task GetString(WebRequest request) => Task.FromResult(stringCallbacks.Where(r => r.Key.Equals(request)).First().Value.Invoke(request)); public override void Init() { diff --git a/src/Jackett.Test/Util/ServerUtilTests.cs b/src/Jackett.Test/Util/ServerUtilTests.cs index 4a7c1b1d2..223a57924 100644 --- a/src/Jackett.Test/Util/ServerUtilTests.cs +++ b/src/Jackett.Test/Util/ServerUtilTests.cs @@ -10,7 +10,7 @@ namespace Jackett.Test.Util [Test] public void ResureRedirectIsFullyQualified_makes_redicts_fully_qualified() { - var res = new WebClientByteResult() + var res = new WebResult { RedirectingTo = "list?p=1" };