Skip to content

Commit

Permalink
Merge pull request #2649 from wabbajack-tools/2648-relog-bug-fix
Browse files Browse the repository at this point in the history 
2648 relog bug fix
  • Loading branch information
@EzioTheDeadPoet
EzioTheDeadPoet authored Nov 23, 2024
2 parents 6a4b7b6 + c0243b8 commit 6c67295
Show file tree
Hide file tree
Showing 5 changed files with 89 additions and 57 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
### Changelog

#### Version - 3.7.5.0 - TBD
* Fix for Wabbajack trying to work with an expired OAuth token.
* Added pre-compile login check.

#### Version - 3.7.4.1 - 11/21/2024
* Add support for the upcoming Nexus game ID change (thanks to [@JonathanFeenstra](https://github.com/JonathanFeenstra))
* Wabbajack will now put modfile Titles, Description and Version into the `.meta` file.
Expand Down
22 changes: 14 additions & 8 deletions Wabbajack.App.Wpf/LoginManagers/NexusLoginManager.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;
using System.Reactive.Disposables;
using System.Reactive.Linq;
using System.Threading.Tasks;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
Expand All @@ -10,7 +10,6 @@
using ReactiveUI.Fody.Helpers;
using Wabbajack.Downloaders;
using Wabbajack.DTOs.Logins;
using Wabbajack.Messages;
using Wabbajack.Networking.Http.Interfaces;
using Wabbajack.UserIntervention;

Expand Down Expand Up @@ -40,13 +39,12 @@ public NexusLoginManager(ILogger<NexusLoginManager> logger, ITokenProvider<Nexus
_logger = logger;
_token = token;
_serviceProvider = serviceProvider;
RefreshTokenState();
Task.Run(async () => await RefreshTokenState());

ClearLogin = ReactiveCommand.CreateFromTask(async () =>
{
_logger.LogInformation("Deleting Login information for {SiteName}", SiteName);
await _token.Delete();
RefreshTokenState();
await ClearLoginToken();
}, this.WhenAnyValue(v => v.HaveLogin));

Icon = BitmapFrame.Create(
Expand All @@ -60,17 +58,25 @@ public NexusLoginManager(ILogger<NexusLoginManager> logger, ITokenProvider<Nexus
}, this.WhenAnyValue(v => v.HaveLogin).Select(v => !v));
}

private async Task ClearLoginToken()
{
await _token.Delete();
await RefreshTokenState();
}

private void StartLogin()
{
var view = new BrowserWindow(_serviceProvider);
view.Closed += (sender, args) => { RefreshTokenState(); };
view.Closed += async (sender, args) => { await RefreshTokenState(); };
var provider = _serviceProvider.GetRequiredService<NexusLoginHandler>();
view.DataContext = provider;
view.Show();
}

private void RefreshTokenState()
private async Task RefreshTokenState()
{
HaveLogin = _token.HaveToken();
var token = await _token.Get();

HaveLogin = _token.HaveToken() && !(token?.OAuth?.IsExpired ?? true);
}
}
109 changes: 63 additions & 46 deletions Wabbajack.App.Wpf/View Models/Compilers/CompilerVM.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,11 @@
using Wabbajack.Common;
using Wabbajack.Compiler;
using Wabbajack.DTOs;
using Wabbajack.DTOs.DownloadStates;
using Wabbajack.DTOs.JsonConverters;
using Wabbajack.Extensions;
using Wabbajack.Installer;
using Wabbajack.LoginManagers;
using Wabbajack.Models;
using Wabbajack.Networking.WabbajackClientApi;
using Wabbajack.Paths;
Expand All @@ -31,15 +33,14 @@

namespace Wabbajack
{


public enum CompilerState
{
Configuration,
Compiling,
Completed,
Errored
}

public class CompilerVM : BackNavigatingVM, ICpuStatusVM
{
private const string LastSavedCompilerSettings = "last-saved-compiler-settings";
Expand All @@ -49,24 +50,23 @@ public class CompilerVM : BackNavigatingVM, ICpuStatusVM
private readonly ILogger<CompilerVM> _logger;
private readonly ResourceMonitor _resourceMonitor;
private readonly CompilerSettingsInferencer _inferencer;
private readonly IEnumerable<INeedsLogin> _logins;
private readonly Client _wjClient;

[Reactive] public string StatusText { get; set; }
[Reactive] public Percent StatusProgress { get; set; }

[Reactive]
public CompilerState State { get; set; }

[Reactive]
public MO2CompilerVM SubCompilerVM { get; set; }

[Reactive] public CompilerState State { get; set; }

[Reactive] public MO2CompilerVM SubCompilerVM { get; set; }

// Paths
public FilePickerVM ModlistLocation { get; }
public FilePickerVM DownloadLocation { get; }
public FilePickerVM OutputLocation { get; }

// Modlist Settings

[Reactive] public string ModListName { get; set; }
[Reactive] public string Version { get; set; }
[Reactive] public string Author { get; set; }
Expand All @@ -87,26 +87,25 @@ public class CompilerVM : BackNavigatingVM, ICpuStatusVM
[Reactive] public RelativePath[] NoMatchInclude { get; set; } = Array.Empty<RelativePath>();
[Reactive] public RelativePath[] Include { get; set; } = Array.Empty<RelativePath>();
[Reactive] public RelativePath[] Ignore { get; set; } = Array.Empty<RelativePath>();

[Reactive] public string[] OtherProfiles { get; set; } = Array.Empty<string>();

[Reactive] public AbsolutePath Source { get; set; }

public AbsolutePath SettingsOutputLocation => Source.Combine(ModListName).WithExtension(Ext.CompilerSettings);


public ReactiveCommand<Unit, Unit> ExecuteCommand { get; }
public ReactiveCommand<Unit, Unit> ReInferSettingsCommand { get; set; }

public LogStream LoggerProvider { get; }
public ReadOnlyObservableCollection<CPUDisplayVM> StatusList => _resourceMonitor.Tasks;

[Reactive]
public ErrorResponse ErrorState { get; private set; }


[Reactive] public ErrorResponse ErrorState { get; private set; }

public CompilerVM(ILogger<CompilerVM> logger, DTOSerializer dtos, SettingsManager settingsManager,
IServiceProvider serviceProvider, LogStream loggerProvider, ResourceMonitor resourceMonitor,
CompilerSettingsInferencer inferencer, Client wjClient) : base(logger)
IServiceProvider serviceProvider, LogStream loggerProvider, ResourceMonitor resourceMonitor,
CompilerSettingsInferencer inferencer, Client wjClient, IEnumerable<INeedsLogin> logins) : base(logger)
{
_logger = logger;
_dtos = dtos;
Expand All @@ -116,6 +115,7 @@ public CompilerVM(ILogger<CompilerVM> logger, DTOSerializer dtos, SettingsManage
_resourceMonitor = resourceMonitor;
_inferencer = inferencer;
_wjClient = wjClient;
_logins = logins;

StatusText = "Compiler Settings";
StatusProgress = Percent.Zero;
Expand All @@ -126,7 +126,7 @@ public CompilerVM(ILogger<CompilerVM> logger, DTOSerializer dtos, SettingsManage
await SaveSettingsFile();
NavigateToGlobal.Send(NavigateToGlobal.ScreenType.ModeSelectionView);
});

SubCompilerVM = new MO2CompilerVM(this);

ExecuteCommand = ReactiveCommand.CreateFromTask(async () => await StartCompilation());
Expand All @@ -152,21 +152,21 @@ public CompilerVM(ILogger<CompilerVM> logger, DTOSerializer dtos, SettingsManage
PathType = FilePickerVM.PathTypeOptions.Folder,
PromptTitle = "Location where the downloads for this list are stored"
};

OutputLocation = new FilePickerVM
{
ExistCheckOption = FilePickerVM.CheckOptions.Off,
PathType = FilePickerVM.PathTypeOptions.Folder,
PromptTitle = "Location where the compiled modlist will be stored"
};

ModlistLocation.Filters.AddRange(new []
ModlistLocation.Filters.AddRange(new[]
{
new CommonFileDialogFilter("MO2 Modlist", "*" + Ext.Txt),
new CommonFileDialogFilter("Compiler Settings File", "*" + Ext.CompilerSettings)
});


this.WhenActivated(disposables =>
{
State = CompilerState.Configuration;
Expand All @@ -188,13 +188,12 @@ public CompilerVM(ILogger<CompilerVM> logger, DTOSerializer dtos, SettingsManage
.Select(_ => Validate())
.BindToStrict(this, vm => vm.ErrorState)
.DisposeWith(disposables);
LoadLastSavedSettings().FireAndForget();
});
}



private async Task ReInferSettings()
{
var newSettings = await _inferencer.InferModListFromLocation(
Expand All @@ -205,7 +204,7 @@ private async Task ReInferSettings()
_logger.LogError("Cannot infer settings");
return;
}

Include = newSettings.Include;
Ignore = newSettings.Ignore;
AlwaysEnabled = newSettings.AlwaysEnabled;
Expand Down Expand Up @@ -252,7 +251,7 @@ private async Task InferModListFromLocation(AbsolutePath path)
Website = settings.ModListWebsite?.ToString() ?? "";
Readme = settings.ModListReadme?.ToString() ?? "";
IsNSFW = settings.ModlistIsNSFW;

Source = settings.Source;
DownloadLocation.TargetPath = settings.Downloads;
if (settings.OutputFile.Extension == Ext.Wabbajack)
Expand Down Expand Up @@ -280,11 +279,28 @@ private async Task StartCompilation()
{
try
{
await SaveSettingsFile();
var token = CancellationToken.None;
State = CompilerState.Compiling;
var downloadStateNexus = new Nexus();
var manager = _logins
.FirstOrDefault(l => l.LoginFor() == downloadStateNexus.GetType());
if (manager == null)
{
_logger.LogError("Cannot compile, could not prepare {Name} for verifying",
downloadStateNexus.GetType().Name);
throw new Exception($"No way to prepare {downloadStateNexus}");
}
RxApp.MainThreadScheduler.Schedule(manager, (_, _) =>
{
manager.TriggerLogin.Execute(null);
return Disposable.Empty;
});
var mo2Settings = GetSettings();
mo2Settings.UseGamePaths = true;
if (mo2Settings.OutputFile.DirectoryExists())
Expand Down Expand Up @@ -326,20 +342,21 @@ private async Task StartCompilation()
{
_logger.LogInformation("Publishing List");
var downloadMetadata = _dtos.Deserialize<DownloadMetadata>(
await mo2Settings.OutputFile.WithExtension(Ext.Meta).WithExtension(Ext.Json).ReadAllTextAsync())!;
await _wjClient.PublishModlist(MachineUrl, System.Version.Parse(Version), mo2Settings.OutputFile, downloadMetadata);
await mo2Settings.OutputFile.WithExtension(Ext.Meta).WithExtension(Ext.Json)
.ReadAllTextAsync())!;
await _wjClient.PublishModlist(MachineUrl, System.Version.Parse(Version),
mo2Settings.OutputFile, downloadMetadata);
}
_logger.LogInformation("Compiler Finished");
RxApp.MainThreadScheduler.Schedule(_logger, (_, _) =>
{
StatusText = "Compilation Completed";
StatusProgress = Percent.Zero;
State = CompilerState.Completed;
return Disposable.Empty;
return Disposable.Empty;
});
}
catch (Exception ex)
{
Expand Down Expand Up @@ -388,17 +405,17 @@ private async Task SaveSettingsFile()
private async Task LoadLastSavedSettings()
{
var lastPath = await _settingsManager.Load<AbsolutePath>(LastSavedCompilerSettings);
if (lastPath == default || !lastPath.FileExists() || lastPath.FileName.Extension != Ext.CompilerSettings) return;
if (lastPath == default || !lastPath.FileExists() ||
lastPath.FileName.Extension != Ext.CompilerSettings) return;
ModlistLocation.TargetPath = lastPath;
}


private CompilerSettings GetSettings()
{

System.Version.TryParse(Version, out var pversion);
Uri.TryCreate(Website, UriKind.Absolute, out var websiteUri);

return new CompilerSettings
{
ModListName = ModListName,
Expand Down Expand Up @@ -436,7 +453,7 @@ public void RemoveProfile(string profile)
{
OtherProfiles = OtherProfiles.Where(p => p != profile).ToArray();
}

public void AddAlwaysEnabled(RelativePath path)
{
AlwaysEnabled = (AlwaysEnabled ?? Array.Empty<RelativePath>()).Append(path).Distinct().ToArray();
Expand All @@ -446,7 +463,7 @@ public void RemoveAlwaysEnabled(RelativePath path)
{
AlwaysEnabled = AlwaysEnabled.Where(p => p != path).ToArray();
}

public void AddNoMatchInclude(RelativePath path)
{
NoMatchInclude = (NoMatchInclude ?? Array.Empty<RelativePath>()).Append(path).Distinct().ToArray();
Expand All @@ -456,7 +473,7 @@ public void RemoveNoMatchInclude(RelativePath path)
{
NoMatchInclude = NoMatchInclude.Where(p => p != path).ToArray();
}

public void AddInclude(RelativePath path)
{
Include = (Include ?? Array.Empty<RelativePath>()).Append(path).Distinct().ToArray();
Expand All @@ -467,7 +484,7 @@ public void RemoveInclude(RelativePath path)
Include = Include.Where(p => p != path).ToArray();
}


public void AddIgnore(RelativePath path)
{
Ignore = (Ignore ?? Array.Empty<RelativePath>()).Append(path).Distinct().ToArray();
Expand All @@ -480,4 +497,4 @@ public void RemoveIgnore(RelativePath path)

#endregion
}
}
}
5 changes: 3 additions & 2 deletions Wabbajack.App.Wpf/Views/MainWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ public partial class MainWindow : MetroWindow

private ObservableCollection<ViewModel> TabVMs = new ObservableCollectionExtended<ViewModel>();

public MainWindow(ILogger<MainWindow> logger, SystemParametersConstructor systemParams, LauncherUpdater updater, MainWindowVM vm)
public MainWindow(ILogger<MainWindow> logger, SystemParametersConstructor systemParams, LauncherUpdater updater
, MainWindowVM vm)
{
InitializeComponent();
_mwvm = vm;
Expand Down Expand Up @@ -122,7 +123,7 @@ public MainWindow(ILogger<MainWindow> logger, SystemParametersConstructor system
.ObserveOn(RxApp.MainThreadScheduler)
.Select(v => v == InstallState.Installing ? Visibility.Collapsed : Visibility.Visible)
.BindTo(this, view => view.SettingsButton.Visibility);

}
catch (Exception ex)
{
Expand Down
Loading

0 comments on commit 6c67295

Please sign in to comment.