Workshop - Added layout finder

src/Artemis.WebClient.Workshop/Handlers/InstallationHandlers/IEntryInstallationHandler.cs

@@ -1,6 +1,5 @@
 using Artemis.UI.Shared.Utilities;
 using Artemis.WebClient.Workshop.Models;
-using Artemis.WebClient.Workshop.Services;
 
 namespace Artemis.WebClient.Workshop.Handlers.InstallationHandlers;
 

src/Artemis.WebClient.Workshop/Handlers/InstallationHandlers/Implementations/LayoutEntryInstallationHandler.cs

@@ -52,7 +52,7 @@ public class LayoutEntryInstallationHandler : IEntryInstallationHandler
         // Extract the archive, we could go through the hoops of keeping track of progress but this should be so quick it doesn't matter
         stream.Seek(0, SeekOrigin.Begin);
         using ZipArchive archive = new(stream);
-        archive.ExtractToDirectory(releaseDirectory.FullName);
+        archive.ExtractToDirectory(releaseDirectory.FullName, true);
 
         ArtemisLayout layout = new(Path.Combine(releaseDirectory.FullName, "layout.xml"));
         if (layout.IsValid)

src/Artemis.WebClient.Workshop/Handlers/UploadHandlers/Implementations/LayoutEntryUploadHandler.cs

@@ -11,12 +11,14 @@ namespace Artemis.WebClient.Workshop.Handlers.UploadHandlers;
 public class LayoutEntryUploadHandler : IEntryUploadHandler
 {
     private readonly IHttpClientFactory _httpClientFactory;
+    private readonly IWorkshopClient _workshopClient;
 
-    public LayoutEntryUploadHandler(IHttpClientFactory httpClientFactory)
+    public LayoutEntryUploadHandler(IHttpClientFactory httpClientFactory, IWorkshopClient workshopClient)
     {
         _httpClientFactory = httpClientFactory;
+        _workshopClient = workshopClient;
     }
-    
+
     /// <inheritdoc />
     public async Task<EntryUploadResult> CreateReleaseAsync(long entryId, IEntrySource entrySource, string? changelog, CancellationToken cancellationToken)
     {
@@ -41,8 +43,10 @@ public class LayoutEntryUploadHandler : IEntryUploadHandler
             await using (Stream layoutArchiveStream = archiveEntry.Open())
                 await layoutStream.CopyToAsync(layoutArchiveStream, cancellationToken);
 
+            List<string> imagePaths = [];
+
             // Add the layout image to the archive
-            CopyImage(layoutPath, source.Layout.LayoutCustomDeviceData.DeviceImage, archive);
+            CopyImage(layoutPath, source.Layout.LayoutCustomDeviceData.DeviceImage, archive, imagePaths);
 
             // Add the LED images to the archive
             foreach (ArtemisLedLayout ledLayout in source.Layout.Leds)
@@ -50,11 +54,12 @@ public class LayoutEntryUploadHandler : IEntryUploadHandler
                 if (ledLayout.LayoutCustomLedData.LogicalLayouts == null)
                     continue;
                 foreach (LayoutCustomLedDataLogicalLayout customData in ledLayout.LayoutCustomLedData.LogicalLayouts)
-                    CopyImage(layoutPath, customData.Image, archive);
+                    CopyImage(layoutPath, customData.Image, archive, imagePaths);
             }
         }
+
         archiveStream.Seek(0, SeekOrigin.Begin);
-        
+
         // Submit the archive
         HttpClient client = _httpClientFactory.CreateClient(WorkshopConstants.WORKSHOP_CLIENT_NAME);
 
@@ -71,16 +76,53 @@ public class LayoutEntryUploadHandler : IEntryUploadHandler
         if (!response.IsSuccessStatusCode)
             return EntryUploadResult.FromFailure($"{response.StatusCode} - {await response.Content.ReadAsStringAsync(cancellationToken)}");
 
+        // Determine layout info, here we're combining user supplied data with what we can infer from the layout
+        List<LayoutInfoInput> layoutInfo = GetLayoutInfoInput(source);
+
+        // Submit layout info, overwriting the existing layout info
+        await _workshopClient.SetLayoutInfo.ExecuteAsync(new SetLayoutInfoInput {EntryId = entryId, LayoutInfo = layoutInfo}, cancellationToken);
+
         Release? release = await response.Content.ReadFromJsonAsync<Release>(cancellationToken);
         return release != null ? EntryUploadResult.FromSuccess(release) : EntryUploadResult.FromFailure("Failed to deserialize response");
     }
 
