mirror of
https://github.com/wabbajack-tools/wabbajack.git
synced 2024-08-30 18:42:17 +00:00
2.5.3.26
This commit is contained in:
parent
175677a033
commit
d0709ffda0
@ -1,5 +1,9 @@
|
|||||||
### Changelog
|
### Changelog
|
||||||
|
|
||||||
|
#### Version - 2.5.3.26 - 8/4/2022
|
||||||
|
* Use the new VectorPlexis domain
|
||||||
|
* Use the new LoversLab API domain
|
||||||
|
|
||||||
#### Version - 2.5.3.25 - 6/29/2022
|
#### Version - 2.5.3.25 - 6/29/2022
|
||||||
* Correctly modify Witcher 3 settings to the game accepts the values
|
* Correctly modify Witcher 3 settings to the game accepts the values
|
||||||
|
|
||||||
|
@ -13,6 +13,7 @@ using System.Text.Json;
|
|||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using System.Windows.Media;
|
using System.Windows.Media;
|
||||||
|
using System.Windows.Threading;
|
||||||
using DynamicData;
|
using DynamicData;
|
||||||
using Microsoft.WindowsAPICodePack.Dialogs;
|
using Microsoft.WindowsAPICodePack.Dialogs;
|
||||||
using ReactiveUI.Fody.Helpers;
|
using ReactiveUI.Fody.Helpers;
|
||||||
@ -24,6 +25,7 @@ using Wabbajack.Models;
|
|||||||
using Wabbajack.Networking.WabbajackClientApi;
|
using Wabbajack.Networking.WabbajackClientApi;
|
||||||
using Wabbajack.Paths;
|
using Wabbajack.Paths;
|
||||||
using Wabbajack.Paths.IO;
|
using Wabbajack.Paths.IO;
|
||||||
|
using Wabbajack.RateLimiter;
|
||||||
using Wabbajack.Services.OSIntegrated;
|
using Wabbajack.Services.OSIntegrated;
|
||||||
|
|
||||||
namespace Wabbajack
|
namespace Wabbajack
|
||||||
@ -47,6 +49,9 @@ namespace Wabbajack
|
|||||||
private readonly ResourceMonitor _resourceMonitor;
|
private readonly ResourceMonitor _resourceMonitor;
|
||||||
private readonly CompilerSettingsInferencer _inferencer;
|
private readonly CompilerSettingsInferencer _inferencer;
|
||||||
private readonly Client _wjClient;
|
private readonly Client _wjClient;
|
||||||
|
|
||||||
|
[Reactive] public string StatusText { get; set; }
|
||||||
|
[Reactive] public Percent StatusProgress { get; set; }
|
||||||
|
|
||||||
[Reactive]
|
[Reactive]
|
||||||
public CompilerState State { get; set; }
|
public CompilerState State { get; set; }
|
||||||
@ -109,6 +114,9 @@ namespace Wabbajack
|
|||||||
_inferencer = inferencer;
|
_inferencer = inferencer;
|
||||||
_wjClient = wjClient;
|
_wjClient = wjClient;
|
||||||
|
|
||||||
|
StatusText = "Compiler Settings";
|
||||||
|
StatusProgress = Percent.Zero;
|
||||||
|
|
||||||
BackCommand =
|
BackCommand =
|
||||||
ReactiveCommand.CreateFromTask(async () =>
|
ReactiveCommand.CreateFromTask(async () =>
|
||||||
{
|
{
|
||||||
@ -241,6 +249,16 @@ namespace Wabbajack
|
|||||||
|
|
||||||
var compiler = MO2Compiler.Create(_serviceProvider, mo2Settings);
|
var compiler = MO2Compiler.Create(_serviceProvider, mo2Settings);
|
||||||
|
|
||||||
|
compiler.OnStatusUpdate += (sender, update) =>
|
||||||
|
{
|
||||||
|
RxApp.MainThreadScheduler.Schedule(update, (scheduler, update) =>
|
||||||
|
{
|
||||||
|
StatusText = update.StatusText;
|
||||||
|
StatusProgress = update.StepsProgress;
|
||||||
|
return Disposable.Empty;
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
await compiler.Begin(token);
|
await compiler.Begin(token);
|
||||||
|
|
||||||
if (PublishUpdate)
|
if (PublishUpdate)
|
||||||
@ -256,6 +274,10 @@ namespace Wabbajack
|
|||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
StatusText = "Compilation Failed";
|
||||||
|
StatusProgress = Percent.Zero;
|
||||||
|
|
||||||
|
|
||||||
State = CompilerState.Errored;
|
State = CompilerState.Errored;
|
||||||
_logger.LogInformation(ex, "Failed Compilation : {Message}", ex.Message);
|
_logger.LogInformation(ex, "Failed Compilation : {Message}", ex.Message);
|
||||||
}
|
}
|
||||||
|
@ -154,6 +154,18 @@ namespace Wabbajack
|
|||||||
this.Bind(ViewModel, vm => vm.MachineUrl, view => view.MachineUrl.Text)
|
this.Bind(ViewModel, vm => vm.MachineUrl, view => view.MachineUrl.Text)
|
||||||
.DisposeWith(disposables);
|
.DisposeWith(disposables);
|
||||||
|
|
||||||
|
this.Bind(ViewModel, vm => vm.StatusText, view => view.TopProgressBar.Title)
|
||||||
|
.DisposeWith(disposables);
|
||||||
|
|
||||||
|
ViewModel.WhenAnyValue(vm => vm.StatusText)
|
||||||
|
.BindToStrict(this, view => view.TopProgressBar.Title)
|
||||||
|
.DisposeWith(disposables);
|
||||||
|
|
||||||
|
ViewModel.WhenAnyValue(vm => vm.StatusProgress)
|
||||||
|
.Select(d => d.Value)
|
||||||
|
.BindToStrict(this, view => view.TopProgressBar.ProgressPercent)
|
||||||
|
.DisposeWith(disposables);
|
||||||
|
|
||||||
ViewModel.WhenAnyValue(vm => vm.AlwaysEnabled)
|
ViewModel.WhenAnyValue(vm => vm.AlwaysEnabled)
|
||||||
.WhereNotNull()
|
.WhereNotNull()
|
||||||
.Select(itms => itms.Select(itm => new RemovableItemViewModel(itm.ToString(), () => ViewModel.RemoveAlwaysEnabled(itm))).ToArray())
|
.Select(itms => itms.Select(itm => new RemovableItemViewModel(itm.ToString(), () => ViewModel.RemoveAlwaysEnabled(itm))).ToArray())
|
||||||
|
@ -13,7 +13,7 @@ public class LoversLabDownloader : AIPS4OAuth2Downloader<LoversLabDownloader, Lo
|
|||||||
public LoversLabDownloader(ILogger<LoversLabDownloader> logger, ITokenProvider<LoversLabLoginState> loginInfo,
|
public LoversLabDownloader(ILogger<LoversLabDownloader> logger, ITokenProvider<LoversLabLoginState> loginInfo,
|
||||||
HttpClient client,
|
HttpClient client,
|
||||||
IHttpDownloader downloader, ApplicationInfo appInfo) : base(logger, loginInfo, client, downloader, appInfo,
|
IHttpDownloader downloader, ApplicationInfo appInfo) : base(logger, loginInfo, client, downloader, appInfo,
|
||||||
new Uri("https://loverslab.com"), "Lovers Lab")
|
new Uri("https://api.loverslab.com"), "Lovers Lab")
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -14,7 +14,7 @@ public class
|
|||||||
public VectorPlexusDownloader(ILogger<VectorPlexusDownloader> logger,
|
public VectorPlexusDownloader(ILogger<VectorPlexusDownloader> logger,
|
||||||
ITokenProvider<VectorPlexusLoginState> loginInfo, HttpClient client,
|
ITokenProvider<VectorPlexusLoginState> loginInfo, HttpClient client,
|
||||||
IHttpDownloader downloader, ApplicationInfo appInfo)
|
IHttpDownloader downloader, ApplicationInfo appInfo)
|
||||||
: base(logger, loginInfo, client, downloader, appInfo, new Uri("https://vectorplexus.com"), "Vector Plexus")
|
: base(logger, loginInfo, client, downloader, appInfo, new Uri("https://vectorplexis.com"), "Vector Plexus")
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user