shpaq/Jackett-Jackett
1
0
Fork 0
mirror of https://github.com/Jackett/Jackett.git synced 2025-09-17 17:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cardigann: improve resolvePath usage

Browse Source
This commit is contained in:
kaso17
2017-01-06 15:05:51 +01:00
parent 08b3ba0f02
commit 8dcc2aedc9
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Jackett/Indexers/CardigannIndexer.cs
View File

@@ -368,7 +368,7 @@ namespace Jackett.Indexers
pairs.Add(Input.Key, value);
}
var LoginUrl = SiteLink + Login.Path;
var LoginUrl = resolvePath(Login.Path).ToString();
configData.CookieHeader.Value = null;
var loginResult = await RequestLoginAndFollowRedirect(LoginUrl, pairs, null, true, null, SiteLink, true);
configData.CookieHeader.Value = loginResult.Cookies;
@@ -377,7 +377,7 @@ namespace Jackett.Indexers
}
else if (Login.Method == "form")
{
var LoginUrl = SiteLink + Login.Path;
var LoginUrl = resolvePath(Login.Path).ToString();
var pairs = new Dictionary<string, string>();
@@ -540,7 +540,7 @@ namespace Jackett.Indexers
return false;
// test if login was successful
var LoginTestUrl = SiteLink + Login.Test.Path;
var LoginTestUrl = resolvePath(Login.Test.Path).ToString();
var testResult = await RequestStringWithCookies(LoginTestUrl);
if (testResult.IsRedirect)
@@ -589,7 +589,7 @@ namespace Jackett.Indexers
if (Login == null || Login.Method != "form")
return configData;
var LoginUrl = SiteLink + Login.Path;
var LoginUrl = resolvePath(Login.Path).ToString();
configData.CookieHeader.Value = null;
landingResult = await RequestStringWithCookies(LoginUrl, null, SiteLink);
@@ -799,6 +799,11 @@ namespace Jackett.Indexers
{
return new Uri(path);
}
else if (path.StartsWith("//"))
{
var basepath = new Uri(SiteLink);
return new Uri(basepath.Scheme + ":" + path);
}
else if(path.StartsWith("/"))
{
var basepath = new Uri(SiteLink);
@@ -808,7 +813,6 @@ namespace Jackett.Indexers
{
return new Uri(SiteLink + path);
}
}
public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
@@ -856,7 +860,7 @@ namespace Jackett.Indexers
variables[".Keywords"] = variables[".Query.Keywords"];
// build search URL
var searchUrl = SiteLink + applyGoTemplateText(Search.Path, variables) + "?";
var searchUrl = resolvePath(applyGoTemplateText(Search.Path, variables) + "?").ToString();
var queryCollection = new NameValueCollection();
if (Search.Inputs != null)
{