- add: config invoke

2025-06-19 21:12:42 +03:00
parent 73682acbab
commit 10d317c867
12 changed files with 308 additions and 96 deletions
--- a/Nebula.Launcher/Assets/Style.axaml
+++ b/Nebula.Launcher/Assets/Style.axaml
@@ -1,4 +1,5 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:pages="clr-namespace:Nebula.Launcher.ViewModels.Pages">
    <Style Selector="Window">
        <Setter Property="Background" Value="{StaticResource DefaultBackground}" />
    </Style>
@@ -85,4 +86,41 @@
        <Setter Property="Background" Value="Transparent" />
        <Setter Property="BorderThickness" Value="0,0,0,1" />
    </Style>
+    
+    <Style Selector="pages|ComplexUnitConfigControl.ConfigBorder">
+        <Setter Property="Background" Value="#333333" />
+        <Setter Property="BorderThickness" Value="2,2,2,2"/>
+        <Setter Property="BorderBrush" Value="Azure"/>
+    </Style>
+    
+    <Style Selector="pages|ArrayUnitConfigControl.ConfigBorder">
+        <Setter Property="Background" Value="#333333" />
+        <Setter Property="BorderThickness" Value="2,2,2,2"/>
+        <Setter Property="BorderBrush" Value="Azure"/>
+    </Style>
+    
+    <Style Selector="pages|StringUnitConfigControl.ConfigBorder">
+        <Setter Property="Background" Value="#333333" />
+        <Setter Property="BorderThickness" Value="2,2,2,2"/>
+        <Setter Property="BorderBrush" Value="Azure"/>
+    </Style>
+    
+    <Style Selector="pages|IntUnitConfigControl.ConfigBorder">
+        <Setter Property="Background" Value="#333333" />
+        <Setter Property="BorderThickness" Value="2,2,2,2"/>
+        <Setter Property="BorderBrush" Value="Azure"/>
+    </Style>
+    
+    <Style Selector="pages|FloatUnitConfigControl.ConfigBorder">
+        <Setter Property="Background" Value="#333333" />
+        <Setter Property="BorderThickness" Value="2,2,2,2"/>
+        <Setter Property="BorderBrush" Value="Azure"/>
+    </Style>
+    
+    <Style Selector="Button.ConfigBorder /template/ ContentPresenter">
+        <Setter Property="Background" Value="#333333" />
+        <Setter Property="BorderThickness" Value="2,2,2,2"/>
+        <Setter Property="BorderBrush" Value="Azure"/>
+        <Setter Property="CornerRadius" Value="0"/>
+    </Style>
 </Styles>
--- a/Nebula.Launcher/Nebula.Launcher.csproj
+++ b/Nebula.Launcher/Nebula.Launcher.csproj
@@ -78,8 +78,4 @@
    <ItemGroup>
      <AdditionalFiles Include="Controls\ServerListView.axaml" />
    </ItemGroup>
-
-    <ItemGroup>
-      <Folder Include="Views\Config\" />
-    </ItemGroup>
 </Project>
--- a/Nebula.Launcher/ServerListProviders/FavoriteServerListProvider.cs
+++ b/Nebula.Launcher/ServerListProviders/FavoriteServerListProvider.cs
@@ -24,6 +24,7 @@ public sealed partial class FavoriteServerListProvider : IServerListProvider, IS
    [GenerateProperty] private ServerViewContainer ServerViewContainer { get; }

    private List<IFilterConsumer> _serverLists = [];
+    private string[] rawServerLists = [];
    
    public bool IsLoaded { get; private set; }
    public Action? OnLoaded { get; set; }
@@ -67,7 +68,6 @@ public sealed partial class FavoriteServerListProvider : IServerListProvider, IS
        servers.Add(robustUrl.ToString());
        ConfigurationService.SetConfigValue(LauncherConVar.Favorites, servers.ToArray());
        ServerViewContainer.Get(robustUrl).IsFavorite = true;
-        Dirty?.Invoke();
    }

    public void RemoveFavorite(ServerEntryModelView entryModelView)
@@ -75,15 +75,31 @@ public sealed partial class FavoriteServerListProvider : IServerListProvider, IS
        var servers = GetFavoriteEntries();
        servers.Remove(entryModelView.Address.ToString());
        ConfigurationService.SetConfigValue(LauncherConVar.Favorites, servers.ToArray());
