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

Fixed bug where search queries were unused

Browse Source
This commit is contained in:
zone117x
2015-04-26 00:51:52 -06:00
parent 59cf8c3e9f
commit 26f1ba7016
3 changed files with 140 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Jackett/Indexers/BitMeTV.cs
View File

@@ -55,7 +55,8 @@ namespace Jackett
{
IsConfigured = false;
cookies = new CookieContainer();
handler = new HttpClientHandler {
handler = new HttpClientHandler
{
CookieContainer = cookies,
AllowAutoRedirect = true,
UseCookies = true,
@@ -96,7 +97,8 @@ namespace Jackett
var response = await client.PostAsync(LoginPost, content);
var responseContent = await response.Content.ReadAsStringAsync();
if (!responseContent.Contains ("/logout.php")) {
if (!responseContent.Contains("/logout.php"))
{
CQ dom = responseContent;
var messageEl = dom["table tr > td.embedded > h2"].Last();
var errorMessage = messageEl.Text();
@@ -104,7 +106,9 @@ namespace Jackett
config.CaptchaImage.Value = captchaImage;
config.CaptchaText.Value = "";
throw new ExceptionWithConfigData(errorMessage, (ConfigurationData)config);
} else {
}
else
{
var configSaveData = new JObject();
configSaveData["cookies"] = cookies.ToJson(SiteLink);
@@ -126,7 +130,8 @@ namespace Jackett
List<ReleaseInfo> releases = new List<ReleaseInfo>();
foreach (var title in query.ShowTitles ?? new string[] { string.Empty }) {
foreach (var title in query.ShowTitles ?? new string[] { string.Empty })
{
var searchString = title + " " + query.GetEpisodeSearchString();
var episodeSearchUrl = string.Format("{0}?search={1}&cat=0", SearchUrl, HttpUtility.UrlEncode(searchString));
@@ -135,7 +140,8 @@ namespace Jackett
var table = dom["tbody > tr > .latest"].Parent().Parent();
foreach (var row in table.Children().Skip(1)) {
foreach (var row in table.Children().Skip(1))
{
var release = new ReleaseInfo();
CQ qDetailsCol = row.ChildElements.ElementAt(1).Cq();
@@ -165,6 +171,10 @@ namespace Jackett
release.Seeders = int.Parse(row.ChildElements.ElementAt(8).Cq().Text());
release.Peers = int.Parse(row.ChildElements.ElementAt(9).Cq().Text()) + release.Seeders;
if (!release.Title.ToLower().Contains(title.ToLower()))
continue;
releases.Add(release);
}
}

3
src/Jackett/Server.cs
View File

@@ -198,7 +198,10 @@ namespace Jackett
var torznabQuery = TorznabQuery.FromHttpQuery(query);
if (torznabQuery.RageID != 0)
torznabQuery.ShowTitles = await sonarrApi.GetShowTitle(torznabQuery.RageID);
else
torznabQuery.ShowTitles = new string[] { torznabQuery.SearchTerm };
var releases = await indexer.PerformQuery(torznabQuery);

2
src/Jackett/TorznabQuery.cs
View File

@@ -20,6 +20,7 @@ namespace Jackett
public int Season { get; private set; }
public string Episode { get; private set; }
public string[] ShowTitles { get; set; }
public string SearchTerm { get; set; }
public string GetEpisodeSearchString()
{
@@ -44,6 +45,7 @@ namespace Jackett
//{t=tvsearch&cat=5030%2c5040&extended=1&apikey=test&offset=0&limit=100&rid=24493&season=5&ep=1}
var q = new TorznabQuery();
q.QueryType = query["t"];
q.SearchTerm = query["q"];
q.Categories = query["cat"].Split(',');
q.Extended = int.Parse(query["extended"]);
q.ApiKey = query["apikey"];