Decouple configs into OpenTabletDriver.Configurations

OpenTabletDriver/ComponentProviders/DeviceConfigurationProvider.cs → OpenTabletDriver.Configurations/DeviceConfigurationProvider.cs

@@ -5,13 +5,13 @@
 using OpenTabletDriver.Plugin.Components;
 using OpenTabletDriver.Plugin.Tablet;
 
-namespace OpenTabletDriver.ComponentProviders
+namespace OpenTabletDriver.Configurations
 {
     public class DeviceConfigurationProvider : IDeviceConfigurationProvider
     {
         public DeviceConfigurationProvider()
         {
-            var asm = typeof(Driver).Assembly;
+            var asm = typeof(DeviceConfigurationProvider).Assembly;
             var jsonSerializer = new JsonSerializer();
 
             TabletConfigurations = asm.GetManifestResourceNames()

OpenTabletDriver.Configurations/OpenTabletDriver.Configurations.csproj

@@ -0,0 +1,34 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup Label="Project Properties">
+    <TargetFrameworks>net5</TargetFrameworks>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <VersionPrefix>0.6.0.0</VersionPrefix>
+    <NoWarn>VSTHRD100; VSTHRD101; VSTHRD110; VSTHRD200</NoWarn>
+    <LangVersion>preview</LangVersion>
+  </PropertyGroup>
+
+  <PropertyGroup Label="NuGet Package Information">
+    <PackageId>OpenTabletDriver.Configurations</PackageId>
+    <Version>0.6.0.0</Version>
+    <Authors>InfinityGhost</Authors>
+    <Description>OpenTabletDriver tablet configurations</Description>
+    <PackageOutputPath>../nupkg</PackageOutputPath>
+    <PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
+  </PropertyGroup>
+
+  <ItemGroup Label="NuGet Packages">
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+  </ItemGroup>
+
+  <ItemGroup Label="Project References">
+    <ProjectReference Include="..\OpenTabletDriver.Plugin\OpenTabletDriver.Plugin.csproj" />
+  </ItemGroup>
+
+  <ItemGroup Label="Configurations">
+    <EmbeddedResource Include=".\Configurations\*\*.json">
+      <IncludeInPackage>true</IncludeInPackage>
+    </EmbeddedResource>
+  </ItemGroup>
+
+</Project>

OpenTabletDriver.Daemon/DriverDaemon.cs

@@ -129,28 +129,18 @@ public Task<IEnumerable<TabletReference>> GetTablets()
 
         public async Task<IEnumerable<TabletReference>> DetectTablets()
         {
-            var configDir = new DirectoryInfo(AppInfo.Current.ConfigurationDirectory);
-            if (configDir.Exists)
-            {
-                Driver.Detect();
+            Driver.Detect();
 
-                foreach (var tablet in Driver.InputDevices)
+            foreach (var tablet in Driver.InputDevices)
+            {
+                foreach (var dev in tablet.InputDevices)
                 {
-                    foreach (var dev in tablet.InputDevices)
-                    {
-                        dev.RawReport += (_, report) => PostDebugReport(tablet, report);
-                        dev.RawClone = debugging;
-                    }
+                    dev.RawReport += (_, report) => PostDebugReport(tablet, report);
+                    dev.RawClone = debugging;
                 }
-
-                return await GetTablets();
             }
-            else
-            {
-                Log.Write("Detect", $"The configuration directory '{configDir.FullName}' does not exist.", LogLevel.Error);
-            }
-            Log.Write("Detect", "No tablet found.");
-            return Array.Empty<TabletReference>();
+
+            return await GetTablets();
         }
 
         public Task SetSettings(Settings? settings)

OpenTabletDriver.Desktop/DesktopDeviceConfigurationProvider.cs

@@ -1,20 +1,60 @@
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using OpenTabletDriver.Configurations;
+using OpenTabletDriver.Plugin;
 using OpenTabletDriver.Plugin.Components;
 using OpenTabletDriver.Plugin.Tablet;
 
+#nullable enable
+
 namespace OpenTabletDriver.Desktop
 {
     public class DesktopDeviceConfigurationProvider : IDeviceConfigurationProvider
     {
+        private readonly DeviceConfigurationProvider _inAssemblyConfigurationProvider = new();
+
         public IEnumerable<TabletConfiguration> TabletConfigurations
         {
             get
             {
-                var files = Directory.EnumerateFiles(AppInfo.Current.ConfigurationDirectory, "*.json", SearchOption.AllDirectories);
-                return files.Select(path => Serialization.Deserialize<TabletConfiguration>(File.OpenRead(path)));
+                IEnumerable<(ConfigurationSource, TabletConfiguration)> jsonConfigurations = Array.Empty<(ConfigurationSource, TabletConfiguration)>();
+
+                if (Directory.Exists(AppInfo.Current.ConfigurationDirectory))
+                {
+                    var files = Directory.EnumerateFiles(AppInfo.Current.ConfigurationDirectory, "*.json", SearchOption.AllDirectories);
+
+                    jsonConfigurations = files.Select(path => Serialization.Deserialize<TabletConfiguration>(File.OpenRead(path)))
+                        .Select(jsonConfig => (ConfigurationSource.File, jsonConfig));
+                }
+                else
+                {
+                    Log.Write("Detect", $"The configuration directory '{AppInfo.Current.ConfigurationDirectory}' does not exist.", LogLevel.Warning);
+                }
+
+                return _inAssemblyConfigurationProvider.TabletConfigurations
+                    .Select(asmConfig => (ConfigurationSource.Assembly, asmConfig))
+                    .Concat(jsonConfigurations)
+                    .GroupBy(sourcedConfig => sourcedConfig.Item2.Name)
+                    .Select(multiSourcedConfig =>
+                    {
+                        var asmConfig = multiSourcedConfig.Where(m => m.Item1 == ConfigurationSource.Assembly)
+                            .Select(m => m.Item2)
+                            .FirstOrDefault();
+                        var jsonConfig = multiSourcedConfig.Where(m => m.Item1 == ConfigurationSource.File)
+                            .Select(m => m.Item2)
+                            .FirstOrDefault();
+
+                        return jsonConfig ?? asmConfig!;
+                    });
             }
         }
+
+        private enum ConfigurationSource
+        {
+            Assembly,
+            File
+        }
     }
 }

OpenTabletDriver.Desktop/OpenTabletDriver.Desktop.csproj

@@ -18,6 +18,7 @@
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\OpenTabletDriver.Native\OpenTabletDriver.Native.csproj" />
     <ProjectReference Include="..\OpenTabletDriver\OpenTabletDriver.csproj" />
+    <ProjectReference Include="..\OpenTabletDriver.Configurations\OpenTabletDriver.Configurations.csproj" />
   </ItemGroup>
 
 </Project>

OpenTabletDriver.Desktop/Settings.cs

@@ -4,8 +4,8 @@
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
-using Newtonsoft.Json;
 using Microsoft.Extensions.DependencyInjection;
+using Newtonsoft.Json;
 using OpenTabletDriver.Desktop.Migration;
 using OpenTabletDriver.Desktop.Profiles;
 using OpenTabletDriver.Desktop.Reflection;

OpenTabletDriver.sln

@@ -29,6 +29,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTabletDriver.Benchmarks
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTabletDriver.Tools.udev", "OpenTabletDriver.Tools.udev\OpenTabletDriver.Tools.udev.csproj", "{E1894A5A-B7D8-4F6B-8816-DBF7C5E1AE10}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTabletDriver.Configurations", "OpenTabletDriver.Configurations\OpenTabletDriver.Configurations.csproj", "{EF54AA9B-A725-44B5-96B5-AE526EF431CF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -198,5 +200,17 @@ Global
 		{E1894A5A-B7D8-4F6B-8816-DBF7C5E1AE10}.Release|x64.Build.0 = Release|Any CPU
 		{E1894A5A-B7D8-4F6B-8816-DBF7C5E1AE10}.Release|x86.ActiveCfg = Release|Any CPU
 		{E1894A5A-B7D8-4F6B-8816-DBF7C5E1AE10}.Release|x86.Build.0 = Release|Any CPU
+		{EF54AA9B-A725-44B5-96B5-AE526EF431CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF54AA9B-A725-44B5-96B5-AE526EF431CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EF54AA9B-A725-44B5-96B5-AE526EF431CF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EF54AA9B-A725-44B5-96B5-AE526EF431CF}.Debug|x64.Build.0 = Debug|Any CPU
+		{EF54AA9B-A725-44B5-96B5-AE526EF431CF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EF54AA9B-A725-44B5-96B5-AE526EF431CF}.Debug|x86.Build.0 = Debug|Any CPU
+		{EF54AA9B-A725-44B5-96B5-AE526EF431CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EF54AA9B-A725-44B5-96B5-AE526EF431CF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EF54AA9B-A725-44B5-96B5-AE526EF431CF}.Release|x64.ActiveCfg = Release|Any CPU
+		{EF54AA9B-A725-44B5-96B5-AE526EF431CF}.Release|x64.Build.0 = Release|Any CPU
+		{EF54AA9B-A725-44B5-96B5-AE526EF431CF}.Release|x86.ActiveCfg = Release|Any CPU
+		{EF54AA9B-A725-44B5-96B5-AE526EF431CF}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal

OpenTabletDriver/DriverServiceCollection.cs

@@ -2,6 +2,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using OpenTabletDriver.ComponentProviders;
+using OpenTabletDriver.Configurations;
 using OpenTabletDriver.Devices;
 using OpenTabletDriver.Plugin.Components;
 

OpenTabletDriver/OpenTabletDriver.csproj

@@ -26,6 +26,7 @@
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\OpenTabletDriver.Plugin\OpenTabletDriver.Plugin.csproj" />
     <ProjectReference Include="..\OpenTabletDriver.Native\OpenTabletDriver.Native.csproj" />
+    <ProjectReference Include="..\OpenTabletDriver.Configurations\OpenTabletDriver.Configurations.csproj" />
   </ItemGroup>
 
   <ItemGroup Label="Configurations">