Move IEntrySource to workshop

src/Artemis.UI/Screens/Workshop/SubmissionWizard/Models/IEntrySource.cs

@@ -1,6 +0,0 @@
-namespace Artemis.UI.Screens.Workshop.SubmissionWizard.Models;
-
-public interface IEntrySource
-{
-    
-}

src/Artemis.UI/Screens/Workshop/SubmissionWizard/Models/SubmissionWizardState.cs

@@ -5,6 +5,7 @@ using Artemis.UI.Screens.Workshop.SubmissionWizard.Steps.Layout;
 using Artemis.UI.Screens.Workshop.SubmissionWizard.Steps.Profile;
 using Artemis.UI.Shared.Services;
 using Artemis.WebClient.Workshop;
+using Artemis.WebClient.Workshop.Handlers.UploadHandlers;
 using DryIoc;
 
 namespace Artemis.UI.Screens.Workshop.SubmissionWizard.Models;

src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Layout/LayoutInfoStepViewModel.cs

@@ -6,7 +6,7 @@ using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using Artemis.Core;
 using Artemis.UI.Screens.Workshop.Layout;
-using Artemis.UI.Screens.Workshop.SubmissionWizard.Models;
+using Artemis.WebClient.Workshop.Handlers.UploadHandlers;
 using PropertyChanged.SourceGenerator;
 using ReactiveUI;
 using ReactiveUI.Validation.Extensions;
@@ -40,7 +40,7 @@ public partial class LayoutInfoStepViewModel : SubmissionViewModel
             _layout = layoutEntrySource.Layout;
             IsKeyboardLayout = _layout.RgbLayout.Type == RGBDeviceType.Keyboard;
             PhysicalLayout = layoutEntrySource.PhysicalLayout;
-            LayoutInfo = layoutEntrySource.LayoutInfo;
+            LayoutInfo = new ObservableCollection<LayoutInfoViewModel>(layoutEntrySource.LayoutInfo.Select(CreateLayoutInfoViewModel));
 
             if (!LayoutInfo.Any())
                 ExecuteAddLayoutInfo();
@@ -58,6 +58,17 @@ public partial class LayoutInfoStepViewModel : SubmissionViewModel
         });
     }
 
+    private LayoutInfoViewModel CreateLayoutInfoViewModel(LayoutInfo layoutInfo)
+    {
+        LayoutInfoViewModel vm = _getLayoutInfoViewModel(_layout ?? throw new InvalidOperationException());
+        vm.Model = layoutInfo.Model;
+        vm.Vendor = layoutInfo.Vendor;
+        vm.DeviceProviderId = layoutInfo.DeviceProviderId;
+        vm.Remove = ReactiveCommand.Create(() => LayoutInfo.Remove(vm));
+
+        return vm;
+    }
+
     private void ExecuteAddLayoutInfo()
     {
         if (_layout == null)
@@ -74,6 +85,7 @@ public partial class LayoutInfoStepViewModel : SubmissionViewModel
             return;
 
         layoutEntrySource.PhysicalLayout = PhysicalLayout;
+        // layoutEntrySource.LayoutInfo = new List<LayoutInfo>(LayoutInfo.Select(i => i.ToLayoutInfo()));
 
         if (string.IsNullOrWhiteSpace(State.Name))
             State.Name = layoutEntrySource.Layout.RgbLayout.Name ?? "";
@@ -108,7 +120,6 @@ public partial class LayoutInfoStepViewModel : SubmissionViewModel
         }
 
         State.Categories = new List<long> {8}; // Device category, yes this could change but why would it
-        
         if (State.EntryId == null)
             State.ChangeScreen<SpecificationsStepViewModel>();
         else

src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Layout/LayoutSelectionStepViewModel.cs

@@ -12,6 +12,7 @@ using System.Threading.Tasks;
 using Artemis.UI.Screens.Workshop.SubmissionWizard.Models;
 using Artemis.UI.Shared.Extensions;
 using Artemis.UI.Shared.Services;
+using Artemis.WebClient.Workshop.Handlers.UploadHandlers;
 using Avalonia.Media.Imaging;
 using Avalonia.Threading;
 using SkiaSharp;

src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Profile/ProfileAdaptionHintsStepViewModel.cs

@@ -9,6 +9,7 @@ using Artemis.Core.Services;
 using Artemis.UI.Screens.ProfileEditor.ProfileTree.Dialogs;
 using Artemis.UI.Screens.Workshop.SubmissionWizard.Models;
 using Artemis.UI.Shared.Services;
+using Artemis.WebClient.Workshop.Handlers.UploadHandlers;
 using DynamicData;
 using DynamicData.Aggregation;
 using ReactiveUI;

src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Profile/ProfileSelectionStepViewModel.cs

@@ -8,6 +8,7 @@ using Artemis.Core.Services;
 using Artemis.UI.Extensions;
 using Artemis.UI.Screens.Workshop.Profile;
 using Artemis.UI.Screens.Workshop.SubmissionWizard.Models;
+using Artemis.WebClient.Workshop.Handlers.UploadHandlers;
 using Material.Icons;
 using PropertyChanged.SourceGenerator;
 using ReactiveUI;

src/Artemis.WebClient.Workshop/Handlers/UploadHandlers/EntryUploadHandlerFactory.cs

@@ -1,5 +1,4 @@
-using Artemis.WebClient.Workshop.Handlers.UploadHandlers.Implementations;
+using DryIoc;
-using DryIoc;
 
 namespace Artemis.WebClient.Workshop.Handlers.UploadHandlers;
 