-        Dirty?.Invoke();
    }

    private List<string> GetFavoriteEntries()
    {
-        return ConfigurationService.GetConfigValue(LauncherConVar.Favorites)?.ToList() ?? [];
+        return rawServerLists.ToList();
    }
-    
-    private void Initialise(){}
+
+    private void Initialise()
+    {
+        ConfigurationService.SubscribeVarChanged(LauncherConVar.Favorites, OnVarChanged, true);
+    }
+
+    private void OnVarChanged(string[]? value)
+    {
+        if (value == null)
+        {
+            rawServerLists = [];
+            Dirty?.Invoke();
+            return;
+        }
+
+        rawServerLists = value;
+        Dirty?.Invoke();
+    }
+
    private void InitialiseInDesignMode(){}
 }

--- a/Nebula.Launcher/Services/ExplorerService.cs
+++ b/Nebula.Launcher/Services/ExplorerService.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+using Nebula.Shared;
+
+namespace Nebula.Launcher.Services;
+
+
+public static class ExplorerHelper
+{
+    public static void OpenFolder(string path)
+    {
+        string command;
+
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            command = "explorer.exe";
+        else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+            command = "xdg-open";
+        else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+            command = "open";
+        else
+            throw new PlatformNotSupportedException("Unsupported OS platform");
+        
+
+        var startInfo = new ProcessStartInfo
+        {
+            FileName = command,
+            Arguments = path,
+            UseShellExecute = false
+        };
+
+        Process.Start(startInfo);
+    }
+}
--- a/Nebula.Launcher/ViewModels/Pages/ConfigurationViewModel.cs
+++ b/Nebula.Launcher/ViewModels/Pages/ConfigurationViewModel.cs
@@ -2,13 +2,15 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Diagnostics;
 using System.Globalization;
+using System.IO;
+using System.IO.Compression;
 using System.Linq;
 using System.Reflection;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Layout;
+using Nebula.Launcher.Services;
 using Nebula.Launcher.Views.Pages;
 using Nebula.Shared;
 using Nebula.Shared.Services;
@@ -22,6 +24,8 @@ public partial class ConfigurationViewModel : ViewModelBase
    public ObservableCollection<IConfigControl> ConfigurationVerbose { get; } = new();
    
    [GenerateProperty] private ConfigurationService ConfigurationService { get; } = default!;
+    [GenerateProperty] private PopupMessageService PopupService { get; } = default!;
+    [GenerateProperty] private FileService FileService { get; set; } = default!;

    public List<(object, Type)> ConVarList = new();

@@ -45,9 +49,40 @@ public partial class ConfigurationViewModel : ViewModelBase
            methodInfo.Invoke(ConfigurationService, [conVar.Item1, conVarControl.GetValue()]);
        }
    }
+
+    public void ResetConfig()
+    {
+        foreach (var conVar in ConVarList)
+        {
+            var methodInfo = ConfigurationService.GetType().GetMethod("SetConfigValue")!.MakeGenericMethod(conVar.Item2);
+            methodInfo.Invoke(ConfigurationService, [conVar.Item1, null]);
+        }
+        
+        ConVarList.Clear();
+        ConfigurationVerbose.Clear();
+
+        InitConfiguration();
+        
+        PopupService.Popup("Configuration has been reset.");
+    }
+
+    public void OpenDataFolder()
+    {
+        ExplorerHelper.OpenFolder(FileService.RootPath);
+    }
+
+    public void ExportLogs()
+    {
+        var logPath = Path.Join(FileService.RootPath, "log");
+        var path = Path.Combine(Path.GetTempPath(), "tempThink"+Path.GetRandomFileName());
+        Directory.CreateDirectory(path);
+        
+        ZipFile.CreateFromDirectory(logPath, Path.Join(path, DateTime.Now.ToString("yyyy-MM-dd") + ".zip"));
+        ExplorerHelper.OpenFolder(path);
+    }
    
-    protected override void InitialiseInDesignMode()
-    { 
+    private void InitConfiguration()
+    {
        AddCvarConf(LauncherConVar.ILSpyUrl);
        AddCvarConf(LauncherConVar.Hub);
        AddCvarConf(LauncherConVar.AuthServers);
@@ -55,10 +90,15 @@ public partial class ConfigurationViewModel : ViewModelBase
        AddCvarConf(CurrentConVar.RobustAssemblyName);
        AddCvarConf(CurrentConVar.ManifestDownloadProtocolVersion);
    }
+    
+    protected override void InitialiseInDesignMode()
+    {
+        InitConfiguration();
+    }

    protected override void Initialise()
    {
-        InitialiseInDesignMode();
+        InitConfiguration();
    }
 }

