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

Use cache type directly instead of a new class, decouple binarystorage and storage

Browse Source
This commit is contained in:
bao-qian
2017-01-13 15:40:32 +00:00
parent a5aa305773
commit 4c6c310e0a
7 changed files with 70 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Plugins/Wox.Plugin.Program/Main.cs
View File

@@ -16,13 +16,13 @@ namespace Wox.Plugin.Program
public class Main : ISettingProvider, IPlugin, IPluginI18n, IContextMenu, ISavable
{
private static readonly object IndexLock = new object();
private static Win32[] _win32s = { };
private static UWP.Application[] _uwps = { };
private static Win32[] _win32s;
private static UWP.Application[] _uwps;
private static PluginInitContext _context;
private static ProgramIndexCache _cache;
private static BinaryStorage<ProgramIndexCache> _cacheStorage;
private static BinaryStorage<Win32[]> _win32Storage;
private static BinaryStorage<UWP.Application[]> _uwpStorage;
private static Settings _settings;
private readonly PluginJsonStorage<Settings> _settingsStorage;
@@ -33,13 +33,10 @@ namespace Wox.Plugin.Program
Stopwatch.Normal("Preload programs", () =>
{
_cacheStorage = new BinaryStorage<ProgramIndexCache>();
_cache = _cacheStorage.Load();
var w = _cache.Win32s;
_win32s = w ?? new Win32[] {};
var u = _cache.UWPs;
_uwps = u ?? new UWP.Application[] { };
_win32Storage = new BinaryStorage<Win32[]>("Win32Cache");
_win32s = _win32Storage.TryLoad(new Win32[] { });
_uwpStorage = new BinaryStorage<UWP.Application[]>("UWPCache");
_uwps = _uwpStorage.TryLoad(new UWP.Application[] { });
});
Log.Info($"Preload {_win32s.Length} win32 programs from cache");
@@ -53,9 +50,8 @@ namespace Wox.Plugin.Program
public void Save()
{
_settingsStorage.Save();
_cache.Win32s = _win32s;
_cache.UWPs = _uwps;
_cacheStorage.Save();
_win32Storage.Save(_win32s);
_uwpStorage.Save(_uwps);
}
public List<Result> Query(Query query)
@@ -76,8 +72,8 @@ namespace Wox.Plugin.Program
public static void IndexPrograms()
{
Win32[] w = {} ;
UWP.Application[] u = {};
Win32[] w = { };
UWP.Application[] u = { };
var t1 = Task.Run(() =>
{
w = Win32.All(_settings);

13
Plugins/Wox.Plugin.Program/ProgramIndexCache.cs
View File

@@ -1,13 +0,0 @@
using System;
using System.Collections.Generic;
using Wox.Plugin.Program.Programs;
namespace Wox.Plugin.Program
{
[Serializable]
public class ProgramIndexCache
{
public Win32[] Win32s = { };
public UWP.Application[] UWPs = { };
}
}

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

@@ -76,7 +76,6 @@
<Compile Include="Programs\UWP.cs" />
<Compile Include="Programs\Win32.cs" />
<Compile Include="SuffixesConverter.cs" />
<Compile Include="ProgramIndexCache.cs" />
<Compile Include="Main.cs" />
<Compile Include="ProgramSetting.xaml.cs">
<DependentUpon>ProgramSetting.xaml</DependentUpon>