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

added notice in log when proxying is used

Browse Source 
bitsoup multi category searches look for all cats instead of making multiple queries
This commit is contained in:
garreth.jeremiah@gmail.com
2015-12-28 08:42:11 -05:00
parent f4129dc4a0
commit af0c15be2c
2 changed files with 231 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Jackett.Console/Program.cs
View File

@@ -69,6 +69,7 @@ namespace JackettConsole
if (options.ProxyConnection != null)
{
Startup.ProxyConnection = options.ProxyConnection.ToLowerInvariant();
Engine.Logger.Info("Proxy enabled. " + Startup.ProxyConnection);
}
// Logging
if (options.Logging)

39
src/Jackett/Indexers/BitSoup.cs
View File

@@ -22,7 +22,7 @@ namespace Jackett.Indexers
{
public class BitSoup : BaseIndexer, IIndexer
{
private string UseLink { get { return (this.configData.AlternateLink.Value != "" ? this.configData.AlternateLink.Value : SiteLink); } }
private string UseLink { get { return (this.configData.AlternateLink.Value != null && this.configData.AlternateLink.Value != "" ? this.configData.AlternateLink.Value : SiteLink); } }
private string BrowseUrl { get { return UseLink + "browse.php"; } }
private string LoginUrl { get { return UseLink + "takelogin.php"; } }
private string LoginReferer { get { return UseLink + "login.php"; } }
@@ -188,38 +188,11 @@ namespace Jackett.Indexers
var queryCollection = new NameValueCollection();
if (!string.IsNullOrWhiteSpace(searchString))
{
queryCollection.Add("search", searchString);
queryCollection.Add("incldead", "0");
queryCollection.Add("cat", "0");
// Tracker cannot search multi categories
// so we either search "all"
// or do multiple searches
if (trackerCats.Count == 0)
{
searchUrl += "?" + queryCollection.GetQueryString();
await ProcessPage(releases, searchUrl);
} else
{
foreach (var cat in trackerCats)
{
queryCollection.Remove("cat");
queryCollection.Add("cat", cat);
searchUrl += "?" + queryCollection.GetQueryString();
await ProcessPage(releases, searchUrl);
}
}
}
else
{
queryCollection.Add("search", "");
queryCollection.Add("cat", "0");
searchUrl += "?" + queryCollection.GetQueryString();
await ProcessPage(releases, searchUrl);
}
queryCollection.Add("search", string.IsNullOrWhiteSpace(searchString)? "" : searchString);
queryCollection.Add("incldead", "0");
queryCollection.Add("cat", (trackerCats.Count < 2 ? "0" : trackerCats.ElementAt(0)));
searchUrl += "?" + queryCollection.GetQueryString();
await ProcessPage(releases, searchUrl);
return releases;
}