Adding some options and a few fixes [release]

timheuer · Feb 16, 2022 · 3dcaa5d · 3dcaa5d
1 parent 89f771b
commit 3dcaa5d
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 8 deletions.
diff --git a/AddActionsWorkflow/AddActionsWorkflow.csproj b/AddActionsWorkflow/AddActionsWorkflow.csproj
@@ -45,6 +45,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="Options\General.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Commands\MyCommand.cs" />
     <Compile Include="AddActionsWorkflowPackage.cs" />
@@ -83,6 +84,7 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Design" />
   </ItemGroup>
   <ItemGroup>

diff --git a/AddActionsWorkflow/AddActionsWorkflowPackage.cs b/AddActionsWorkflow/AddActionsWorkflowPackage.cs
@@ -4,13 +4,16 @@
 global using Task = System.Threading.Tasks.Task;
 using System.Runtime.InteropServices;
 using System.Threading;
+using AddActionsWorkflow.Options;
 
 namespace AddActionsWorkflow
 {
     [PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)]
     [InstalledProductRegistration(Vsix.Name, Vsix.Description, Vsix.Version)]
     [ProvideMenuResource("Menus.ctmenu", 1)]
     [Guid(PackageGuids.AddActionsWorkflowString)]
+    [ProvideOptionPage(typeof(OptionsProvider.GeneralOptions), "GitHub Actions Workflow", "General", 0, 0, true)]
+    [ProvideProfile(typeof(OptionsProvider.GeneralOptions), "GitHub Actions Workflow", "General", 0, 0, true)]
     public sealed class AddActionsWorkflowPackage : ToolkitPackage
     {
         protected override async Task InitializeAsync(CancellationToken cancellationToken, IProgress<ServiceProgressData> progress)

diff --git a/AddActionsWorkflow/Commands/MyCommand.cs b/AddActionsWorkflow/Commands/MyCommand.cs
@@ -1,4 +1,5 @@
-using System.Diagnostics;
+using AddActionsWorkflow.Options;
+using System.Diagnostics;
 using System.IO;
 using System.Threading.Tasks;
 
@@ -21,8 +22,10 @@ protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         proc.StartInfo.WorkingDirectory = repoRoot;
         proc.StartInfo.FileName = "dotnet";
 
-        var workflowName = $"build-{Guid.NewGuid().ToString().Substring(0, 5)}";
-        proc.StartInfo.Arguments = $"new workflow -n {workflowName} --no-update-check";
+        var general = await General.GetLiveInstanceAsync();
+        var workflowName = general.RandomizeFileName ? $"{general.DefaultName}-{Guid.NewGuid().ToString().Substring(0, 5)}" : general.DefaultName;
+        var overwriteFile = general.OverwriteExisting ? "--force" : "";
+        proc.StartInfo.Arguments = $"new workflow -n {workflowName} --no-update-check {overwriteFile}";
         proc.Start();
 
         // add solution folder
@@ -33,16 +36,16 @@ protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         // if the folder exists, use it otherwise create
         foreach (var item in sln.Children)
         {
-            if (item.Name.ToLower() == "solution items")
+            if (item.Name.ToLower() == general.SolutionFolderName.ToLower())
             {
                 proj = item as SolutionFolder;
                 folderExists = true;
+                break;
             }
-            break;
         }
 
         if (!folderExists)
-            proj = await sln.AddSolutionFolderAsync("Solution Items");
+            proj = await sln.AddSolutionFolderAsync(general.SolutionFolderName);
 
         _ = await proj?.AddExistingFilesAsync(Path.Combine(slnDir, @$".github\workflows\{workflowName}.yaml"));
     }
@@ -60,12 +63,15 @@ internal async Task<String> GetGitRootDirAsync(string workingDirectory)
         git.StartInfo.Arguments = "rev-parse --show-toplevel";
         git.Start();
 
-        rootGitDir = await git.StandardOutput.ReadToEndAsync();
-
         if (git.ExitCode == 0)
         {
+            rootGitDir = await git.StandardOutput.ReadToEndAsync();
             rootGitDir = rootGitDir.Replace('/', '\\').Replace("\n", "");
         }
+        else
+        {
+            git.Kill();
+        }
 
         return rootGitDir;
     }

diff --git a/AddActionsWorkflow/Options/General.cs b/AddActionsWorkflow/Options/General.cs
@@ -0,0 +1,36 @@
+using System.ComponentModel;
+
+namespace AddActionsWorkflow.Options
+{
+    internal partial class OptionsProvider
+    {
+        public class GeneralOptions : BaseOptionPage<General> { }
+    }
+
+    public class General : BaseOptionModel<General>
+    {
+        [Category("Generator")]
+        [DisplayName("Default file name")]
+        [Description("The base name of the workflow (.yaml) file to be generated")]
+        [DefaultValue("build-")]
+        public string DefaultName { get; set; } = "build-";
+
+        [Category("Generator")]
+        [DisplayName("Randomize file name")]
+        [Description("If true, a suffix is added to the Default file name to avoid conflicts")]
+        [DefaultValue(true)]
+        public bool RandomizeFileName { get; set; } = true;
+
+        [Category("Generator")]
+        [DisplayName("Overwrite if exists")]
+        [Description("If true, this will overwrite same-named workflow files if exists")]
+        [DefaultValue(false)]
+        public bool OverwriteExisting { get; set; } = false;
+
+        [Category("Generator")]
+        [DisplayName("Solution Folder")]
+        [Description("The Solution Items folder to add these to in the Visual Studio solution")]
+        [DefaultValue("Solution Items")]
+        public string SolutionFolderName { get; set; } = "Solution Items";
+    }
+}