Deploy RepositoryActions.json on first run

Author: awaescher

Diff for: RepoZ.Api.Common/Git/RepositoryActions/DefaultRepositoryActionConfigurationStore.cs

@@ -52,7 +52,7 @@ public void Preload()
 
 		private bool TryCopyDefaultJsonFile()
 		{
-			var defaultFile = Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), "RepositoryActions.json");
+			var defaultFile = Path.Combine(AppDataPathProvider.GetAppResourcesPath(), "RepositoryActions.json");
 			var targetFile = GetFileName();
 
 			try

Diff for: RepoZ.Api.Common/IO/DefaultAppDataPathProvider.cs

@@ -6,6 +6,8 @@ namespace RepoZ.Api.Common.IO
 {
 	public class DefaultAppDataPathProvider : IAppDataPathProvider
 	{
-		public string GetAppDataPath() => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "RepoZ");
+		public virtual string GetAppDataPath() => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "RepoZ");
+
+		public virtual string GetAppResourcesPath() => Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location);
 	}
 }

Diff for: RepoZ.Api.Mac/IO/MacAppDataPathProvider.cs

@@ -0,0 +1,11 @@
+using System;
+using System.IO;
+using RepoZ.Api.Common.IO;
+
+namespace RepoZ.Api.Mac.IO
+{
+	public class MacAppDataPathProvider : DefaultAppDataPathProvider
+	{
+		public override string GetAppResourcesPath() => Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location), "..", "Resources");
+	}
+}

Diff for: RepoZ.Api/IO/IAppDataPathProvider.cs

@@ -3,5 +3,7 @@
 	public interface IAppDataPathProvider
 	{
 		string GetAppDataPath();
+
+		string GetAppResourcesPath();
 	}
 }

Diff for: RepoZ.App.Mac/AppDelegate.cs

@@ -99,7 +99,7 @@ private void RegisterServices(TinyIoCContainer container)
 			container.Register<IRepositoryObserverFactory, MacRepositoryObserverFactory>().AsSingleton();
 			container.Register<IPathCrawlerFactory, DefaultPathCrawlerFactory>().AsSingleton();
 
-			container.Register<IAppDataPathProvider, DefaultAppDataPathProvider>();
+			container.Register<IAppDataPathProvider, MacAppDataPathProvider>();
 			container.Register<IErrorHandler, UIErrorHandler>();
 			container.Register<IRepositoryActionProvider, DefaultRepositoryActionProvider>();
 			container.Register<IRepositoryReader, DefaultRepositoryReader>();

Diff for: RepoZ.App.Mac/PopupViewController.cs

@@ -6,20 +6,24 @@
 using System.Diagnostics;
 using RepoZ.Api.Common.Common;
 using RepoZ.Api.Common.Git.AutoFetch;
