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

Move websearch images to %APPDATA%

Browse Source
This commit is contained in:
bao-qian
2016-05-07 19:16:13 +01:00
parent ae121895e9
commit 39ba1e0582
9 changed files with 77 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,11 +1,13 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Controls;
using JetBrains.Annotations;
using Wox.Infrastructure;
using Wox.Infrastructure.Storage;
using Wox.Plugin.WebSearch.SuggestionSources;
@@ -20,8 +22,8 @@ namespace Wox.Plugin.WebSearch
private CancellationTokenSource _updateSource;
private CancellationToken _updateToken;
public const string ImageDirectory = "Images";
public static string PluginDirectory;
public const string Images = "Images";
public static string ImagesDirectory;
public void Save()
{
@@ -86,7 +88,7 @@ namespace Wox.Plugin.WebSearch
var task = Task.Run(() =>
{
results.AddRange(ResultsFromSuggestions(keyword, subtitle, webSearch));
}, _updateToken);
if (!task.Wait(waittime))
@@ -123,12 +125,24 @@ namespace Wox.Plugin.WebSearch
return new List<Result>();
}
static Main()
{
var plugins = Infrastructure.Wox.Plugins;
var assemblyName = typeof(Main).Assembly.GetName().Name;
var pluginDirectory = Path.Combine(Infrastructure.Wox.SettingsPath, plugins, assemblyName);
ImagesDirectory = Path.Combine(pluginDirectory, Images);
}
public void Init(PluginInitContext context)
{
Context = context;
PluginDirectory = Context.CurrentPluginMetadata.PluginDirectory;
_storage = new PluginJsonStorage<Settings>();
_settings = _storage.Load();
var pluginDirectory = context.CurrentPluginMetadata.PluginDirectory;
var bundledImagesDirectory = Path.Combine(pluginDirectory, Images);
Helper.ValidateDataDirectory(bundledImagesDirectory, ImagesDirectory);
}
#region ISettingProvider Members

4
Plugins/Wox.Plugin.WebSearch/WebSearch.cs
View File

@@ -20,7 +20,7 @@ namespace Wox.Plugin.WebSearch
set
{
_icon = value;
IconPath = Path.Combine(Main.PluginDirectory, Main.ImageDirectory, value);
IconPath = Path.Combine(Main.ImagesDirectory, value);
}
}
@@ -31,7 +31,7 @@ namespace Wox.Plugin.WebSearch
[JsonIgnore]
internal string IconPath { get; private set; } = Path.Combine
(
Main.PluginDirectory, Main.ImageDirectory, DefaultIcon
Main.ImagesDirectory, DefaultIcon
);
public string Url { get; set; }

2
Plugins/Wox.Plugin.WebSearch/WebSearchSetting.xaml.cs
View File

@@ -120,7 +120,7 @@ namespace Wox.Plugin.WebSearch
private void SelectIconButtonOnClick(object sender, RoutedEventArgs e)
{
var directory = Path.Combine(Main.PluginDirectory, Main.ImageDirectory);
var directory = Path.Combine(Main.ImagesDirectory, Main.Images);
var dlg = new OpenFileDialog
{
InitialDirectory = directory,

1
Plugins/Wox.Plugin.WebSearch/Wox.Plugin.WebSearch.csproj
View File

@@ -45,6 +45,7 @@
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Core" />
<Reference Include="System.Xaml" />
<Reference Include="System.Xml.Linq" />