NebulaTeam/NebulaLauncher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- add: some logging think

Browse Source
This commit is contained in:
Cinka
2025-05-05 22:01:59 +03:00
parent 86eeae9a8b
commit 1e1ca47c42
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/.idea.Nebula/.idea/avalonia.xml generated
View File

@@ -8,6 +8,8 @@
<entry key="Nebula.Launcher/Assets/Icons.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" /> <entry key="Nebula.Launcher/Assets/Icons.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
<entry key="Nebula.Launcher/Assets/Resources.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" /> <entry key="Nebula.Launcher/Assets/Resources.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
<entry key="Nebula.Launcher/Assets/Style.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" /> <entry key="Nebula.Launcher/Assets/Style.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
<entry key="Nebula.Launcher/MessageBox/MessageView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
<entry key="Nebula.Launcher/MessageBox/MessageWindow.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
<entry key="Nebula.Launcher/ViewModels/Styles1.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" /> <entry key="Nebula.Launcher/ViewModels/Styles1.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
<entry key="Nebula.Launcher/Views/Controls/PlayerContainerControl.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" /> <entry key="Nebula.Launcher/Views/Controls/PlayerContainerControl.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
<entry key="Nebula.Launcher/Views/Controls/ServerContainerControl.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" /> <entry key="Nebula.Launcher/Views/Controls/ServerContainerControl.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />

8
Nebula.Launcher/ViewModels/Pages/AccountInfoViewModel.cs
View File

@@ -12,6 +12,7 @@ using Nebula.Launcher.ViewModels.Popup;
using Nebula.Launcher.Views.Pages; using Nebula.Launcher.Views.Pages;
using Nebula.Shared; using Nebula.Shared;
using Nebula.Shared.Services; using Nebula.Shared.Services;
using Nebula.Shared.Services.Logging;
using Nebula.Shared.Utils; using Nebula.Shared.Utils;
namespace Nebula.Launcher.ViewModels.Pages; namespace Nebula.Launcher.ViewModels.Pages;
@@ -37,6 +38,7 @@ public partial class AccountInfoViewModel : ViewModelBase, IViewModelPage
private bool _isProfilesEmpty; private bool _isProfilesEmpty;
[GenerateProperty] private PopupMessageService PopupMessageService { get; } = default!; [GenerateProperty] private PopupMessageService PopupMessageService { get; } = default!;
[GenerateProperty] private ConfigurationService ConfigurationService { get; } = default!; [GenerateProperty] private ConfigurationService ConfigurationService { get; } = default!;
[GenerateProperty] private DebugService DebugService { get; }
[GenerateProperty] private AuthService AuthService { get; } = default!; [GenerateProperty] private AuthService AuthService { get; } = default!;
[GenerateProperty, DesignConstruct] private ViewHelperService ViewHelperService { get; } = default!; [GenerateProperty, DesignConstruct] private ViewHelperService ViewHelperService { get; } = default!;
@@ -45,6 +47,8 @@ public partial class AccountInfoViewModel : ViewModelBase, IViewModelPage
[ObservableProperty] private AuthServerCredentials _authItemSelect; [ObservableProperty] private AuthServerCredentials _authItemSelect;
private ILogger _logger;
//Design think //Design think
protected override void InitialiseInDesignMode() protected override void InitialiseInDesignMode()
{ {
@@ -57,6 +61,7 @@ public partial class AccountInfoViewModel : ViewModelBase, IViewModelPage
//Real think //Real think
protected override void Initialise() protected override void Initialise()
{ {
_logger = DebugService.GetLogger(this);
ReadAuthConfig(); ReadAuthConfig();
} }
@@ -121,7 +126,6 @@ public partial class AccountInfoViewModel : ViewModelBase, IViewModelPage
} }
catch (AuthException e) catch (AuthException e)
{ {
switch (e.Error.Code) switch (e.Error.Code)
{ {
case AuthenticateDenyCode.TfaRequired: case AuthenticateDenyCode.TfaRequired:
@@ -129,9 +133,11 @@ public partial class AccountInfoViewModel : ViewModelBase, IViewModelPage
var p = ViewHelperService.GetViewModel<TfaViewModel>(); var p = ViewHelperService.GetViewModel<TfaViewModel>();
p.OnTfaEntered += OnTfaEntered; p.OnTfaEntered += OnTfaEntered;
PopupMessageService.Popup(p); PopupMessageService.Popup(p);
_logger.Log("TFA required");
break; break;
case AuthenticateDenyCode.InvalidCredentials: case AuthenticateDenyCode.InvalidCredentials:
PopupMessageService.Popup("Invalid Credentials!"); PopupMessageService.Popup("Invalid Credentials!");
_logger.Error($"Invalid credentials");
break; break;
default: default:
throw; throw;

7
Nebula.Launcher/ViewModels/ServerEntryModelView.cs
View File

@@ -160,7 +160,6 @@ public partial class ServerEntryModelView : ViewModelBase
MainViewModel.RequirePage<ContentBrowserViewModel>().Go(Address.ToString(), new ContentPath()); MainViewModel.RequirePage<ContentBrowserViewModel>().Go(Address.ToString(), new ContentPath());
} }
public void ToggleFavorites() public void ToggleFavorites()
{ {
OnFavoriteToggle?.Invoke(); OnFavoriteToggle?.Invoke();
@@ -228,9 +227,11 @@ public partial class ServerEntryModelView : ViewModelBase
Process.Exited += OnExited; Process.Exited += OnExited;
} }
catch (TaskCanceledException) catch (TaskCanceledException e)
{ {
PopupMessageService.Popup("Task canceled"); PopupMessageService.Popup("Task canceled: " + e.Message);
_logger.Error("Task canceled");
_logger.Error(e);
} }
catch (Exception e) catch (Exception e)
{ {