From 65ec957c4c6b96668ff45463038901252aef6363 Mon Sep 17 00:00:00 2001 From: Isaac Marovitz Date: Fri, 19 Apr 2024 16:47:31 -0400 Subject: [PATCH] Migrate Network to SettingsNetworkViewModel --- .../Settings/SettingsNetworkViewModel.cs | 104 ++++++++++++++++++ .../ViewModels/Settings/SettingsViewModel.cs | 91 ++------------- .../Views/Settings/SettingsNetworkView.axaml | 4 +- .../Settings/SettingsNetworkView.axaml.cs | 4 + .../UI/Windows/SettingsWindow.axaml.cs | 5 +- 5 files changed, 120 insertions(+), 88 deletions(-) create mode 100644 src/Ryujinx/UI/ViewModels/Settings/SettingsNetworkViewModel.cs diff --git a/src/Ryujinx/UI/ViewModels/Settings/SettingsNetworkViewModel.cs b/src/Ryujinx/UI/ViewModels/Settings/SettingsNetworkViewModel.cs new file mode 100644 index 0000000000..372e6bd12c --- /dev/null +++ b/src/Ryujinx/UI/ViewModels/Settings/SettingsNetworkViewModel.cs @@ -0,0 +1,104 @@ +using Avalonia.Collections; +using Avalonia.Threading; +using Ryujinx.Ava.Common.Locale; +using Ryujinx.Common.Configuration.Multiplayer; +using Ryujinx.UI.Common.Configuration; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net.NetworkInformation; +using System.Threading.Tasks; + +namespace Ryujinx.Ava.UI.ViewModels.Settings +{ + public class SettingsNetworkViewModel : BaseModel + { + public event Action DirtyEvent; + + private readonly Dictionary _networkInterfaces = new(); + public AvaloniaList NetworkInterfaceList + { + get => new(_networkInterfaces.Keys); + } + + private bool _enableInternetAccess; + public bool EnableInternetAccess + { + get => _enableInternetAccess; + set + { + _enableInternetAccess = value; + DirtyEvent?.Invoke(); + } + } + + private int _networkInterfaceIndex; + public int NetworkInterfaceIndex + { + get => _networkInterfaceIndex; + set + { + _networkInterfaceIndex = value != -1 ? value : 0; + OnPropertyChanged(); + DirtyEvent?.Invoke(); + } + } + + private int _multiplayerModeIndex; + public int MultiplayerModeIndex + { + get => _multiplayerModeIndex; + set + { + _multiplayerModeIndex = value; + DirtyEvent?.Invoke(); + } + } + + public SettingsNetworkViewModel() + { + ConfigurationState config = ConfigurationState.Instance; + + Task.Run(PopulateNetworkInterfaces); + + // LAN interface index is loaded asynchronously in PopulateNetworkInterfaces() + EnableInternetAccess = config.System.EnableInternetAccess; + MultiplayerModeIndex = (int)config.Multiplayer.Mode.Value; + } + + private async Task PopulateNetworkInterfaces() + { + _networkInterfaces.Clear(); + _networkInterfaces.Add(LocaleManager.Instance[LocaleKeys.NetworkInterfaceDefault], "0"); + + foreach (NetworkInterface networkInterface in NetworkInterface.GetAllNetworkInterfaces()) + { + await Dispatcher.UIThread.InvokeAsync(() => + { + _networkInterfaces.Add(networkInterface.Name, networkInterface.Id); + }); + } + + // Network interface index needs to be loaded during the async method, or it will always return 0. + NetworkInterfaceIndex = _networkInterfaces.Values.ToList().IndexOf(ConfigurationState.Instance.Multiplayer.LanInterfaceId.Value); + } + + public bool CheckIfModified(ConfigurationState config) + { + bool isDirty = false; + + isDirty |= config.System.EnableInternetAccess.Value != EnableInternetAccess; + isDirty |= config.Multiplayer.LanInterfaceId.Value != _networkInterfaces[NetworkInterfaceList[NetworkInterfaceIndex]]; + isDirty |= config.Multiplayer.Mode.Value != (MultiplayerMode)MultiplayerModeIndex; + + return isDirty; + } + + public void Save(ConfigurationState config) + { + config.System.EnableInternetAccess.Value = EnableInternetAccess; + config.Multiplayer.LanInterfaceId.Value = _networkInterfaces[NetworkInterfaceList[NetworkInterfaceIndex]]; + config.Multiplayer.Mode.Value = (MultiplayerMode)MultiplayerModeIndex; + } + } +} diff --git a/src/Ryujinx/UI/ViewModels/Settings/SettingsViewModel.cs b/src/Ryujinx/UI/ViewModels/Settings/SettingsViewModel.cs index d089735f3d..111d3c084c 100644 --- a/src/Ryujinx/UI/ViewModels/Settings/SettingsViewModel.cs +++ b/src/Ryujinx/UI/ViewModels/Settings/SettingsViewModel.cs @@ -25,13 +25,8 @@ namespace Ryujinx.Ava.UI.ViewModels.Settings private TimeZoneContentManager _timeZoneContentManager; private readonly List _validTzRegions; - - private readonly Dictionary _networkInterfaces; - private bool _directoryChanged; - private int _networkInterfaceIndex; - private int _multiplayerModeIndex; private bool _isModified; @@ -117,17 +112,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Settings } } - private bool _enableInternetAccess; - public bool EnableInternetAccess - { - get => _enableInternetAccess; - set - { - _enableInternetAccess = value; - CheckIfModified(); - } - } - private bool _enableFsIntegrityChecks; public bool EnableFsIntegrityChecks { @@ -172,6 +156,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Settings private readonly SettingsHotkeysViewModel _hotkeysViewModel; private readonly SettingsInputViewModel _inputViewModel; private readonly SettingsLoggingViewModel _loggingViewModel; + private readonly SettingsNetworkViewModel _networkViewModel; public DateTimeOffset CurrentDate { get; set; } public TimeSpan CurrentTime { get; set; } @@ -179,31 +164,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Settings internal AvaloniaList TimeZones { get; set; } public AvaloniaList GameDirectories { get; set; } - public AvaloniaList NetworkInterfaceList - { - get => new(_networkInterfaces.Keys); - } - - public int NetworkInterfaceIndex - { - get => _networkInterfaceIndex; - set - { - _networkInterfaceIndex = value != -1 ? value : 0; - ConfigurationState.Instance.Multiplayer.LanInterfaceId.Value = _networkInterfaces[NetworkInterfaceList[_networkInterfaceIndex]]; - } - } - - public int MultiplayerModeIndex - { - get => _multiplayerModeIndex; - set - { - _multiplayerModeIndex = value; - ConfigurationState.Instance.Multiplayer.Mode.Value = (MultiplayerMode)_multiplayerModeIndex; - } - } - public SettingsViewModel( VirtualFileSystem virtualFileSystem, ContentManager contentManager, @@ -212,7 +172,8 @@ namespace Ryujinx.Ava.UI.ViewModels.Settings SettingsGraphicsViewModel graphicsViewModel, SettingsHotkeysViewModel hotkeysViewModel, SettingsInputViewModel inputViewModel, - SettingsLoggingViewModel loggingViewModel) : this() + SettingsLoggingViewModel loggingViewModel, + SettingsNetworkViewModel networkViewModel) : this() { _virtualFileSystem = virtualFileSystem; _contentManager = contentManager; @@ -223,6 +184,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Settings _hotkeysViewModel = hotkeysViewModel; _inputViewModel = inputViewModel; _loggingViewModel = loggingViewModel; + _networkViewModel = networkViewModel; _audioViewModel.DirtyEvent += CheckIfModified; _cpuViewModel.DirtyEvent += CheckIfModified; @@ -230,6 +192,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Settings _hotkeysViewModel.DirtyEvent += CheckIfModified; _inputViewModel.DirtyEvent += CheckIfModified; _loggingViewModel.DirtyEvent += CheckIfModified; + _networkViewModel.DirtyEvent += CheckIfModified; if (Program.PreviewerDetached) { @@ -242,9 +205,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Settings GameDirectories = new AvaloniaList(); TimeZones = new AvaloniaList(); _validTzRegions = new List(); - _networkInterfaces = new Dictionary(); - - Task.Run(PopulateNetworkInterfaces); if (Program.PreviewerDetached) { @@ -291,14 +251,8 @@ namespace Ryujinx.Ava.UI.ViewModels.Settings isDirty |= _hotkeysViewModel?.CheckIfModified(config) ?? false; // TODO: IMPLEMENT THIS!! // isDirty |= _inputViewModel?.CheckIfModified(config) ?? false; - - // Network - isDirty |= config.System.EnableInternetAccess.Value != EnableInternetAccess; - isDirty |= _loggingViewModel?.CheckIfModified(config) ?? false; - - isDirty |= config.Multiplayer.LanInterfaceId.Value != _networkInterfaces[NetworkInterfaceList[NetworkInterfaceIndex]]; - isDirty |= config.Multiplayer.Mode.Value != (MultiplayerMode)MultiplayerModeIndex; + isDirty |= _networkViewModel?.CheckIfModified(config) ?? false; IsModified = isDirty; } @@ -327,25 +281,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Settings Dispatcher.UIThread.Post(() => OnPropertyChanged(nameof(TimeZone))); } - private async Task PopulateNetworkInterfaces() - { - _networkInterfaces.Clear(); - _networkInterfaces.Add(LocaleManager.Instance[LocaleKeys.NetworkInterfaceDefault], "0"); - - foreach (NetworkInterface networkInterface in NetworkInterface.GetAllNetworkInterfaces()) - { - await Dispatcher.UIThread.InvokeAsync(() => - { - _networkInterfaces.Add(networkInterface.Name, networkInterface.Id); - }); - } - - // Network interface index needs to be loaded during the async method or it will always return 0. - NetworkInterfaceIndex = _networkInterfaces.Values.ToList().IndexOf(ConfigurationState.Instance.Multiplayer.LanInterfaceId.Value); - - Dispatcher.UIThread.Post(() => OnPropertyChanged(nameof(NetworkInterfaceIndex))); - } - public void ValidateAndSetTimeZone(string location) { if (_validTzRegions.Contains(location)) @@ -383,12 +318,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Settings EnableFsIntegrityChecks = config.System.EnableFsIntegrityChecks; ExpandDramSize = config.System.ExpandRam; IgnoreMissingServices = config.System.IgnoreMissingServices; - - // Network - EnableInternetAccess = config.System.EnableInternetAccess; - // LAN interface index is loaded asynchronously in PopulateNetworkInterfaces() - - MultiplayerModeIndex = (int)config.Multiplayer.Mode.Value; } public void SaveSettings() @@ -430,14 +359,8 @@ namespace Ryujinx.Ava.UI.ViewModels.Settings _graphicsViewModel?.Save(config); _hotkeysViewModel?.Save(config); _inputViewModel?.Save(config); - - // Network - config.System.EnableInternetAccess.Value = EnableInternetAccess; - _loggingViewModel?.Save(config); - - config.Multiplayer.LanInterfaceId.Value = _networkInterfaces[NetworkInterfaceList[NetworkInterfaceIndex]]; - config.Multiplayer.Mode.Value = (MultiplayerMode)MultiplayerModeIndex; + _networkViewModel?.Save(config); config.ToFileFormat().SaveConfig(Program.ConfigurationPath); diff --git a/src/Ryujinx/UI/Views/Settings/SettingsNetworkView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsNetworkView.axaml index 15dbf53ff3..80c04c22f9 100644 --- a/src/Ryujinx/UI/Views/Settings/SettingsNetworkView.axaml +++ b/src/Ryujinx/UI/Views/Settings/SettingsNetworkView.axaml @@ -7,9 +7,9 @@ xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale" xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels.Settings" mc:Ignorable="d" - x:DataType="viewModels:SettingsViewModel"> + x:DataType="viewModels:SettingsNetworkViewModel"> - +