Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-09 20:57:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

use unified http method for plugin installation + add more exceptions

Browse Source 
#573
#610
This commit is contained in:
bao-qian
2016-05-10 20:26:47 +01:00
parent 8325083402
commit 6359826fd9
7 changed files with 111 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Plugins/Wox.Plugin.WebSearch/SuggestionSources/Baidu.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using Newtonsoft.Json;
@@ -18,7 +19,20 @@ namespace Wox.Plugin.WebSearch.SuggestionSources
public override async Task<List<string>> GetSuggestions(string query)
{
var result = await HttpRequest.Get("http://suggestion.baidu.com/su?json=1&wd=" + Uri.EscapeUriString(query), Proxy, "GB2312");
string result;
try
{
const string api = "http://suggestion.baidu.com/su?json=1&wd=";
result = await Http.Get(api + Uri.EscapeUriString(query), Proxy, "GB2312");
}
catch (WebException e)
{
Log.Warn("Can't get suggestion from baidu");
Log.Error(e);
return new List<string>(); ;
}
if (string.IsNullOrEmpty(result)) return new List<string>();
Match match = reg.Match(result);

14
Plugins/Wox.Plugin.WebSearch/SuggestionSources/Google.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Threading.Tasks;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
@@ -14,7 +15,18 @@ namespace Wox.Plugin.WebSearch.SuggestionSources
public override string Domain { get; set; } = "www.google.com";
public override async Task<List<string>> GetSuggestions(string query)
{
var result = await HttpRequest.Get("https://www.google.com/complete/search?output=chrome&q=" + Uri.EscapeUriString(query), Proxy);
string result;
try
{
const string api = "https://www.google.com/complete/search?output=chrome&q=";
result = await Http.Get(api + Uri.EscapeUriString(query), Proxy);
}
catch (WebException e)
{
Log.Warn("Can't get suggestion from google");
Log.Error(e);
return new List<string>(); ;
}
if (string.IsNullOrEmpty(result)) return new List<string>();
JContainer json;
try