Use JSON for settings

GH-87

Directory.Build.props

@@ -24,10 +24,6 @@
     <FileVersion>$(Version)</FileVersion>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <NoWarn>$(NoWarn);NETSDK1206</NoWarn>
-  </PropertyGroup>
-
   <PropertyGroup Condition="'$(TargetOS)' == '' And $([MSBuild]::IsOSPlatform('Windows'))">
     <TargetOS>Windows</TargetOS>
   </PropertyGroup>

build/KeyboardSwitch.Build/Build.Files.Pkg.cs

@@ -6,7 +6,6 @@ public partial class Build
     private const string AppInfoFile = "Info.plist";
     private const string KeyboardSwitchUninstaller = nameof(KeyboardSwitchUninstaller);
 
-    private const string LibSqLite = "libe_sqlite3.dylib";
     private const string LibUioHook = "libuiohook.dylib";
     private const string LibAvaloniaNative = "libAvaloniaNative.dylib";
     private const string LibHarfBuzzSharp = "libHarfBuzzSharp.dylib";
@@ -48,9 +47,6 @@ public partial class Build
     private static AbsolutePath KeyboardSwitchSettingsExecutableFile =>
         PublishOutputDirectory / KeyboardSwitchSettings;
 
-    private static AbsolutePath LibSqLiteFile =>
-        PublishOutputDirectory / LibSqLite;
-
     private static AbsolutePath LibUioHookFile =>
         PublishOutputDirectory / LibUioHook;
 
@@ -66,18 +62,12 @@ public partial class Build
     private static AbsolutePath KeyboardSwitchAppExecutableFile =>
         KeyboardSwitchAppMacOSDirectory / KeyboardSwitch;
 
-    private static AbsolutePath KeyboardSwitchAppLibSqLiteFile =>
-        KeyboardSwitchAppMacOSDirectory / LibSqLite;
-
     private static AbsolutePath KeyboardSwitchAppLibUioHookFile =>
         KeyboardSwitchAppMacOSDirectory / LibUioHook;
 
     private static AbsolutePath KeyboardSwitchSettingsAppExecutableFile =>
         KeyboardSwitchSettingsAppMacOSDirectory / KeyboardSwitchSettings;
 
-    private static AbsolutePath KeyboardSwitchSettingsAppLibSqLiteFile =>
-        KeyboardSwitchSettingsAppMacOSDirectory / LibSqLite;
-
     private static AbsolutePath KeyboardSwitchSettingsAppLibAvaloniaNativeFile =>
         KeyboardSwitchSettingsAppMacOSDirectory / LibAvaloniaNative;
 

build/KeyboardSwitch.Build/Build.Targets.cs

@@ -213,7 +213,6 @@ public partial class Build
             KeyboardSwitchAppMacOSDirectory.CreateOrCleanDirectory();
 
             CopyFileToDirectory(KeyboardSwitchExecutableFile, KeyboardSwitchAppMacOSDirectory);
-            CopyFileToDirectory(LibSqLiteFile, KeyboardSwitchAppMacOSDirectory);
             CopyFileToDirectory(LibUioHookFile, KeyboardSwitchAppMacOSDirectory);
 
             KeyboardSwitchAppResourcesDirectory.CreateOrCleanDirectory();
@@ -233,7 +232,6 @@ public partial class Build
 
             CopyFileToDirectory(KeyboardSwitchSettingsExecutableFile, KeyboardSwitchSettingsAppMacOSDirectory);
             CopyFileToDirectory(LibAvaloniaNativeFile, KeyboardSwitchSettingsAppMacOSDirectory);
-            CopyFileToDirectory(LibSqLiteFile, KeyboardSwitchSettingsAppMacOSDirectory);
             CopyFileToDirectory(LibHarfBuzzSharpFile, KeyboardSwitchSettingsAppMacOSDirectory);
             CopyFileToDirectory(LibSkiaSharpFile, KeyboardSwitchSettingsAppMacOSDirectory);
 
