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

Refactoring proxy, part 2

Browse Source
This commit is contained in:
bao-qian
2016-06-19 16:18:43 +01:00
parent 764a372e9f
commit 3efeb4a0a6
41 changed files with 98 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Wox.Plugin.WebSearch/Main.cs
View File

@@ -104,7 +104,7 @@ namespace Wox.Plugin.WebSearch
private async Task<IEnumerable<Result>> Suggestions(string keyword, string subtitle, WebSearch webSearch)
{
var source = SuggestionSource.GetSuggestionSource(_settings.WebSearchSuggestionSource, Context);
var source = SuggestionSource.GetSuggestionSource(_settings.WebSearchSuggestionSource);
if (source != null)
{
var suggestions = await source.GetSuggestions(keyword);

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

@@ -24,7 +24,7 @@ namespace Wox.Plugin.WebSearch.SuggestionSources
try
{
const string api = "http://suggestion.baidu.com/su?json=1&wd=";
result = await Http.Get(api + Uri.EscapeUriString(query), Proxy, "GB2312");
result = await Http.Get(api + Uri.EscapeUriString(query), "GB2312");
}
catch (WebException e)
{
@@ -61,9 +61,5 @@ namespace Wox.Plugin.WebSearch.SuggestionSources
return new List<string>();
}
public Baidu(IHttpProxy httpProxy) : base(httpProxy)
{
}
}
}

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

@@ -19,7 +19,7 @@ namespace Wox.Plugin.WebSearch.SuggestionSources
try
{
const string api = "https://www.google.com/complete/search?output=chrome&q=";
result = await Http.Get(api + Uri.EscapeUriString(query), Proxy);
result = await Http.Get(api + Uri.EscapeUriString(query));
}
catch (WebException e)
{
@@ -48,9 +48,5 @@ namespace Wox.Plugin.WebSearch.SuggestionSources
}
return new List<string>();
}
public Google(IHttpProxy httpProxy) : base(httpProxy)
{
}
}
}

12
Plugins/Wox.Plugin.WebSearch/SuggestionSources/ISuggestionSource.cs
View File

@@ -6,24 +6,18 @@ namespace Wox.Plugin.WebSearch.SuggestionSources
public abstract class SuggestionSource
{
public virtual string Domain { get; set; }
public IHttpProxy Proxy { get; set; }
public SuggestionSource(IHttpProxy httpProxy)
{
Proxy = httpProxy;
}
public abstract Task<List<string>> GetSuggestions(string query);
public static SuggestionSource GetSuggestionSource(string name, PluginInitContext context)
public static SuggestionSource GetSuggestionSource(string name)
{
switch (name.ToLower())
{
case "google":
return new Google(context.Proxy);
return new Google();
case "baidu":
return new Baidu(context.Proxy);
return new Baidu();
default:
return null;