Fix applicationDirectory issues and add plugin debuggerMode

Wox.Infrastructure/CommonStorage.cs

@@ -11,7 +11,7 @@ namespace Wox.Infrastructure
     [Serializable]
     public class CommonStorage
     {
-        private static string configPath = Directory.GetCurrentDirectory() + "\\config.json";
+        private static string configPath = Path.GetDirectoryName(Application.ExecutablePath) + "\\config.json";
         private static object locker = new object();
         private static CommonStorage storage;
 

Wox.Infrastructure/UserSettings/UserSetting.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.IO;
+using System.Windows.Forms;
 
 namespace Wox.Infrastructure.UserSettings
 {
@@ -29,7 +30,7 @@ namespace Wox.Infrastructure.UserSettings
             {
                 Title = "Google",
                 ActionWord = "g",
-                IconPath = Directory.GetCurrentDirectory() + @"\Images\websearch\google.png",
+                IconPath = Path.GetDirectoryName(Application.ExecutablePath) + @"\Images\websearch\google.png",
                 Url = "https://www.google.com/search?q={q}",
                 Enabled = true
             };
@@ -40,7 +41,7 @@ namespace Wox.Infrastructure.UserSettings
             {
                 Title = "Wikipedia",
                 ActionWord = "wiki",
-                IconPath = Directory.GetCurrentDirectory() + @"\Images\websearch\wiki.png",
+                IconPath = Path.GetDirectoryName(Application.ExecutablePath) + @"\Images\websearch\wiki.png",
                 Url = "http://en.wikipedia.org/wiki/{q}",
                 Enabled = true
             };

Wox.Plugin.System/BrowserBookmarks.cs

@@ -27,7 +27,7 @@ namespace Wox.Plugin.System
             {
                 Title = c.Name,
                 SubTitle = "Bookmark: " + c.Url,
-                IcoPath = Directory.GetCurrentDirectory() + @"\Images\bookmark.png",
+                IcoPath = Path.GetDirectoryName(Application.ExecutablePath) + @"\Images\bookmark.png",
                 Score = 5,
                 Action = (e) =>
                 {

Wox.Plugin.System/CMD.cs

@@ -12,7 +12,7 @@ namespace Wox.Plugin.System
     public class CMD : BaseSystemPlugin
     {
         private Dictionary<string, int> cmdHistory = new Dictionary<string, int>();
-        private string filePath = Directory.GetCurrentDirectory() + "\\CMDHistory.dat";
+        private string filePath = Path.GetDirectoryName(Application.ExecutablePath) + "\\CMDHistory.dat";
         private PluginInitContext context;
 
         protected override List<Result> QueryInternal(Query query)

Wox.UAC/FileTypeAssociateInstaller.cs

@@ -60,8 +60,8 @@ namespace Wox.UAC
 
         public void RegisterInstaller()
         {
-            string filePath = Directory.GetCurrentDirectory() + "\\Wox.exe";
+            string filePath = Path.Combine(Path.GetDirectoryName(System.Windows.Forms.Application.ExecutablePath),  "Wox.exe");
-            string iconPath = Directory.GetCurrentDirectory() + "\\app.ico";
+            string iconPath = Path.Combine(Path.GetDirectoryName(System.Windows.Forms.Application.ExecutablePath),  "app.ico");
 
             SaveReg(filePath, ".wox", iconPath, true);
         }

Wox.UAC/Wox.UAC.csproj

@@ -54,6 +54,7 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />

Wox/App.xaml.cs

@@ -83,6 +83,11 @@ namespace Wox
                 return;
             }
 
+            if (e.Args.Length > 0 && e.Args[0].ToLower() == "plugindebugger")
+            {
+                var path = e.Args[1];
+                PluginLoader.Plugins.ActivatePluginDebugger(path);
+            }
 
             window = new MainWindow();
             if (e.Args.Length == 0 || e.Args[0].ToLower() != "hidestart")

Wox/MainWindow.xaml.cs

@@ -424,7 +424,7 @@ namespace Wox
         {
             var dict = new ResourceDictionary
             {
-                Source = new Uri(Path.Combine(Directory.GetCurrentDirectory(), "Themes\\" + themeName + ".xaml"), UriKind.Absolute)
+                Source = new Uri(Path.Combine(Path.GetDirectoryName(System.Windows.Forms.Application.ExecutablePath), "Themes\\" + themeName + ".xaml"), UriKind.Absolute)
             };
 
 

Wox/PluginLoader/BasePluginLoader.cs

@@ -13,7 +13,7 @@ namespace Wox.PluginLoader
 {
     public abstract class BasePluginLoader
     {
-        private static string PluginPath = AppDomain.CurrentDomain.BaseDirectory + "Plugins";
+        private static string PluginPath = Path.Combine(Path.GetDirectoryName(System.Windows.Forms.Application.ExecutablePath), "Plugins");
         private static string PluginConfigName = "plugin.json";
         protected static List<PluginMetadata> pluginMetadatas = new List<PluginMetadata>();
         public abstract List<PluginPair> LoadPlugin();
@@ -23,6 +23,12 @@ namespace Wox.PluginLoader
             pluginMetadatas.Clear();
             ParseSystemPlugins();
             ParseThirdPartyPlugins();
+
+            if (Plugins.DebuggerMode != null)
+            {
+                PluginMetadata metadata = GetMetadataFromJson(Plugins.DebuggerMode);
+                if (metadata != null) pluginMetadatas.Add(metadata);
+            }
         }
 
         private static void ParseSystemPlugins()

Wox/PluginLoader/Plugins.cs

@@ -12,6 +12,7 @@ namespace Wox.PluginLoader
 {
     public static class Plugins
     {
+        private static string debuggerMode = null;
         private static List<PluginPair> plugins = new List<PluginPair>();
 
         public static void Init()
@@ -68,5 +69,15 @@ namespace Wox.PluginLoader
 
             return plugins.Any(o => o.Metadata.PluginType == PluginType.ThirdParty && o.Metadata.ActionKeyword == query.ActionName);
         }
+
+        public static void ActivatePluginDebugger(string path)
+        {
+            debuggerMode = path;    
+        }
+
+        public static String DebuggerMode
+        {
+            get { return debuggerMode; }
+        }
     }
 }

Wox/PluginLoader/PythonPluginLoader.cs

@@ -47,7 +47,7 @@ namespace Wox.PluginLoader
 
         private void SetPythonHome()
         {
-            //Environment.SetEnvironmentVariable("PYTHONHOME",Path.Combine(Directory.GetCurrentDirectory(),"PythonHome"));
+            //Environment.SetEnvironmentVariable("PYTHONHOME",Path.Combine(Path.GetDirectoryName(Application.ExecutablePath),"PythonHome"));
             //PythonEngine.PythonHome = 
             //PythonEngine.ProgramName
         }

Wox/SettingWindow.xaml.cs

@@ -139,7 +139,7 @@ namespace Wox
 
         private List<string> LoadAvailableThemes()
         {
-            string themePath = Directory.GetCurrentDirectory() + "\\Themes\\";
+            string themePath = Path.Combine(Path.GetDirectoryName(System.Windows.Forms.Application.ExecutablePath), "Themes");
             return Directory.GetFiles(themePath).Where(filePath => filePath.EndsWith(".xaml") && !filePath.EndsWith("Default.xaml")).ToList();
         }
 
@@ -244,9 +244,9 @@ namespace Wox
             IWshShortcut shortcut = (IWshShortcut)wshShell.CreateShortcut(woxLinkPath);
             shortcut.TargetPath = Application.ExecutablePath;
             shortcut.Arguments = "hideStart";
-            shortcut.WorkingDirectory = Application.StartupPath;
+            shortcut.WorkingDirectory = Path.GetDirectoryName(Application.ExecutablePath);
             shortcut.Description = "Launch Wox";
-            shortcut.IconLocation = Application.StartupPath + @"\App.ico";
+            shortcut.IconLocation = Path.Combine(Path.GetDirectoryName(Application.ExecutablePath), "App.ico");
             shortcut.Save();
         }