@@ -263,12 +261,10 @@ public partial class Build
         {
             Log.Information("Creating a macOS package containing the published project");
 
-            this.Sign(KeyboardSwitchAppLibSqLiteFile);
             this.Sign(KeyboardSwitchAppLibUioHookFile);
             this.Sign(KeyboardSwitchAppExecutableFile, hardenedRuntime: true);
 
             this.Sign(KeyboardSwitchSettingsAppLibAvaloniaNativeFile);
-            this.Sign(KeyboardSwitchSettingsAppLibSqLiteFile);
             this.Sign(KeyboardSwitchSettingsAppLibHarfBuzzSharpFile);
             this.Sign(KeyboardSwitchSettingsAppLibSkiaSharpFile);
             this.Sign(KeyboardSwitchSettingsAppExecutableFile, hardenedRuntime: true);

build/KeyboardSwitch.Build/linux/keyboard-switch.spec

@@ -76,9 +76,9 @@ $INSTALL_DIR/KeyboardSwitch --stop
 
 awk -F: '($3 >= 1000) && ($3 < 60000) && ($1 != "nobody") { print $1 }' /etc/passwd | while read -r CURRENT_USER
 do
-    if [ -f "$(eval echo ~$CURRENT_USER)/.keyboard-switch/.setup-configured" ]
+    if [ -f "$(eval echo ~$CURRENT_USER)/.config/keyboard-switch/.setup-configured" ]
     then
-        rm "$(eval echo ~$CURRENT_USER)/.keyboard-switch/.setup-configured"
+        rm "$(eval echo ~$CURRENT_USER)/.config/keyboard-switch/.setup-configured"
     fi
 
     if [ -f "$(eval echo ~$CURRENT_USER)/$SERVICE_DESKTOP_FILE" ]

build/KeyboardSwitch.Build/linux/prerm

@@ -11,9 +11,9 @@ $INSTALL_DIR/KeyboardSwitch --stop
 
 awk -F: '($3 >= 1000) && ($3 < 60000) && ($1 != "nobody") { print $1 }' /etc/passwd | while read -r CURRENT_USER
 do
-    if [ -f "$(eval echo ~$CURRENT_USER)/.keyboard-switch/.setup-configured" ]
+    if [ -f "$(eval echo ~$CURRENT_USER)/.config/keyboard-switch/.setup-configured" ]
     then
-        rm "$(eval echo ~$CURRENT_USER)/.keyboard-switch/.setup-configured"
+        rm "$(eval echo ~$CURRENT_USER)/.config/keyboard-switch/.setup-configured"
     fi
 
     if [ -f "$(eval echo ~$CURRENT_USER)/$SERVICE_DESKTOP_FILE" ]

build/KeyboardSwitch.Build/linux/uninstall.sh

@@ -9,9 +9,9 @@ GNOME_EXTENSION_DIR=$HOME/.local/share/gnome-shell/extensions/switch-layout@toli
 
 $INSTALL_DIR/KeyboardSwitch --stop
 
-if [ -f "$HOME/.keyboard-switch/.setup-configured" ]
+if [ -f "$HOME/.config/keyboard-switch/.setup-configured" ]
 then
-    rm "$HOME/.keyboard-switch/.setup-configured"
+    rm "$HOME/.config/keyboard-switch/.setup-configured"
 fi
 
 if [ -f "$SERVICE_DESKTOP_FILE" ]

src/KeyboardSwitch.Core/IncompatibleAppVersionException.cs → src/KeyboardSwitch.Core/Exceptions/IncompatibleAppVersionException.cs

@@ -1,4 +1,4 @@
-namespace KeyboardSwitch.Core;
+namespace KeyboardSwitch.Core.Exceptions;
 
 public sealed class IncompatibleAppVersionException : Exception
 {

src/KeyboardSwitch.Core/Exceptions/SettingsException.cs

@@ -0,0 +1,15 @@
+namespace KeyboardSwitch.Core.Exceptions;
+
+public sealed class SettingsException : Exception
+{
+    public SettingsException()
+    { }
+
+    public SettingsException(string? message)
+        : base(message)
+    { }
+
+    public SettingsException(string? message, Exception? innerException)
+        : base(message, innerException)
+    { }
+}

src/KeyboardSwitch.Core/KeyboardSwitch.Core.csproj

@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <PackageReference Include="akavache" Version="9.1.20" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
     <PackageReference Include="SharpHook" Version="5.2.3" />
     <PackageReference Include="SharpHook.Reactive" Version="5.2.3" />
     <PackageReference Include="System.Interactive" Version="6.0.1" />
     <PackageReference Include="System.Interactive.Async" Version="6.0.1" />
     <PackageReference Include="System.Reactive" Version="6.0.0" />
+    <PackageReference Include="System.Text.Json" Version="8.0.1" />
   </ItemGroup>
 </Project>

src/KeyboardSwitch.Core/ObservableExtensions.cs

@@ -1,7 +1,5 @@
 namespace KeyboardSwitch.Core;
 
-using Akavache;
-
 public static class ObservableExtensions
 {
     public static IObservable<Unit> Discard<T>(this IObservable<T> observable) =>
@@ -36,15 +34,4 @@ public static IObservable<T> WhereValueNotNull<T>(this IObservable<T?> observabl
             await observer();
             return Unit.Default;
         }).Subscribe();
-
-    public static Task<bool> ContainsKey(this IBlobCache cache, string key)
-    {
-        var completionSource = new TaskCompletionSource<bool>();
-
-        cache.Get(key).Subscribe(
-            x => completionSource.SetResult(true),
-            ex => completionSource.SetResult(false));
-
-        return completionSource.Task;
-    }
 }

src/KeyboardSwitch.Core/ServiceExtensions.cs

@@ -8,9 +8,7 @@ public static class ServiceExtensions
             .AddSingleton<IEventSimulator, EventSimulator>()
             .AddSingleton<IKeyboardHookService, SharpHookService>()
             .AddSingleton<ITextService, ClipboardTextService>()
-            .AddSingleton(BlobCacheFactory.CreateBlobCache)
-            .AddSingleton<BlobCacheSettingsService>()
-            .AddSingleton<IAppSettingsService, BlobCacheSettingsService>()
+            .AddSingleton<IAppSettingsService, JsonSettingsService>()
             .AddSingleton<ISwitchService, SwitchService>()
             .AddSingleton<INamedPipeService, NamedPipeService>()
             .AddSingleton<ISingleInstanceService, SingleInstanceService>();