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

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

@@ -25,7 +25,7 @@ namespace Jackett
public StringItem CaptchaText { get; private set; } public StringItem CaptchaText { get; private set; }
public BmtvConfig () public BmtvConfig()
{ {
Username = new StringItem { Name = "Username" }; Username = new StringItem { Name = "Username" };
Password = new StringItem { Name = "Password" }; Password = new StringItem { Name = "Password" };
@@ -33,7 +33,7 @@ namespace Jackett
CaptchaText = new StringItem { Name = "Captcha Text" }; CaptchaText = new StringItem { Name = "Captcha Text" };
} }
public override Item[] GetItems () public override Item[] GetItems()
{ {
return new Item[] { Username, Password, CaptchaImage, CaptchaText }; return new Item[] { Username, Password, CaptchaImage, CaptchaText };
} }
@@ -51,39 +51,40 @@ namespace Jackett
public event Action<IndexerInterface, JToken> OnSaveConfigurationRequested; public event Action<IndexerInterface, JToken> OnSaveConfigurationRequested;
public BitMeTV () public BitMeTV()
{ {
IsConfigured = false; IsConfigured = false;
cookies = new CookieContainer (); cookies = new CookieContainer();
handler = new HttpClientHandler { handler = new HttpClientHandler
{
CookieContainer = cookies, CookieContainer = cookies,
AllowAutoRedirect = true, AllowAutoRedirect = true,
UseCookies = true, UseCookies = true,
}; };
client = new HttpClient (handler); client = new HttpClient(handler);
} }
public string DisplayName { get { return "BitMeTV"; } } public string DisplayName { get { return "BitMeTV"; } }
public string DisplayDescription { get { return "TV Episode specialty tracker"; } } public string DisplayDescription { get { return "TV Episode specialty tracker"; } }
public Uri SiteLink { get { return new Uri (BaseUrl); } } public Uri SiteLink { get { return new Uri(BaseUrl); } }
public bool IsConfigured { get; private set; } public bool IsConfigured { get; private set; }
public async Task<ConfigurationData> GetConfigurationForSetup () public async Task<ConfigurationData> GetConfigurationForSetup()
{ {
await client.GetAsync (LoginUrl); await client.GetAsync(LoginUrl);
var captchaImage = await client.GetByteArrayAsync (CaptchaUrl); var captchaImage = await client.GetByteArrayAsync(CaptchaUrl);
var config = new BmtvConfig (); var config = new BmtvConfig();
config.CaptchaImage.Value = captchaImage; config.CaptchaImage.Value = captchaImage;
return (ConfigurationData)config; return (ConfigurationData)config;
} }
public async Task ApplyConfiguration (JToken configJson) public async Task ApplyConfiguration(JToken configJson)
{ {
var config = new BmtvConfig (); var config = new BmtvConfig();
config.LoadValuesFromJson (configJson); config.LoadValuesFromJson(configJson);
var pairs = new Dictionary<string, string> { var pairs = new Dictionary<string, string> {
{ "username", config.Username.Value }, { "username", config.Username.Value },
@@ -91,91 +92,100 @@ namespace Jackett
{ "secimage", config.CaptchaText.Value } { "secimage", config.CaptchaText.Value }
}; };
var content = new FormUrlEncodedContent (pairs); var content = new FormUrlEncodedContent(pairs);
var response = await client.PostAsync (LoginPost, content); var response = await client.PostAsync(LoginPost, content);
var responseContent = await response.Content.ReadAsStringAsync (); var responseContent = await response.Content.ReadAsStringAsync();
if (!responseContent.Contains ("/logout.php")) { if (!responseContent.Contains("/logout.php"))
{
CQ dom = responseContent; CQ dom = responseContent;
var messageEl = dom ["table tr > td.embedded > h2"].Last (); var messageEl = dom["table tr > td.embedded > h2"].Last();
var errorMessage = messageEl.Text (); var errorMessage = messageEl.Text();
var captchaImage = await client.GetByteArrayAsync (CaptchaUrl); var captchaImage = await client.GetByteArrayAsync(CaptchaUrl);
config.CaptchaImage.Value = captchaImage; config.CaptchaImage.Value = captchaImage;
config.CaptchaText.Value = ""; config.CaptchaText.Value = "";
throw new ExceptionWithConfigData (errorMessage, (ConfigurationData)config); throw new ExceptionWithConfigData(errorMessage, (ConfigurationData)config);
} else { }
var configSaveData = new JObject (); else
configSaveData ["cookies"] = cookies.ToJson (SiteLink); {
var configSaveData = new JObject();
configSaveData["cookies"] = cookies.ToJson(SiteLink);
if (OnSaveConfigurationRequested != null) if (OnSaveConfigurationRequested != null)
OnSaveConfigurationRequested (this, configSaveData); OnSaveConfigurationRequested(this, configSaveData);
IsConfigured = true; IsConfigured = true;
} }
} }
public void LoadFromSavedConfiguration (JToken jsonConfig) public void LoadFromSavedConfiguration(JToken jsonConfig)
{ {
cookies.FillFromJson (new Uri (BaseUrl), (JArray)jsonConfig ["cookies"]); cookies.FillFromJson(new Uri(BaseUrl), (JArray)jsonConfig["cookies"]);
IsConfigured = true; IsConfigured = true;
} }
public async Task<ReleaseInfo[]> PerformQuery (TorznabQuery query) public async Task<ReleaseInfo[]> PerformQuery(TorznabQuery query)
{ {
List<ReleaseInfo> releases = new List<ReleaseInfo> (); 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 searchString = title + " " + query.GetEpisodeSearchString();
var episodeSearchUrl = string.Format ("{0}?search={1}&cat=0", SearchUrl, HttpUtility.UrlEncode (searchString)); var episodeSearchUrl = string.Format("{0}?search={1}&cat=0", SearchUrl, HttpUtility.UrlEncode(searchString));
var results = await client.GetStringAsync (episodeSearchUrl); var results = await client.GetStringAsync(episodeSearchUrl);
CQ dom = results; CQ dom = results;
var table = dom ["tbody > tr > .latest"].Parent ().Parent (); 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 (); {
var release = new ReleaseInfo();
CQ qDetailsCol = row.ChildElements.ElementAt (1).Cq (); CQ qDetailsCol = row.ChildElements.ElementAt(1).Cq();
CQ qLink = qDetailsCol.Children ("a").First (); CQ qLink = qDetailsCol.Children("a").First();
release.MinimumRatio = 1; release.MinimumRatio = 1;
release.MinimumSeedTime = 172800; release.MinimumSeedTime = 172800;
release.Comments = new Uri (BaseUrl + "/" + qLink.Attr ("href")); release.Comments = new Uri(BaseUrl + "/" + qLink.Attr("href"));
release.Guid = release.Comments; release.Guid = release.Comments;
release.Title = qLink.Attr ("title"); release.Title = qLink.Attr("title");
release.Description = release.Title; release.Description = release.Title;
//"Tuesday, June 11th 2013 at 03:52:53 AM" to... //"Tuesday, June 11th 2013 at 03:52:53 AM" to...
//"Tuesday June 11 2013 03:52:53 AM" //"Tuesday June 11 2013 03:52:53 AM"
var timestamp = qDetailsCol.Children ("font").Text ().Trim () + " "; var timestamp = qDetailsCol.Children("font").Text().Trim() + " ";
var timeParts = new List<string> (timestamp.Replace (" at", "").Replace (",", "").Split (' ')); var timeParts = new List<string>(timestamp.Replace(" at", "").Replace(",", "").Split(' '));
timeParts [2] = Regex.Replace (timeParts [2], "[^0-9.]", ""); timeParts[2] = Regex.Replace(timeParts[2], "[^0-9.]", "");
var formattedTimeString = string.Join (" ", timeParts.ToArray ()).Trim (); var formattedTimeString = string.Join(" ", timeParts.ToArray()).Trim();
release.PublishDate = DateTime.ParseExact (formattedTimeString, "dddd MMMM d yyyy hh:mm:ss tt", CultureInfo.InvariantCulture); release.PublishDate = DateTime.ParseExact(formattedTimeString, "dddd MMMM d yyyy hh:mm:ss tt", CultureInfo.InvariantCulture);
release.Link = new Uri (BaseUrl + "/" + row.ChildElements.ElementAt (2).Cq ().Children ("a.index").Attr ("href")); release.Link = new Uri(BaseUrl + "/" + row.ChildElements.ElementAt(2).Cq().Children("a.index").Attr("href"));
var sizeCol = row.ChildElements.ElementAt (6); var sizeCol = row.ChildElements.ElementAt(6);
var sizeVal = float.Parse (sizeCol.ChildNodes [0].NodeValue); var sizeVal = float.Parse(sizeCol.ChildNodes[0].NodeValue);
var sizeUnit = sizeCol.ChildNodes [2].NodeValue; var sizeUnit = sizeCol.ChildNodes[2].NodeValue;
release.Size = ReleaseInfo.GetBytes (sizeUnit, sizeVal); release.Size = ReleaseInfo.GetBytes(sizeUnit, sizeVal);
release.Seeders = int.Parse (row.ChildElements.ElementAt (8).Cq ().Text ()); release.Seeders = int.Parse(row.ChildElements.ElementAt(8).Cq().Text());
release.Peers = int.Parse (row.ChildElements.ElementAt (9).Cq ().Text ()) + release.Seeders; release.Peers = int.Parse(row.ChildElements.ElementAt(9).Cq().Text()) + release.Seeders;
releases.Add (release);
if (!release.Title.ToLower().Contains(title.ToLower()))
continue;
releases.Add(release);
} }
} }
return releases.ToArray (); return releases.ToArray();
} }
public Task<byte[]> Download (Uri link) public Task<byte[]> Download(Uri link)
{ {
return client.GetByteArrayAsync (link); return client.GetByteArrayAsync(link);
} }
} }
} }