+using RepoZ.Api.Common.Git;
+using System.IO;
 
 namespace RepoZ.App.Mac
 {
 	public partial class PopupViewController : AppKit.NSViewController
 	{
 		private const int MENU_MANAGE = 4711;
 		private const int MENU_AUTOFETCH = 4712;
-		private const int MENU_PINGBACK = 4713;
+		private const int MENU_ADVANCED = 4713;
+		private const int MENU_PINGBACK = 4714;
 
 		private IRepositoryInformationAggregator _aggregator;
 		private IRepositoryMonitor _monitor;
 		private IAppSettingsService _appSettingsService;
 		private IRepositoryIgnoreStore _repositoryIgnoreStore;
 		private ITranslationService _translationService;
+		private IRepositoryActionConfigurationStore _actionConfigurationStore;
 		private HeaderMetrics _initialHeaderMetrics;
 
 		#region Constructors
@@ -74,6 +78,7 @@ public override void ViewWillAppear()
 			_appSettingsService = container.Resolve<IAppSettingsService>();
 			_repositoryIgnoreStore = container.Resolve<IRepositoryIgnoreStore>();
 			_translationService = container.Resolve<ITranslationService>();
+			_actionConfigurationStore = container.Resolve<IRepositoryActionConfigurationStore>();
 
 			// Do any additional setup after loading the view.
 			var datasource = new RepositoryTableDataSource(_aggregator.Repositories);
@@ -204,6 +209,7 @@ private void CreateMenu()
 
 				new NSMenuItem(_translationService.Translate("ManageRepos")) { Tag = MENU_MANAGE},
 				new NSMenuItem(_translationService.Translate("AutoFetch")) { Tag = MENU_AUTOFETCH },
+				new NSMenuItem(_translationService.Translate("Advanced")) { Tag = MENU_ADVANCED },
 				NSMenuItem.SeparatorItem,
 				new NSMenuItem(_translationService.Translate("PingBack")) { Tag = MENU_PINGBACK },
 				NSMenuItem.SeparatorItem,
@@ -218,6 +224,8 @@ private void CreateMenu()
 				new NSMenuItem(_translationService.Translate("ScanMac"), async (s, e) => await _monitor.ScanForLocalRepositoriesAsync()),
 				new NSMenuItem(_translationService.Translate("Clear"), (s, e) => _monitor.Reset()),
 				NSMenuItem.SeparatorItem,
+				new NSMenuItem(_translationService.Translate("CustomizeRepositoryActions"), HandleCustomizeRepositoryAction),
+				NSMenuItem.SeparatorItem,
 				new NSMenuItem(_translationService.Translate("ResetIgnoreRules"), (s, e) => _repositoryIgnoreStore.Reset())
 			};
 
@@ -241,6 +249,16 @@ private void CreateMenu()
 			foreach (var item in autoFetchItems)
 				autoFetchItem.Submenu.AddItem(item);
 
+			var advancedItems = new NSMenuItem[] {
+				new CheckableMenuItem(_translationService.Translate("PruneOnFetch"), value => _appSettingsService.PruneOnFetch = value, () => _appSettingsService.PruneOnFetch)
+			};
+
+			var advancedItem = MenuButton.Menu.ItemWithTag(MENU_ADVANCED);
+			advancedItem.Submenu = new NSMenu { AutoEnablesItems = false };
+
+			foreach (var item in advancedItems)
+				advancedItem.Submenu.AddItem(item);
+
 			var pingbackItems = new NSMenuItem[] {
 				new NSMenuItem(_translationService.Translate("Donate"), (s, e) => Navigate("https://github.com/sponsors/awaescher")),
 				NSMenuItem.SeparatorItem,
@@ -257,8 +275,9 @@ private void CreateMenu()
 
 		partial void MenuButton_Click(NSObject sender)
 		{
-			var currentMode = _appSettingsService.AutoFetchMode;
+			var currentAutoFetchMode = _appSettingsService.AutoFetchMode;
 			var autoFetchItem = MenuButton.Menu.ItemWithTag(MENU_AUTOFETCH);
+			var advancedItem = MenuButton.Menu.ItemWithTag(MENU_ADVANCED);
 
 			for (int i = 0; i < autoFetchItem.Submenu.Count; i++)
 			{
@@ -268,18 +287,43 @@ partial void MenuButton_Click(NSObject sender)
 					continue;
 
 				var itemMode = (AutoFetchMode)Enum.Parse(typeof(AutoFetchMode), item.Identifier);
-				item.State = itemMode == currentMode ? NSCellStateValue.On : NSCellStateValue.Off;
+				item.State = itemMode == currentAutoFetchMode ? NSCellStateValue.On : NSCellStateValue.Off;
 			}
 
+			UpdateCheckableItems(MenuButton.Menu);
+			
 			MenuButton.Menu.PopUpMenu(null, new CoreGraphics.CGPoint() { X = 0, Y = MenuButton.Frame.Height }, MenuButton);
 		}
 
+		void UpdateCheckableItems(NSMenu menu)
+		{
+			if (menu is null)
+				return;
+
+			foreach (var item in menu.Items)
+			{
+				(item as CheckableMenuItem)?.Update();
+				UpdateCheckableItems(item.Submenu);
+			}
+		}
+
 		void HandleAutoFetchChange(object sender, EventArgs e)
 		{
 			var newMode = (AutoFetchMode)Enum.Parse(typeof(AutoFetchMode), (sender as NSMenuItem).Identifier);
 			_appSettingsService.AutoFetchMode = newMode;
 		}
 
+		void HandleCustomizeRepositoryAction(object sender, EventArgs e)
+		{
+			Navigate("https://github.com/awaescher/RepoZ-RepositoryActions");
+
+			var fileName = ((FileRepositoryStore)_actionConfigurationStore).GetFileName();
+			var directoryName = Path.GetDirectoryName(fileName);
+
+			if (Directory.Exists(directoryName))
+				Process.Start(directoryName);
+		}
+
 		void Datasource_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
 		{
 			this.InvokeOnMainThread(SetControlVisibilityByRepositoryAvailability);
@@ -334,5 +378,31 @@ private class HeaderMetrics
 			public nfloat MenuButtonLeft { get; set; }
 			public nfloat SearchBoxWidth { get; set; }
 		}
+
+		private class CheckableMenuItem : NSMenuItem
+		{
+			public CheckableMenuItem(string title, Action<bool> onChange, Func<bool> isChecked) : base(title)
+			{
+				OnChange = onChange ?? throw new ArgumentNullException(nameof(onChange));
+				IsChecked = isChecked ?? throw new ArgumentNullException(nameof(isChecked));
+
+				base.Activated += CheckableMenuItem_Activated;
+			}
+
+			private void CheckableMenuItem_Activated(object sender, EventArgs e)
+			{
+				State = (State == NSCellStateValue.On) ? NSCellStateValue.Off : NSCellStateValue.On;
+				OnChange.Invoke(State == NSCellStateValue.On);
+			}
+
+			public void Update()
+			{
+				State = IsChecked.Invoke() ? NSCellStateValue.On : NSCellStateValue.Off;
+			}
+
+			public Action<bool> OnChange { get; }
+
+			public Func<bool> IsChecked { get; }
+		}
 	}
 }