@@ -103,31 +143,34 @@ public static class ConfigControlHelper{
    }
 }

-public sealed class ComplexUnitConfigControl : StackPanel, IConfigControl
+public sealed class ComplexUnitConfigControl : Border, IConfigControl
 {
-    private List<(PropertyInfo, IConfigControl)> _units = [];
+    private readonly List<(PropertyInfo, IConfigControl)> _units = [];
    
    private Type _objectType = typeof(object);
+
+    private readonly StackPanel _panel = new();
    
    public string ConfigName { get; }
    public bool Dirty => _units.Any(dirty => dirty.Item2.Dirty);

    public ComplexUnitConfigControl(string name, object obj)
    {
-        Orientation = Orientation.Vertical;
-        Margin = new Thickness(5);
-        Spacing = 2f;
+        Classes.Add("ConfigBorder");
+        _panel.Orientation = Orientation.Vertical;
+        _panel.Spacing = 4f;
        ConfigName = name;
+        Child = _panel;
        SetValue(obj);
    }

    public void SetValue(object value)
    {
        _units.Clear();
-        Children.Clear();
+        _panel.Children.Clear();
        _objectType = value.GetType();
        
-        Children.Add(new Label()
+        _panel.Children.Add(new Label()
        {
            Content = ConfigName
        });
@@ -141,7 +184,8 @@ public sealed class ComplexUnitConfigControl : StackPanel, IConfigControl

            var control = ConfigControlHelper.GetConfigControl(propInfo.Name, propValue);
            
-            Children.Add(control as Control);
+            ((Control)control).Margin = new Thickness(5);
+            _panel.Children.Add((Control)control);
            _units.Add((propInfo,control));
        }
    }
@@ -158,48 +202,51 @@ public sealed class ComplexUnitConfigControl : StackPanel, IConfigControl
    }
 }

-public sealed class ArrayUnitConfigControl : StackPanel, IConfigControl
+public sealed class ArrayUnitConfigControl : Border, IConfigControl
 {
    private readonly List<IConfigControl> _itemControls = [];
    private readonly StackPanel _itemsPanel = new StackPanel() { Orientation = Orientation.Vertical };
-    private readonly Button _addButton = new Button() { Content = "Add Item" };
-    private int oldCount;
+    private readonly Button _addButton = new Button() { Content = "Add Item", Classes = { "ConfigBorder" }};
+    private readonly int _oldCount;
    private readonly Type _elementType;
+    private readonly StackPanel _panel = new();

    public string ConfigName { get; }
-    public bool Dirty => _itemControls.Any(dirty => dirty.Dirty) || _itemControls.Count != oldCount;
+    public bool Dirty => _itemControls.Any(dirty => dirty.Dirty) || _itemControls.Count != _oldCount;

    public ArrayUnitConfigControl(string name, object value)
    {
-        _elementType = value.GetType().GetElementType();
+        Classes.Add("ConfigBorder");
+        _elementType = value.GetType().GetElementType()!;
        
        ConfigName = name;
-        Orientation = Orientation.Vertical;
-        Margin = new Thickness(5);
-        Spacing = 2f;
+        _panel.Orientation = Orientation.Vertical;
+        _panel.Spacing = 4f;
+        _itemsPanel.Spacing = 4f;

-        Children.Add(new Label { Content = name });
-        Children.Add(_itemsPanel);
-        Children.Add(_addButton);
-
-        _addButton.Click += (_, _) => AddItem(ConfigControlHelper.CreateDefaultValue(_elementType));
+        _panel.Children.Add(new Label { Content = name });
+        _panel.Children.Add(_itemsPanel);
+        _panel.Children.Add(_addButton);

+        _addButton.Click += (_, _) => AddItem(ConfigControlHelper.CreateDefaultValue(_elementType)!);
+        Child = _panel; 
        SetValue(value);
-        oldCount = _itemControls.Count;
+        _oldCount = _itemControls.Count;
    }

    private void AddItem(object value)
    {
        var itemPanel = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 2 };
        var control = ConfigControlHelper.GetConfigControl(_itemControls.Count.ToString(), value);
-        var removeButton = new Button { Content = "Remove" };
+        var removeButton = new Button { Content = "Remove", Classes = { "ConfigBorder" }};

        removeButton.Click += (_, _) =>
        {
            _itemControls.Remove(control);
            _itemsPanel.Children.Remove(itemPanel);
        };
-
+        
+        ((Control)control).Margin = new Thickness(5);
        itemPanel.Children.Add((Control)control);
        itemPanel.Children.Add(removeButton);

@@ -242,37 +289,35 @@ public sealed class ArrayUnitConfigControl : StackPanel, IConfigControl
    }
 }

