Support %DIR% variable; add Edit Global Setting MenuItem

XUJINKAI · XUJINKAI · commit ba512eaa1861 · 2019-10-10T02:48:59.000+08:00
diff --git a/ShellCommand/DataModel/DefaultSetting.cs b/ShellCommand/DataModel/DefaultSetting.cs
@@ -14,34 +14,5 @@ public static DirectoryCommand[] GetDirectoryCommand()
                     new DirectoryCommand(){ Name = "Custom Command", Command = "cmd" },
                 };
         }
-
-        public static GlobalConfig GetGlobal()
-        {
-            return new GlobalConfig()
-            {
-                GlobalCommands = new List<DirectoryCommand>()
-                {
-                    new DirectoryCommand()
-                    {
-                        Command = "git pull",
-                        Match = ".git",
-                    },
-                    new DirectoryCommand()
-                    {
-                        Command = "git submodule update --init --recursive",
-                        Match = ".gitmodules",
-                    },
-                    new DirectoryCommand()
-                    {
-                        Name = "Open Command Window Here",
-                        Command = "cmd",
-                    },
-                },
-                Functions = new BuildinFunctions
-                {
-                    CopyPath = true,
-                }
-            };
-        }
     }
 }
diff --git a/ShellCommand/DataModel/DirectoryCommand.cs b/ShellCommand/DataModel/DirectoryCommand.cs
@@ -18,7 +18,8 @@ public class DirectoryCommand
 
         public void Execute(string workingDir)
         {
-            var (com, arg) = Cmd.SplitCommandArg(Command);
+            var repcommand = Command.Replace(Env.VAR_DIR, workingDir.Replace("\\", "/"));
+            var (com, arg) = Cmd.SplitCommandArg(repcommand);
             ProcessInfoChain ProcessInfoChain = ProcessInfoChain.New(com, arg);
             if (RunAsAdmin)
             {
diff --git a/ShellCommand/Env.cs b/ShellCommand/Env.cs
@@ -11,12 +11,15 @@ public static class Env
         public const string AppName = "ShellCommand";
         public const string CommandFileName = ".shellcommand.yaml";
         public const string GlobalSettingFileName= "global.shellcommand.yaml";
+        public const string GlobalTemplateSettingFileName = "global.template.shellcommand.yaml";
 
         public const string CreateFolderSpecificFileText = "Create .shellcommand.yaml";
+        public const string OpenGlobalSettingFileText = "Edit Global Setting";
         public const string OpenAppText = "Setting";
 
         public const string ConfigTitle = "# ShellCommand: https://github.com/XUJINKAI/ShellCommand \r\n\r\n";
 
+        public const string VAR_DIR = "%DIR%";
 
         public static string GetAppFolder()
         {
diff --git a/ShellCommand/MainWindow.xaml.cs b/ShellCommand/MainWindow.xaml.cs
@@ -77,11 +77,12 @@ private void Uninstall(object sender, RoutedEventArgs e)
 
         private void AdminInstall()
         {
-            var configpath = System.IO.Path.Combine(XJK.ENV.BaseDirectory, Env.GlobalSettingFileName);
-            if (!File.Exists(configpath))
+            var globalfile = System.IO.Path.Combine(XJK.ENV.BaseDirectory, Env.GlobalSettingFileName);
+            if (!File.Exists(globalfile))
             {
-                var setting = DataModel.DefaultSetting.GetGlobal();
-                Util.Yaml.SaveYaml(configpath, setting);
+                var templatefile = System.IO.Path.Combine(XJK.ENV.BaseDirectory, Env.GlobalTemplateSettingFileName);
+                if (File.Exists(templatefile))
+                    File.Copy(templatefile, globalfile);
             }
             Util.Reg.SetExePath(XJK.ENV.EntryLocation);
             Util.Reg.SetLogPath();
diff --git a/ShellCommand/MenuDefinition/BuildinMenuItems.cs b/ShellCommand/MenuDefinition/BuildinMenuItems.cs
@@ -34,6 +34,17 @@ public static ToolStripMenuItem InitDirectoryFile(string path)
             return item;
         }
 
+        public static ToolStripMenuItem OpenGlobalSetting()
+        {
+            var item = new ToolStripMenuItem(Env.OpenGlobalSettingFileText);
+            item.Click += (sender, args) =>
+            {
+                var path = Path.Combine(Env.GetAppFolder(), Env.GlobalSettingFileName);
+                Cmd.RunAsInvoker(path, "");
+            };
+            return item;
+        }
+
         public static ToolStripMenuItem OpenApp()
         {
             var path = Util.Reg.GetExePath();
diff --git a/ShellCommand/MenuDefinition/DirectoryBackgroundContextMenu.cs b/ShellCommand/MenuDefinition/DirectoryBackgroundContextMenu.cs
@@ -39,7 +39,7 @@ protected override ContextMenuStrip CreateMenu()
                 container.DropDownItems.Add(new ToolStripSeparator());
             }
 
-            var globalSettingPath = Path.Combine(Util.Reg.GetAppFolderPath(), Env.GlobalSettingFileName);
+            var globalSettingPath = Path.Combine(Env.GetAppFolder(), Env.GlobalSettingFileName);
             if (File.Exists(globalSettingPath))
             {
                 var globalItems = CommandFileParser.ParseGlobalCommand(globalSettingPath, FolderPath);
@@ -54,6 +54,8 @@ protected override ContextMenuStrip CreateMenu()
             {
                 container.DropDownItems.Add(BuildinMenuItems.InitDirectoryFile(CommandFilePath));
             }
+
+            container.DropDownItems.Add(BuildinMenuItems.OpenGlobalSetting());
             container.DropDownItems.Add(BuildinMenuItems.OpenApp());
 
             menu.Items.Add(container);
diff --git a/ShellCommand/ShellCommand.csproj b/ShellCommand/ShellCommand.csproj
@@ -178,6 +178,9 @@
     <None Include=".shellcommand.yaml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="global.template.shellcommand.yaml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.7.2">
diff --git a/ShellCommand/Util/Reg.cs b/ShellCommand/Util/Reg.cs
@@ -42,10 +42,5 @@ public static string GetExePath()
                 return key.GetValue(ExePath) as string;
             }
         }
-
-        public static string GetAppFolderPath()
-        {
-            return Path.GetDirectoryName(GetExePath());
-        }
     }
 }
