Merge pull request #31 from mast-eu/29-FixDirectoryStructure

place all plugins in sub-directories

Author: mast-eu

src/GitExtensions.PluginManager/GitExtensions.PluginManager.csproj

@@ -13,7 +13,7 @@
   <PropertyGroup>
     <PackageManagerTargetPath>PackageManager\PackageManager.UI.exe</PackageManagerTargetPath>
     <PackageManagerSourcePath>..\PackageManager.UI\bin\$(Configuration)\$(TargetFramework)\PackageManager.UI.exe</PackageManagerSourcePath>
-    <GitExtensionsDebugPluginsPath>..\..\references\GitExtensions\UserPlugins\</GitExtensionsDebugPluginsPath>
+    <GitExtensionsDebugPluginsPath>..\..\references\GitExtensions\UserPlugins\GitExtensions.PluginManager\</GitExtensionsDebugPluginsPath>
     <GitExtensionsReferenceSource>appveyor</GitExtensionsReferenceSource>
     <GitExtensionsReferenceVersion>v3.2.0.5938</GitExtensionsReferenceVersion>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>

src/GitExtensions.PluginManager/Plugin.cs

@@ -58,7 +58,7 @@ public override bool Execute(GitUIEventArgs gitUiCommands)
 
             ProcessStartInfo info = new ProcessStartInfo()
             {
-                FileName = Path.Combine(pluginsPath, PluginManagerRelativePath),
+                FileName = Path.Combine(pluginsPath, PackageId, PluginManagerRelativePath),
                 Arguments = args.ToString(),
                 UseShellExecute = false,
             };

src/PackageManager.UI/Exceptions/PackageInstallExceptionHandler.cs

@@ -30,7 +30,7 @@ void IExceptionHandler<IExceptionHandlerContext<PackageFileExtractionException>>
 
         void IExceptionHandler<IExceptionHandlerContext<PackageFileRemovalException>>.Handle(IExceptionHandlerContext<PackageFileRemovalException> context)
         {
-            navigator.Notify("Package Removal Error", $"Error deleting file to '{context.Exception.FilePath}'", Navigator.MessageType.Error);
+            navigator.Notify("Package Removal Error", $"Error deleting file '{context.Exception.FilePath}'", Navigator.MessageType.Error);
             context.IsHandled = true;
         }
     }

src/PackageManager/ViewModels/Commands/InstallCommand.cs

@@ -4,6 +4,7 @@
 using PackageManager.Services;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading;
@@ -37,7 +38,9 @@ protected override async Task ExecuteAsync(IPackage package, CancellationToken c
             if (execute)
             {
                 IPackageContent packageContent = await package.GetContentAsync(cancellationToken);
-                await packageContent.ExtractToAsync(service.Path, cancellationToken);
+                string pluginPath = Path.Combine(service.Path, package.Id);
+                Directory.CreateDirectory(pluginPath);
+                await packageContent.ExtractToAsync(pluginPath, cancellationToken);
 
                 service.Install(package);
             }

src/PackageManager/ViewModels/Commands/ReinstallCommand.cs

@@ -4,6 +4,7 @@
 using PackageManager.Services;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading;
@@ -30,8 +31,9 @@ protected override bool CanExecuteOverride(IPackage package)
         protected override async Task ExecuteAsync(IPackage package, CancellationToken cancellationToken)
         {
             IPackageContent packageContent = await package.GetContentAsync(cancellationToken);
-            await packageContent.RemoveFromAsync(service.Path, cancellationToken);
-            await packageContent.ExtractToAsync(service.Path, cancellationToken);
+            string pluginPath = Path.Combine(service.Path, package.Id);
+            await packageContent.RemoveFromAsync(pluginPath, cancellationToken);
+            await packageContent.ExtractToAsync(pluginPath, cancellationToken);
         }
 
         public new void RaiseCanExecuteChanged()

src/PackageManager/ViewModels/Commands/UninstallCommand.cs

@@ -4,6 +4,7 @@
 using PackageManager.Services;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading;
@@ -40,7 +41,14 @@ protected override async Task ExecuteAsync(IPackage package, CancellationToken c
             if (execute)
             {
                 IPackageContent packageContent = await package.GetContentAsync(cancellationToken);
-                await packageContent.RemoveFromAsync(service.Path, cancellationToken);
+                string pluginPath = Path.Combine(service.Path, package.Id);
+                await packageContent.RemoveFromAsync(pluginPath, cancellationToken);
+
+                // do not delete the plugin directory if it still contains files (e.g. data files)
+                if (Directory.Exists(pluginPath) && !Directory.EnumerateFileSystemEntries(pluginPath).Any())
+                {
+                    Directory.Delete(pluginPath);
+                }
 
                 cancellationToken.ThrowIfCancellationRequested();
 

src/PackageManager/ViewModels/Commands/UpdateCommand.cs

@@ -3,6 +3,7 @@
 using PackageManager.Models;
 using PackageManager.Services;
 using System;
+using System.IO;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -46,11 +47,12 @@ protected override async Task ExecuteAsync(PackageUpdateViewModel package, Cance
                 }
 
                 IPackageContent packageContent = await package.Current.Model.GetContentAsync(cancellationToken);
-                await packageContent.RemoveFromAsync(install.Path, cancellationToken);
+                string pluginPath = Path.Combine(install.Path, package.Current.Id);
+                await packageContent.RemoveFromAsync(pluginPath, cancellationToken);
                 install.Uninstall(package.Current.Model);
 
                 packageContent = await package.Target.GetContentAsync(cancellationToken);
-                await packageContent.ExtractToAsync(install.Path, cancellationToken);
+                await packageContent.ExtractToAsync(pluginPath, cancellationToken);
                 install.Install(package.Target);
 
                 if (package.IsSelf)

test/PackageManager.Tests/ViewModels/Commands/Package.cs

@@ -2,6 +2,7 @@
 using PackageManager.Models;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading;
@@ -20,12 +21,12 @@ public Package(string extractPath, string id, string version = null)
         {
             Mock<IPackageContent> contentMock = new Mock<IPackageContent>();
             contentMock
-                .Setup(pc => pc.ExtractToAsync(It.Is<string>(s => s == extractPath), It.IsAny<CancellationToken>()))
+                .Setup(pc => pc.ExtractToAsync(It.Is<string>(s => s == Path.Combine(extractPath, id)), It.IsAny<CancellationToken>()))
                 .Callback(() => ExtractToAsyncCalled.Increment())
                 .Returns(() => Task.CompletedTask);
 
             contentMock
-                .Setup(pc => pc.RemoveFromAsync(It.Is<string>(s => s == extractPath), It.IsAny<CancellationToken>()))
+                .Setup(pc => pc.RemoveFromAsync(It.Is<string>(s => s == Path.Combine(extractPath, id)), It.IsAny<CancellationToken>()))
                 .Callback(() => RemoveFromAsyncCalled.Increment())
                 .Returns(() => Task.CompletedTask);