Refactoring

This commit is contained in:
qianlifeng
2014-12-21 22:03:03 +08:00
parent c20314f83c
commit 2b211c2ba0
26 changed files with 168 additions and 273 deletions

View File

@@ -9,6 +9,7 @@ using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Newtonsoft.Json.Serialization;
using Wox.Infrastructure;
using Wox.Infrastructure.Http;
using YAMP.Numerics;
namespace Wox.Plugin.SystemPlugins.SuggestionSources
@@ -19,36 +20,30 @@ namespace Wox.Plugin.SystemPlugins.SuggestionSources
public override List<string> GetSuggestions(string query)
{
try
{
var response =
HttpRequest.CreateGetHttpResponse(
"http://suggestion.baidu.com/su?json=1&wd=" + Uri.EscapeUriString(query), null,
null, null);
var stream = response.GetResponseStream();
var result = HttpRequest.Get("http://suggestion.baidu.com/su?json=1&wd=" + Uri.EscapeUriString(query), "GB2312");
if (string.IsNullOrEmpty(result)) return new List<string>();
if (stream != null)
Match match = reg.Match(result);
if (match.Success)
{
JContainer json = null;
try
{
var body = new StreamReader(stream, Encoding.GetEncoding("GB2312")).ReadToEnd();
Match m = reg.Match(body);
if (m.Success)
json =JsonConvert.DeserializeObject(match.Groups[1].Value) as JContainer;
}
catch{}
if (json != null)
{
var results = json["s"] as JArray;
if (results != null)
{
var json = JsonConvert.DeserializeObject(m.Groups[1].Value) as JContainer;
if (json != null)
{
var results = json["s"] as JArray;
if (results != null)
{
return results.OfType<JValue>().Select(o => o.Value).OfType<string>().ToList();
}
}
return results.OfType<JValue>().Select(o => o.Value).OfType<string>().ToList();
}
}
}
catch
{ }
return null;
return new List<string>();
}
}
}

View File

@@ -8,6 +8,7 @@ using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Newtonsoft.Json.Serialization;
using Wox.Infrastructure;
using Wox.Infrastructure.Http;
using YAMP.Numerics;
namespace Wox.Plugin.SystemPlugins.SuggestionSources
@@ -16,32 +17,24 @@ namespace Wox.Plugin.SystemPlugins.SuggestionSources
{
public override List<string> GetSuggestions(string query)
{
var result = HttpRequest.Get("https://www.google.com/complete/search?output=chrome&q=" + Uri.EscapeUriString(query));
if (string.IsNullOrEmpty(result)) return new List<string>();
try
{
var response =
HttpRequest.CreateGetHttpResponse(
"https://www.google.com/complete/search?output=chrome&q=" + Uri.EscapeUriString(query), null,
null, null);
var stream = response.GetResponseStream();
if (stream != null)
JContainer json = JsonConvert.DeserializeObject(result) as JContainer;
if (json != null)
{
var body = new StreamReader(stream).ReadToEnd();
var json = JsonConvert.DeserializeObject(body) as JContainer;
if (json != null)
var results = json[1] as JContainer;
if (results != null)
{
var results = json[1] as JContainer;
if (results != null)
{
return results.OfType<JValue>().Select(o => o.Value).OfType<string>().ToList();
}
return results.OfType<JValue>().Select(o => o.Value).OfType<string>().ToList();
}
}
}
catch
{ }
return null;
catch { }
return new List<string>();
}
}
}