diff --git a/ShellCommand/global.template.shellcommand.yaml b/ShellCommand/global.template.shellcommand.yaml
@@ -0,0 +1,20 @@
+# ShellCommand: https://github.com/XUJINKAI/ShellCommand 
+
+GlobalCommands:
+- Name: Open SourceTree Here
+  Command: cmd /c start %LocalAppData%\SourceTree\SourceTree.exe -f "%DIR%"
+  Match: .git
+
+- Command: git pull
+  Match: .git
+- Command: git submodule update --init --recursive
+  Match: .gitmodules
+
+- Name: Open Command Window Here
+  Command: cmd
+- Name: Open Command Window Here (Administrator)
+  Command: cmd /K "cd /d ""%DIR%"""
+  RunAsAdmin: true
+
+Functions:
+  CopyPath: true

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,8 @@ public class DirectoryCommand`
`18`	`18`
`19`	`19`	`public void Execute(string workingDir)`
`20`	`20`	`{`
`21`		`- var (com, arg) = Cmd.SplitCommandArg(Command);`
	`21`	`+ var repcommand = Command.Replace(Env.VAR_DIR, workingDir.Replace("\\", "/"));`
	`22`	`+ var (com, arg) = Cmd.SplitCommandArg(repcommand);`
`22`	`23`	`ProcessInfoChain ProcessInfoChain = ProcessInfoChain.New(com, arg);`
`23`	`24`	`if (RunAsAdmin)`
`24`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -77,11 +77,12 @@ private void Uninstall(object sender, RoutedEventArgs e)`
`77`	`77`
`78`	`78`	`private void AdminInstall()`
`79`	`79`	`{`
`80`		`- var configpath = System.IO.Path.Combine(XJK.ENV.BaseDirectory, Env.GlobalSettingFileName);`
`81`		`- if (!File.Exists(configpath))`
	`80`	`+ var globalfile = System.IO.Path.Combine(XJK.ENV.BaseDirectory, Env.GlobalSettingFileName);`
	`81`	`+ if (!File.Exists(globalfile))`
`82`	`82`	`{`
`83`		`- var setting = DataModel.DefaultSetting.GetGlobal();`
`84`		`- Util.Yaml.SaveYaml(configpath, setting);`
	`83`	`+ var templatefile = System.IO.Path.Combine(XJK.ENV.BaseDirectory, Env.GlobalTemplateSettingFileName);`
	`84`	`+ if (File.Exists(templatefile))`
	`85`	`+ File.Copy(templatefile, globalfile);`
`85`	`86`	`}`
`86`	`87`	`Util.Reg.SetExePath(XJK.ENV.EntryLocation);`
`87`	`88`	`Util.Reg.SetLogPath();`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ protected override ContextMenuStrip CreateMenu()`
`39`	`39`	`container.DropDownItems.Add(new ToolStripSeparator());`
`40`	`40`	`}`
`41`	`41`
`42`		`- var globalSettingPath = Path.Combine(Util.Reg.GetAppFolderPath(), Env.GlobalSettingFileName);`
	`42`	`+ var globalSettingPath = Path.Combine(Env.GetAppFolder(), Env.GlobalSettingFileName);`
`43`	`43`	`if (File.Exists(globalSettingPath))`
`44`	`44`	`{`
`45`	`45`	`var globalItems = CommandFileParser.ParseGlobalCommand(globalSettingPath, FolderPath);`
`@@ -54,6 +54,8 @@ protected override ContextMenuStrip CreateMenu()`
`54`	`54`	`{`
`55`	`55`	`container.DropDownItems.Add(BuildinMenuItems.InitDirectoryFile(CommandFilePath));`
`56`	`56`	`}`
	`57`	`+`
	`58`	`+ container.DropDownItems.Add(BuildinMenuItems.OpenGlobalSetting());`
`57`	`59`	`container.DropDownItems.Add(BuildinMenuItems.OpenApp());`
`58`	`60`
`59`	`61`	`menu.Items.Add(container);`
Original file line number	Diff line number	Diff line change
`@@ -42,10 +42,5 @@ public static string GetExePath()`
`42`	`42`	`return key.GetValue(ExePath) as string;`
`43`	`43`	`}`
`44`	`44`	`}`
`45`		`-`
`46`		`- public static string GetAppFolderPath()`
`47`		`- {`
`48`		`- return Path.GetDirectoryName(GetExePath());`
`49`		`- }`
`50`	`45`	`}`
`51`	`46`	`}`