Private GIT

Skip to content
Snippets Groups Projects
Commit af0c15be authored by garreth.jeremiah@gmail.com's avatar garreth.jeremiah@gmail.com
Browse files

added notice in log when proxying is used

bitsoup multi category searches look for all cats instead of making multiple queries
parent f4129dc4
No related branches found
No related tags found
No related merge requests found
......@@ -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)
......
......@@ -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("search", string.IsNullOrWhiteSpace(searchString)? "" : 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);
queryCollection.Add("cat", (trackerCats.Count < 2 ? "0" : trackerCats.ElementAt(0)));
searchUrl += "?" + queryCollection.GetQueryString();
await ProcessPage(releases, searchUrl);
}
}
}
else
{
queryCollection.Add("search", "");
queryCollection.Add("cat", "0");
searchUrl += "?" + queryCollection.GetQueryString();
await ProcessPage(releases, searchUrl);
}
return releases;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment