Minor cleanup

Fronter.NET.Tests/Services/UpdateCheckerTests.cs

@@ -14,7 +14,7 @@ public void LatestReleaseInfoIsDownloaded() {
 		Assert.Matches(versionRegex, info.Version);
 		Assert.False(string.IsNullOrWhiteSpace(info.Description));
 		Assert.NotNull(info.ZipUrl);
-		Assert.StartsWith($"https://github.com/ParadoxGameConverters/ImperatorToCK3/releases/download/{info.Version}/ImperatorToCK3", info.ZipUrl!);
-		Assert.EndsWith(".zip", info.ZipUrl!);
+		Assert.StartsWith($"https://github.com/ParadoxGameConverters/ImperatorToCK3/releases/download/{info.Version}/ImperatorToCK3", info.ZipUrl);
+		Assert.EndsWith(".zip", info.ZipUrl);
 	}
 }

Fronter.NET/Extensions/DynamicLocExtension.cs

@@ -13,6 +13,7 @@ public DynamicLocExtension(string path) {
 		Converter = new LocKeyToValueConverter();
 	}
 
+	// ReSharper disable once UnusedMember.Global
 	public MultiBinding ProvideValue() {
 		return this;
 	}

Fronter.NET/Models/Configuration/Configuration.cs

@@ -3,8 +3,6 @@
 using Fronter.Models.Configuration.Options;
 using Fronter.ViewModels;
 using log4net;
-using Microsoft.CodeAnalysis;
-using ReactiveUI;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -51,7 +49,7 @@ public Configuration() {
 			logger.Warn($"{fronterOptionsPath} not found!");
 		}
 		parser.ClearRegisteredRules();
-		
+
 		InitializePaths();
 
 		RegisterPreloadKeys(parser);