-public abstract class UnitConfigControl<T> : StackPanel, IConfigControl where T : notnull
+public abstract class UnitConfigControl<T> : Border, IConfigControl where T : notnull
 {
-    private readonly Label _nameLabel = new Label();
-    private readonly TextBox _valueLabel = new TextBox();
+    private readonly Label _nameLabel = new();
+    private readonly TextBox _valueLabel = new();
    private string _originalValue;
-    
-    public string ConfigName { get; private set;}
-   
-    public bool Dirty
-    {
-        get
-        {
-            return _originalValue != ConfigValue;
-        }
-    }

-    protected string? ConfigValue
+    private StackPanel _panel = new();
+    
+    public string ConfigName { get; }
+   
+    public bool Dirty => _originalValue != ConfigValue;
+
+    protected string ConfigValue
    {
-        get => _valueLabel.Text;
+        get => _valueLabel.Text ?? string.Empty;
        set => _valueLabel.Text = value;
    }

    public UnitConfigControl(string name, T value)
    {
+        Classes.Add("ConfigBorder");
        ConfigName = name;
-        Orientation = Orientation.Horizontal;
-        Children.Add(_nameLabel);
-        Children.Add(_valueLabel);
+        _panel.Orientation = Orientation.Horizontal;
+        _panel.Children.Add(_nameLabel);
+        _panel.Children.Add(_valueLabel);
        
        _nameLabel.Content = name;
        _nameLabel.VerticalAlignment = VerticalAlignment.Center;
+        Child = _panel;
        
        SetConfValue(value);
        _originalValue = ConfigValue;
@@ -302,7 +347,7 @@ public sealed class StringUnitConfigControl(string name, string value) : UnitCon

    public override string GetConfValue()
    {
-        return ConfigValue ?? string.Empty;
+        return ConfigValue;
    }
 }

@@ -315,8 +360,6 @@ public sealed class IntUnitConfigControl(string name, int value) : UnitConfigCon

    public override int GetConfValue()
    {
-        Debug.Assert(ConfigValue != null, nameof(ConfigValue) + " != null");
-        
        return int.Parse(ConfigValue);
    }
 }
@@ -333,8 +376,6 @@ public sealed class FloatUnitConfigControl(string name, float value) : UnitConfi

    public override float GetConfValue()
    {
-        Debug.Assert(ConfigValue != null, nameof(ConfigValue) + " != null");
-        
        return float.Parse(ConfigValue, CultureInfo);
    }
 }
--- a/Nebula.Launcher/ViewModels/Pages/ContentBrowserViewModel.cs
+++ b/Nebula.Launcher/ViewModels/Pages/ContentBrowserViewModel.cs
@@ -59,12 +59,7 @@ public sealed partial class ContentBrowserViewModel : ViewModelBase, IContentHol
        PopupService.Popup(loading);

        Task.Run(() => ContentService.Unpack(serverEntry.FileApi, myTempDir, loading));
-        var startInfo = new ProcessStartInfo(){
-            FileName = "explorer.exe",
-            Arguments = tmpDir,
-        };
-      
-        Process.Start(startInfo);
+        ExplorerHelper.OpenFolder(tmpDir);
    }

    public void OnGoEnter()
--- a/Nebula.Launcher/ViewModels/Pages/ServerOverviewModel.cs
+++ b/Nebula.Launcher/ViewModels/Pages/ServerOverviewModel.cs
@@ -57,9 +57,15 @@ public partial class ServerOverviewModel : ViewModelBase

    //real think
    protected override void Initialise()