3
src/Jackett/Server.cs
View File

@@ -198,7 +198,10 @@ namespace Jackett
var torznabQuery = TorznabQuery.FromHttpQuery(query); var torznabQuery = TorznabQuery.FromHttpQuery(query);
if (torznabQuery.RageID != 0)
torznabQuery.ShowTitles = await sonarrApi.GetShowTitle(torznabQuery.RageID); torznabQuery.ShowTitles = await sonarrApi.GetShowTitle(torznabQuery.RageID);
else
torznabQuery.ShowTitles = new string[] { torznabQuery.SearchTerm };
var releases = await indexer.PerformQuery(torznabQuery); 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 int Season { get; private set; }
public string Episode { get; private set; } public string Episode { get; private set; }
public string[] ShowTitles { get; set; } public string[] ShowTitles { get; set; }
public string SearchTerm { get; set; }
public string GetEpisodeSearchString() 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} //{t=tvsearch&cat=5030%2c5040&extended=1&apikey=test&offset=0&limit=100&rid=24493&season=5&ep=1}
var q = new TorznabQuery(); var q = new TorznabQuery();
q.QueryType = query["t"]; q.QueryType = query["t"];
q.SearchTerm = query["q"];
q.Categories = query["cat"].Split(','); q.Categories = query["cat"].Split(',');
q.Extended = int.Parse(query["extended"]); q.Extended = int.Parse(query["extended"]);
q.ApiKey = query["apikey"]; q.ApiKey = query["apikey"];