From ba0bda6aa6645c3459b01ff4f0ece42656fc583f Mon Sep 17 00:00:00 2001
From: qianlifeng <qianlf2008@163.com>
Date: Mon, 29 Dec 2014 21:55:27 +0800
Subject: [PATCH] Update the installer

---
 Deploy/Installer/Installer.iss            | 14 ++++++++---
 Wox.Core/Plugin/PluginManager.cs          |  3 ---
 Wox.Core/{README.txt => README.md}        |  1 +
 Wox.Core/Wox.Core.csproj                  |  2 +-
 Wox.Infrastructure/Storage/BaseStorage.cs | 29 ++++++++++++++++++-----
 Wox.Plugin/README.md                      |  5 ++++
 Wox.Plugin/Wox.Plugin.csproj              |  3 +++
 Wox/App.config                            |  8 ++++++-
 Wox/Helper/WoxLogPathConverter.cs         | 17 +++++++++++++
 Wox/MainWindow.xaml.cs                    |  1 +
 Wox/ThemeManager.cs                       |  3 ---
 Wox/Wox.csproj                            |  1 +
 12 files changed, 70 insertions(+), 17 deletions(-)
 rename Wox.Core/{README.txt => README.md} (94%)
 create mode 100644 Wox.Plugin/README.md
 create mode 100644 Wox/Helper/WoxLogPathConverter.cs

diff --git a/Deploy/Installer/Installer.iss b/Deploy/Installer/Installer.iss
index 21f08fd913..253572eef3 100644
--- a/Deploy/Installer/Installer.iss
+++ b/Deploy/Installer/Installer.iss
@@ -29,11 +29,13 @@ Name: english; MessagesFile: compiler:Default.isl
 Type: files; Name: "{commonstartup}\{#MyAppName}.lnk"
 
 [Tasks]
-Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked
+Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons};
 Name: startupfolder; Description: Startup with Windows;
 
 [Files]