src/Artemis.WebClient.Workshop/Handlers/UploadHandlers/IEntrySource.cs

@@ -0,0 +1,6 @@
+namespace Artemis.WebClient.Workshop.Handlers.UploadHandlers;
+
+public interface IEntrySource
+{
+    
+}

src/Artemis.WebClient.Workshop/Handlers/UploadHandlers/IEntryUploadHandler.cs

@@ -4,5 +4,5 @@ namespace Artemis.WebClient.Workshop.Handlers.UploadHandlers;
 
 public interface IEntryUploadHandler
 {
-    Task<EntryUploadResult> CreateReleaseAsync(long entryId, object file, Progress<StreamProgress> progress, CancellationToken cancellationToken);
+    Task<EntryUploadResult> CreateReleaseAsync(long entryId, IEntrySource entrySource, Progress<StreamProgress> progress, CancellationToken cancellationToken);
 }

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

@@ -1,10 +1,6 @@
-using System.Collections.Generic;
+using Artemis.Core;
-using System.Collections.ObjectModel;
-using System.Linq;
-using Artemis.Core;
-using Artemis.UI.Screens.Workshop.Layout;
 
-namespace Artemis.UI.Screens.Workshop.SubmissionWizard.Models;
+namespace Artemis.WebClient.Workshop.Handlers.UploadHandlers;
 
 public class LayoutEntrySource : IEntrySource
 {
@@ -14,8 +10,8 @@ public class LayoutEntrySource : IEntrySource
     }
 
     public ArtemisLayout Layout { get; set; }
-    public ObservableCollection<LayoutInfoViewModel> LayoutInfo { get; } = new();
+    public List<LayoutInfo> LayoutInfo { get; set; } = new();
-    public KeyboardLayoutType PhysicalLayout { get; set; }
+    public Core.KeyboardLayoutType PhysicalLayout { get; set; }
 
     private List<LayoutCustomLedDataLogicalLayout> GetLogicalLayouts()
     {
@@ -27,3 +23,10 @@ public class LayoutEntrySource : IEntrySource
             .ToList();
     }
 }
+
+public class LayoutInfo
+{
+    public string Vendor { get; set; } = string.Empty;
+    public string Model { get; set; } = string.Empty;
+    public Guid DeviceProviderId { get; set; }
+}

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

@@ -1,12 +1,25 @@
-using Artemis.UI.Shared.Utilities;
+using System.Xml.Serialization;
+using Artemis.UI.Shared.Utilities;
+using RGB.NET.Layout;
 
-namespace Artemis.WebClient.Workshop.Handlers.UploadHandlers.Implementations;
+namespace Artemis.WebClient.Workshop.Handlers.UploadHandlers;
 
 public class LayoutEntryUploadHandler : IEntryUploadHandler
 {
     /// <inheritdoc />
-    public async Task<EntryUploadResult> CreateReleaseAsync(long entryId, object file, Progress<StreamProgress> progress, CancellationToken cancellationToken)
+    public async Task<EntryUploadResult> CreateReleaseAsync(long entryId, IEntrySource entrySource, Progress<StreamProgress> progress, CancellationToken cancellationToken)
     {
-        throw new NotImplementedException();
+        if (entrySource is not LayoutEntrySource source)
+            throw new InvalidOperationException("Can only create releases for layouts");
+        
+        // Create a copy of the layout, image paths are about to be rewritten
+        XmlSerializer serializer = new(typeof(DeviceLayout));
+        using MemoryStream ms = new();
+        await using StreamWriter writer = new(ms);
+        serializer.Serialize(writer, source.Layout.RgbLayout);
+        await writer.FlushAsync();
+        ms.Seek(0, SeekOrigin.Begin);
+
+        return new EntryUploadResult();
     }
 }

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

@@ -1,6 +1,6 @@
 using Artemis.Core;
 
-namespace Artemis.UI.Screens.Workshop.SubmissionWizard.Models;
+namespace Artemis.WebClient.Workshop.Handlers.UploadHandlers;
 
 public class ProfileEntrySource : IEntrySource
 {

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

@@ -1,11 +1,10 @@
 using System.Net.Http.Headers;
-using Artemis.Core;
 using Artemis.Core.Services;
 using Artemis.UI.Shared.Utilities;
 using Artemis.WebClient.Workshop.Entities;
 using Newtonsoft.Json;
 
-namespace Artemis.WebClient.Workshop.Handlers.UploadHandlers.Implementations;
+namespace Artemis.WebClient.Workshop.Handlers.UploadHandlers;
 
 public class ProfileEntryUploadHandler : IEntryUploadHandler
 {
@@ -19,12 +18,12 @@ public class ProfileEntryUploadHandler : IEntryUploadHandler
     }
 
     /// <inheritdoc />
-    public async Task<EntryUploadResult> CreateReleaseAsync(long entryId, object file, Progress<StreamProgress> progress, CancellationToken cancellationToken)
+    public async Task<EntryUploadResult> CreateReleaseAsync(long entryId, IEntrySource entrySource, Progress<StreamProgress> progress, CancellationToken cancellationToken)
     {
-        if (file is not ProfileConfiguration profileConfiguration)
+        if (entrySource is not ProfileEntrySource source)
             throw new InvalidOperationException("Can only create releases for profile configurations");
 
-        await using Stream archiveStream = await _profileService.ExportProfile(profileConfiguration);
+        await using Stream archiveStream = await _profileService.ExportProfile(source.ProfileConfiguration);
 
         // Submit the archive
         HttpClient client = _httpClientFactory.CreateClient(WorkshopConstants.WORKSHOP_CLIENT_NAME);