-    private static void CopyImage(string layoutPath, string? imagePath, ZipArchive archive)
+    private static List<LayoutInfoInput> GetLayoutInfoInput(LayoutEntrySource source)
     {
-        if (imagePath == null)
+        RGBDeviceType deviceType = Enum.Parse<RGBDeviceType>(source.Layout.RgbLayout.Type.ToString(), true);
+        KeyboardLayoutType physicalLayout = Enum.Parse<KeyboardLayoutType>(source.PhysicalLayout.ToString(), true);
+
+        List<string> logicalLayouts = source.Layout.Leds.SelectMany(l => l.GetLogicalLayoutNames()).Distinct().ToList();
+        if (logicalLayouts.Any())
+        {
+            return logicalLayouts.SelectMany(logicalLayout => source.LayoutInfo.Select(i => new LayoutInfoInput
+            {
+                PhysicalLayout = deviceType == RGBDeviceType.Keyboard ? physicalLayout : null,
+                LogicalLayout = logicalLayout,
+                Model = i.Model,
+                Vendor = i.Vendor,
+                DeviceType = deviceType,
+                DeviceProvider = i.DeviceProviderId
+            })).ToList();
+        }
+
+        return source.LayoutInfo.Select(i => new LayoutInfoInput
+        {
+            PhysicalLayout = deviceType == RGBDeviceType.Keyboard ? physicalLayout : null,
+            LogicalLayout = null,
+            Model = i.Model,
+            Vendor = i.Vendor,
+            DeviceType = deviceType,
+            DeviceProvider = i.DeviceProviderId
+        }).ToList();
+    }
+
+    private static void CopyImage(string layoutPath, string? imagePath, ZipArchive archive, List<string> imagePaths)
+    {
+        if (imagePath == null || imagePaths.Contains(imagePath))
             return;
 
         string fullPath = Path.Combine(layoutPath, imagePath);
         archive.CreateEntryFromFile(fullPath, imagePath);
+        imagePaths.Add(imagePath);
     }
 }

src/Artemis.WebClient.Workshop/Mutations/SetLayoutInfo.graphql

@@ -0,0 +1,5 @@
+mutation SetLayoutInfo ($input: SetLayoutInfoInput!) {
+    setLayoutInfo(input: $input) {
+        id
+    }    
+}

src/Artemis.WebClient.Workshop/Queries/SearchLayout.graphql

@@ -0,0 +1,23 @@
+query SearchLayout($deviceType: RGBDeviceType!, $deviceProvider: UUID!, $model: String!, $vendor: String!) {
+    searchLayout(deviceProvider: $deviceProvider, deviceType: $deviceType, model: $model, vendor: $vendor) {
+        entry {
+            ...entrySummary
+            latestRelease {
+                ...release
+            }
+        }
+    }
+}
+
+query SearchKeyboardLayout($deviceProvider: UUID!, $model: String!, $vendor: String!, $logicalLayout: String,  $physicalLayout: KeyboardLayoutType!) {
+    searchKeyboardLayout(deviceProvider: $deviceProvider, logicalLayout: $logicalLayout, model: $model, physicalLayout: $physicalLayout, vendor: $vendor) {
+        entry {
+            ...entrySummary
+            latestRelease {
+                ...release
+            }
+        }
+        logicalLayout
+        physicalLayout
+    }
+}

src/Artemis.WebClient.Workshop/schema.graphql

@@ -101,6 +101,7 @@ type Mutation {
     removeEntry(id: Long!): Entry
     removeLayoutInfo(id: Long!): LayoutInfo!
     removeRelease(id: Long!): Release!
+    setLayoutInfo(input: SetLayoutInfoInput!): [LayoutInfo!]!
     updateEntry(input: UpdateEntryInput!): Entry
     updateEntryImage(input: UpdateEntryImageInput!): Image
     updateRelease(input: UpdateReleaseInput!): Release
@@ -399,6 +400,15 @@ input LayoutInfoFilterInput {
     vendor: StringOperationFilterInput
 }
 
+input LayoutInfoInput {
+    deviceProvider: UUID!
+    deviceType: RGBDeviceType!
+    logicalLayout: String
+    model: String!
+    physicalLayout: KeyboardLayoutType
+    vendor: String!
+}
+
 input ListFilterInputTypeOfCategoryFilterInput {
     all: CategoryFilterInput
     any: Boolean
@@ -527,6 +537,11 @@ input ReleaseSortInput {
     version: SortEnumType
 }
 
+input SetLayoutInfoInput {
+    entryId: Long!
+    layoutInfo: [LayoutInfoInput!]!
+}
+
 input StringOperationFilterInput {
     and: [StringOperationFilterInput!]
     contains: String