-Source: {#MyAppPath}\*; DestDir: {app}; Flags: ignoreversion recursesubdirs
+Source: {#MyAppPath}\*; Excludes: Plugins\*,Themes\*; DestDir: {app}; Flags: ignoreversion recursesubdirs
+Source: {#MyAppPath}\Plugins\*; DestDir: {%USERPROFILE}\.Wox\Plugins; Flags: ignoreversion recursesubdirs
+Source: {#MyAppPath}\Themes\*; DestDir: {%USERPROFILE}\.Wox\Themes; Flags: ignoreversion recursesubdirs
 
 [Icons]
 Name: {group}\{#MyAppName}; Filename: {app}\{#MyAppExeName}
@@ -42,4 +44,10 @@ Name: {userdesktop}\{#MyAppName}; Filename: {app}\{#MyAppExeName}; Tasks: deskto
 Name: {userstartup}\{#MyAppName}; Filename: {app}\{#MyAppExeName}; Tasks: startupfolder
 
 [Run]
-Filename: {app}\{#MyAppExeName}; Description: {cm:LaunchProgram,{#MyAppName}}; Flags: nowait postinstall skipifsilent
+Filename: {app}\{#MyAppExeName}; Description: {cm:LaunchProgram,{#MyAppName}}; Flags: nowait postinstall skipifsilent unchecked
+
+[UninstallDelete]
+Type: filesandordirs; Name: "{%USERPROFILE}\.Wox"
+
+[UninstallRun]
+Filename: {sys}\taskkill.exe; Parameters: "/f /im Wox.exe"; Flags: skipifdoesntexist runhidden
diff --git a/Wox.Core/Plugin/PluginManager.cs b/Wox.Core/Plugin/PluginManager.cs
index fbe46db441..70d2918e26 100644
--- a/Wox.Core/Plugin/PluginManager.cs
+++ b/Wox.Core/Plugin/PluginManager.cs
@@ -46,9 +46,6 @@ namespace Wox.Core.Plugin
         static PluginManager()
         {
             pluginDirectories.Add(DefaultPluginDirectory);
-            pluginDirectories.Add(
-                Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Plugins"));
-
             MakesurePluginDirectoriesExist();
         }
 
diff --git a/Wox.Core/README.txt b/Wox.Core/README.md
similarity index 94%
rename from Wox.Core/README.txt
rename to Wox.Core/README.md
index 5a0b695dc5..2c191d0856 100644
--- a/Wox.Core/README.txt
+++ b/Wox.Core/README.md
@@ -1,4 +1,5 @@
 What does Wox.Core do?
+=====
 
 * Handle Query
 * Loading Plugins (including system plugin and user plugin)
\ No newline at end of file
diff --git a/Wox.Core/Wox.Core.csproj b/Wox.Core/Wox.Core.csproj
index 1aacac6d10..ce60a7f391 100644
--- a/Wox.Core/Wox.Core.csproj
+++ b/Wox.Core/Wox.Core.csproj
@@ -69,7 +69,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="README.txt" />
+    <None Include="README.md" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Wox.Infrastructure\Wox.Infrastructure.csproj">
diff --git a/Wox.Infrastructure/Storage/BaseStorage.cs b/Wox.Infrastructure/Storage/BaseStorage.cs
index d899cb6908..c72bf63c35 100644
--- a/Wox.Infrastructure/Storage/BaseStorage.cs
+++ b/Wox.Infrastructure/Storage/BaseStorage.cs
@@ -10,18 +10,35 @@ using Newtonsoft.Json;
 namespace Wox.Infrastructure.Storage
 {
     [Serializable]
-    public abstract class BaseStorage<T> : IStorage where T : class,IStorage,new()
+    public abstract class BaseStorage<T> : IStorage where T : class,IStorage, new()
     {
-        private readonly string configFolder = Path.Combine(Path.GetDirectoryName(Application.ExecutablePath), "Config");
+        private string configFolder;
+
+        private string ConfigFolder
+        {
+            get
+            {
+                if (string.IsNullOrEmpty(configFolder))
+                {
+                    string userProfilePath = Environment.GetEnvironmentVariable("USERPROFILE");
+                    if (userProfilePath == null)
+                    {
+                        throw new ArgumentException("Environment variable USERPROFILE is empty");
+                    }
+                    configFolder = Path.Combine(Path.Combine(userProfilePath, ".Wox"), "Config");
+                }
+                return configFolder;
+            }
+        }
 
         protected string ConfigPath
         {
             get
             {
-                return Path.Combine(configFolder, ConfigName + FileSuffix);
+                return Path.Combine(ConfigFolder, ConfigName + FileSuffix);
             }
         }
-        
+
         protected abstract string FileSuffix { get; }
 
         protected abstract string ConfigName { get; }
@@ -72,9 +89,9 @@ namespace Wox.Infrastructure.Storage
         {
             if (!File.Exists(ConfigPath))
             {
-                if (!Directory.Exists(configFolder))
+                if (!Directory.Exists(ConfigFolder))
                 {
-                    Directory.CreateDirectory(configFolder);
+                    Directory.CreateDirectory(ConfigFolder);
                 }
                 File.Create(ConfigPath).Close();
             }
diff --git a/Wox.Plugin/README.md b/Wox.Plugin/README.md
new file mode 100644
index 0000000000..1d5c7394da
--- /dev/null
+++ b/Wox.Plugin/README.md
@@ -0,0 +1,5 @@
+What does Wox.Plugin do?
+====
+
+* Define base objects and interfaces for plugins
+* Plugin Author who making C# plugin should reference this DLL via nuget
\ No newline at end of file
diff --git a/Wox.Plugin/Wox.Plugin.csproj b/Wox.Plugin/Wox.Plugin.csproj
index abc3493ebb..d915ddd7bc 100644
--- a/Wox.Plugin/Wox.Plugin.csproj
+++ b/Wox.Plugin/Wox.Plugin.csproj
@@ -59,6 +59,9 @@
     <Compile Include="Result.cs" />
     <Compile Include="ActionContext.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="README.md" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Wox/App.config b/Wox/App.config
index 092ef1ab88..83d95cfffe 100644
--- a/Wox/App.config
+++ b/Wox/App.config
@@ -8,7 +8,13 @@
   </appSettings>
   <log4net>
     <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="log.txt"/>
+      <file type="log4net.Util.PatternString">
+        <converter>
+          <name value="WoxLogPathConverter" />
+          <type value="Wox.Helper.WoxLogPathConverter,Wox" />
+        </converter>
+        <conversionPattern value="%WoxLogPathConverter{log}\\log.txt" />
+      </file>
       <appendToFile value="true"/>
       <rollingStyle value="Date"/>
       <datePattern value="yyyyMMdd-HH:mm:ss"/>
diff --git a/Wox/Helper/WoxLogPathConverter.cs b/Wox/Helper/WoxLogPathConverter.cs
new file mode 100644
index 0000000000..515916ad6f
--- /dev/null
+++ b/Wox/Helper/WoxLogPathConverter.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+
+namespace Wox.Helper
+{
+    public class WoxLogPathConverter : log4net.Util.PatternConverter
+    {
+        protected override void Convert(TextWriter writer, object state)
+        {
+            string userProfilePath = Environment.GetEnvironmentVariable("USERPROFILE");
+            writer.Write(Path.Combine(userProfilePath, ".Wox"));
+        }
+    }
+}
diff --git a/Wox/MainWindow.xaml.cs b/Wox/MainWindow.xaml.cs
index d192dd9f37..20f6daca39 100644
--- a/Wox/MainWindow.xaml.cs
+++ b/Wox/MainWindow.xaml.cs
@@ -37,6 +37,7 @@ using Path = System.IO.Path;
 using Rectangle = System.Drawing.Rectangle;
 using TextBox = System.Windows.Controls.TextBox;
 using ToolTip = System.Windows.Controls.ToolTip;
+using Wox.Infrastructure.Logger;
 
 namespace Wox
 {
diff --git a/Wox/ThemeManager.cs b/Wox/ThemeManager.cs
index ce30c8161a..f4844bb009 100644
--- a/Wox/ThemeManager.cs
+++ b/Wox/ThemeManager.cs
@@ -18,9 +18,6 @@ namespace Wox
 
         static ThemeManager()
         {
-            themeDirectories.Add(
-            Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Themes"));
-
             string userProfilePath = Environment.GetEnvironmentVariable("USERPROFILE");
             if (userProfilePath != null)
             {
diff --git a/Wox/Wox.csproj b/Wox/Wox.csproj
index b4e29e6d42..86c2fdaba7 100644
--- a/Wox/Wox.csproj
+++ b/Wox/Wox.csproj
@@ -104,6 +104,7 @@
     <Reference Include="WPFToolkit, Version=3.5.40128.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Helper\WoxLogPathConverter.cs" />
     <Compile Include="ImageLoader\ImageCacheStroage.cs" />
     <Compile Include="Storage\UserSelectedRecordStorage.cs" />
     <Compile Include="ThemeManager.cs" />