Diff for: RepoZ.App.Mac/RepoZ.App.Mac.csproj

@@ -176,6 +176,9 @@
     <BundleResource Include="..\RepoZ.App.Win\i18n\en-us.xaml">
       <Link>i18n\en-us.xaml</Link>
     </BundleResource>
+    <BundleResource Include="..\_ref\macOS\RepositoryActions.json">
+      <Link>Resources\RepositoryActions.json</Link>
+    </BundleResource>
   </ItemGroup>
   <ItemGroup>
     <NativeReference Include="..\_ref\libgit2-4aecb64.dylib">

Diff for: RepoZ.App.Win/MainWindow.xaml.cs

@@ -213,13 +213,13 @@ private void ResetIgnoreRulesButton_Click(object sender, RoutedEventArgs e)
 
 		private void CustomizeContextMenu_Click(object sender, RoutedEventArgs e)
 		{
+			Navigate("https://github.com/awaescher/RepoZ-RepositoryActions");
+
 			var fileName = ((FileRepositoryStore)_actionConfigurationStore).GetFileName();
 			var directoryName = Path.GetDirectoryName(fileName);
 
 			if (Directory.Exists(directoryName))
 				Process.Start(directoryName);
-
-			Navigate("https://github.com/awaescher/RepoZ-RepositoryActions");
 		}
 
 		private void UpdateButton_Click(object sender, RoutedEventArgs e)

Diff for: _ref/macOS/RepositoryActions.json

@@ -98,8 +98,9 @@
     [
         {
             "name": "{OpenIn} Finder",
-            "command": '"{Repository.SafePath}"',
-            "keys": "Command+Shift+E",
+            "command": "open",
+            "arguments": '"{Repository.SafePath}"',
+            "keys": "Command+Shift+F",
             "active": "true"
         },
         {

Diff for: _setup/RepoZ.pkgproj

@@ -6,9 +6,16 @@
 	<array>
 		<dict>
 			<key>MUST-CLOSE-APPLICATION-ITEMS</key>
-			<array/>
+			<array>
+				<dict>
+					<key>APPLICATION_ID</key>
+					<string>net.sodacore.RepoZ</string>
+					<key>STATE</key>
+					<true/>
+				</dict>
+			</array>
 			<key>MUST-CLOSE-APPLICATIONS</key>
-			<false/>
+			<true/>
 			<key>PACKAGE_FILES</key>
 			<dict>
 				<key>DEFAULT_INSTALL_LOCATION</key>