+    {
+        ConfigurationService.SubscribeVarChanged(LauncherConVar.Hub, OnHubListChanged, true);
+    }
+
+    private void OnHubListChanged(ServerHubRecord[]? value)
    {
        var tempItems = new List<ServerListTabTemplate>();
-        foreach (var record in ConfigurationService.GetConfigValue(LauncherConVar.Hub) ?? [])
+        
+        foreach (var record in value ?? [])
        {
            tempItems.Add(new ServerListTabTemplate(ServiceProvider.GetService<HubServerListProvider>()!.With(record.MainUrl), record.Name));
        }
@@ -125,17 +131,32 @@ public partial class ServerOverviewModel : ViewModelBase
 public class ServerViewContainer
 {
    private readonly ViewHelperService _viewHelperService;
+    private List<string> favorites = [];

    public ServerViewContainer()
    {
        _viewHelperService = new ViewHelperService();
    }

-    public ServerViewContainer(ViewHelperService viewHelperService)
+    public ServerViewContainer(ViewHelperService viewHelperService, ConfigurationService configurationService)
    {
        _viewHelperService = viewHelperService;
+        configurationService.SubscribeVarChanged(LauncherConVar.Favorites, OnFavoritesChange, true);
    }
-    
+
+    private void OnFavoritesChange(string[]? value)
+    {
+        favorites = new List<string>(value ?? []);
+        
+        foreach (var favorite in favorites)
+        {
+            if (_entries.TryGetValue(favorite, out var entry))
+            {
+                entry.IsFavorite = true;
+            }
+        }
+    }
+
    private readonly Dictionary<string, ServerEntryModelView> _entries = new();
    
    public ICollection<ServerEntryModelView> Items => _entries.Values;
@@ -158,6 +179,8 @@ public class ServerViewContainer

            entry = _viewHelperService.GetViewModel<ServerEntryModelView>().WithData(url, serverStatus);
            
+            if(favorites.Contains(url.ToString())) entry.IsFavorite = true;
+            
            _entries.Add(url.ToString(), entry);
        }
        
--- a/Nebula.Launcher/ViewModels/ServerEntryModelView.cs
+++ b/Nebula.Launcher/ViewModels/ServerEntryModelView.cs
@@ -134,17 +134,10 @@ public partial class ServerEntryModelView : ViewModelBase, IFilterConsumer
            SetStatus(serverStatus!);
        else
            FetchStatus();
-        
-        IsFavorite = GetFavoriteEntries().Contains(Address.ToString());

        return this;
    }
-    
-    private List<string> GetFavoriteEntries()
-    {
-        return ConfigurationService.GetConfigValue(LauncherConVar.Favorites)?.ToList() ?? [];
-    }
-
+  
    private async void FetchStatus()
    {
        try
--- a/Nebula.Launcher/Views/Pages/ConfigurationView.axaml
+++ b/Nebula.Launcher/Views/Pages/ConfigurationView.axaml
@@ -21,14 +21,45 @@
                    </ItemsPanelTemplate>
                </ItemsControl.ItemsPanel>
            </ItemsControl>
-            <Button 
-                VerticalAlignment="Bottom" 
-                HorizontalAlignment="Stretch" 
-                Padding="5"
-                Margin="5"
-                Command="{Binding InvokeUpdateConfiguration}">
-                Save
-            </Button>
+            <StackPanel Orientation="Horizontal" Spacing="5">
+                <Button 
+                    Classes="ConfigBorder"
+                    VerticalAlignment="Bottom" 
+                    HorizontalAlignment="Stretch" 
+                    Padding="5"
+                    Margin="5"
+                    Command="{Binding InvokeUpdateConfiguration}">
+                    Save
+                </Button>
+                <Button 
+                    Classes="ConfigBorder"
+                    VerticalAlignment="Bottom" 
+                    HorizontalAlignment="Stretch" 
+                    Padding="5"
+                    Margin="5"
+                    Command="{Binding ResetConfig}">
+                    Reset to default
+                </Button>
+                <Button 
+                    Classes="ConfigBorder"
+                    VerticalAlignment="Bottom" 
+                    HorizontalAlignment="Stretch" 
+                    Padding="5"
+                    Margin="5"
+                    Command="{Binding OpenDataFolder}">
+                    Open Data path
+                </Button>
+                
+                <Button 
+                    Classes="ConfigBorder"
+                    VerticalAlignment="Bottom" 
+                    HorizontalAlignment="Stretch" 
+                    Padding="5"
+                    Margin="5"
+                    Command="{Binding ExportLogs}">
+                    Export logs
+                </Button>
+            </StackPanel>
        </StackPanel>
    </ScrollViewer>
 </UserControl>