Use variable instead of global static method

1. introduce variable
2. part of #389
3. refactoring program suffix in program plugin
4. 全局变量一时爽,代码重构火葬场
This commit is contained in:
bao-qian
2016-03-28 03:09:57 +01:00
parent c596039453
commit b22a4501cc
36 changed files with 402 additions and 343 deletions

View File

@@ -17,6 +17,7 @@ namespace Wox.Plugin.Everything
private readonly EverythingAPI _api = new EverythingAPI();
private static readonly List<string> ImageExts = new List<string> { ".png", ".jpg", ".jpeg", ".gif", ".bmp", ".tiff", ".ico" };
private static readonly List<string> ExecutableExts = new List<string> { ".exe" };
private ContextMenuStorage _settings = ContextMenuStorage.Instance;
public List<Result> Query(Query query)
{
@@ -24,10 +25,10 @@ namespace Wox.Plugin.Everything
if (!string.IsNullOrEmpty(query.Search))
{
var keyword = query.Search;
if (ContextMenuStorage.Instance.MaxSearchCount <= 0)
if (_settings.MaxSearchCount <= 0)
{
ContextMenuStorage.Instance.MaxSearchCount = 50;
ContextMenuStorage.Instance.Save();
_settings.MaxSearchCount = 50;
_settings.Save();
}
if (keyword == "uninstalleverything")
@@ -47,7 +48,7 @@ namespace Wox.Plugin.Everything
try
{
var searchList = _api.Search(keyword, maxCount: ContextMenuStorage.Instance.MaxSearchCount).ToList();
var searchList = _api.Search(keyword, maxCount: _settings.MaxSearchCount).ToList();
foreach (var s in searchList)
{
var path = s.FullPath;
@@ -154,7 +155,7 @@ namespace Wox.Plugin.Everything
public void Init(PluginInitContext context)
{
_context = context;
ContextMenuStorage.Instance.API = context.API;
_settings.API = context.API;
LoadLibrary(Path.Combine(
Path.Combine(context.CurrentPluginMetadata.PluginDirectory, (IntPtr.Size == 4) ? "x86" : "x64"),
@@ -285,7 +286,7 @@ namespace Wox.Plugin.Everything
List<ContextMenu> availableContextMenus = new List<ContextMenu>();
availableContextMenus.AddRange(GetDefaultContextMenu());
availableContextMenus.AddRange(ContextMenuStorage.Instance.ContextMenus);
availableContextMenus.AddRange(_settings.ContextMenus);
if (record.Type == ResultType.File)
{