From dd55ba6fdcce8506826654efcb39fc3e1a2f6696 Mon Sep 17 00:00:00 2001
From: Morten Nilsen <morten.nilsen@flytit.no>
Date: Wed, 3 Apr 2024 14:14:23 +0200
Subject: [PATCH] cleanup

---
 BrowserPicker.sln.DotSettings                        |  1 +
 src/BrowserPicker.App/View/BrowserList.xaml          |  2 +-
 .../ViewModel/ApplicationViewModel.cs                | 12 +++++++++---
 .../ViewModel/ConfigurationViewModel.cs              |  7 +++----
 src/BrowserPicker/UrlHandler.cs                      |  4 +++-
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/BrowserPicker.sln.DotSettings b/BrowserPicker.sln.DotSettings
index 0ee5de3..a8fd109 100644
--- a/BrowserPicker.sln.DotSettings
+++ b/BrowserPicker.sln.DotSettings
@@ -16,6 +16,7 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=ngen/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=olsvc/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Runsafe/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=runtimeconfig/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=safelinks/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=shortener/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Shorteners/@EntryIndexedValue">True</s:Boolean>
diff --git a/src/BrowserPicker.App/View/BrowserList.xaml b/src/BrowserPicker.App/View/BrowserList.xaml
index 21d44ae..111a473 100644
--- a/src/BrowserPicker.App/View/BrowserList.xaml
+++ b/src/BrowserPicker.App/View/BrowserList.xaml
@@ -101,7 +101,7 @@
 						<Button Command="{Binding Select}" CommandParameter="{Binding Path=DataContext.Url.TargetURL,RelativeSource={RelativeSource AncestorType={x:Type ScrollViewer}}}"  Margin="2">
 							<Button.Style>
 								<Style TargetType="Button">
-									<Setter Property="UIElement.Visibility" Value="Visible" />
+									<Setter Property="Visibility" Value="Visible" />
 									<Style.Triggers>
 										<DataTrigger Binding="{Binding Model.Disabled}" Value="True">
 											<Setter Property="UIElement.Visibility" Value="Collapsed" />
diff --git a/src/BrowserPicker.App/ViewModel/ApplicationViewModel.cs b/src/BrowserPicker.App/ViewModel/ApplicationViewModel.cs
index d58af73..7e2bc96 100644
--- a/src/BrowserPicker.App/ViewModel/ApplicationViewModel.cs
+++ b/src/BrowserPicker.App/ViewModel/ApplicationViewModel.cs
@@ -7,12 +7,15 @@
 using System.Windows;
 using System.Windows.Input;
 using BrowserPicker.Framework;
+#if DEBUG
 using JetBrains.Annotations;
+#endif
 
 namespace BrowserPicker.ViewModel;
 
 public sealed class ApplicationViewModel : ModelBase
 {
+#if DEBUG
 	// Used by WPF designer
 	[UsedImplicitly]
 	public ApplicationViewModel()
@@ -24,7 +27,7 @@ public ApplicationViewModel()
 			WellKnownBrowsers.List.Select(b => new BrowserViewModel(new BrowserModel(b, null, null), this))
 		);
 	}
-
+	
 	internal ApplicationViewModel(ConfigurationViewModel config)
 	{
 		Url = new UrlHandler(config.Settings, "https://github.com/mortenn/BrowserPicker");
@@ -34,8 +37,9 @@ internal ApplicationViewModel(ConfigurationViewModel config)
 			WellKnownBrowsers.List.Select(b => new BrowserViewModel(new BrowserModel(b, null, null), this))
 		);
 	}
+#endif
 
-	public ApplicationViewModel(List<string> arguments, IBrowserPickerConfiguration settings)
+	public ApplicationViewModel(IReadOnlyCollection<string> arguments, IBrowserPickerConfiguration settings)
 	{
 		var options = arguments.Where(arg => arg[0] == '/').ToList();
 		force_choice = options.Contains("/choose");
@@ -67,11 +71,13 @@ public void Initialize()
 		}
 
 		BrowserViewModel start = GetBrowserToLaunch(Url.UnderlyingTargetURL ?? Url.TargetURL);
+#if DEBUG
 		if (Debugger.IsAttached && start != null)
 		{
 			Debug.WriteLine($"Skipping launch of browser {start.Model.Name} due to debugger being attached");
 			return;
 		}
+#endif
 		start?.Select.Execute(null);
 	}
 
@@ -113,7 +119,7 @@ internal string GetBrowserToLaunchForUrl(string targetUrl)
 			.Select(rule => new { rule, matchLength = rule.MatchLength(url) })
 			.Where(o => o.matchLength > 0)
 			.ToList();
-			
+
 		return auto.Count <= 0
 			? null
 			: auto.OrderByDescending(o => o.matchLength).First().rule.Browser;
diff --git a/src/BrowserPicker.App/ViewModel/ConfigurationViewModel.cs b/src/BrowserPicker.App/ViewModel/ConfigurationViewModel.cs
index 81bf976..75c741c 100644
--- a/src/BrowserPicker.App/ViewModel/ConfigurationViewModel.cs
+++ b/src/BrowserPicker.App/ViewModel/ConfigurationViewModel.cs
@@ -1,6 +1,5 @@
 using BrowserPicker.Framework;
 using System.ComponentModel;
-using JetBrains.Annotations;
 using System.Threading;
 using System.Linq;
 using System.Collections.ObjectModel;
@@ -8,7 +7,10 @@
 using BrowserPicker.View;
 using System.Windows;
 using System.Collections.Generic;
+#if DEBUG
 using System.Threading.Tasks;
+using JetBrains.Annotations;
+#endif
 
 namespace BrowserPicker.ViewModel;
 
@@ -41,7 +43,6 @@ public ConfigurationViewModel()
 			ConfigurationMode = true
 		};
 		Settings.BrowserList.AddRange(ParentViewModel.Choices.Select(m => m.Model));
-		AvailableBrowsers = [.. ParentViewModel.Choices];
 		test_defaults_url = ParentViewModel.Url?.UnderlyingTargetURL ?? ParentViewModel.Url?.TargetURL;
 	}
 
@@ -145,8 +146,6 @@ public bool AutoAddDefault
 		set => SetProperty(ref auto_add_default, value);
 	}
 
-	public List<BrowserViewModel> AvailableBrowsers { get; init; }
-
 	public ObservableCollection<DefaultSetting> Defaults { get; } = [];
 
 	public MatchType NewDefaultMatchType
diff --git a/src/BrowserPicker/UrlHandler.cs b/src/BrowserPicker/UrlHandler.cs
index 7a250f8..95f8555 100644
--- a/src/BrowserPicker/UrlHandler.cs
+++ b/src/BrowserPicker/UrlHandler.cs
@@ -1,5 +1,4 @@
 using BrowserPicker.Framework;
-using JetBrains.Annotations;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -7,6 +6,9 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Web;
+#if DEBUG
+using JetBrains.Annotations;
+#endif
 
 namespace BrowserPicker;