@@ -157,23 +155,23 @@ public void InitializePaths() {
 		if (!OperatingSystem.IsWindows()) {
 			return;
 		}
-		
+
 		string documentsDir = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
 
 		foreach (var folder in RequiredFolders) {
 			string? initialValue = null;
-			
+
 			if (!string.IsNullOrEmpty(folder.Value)) {
 				continue;
 			}
-			
+
 			if (folder.SearchPathType == "windowsUsersFolder") {
 				initialValue = Path.Combine(documentsDir, folder.SearchPath);
 			} else if (folder.SearchPathType == "steamFolder") {
 				if (!int.TryParse(folder.SearchPathId, out int steamId)) {
 					continue;
 				}
-				
+
 				var possiblePath = CommonFunctions.GetSteamInstallPath(steamId);
 				if (possiblePath is null) {
 					continue;
@@ -186,7 +184,7 @@ public void InitializePaths() {
 			} else if (folder.SearchPathType == "direct") {
 				initialValue = folder.SearchPath;
 			}
-			
+
 			if (Directory.Exists(initialValue)) {
 				folder.Value = initialValue;
 			}
@@ -220,10 +218,10 @@ public void InitializePaths() {
 			}
 		}
 	}
-	
+
 	public bool ExportConfiguration() {
 		SetSavingStatus("CONVERTSTATUSIN");
-		
+
 		if (string.IsNullOrEmpty(ConverterFolder)) {
 			logger.Error("Converter folder is not set!");
 			SetSavingStatus("CONVERTSTATUSPOSTFAIL");

Fronter.NET/Models/Configuration/RequiredFile.cs

@@ -33,7 +33,7 @@ public override string Value {
 		get => base.Value;
 		set {
 			if (!string.IsNullOrEmpty(value) && !File.Exists(value)) {
-				throw new DataValidationException($"File does not exist!");
+				throw new DataValidationException("File does not exist!");
 			}
 
 			base.Value = value;

Fronter.NET/Models/Configuration/RequiredFolder.cs

@@ -32,7 +32,7 @@ public override string Value {
 		get => base.Value;
 		set {
 			if (!string.IsNullOrEmpty(value) && !Directory.Exists(value)) {
-				throw new DataValidationException($"Directory does not exist!");
+				throw new DataValidationException("Directory does not exist!");
 			}
 
 			base.Value = value;

Fronter.NET/Models/LogLine.cs

@@ -1,10 +1,7 @@
-using commonItems;
-using Fronter.Services;
-using log4net.Core;
+using log4net.Core;
 using ReactiveUI;
-using System.ComponentModel;
 
-namespace Fronter.Models; 
+namespace Fronter.Models;
 
 public class LogLine : ReactiveObject {
 	public enum MessageSource {
@@ -15,7 +12,7 @@ public enum MessageSource {
 	public string Timestamp { get; set; } = string.Empty;
 	public Level? Level { get; set; }
 	public string LevelName => Level?.Name ?? string.Empty;
-	
+
 	public MessageSource Source { get; set; } = MessageSource.Uninitialized;
 
 	private string message = string.Empty;

Fronter.NET/Services/ConverterLauncher.cs

@@ -1,5 +1,4 @@
 using commonItems;
-using Fronter.LogAppenders;
 using Fronter.Models.Configuration;
 using log4net;
 using log4net.Core;
@@ -57,11 +56,11 @@ public bool LaunchConverter() {
 
 		var timer = new Stopwatch();
 		timer.Start();
-		
+
 		process.Start();
 		process.BeginOutputReadLine();
 		process.WaitForExit();
-		
+
 		timer.Stop();
 
 		if (process.ExitCode == 0) {

Fronter.NET/Services/MessageSlicer.cs

@@ -1,5 +1,4 @@
-using commonItems;
-using Fronter.Models;
+using Fronter.Models;
 using log4net;
 using log4net.Core;
 using System.Text.RegularExpressions;
@@ -11,7 +10,7 @@ public static class MessageSlicer {
 
 	public static LogLine SliceMessage(string message) {
 		var logMessage = new LogLine();
-		
+
 		var posOpen = message.IndexOf('[');
 		var posClose = message.IndexOf(']');
 
@@ -24,13 +23,13 @@ public static LogLine SliceMessage(string message) {
 		if (dateTimeRegex.IsMatch(timestampPart)) {
 			logMessage.Timestamp = timestampPart;
 		}
-		
+
 		var logLevelStr = message.Substring(posOpen + 1, posClose - posOpen - 1);
 		logMessage.Level = GetLogLevel(logLevelStr);
 		if (message.Length >= posClose + 2) {
 			logMessage.Message = message[(posClose + 2)..];
 		}
-		
+
 		return logMessage;
 	}
 

Fronter.NET/ValueConverters/LogLevelToColorNameConverter.cs

@@ -1,11 +1,9 @@
-using Avalonia;
-using Avalonia.Data.Converters;
+using Avalonia.Data.Converters;
 using Avalonia.Media;
-using commonItems;
 using log4net.Core;
 using System;
 
-namespace Fronter.ValueConverters; 
+namespace Fronter.ValueConverters;
 
 // based on https://stackoverflow.com/a/5551986/10249243
 public class LogLevelToColorNameConverter : IValueConverter {

Fronter.NET/ViewModels/MainWindowViewModel.cs

@@ -5,24 +5,23 @@
 using commonItems;
 using FluentAvalonia.Styling;
 using Fronter.Extensions;
+using Fronter.LogAppenders;
 using Fronter.Models;
 using Fronter.Models.Configuration;
 using Fronter.Services;
 using Fronter.Views;
+using log4net;
+using log4net.Core;
 using MessageBox.Avalonia;
 using MessageBox.Avalonia.DTO;
 using MessageBox.Avalonia.Enums;
 using MessageBox.Avalonia.Models;
 using ReactiveUI;
-using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.IO;
 using System.Linq;
 using System.Threading;
-using Fronter.LogAppenders;
-using log4net;
-using log4net.Core;
-using System.IO;
 
 namespace Fronter.ViewModels;
 
@@ -32,7 +31,7 @@ public class MainWindowViewModel : ViewModelBase {
 		.ToDictionary(l => l, l => loc.TranslateLanguage(l));
 
 	public Configuration Config { get; }
-	
+
 	public PathPickerViewModel PathPicker { get; }
 	public OptionsViewModel Options { get; }
 
@@ -57,11 +56,11 @@ public string CopyStatus {
 		get => copyStatus;
 		set => this.RaiseAndSetIfChanged(ref copyStatus, value);
 	}
-	
-	
+
+
 	public MainWindowViewModel() {
 		Config = new Configuration();
-		
+
 		var appenders = LogManager.GetRepository().GetAppenders();
 		var gridAppender = appenders.First(a => a.Name == "grid");
 		if (gridAppender is not LogGridAppender logGridAppender) {
@@ -115,12 +114,12 @@ public void LaunchConverter() {
 		SaveStatus = "CONVERTSTATUSPRE";
 		ConvertStatus = "CONVERTSTATUSPRE";
 		CopyStatus = "CONVERTSTATUSPRE";
-		
+
 		if (!VerifyMandatoryPaths()) {
 			return;
 		}
 		Config.ExportConfiguration();
-		
+
 		var converterLauncher = new ConverterLauncher(Config);
 		bool success;
 		var converterThread = new Thread(() => {
@@ -145,8 +144,8 @@ public void LaunchConverter() {
 
 	public async void CheckForUpdates() {
 		if (Config.UpdateCheckerEnabled &&
-		    Config.CheckForUpdatesOnStartup &&
-		    UpdateChecker.IsUpdateAvailable("commit_id.txt", Config.PagesCommitIdUrl)) {
+			Config.CheckForUpdatesOnStartup &&
+			UpdateChecker.IsUpdateAvailable("commit_id.txt", Config.PagesCommitIdUrl)) {
 			var info = UpdateChecker.GetLatestReleaseInfo(Config.Name);
 
 			const string updateNow = "Update now";

Fronter.NET/ViewModels/PathPickerViewModel.cs

@@ -1,17 +1,11 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Controls;
 using commonItems;
 using Fronter.Extensions;
 using Fronter.Models.Configuration;
 using Fronter.Views;
-using ReactiveUI;
-using System;
 using System.Collections.ObjectModel;
-using System.Reactive;
-using System.Threading.Tasks;
 
-namespace Fronter.ViewModels; 
+namespace Fronter.ViewModels;
 
 /// <summary>
 ///     The PathPickerViewModel lets the user select paths to various stuff the converter needs to know where to find.
@@ -24,13 +18,13 @@ public PathPickerViewModel(Configuration config) {
 
 	public ObservableCollection<RequiredFolder> RequiredFolders { get; }
 	public ObservableCollection<RequiredFile> RequiredFiles { get; }
-	
+
 	public async void OpenFolderDialog(RequiredFolder folder) {
 		var dlg = new OpenFolderDialog {
 			Title = TranslationSource.Instance[folder.DisplayName],
 			Directory = string.IsNullOrEmpty(folder.Value) ? null : folder.Value
 		};
-		
+
 		var result = await dlg.ShowAsync(MainWindow.Instance);
 		if (result is not null) {
 			folder.Value = result;
@@ -46,9 +40,9 @@ public async void OpenFileDialog(RequiredFile file) {
 			dlg.Directory = CommonFunctions.GetPath(file.Value);
 		}
 		dlg.Filters.Add(new FileDialogFilter {
-			Extensions = {file.AllowedExtension.TrimStart('*', '.')}
+			Extensions = { file.AllowedExtension.TrimStart('*', '.') }
 		});
-		
+
 		var result = await dlg.ShowAsync(MainWindow.Instance);
 		if (result is not null) {
 			file.Value = result[0];

Fronter.NET/Views/MainWindow.axaml

@@ -4,7 +4,6 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:viewModels="clr-namespace:Fronter.ViewModels"
         xmlns:views="clr-namespace:Fronter.Views"
-        xmlns:fronter="clr-namespace:Fronter"
         xmlns:ns="clr-namespace:Fronter.Extensions"
         xmlns:vc="clr-namespace:Fronter.ValueConverters"
         xmlns:log4netCore="clr-namespace:log4net.Core;assembly=log4net"