Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix CPU display

Browse Source
This commit is contained in:
Timothy Baldridge 2022-01-05 21:12:40 -07:00 committed by Unnoen
parent d48c87dd1b
commit 50c58725a7
No known key found for this signature in database
GPG Key ID: 8F8E42252BA20553
6 changed files with 71 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Wabbajack.App.Wpf/Models/LoggerProvider.cs
View File

@ -38,7 +38,9 @@ public class LoggerProvider : ILoggerProvider
_disposables = new CompositeDisposable();
Messages.Subscribe(m => _messageLog.AddOrUpdate(m))
Messages
.ObserveOnGuiThread()
.Subscribe(m => _messageLog.AddOrUpdate(m))
.DisposeWith(_disposables);
Messages.Subscribe(m => LogToFile(m))

25
Wabbajack.App.Wpf/Models/ResourceMonitor.cs
View File

@ -7,12 +7,15 @@ using System.Reactive.Subjects;
using System.Timers;
using DynamicData;
using DynamicData.Kernel;
using ReactiveUI;
using Wabbajack.RateLimiter;
namespace Wabbajack.Models;
public class ResourceMonitor : IDisposable
{
private readonly TimeSpan PollInterval = TimeSpan.FromMilliseconds(1000);
private readonly IResource[] _resources;
private readonly Timer _timer;
@ -33,30 +36,26 @@ public class ResourceMonitor : IDisposable
{
_compositeDisposable = new CompositeDisposable();
_resources = resources.ToArray();
_timer = new Timer();
_timer.Interval = 250;
_timer.Elapsed += Elapsed;
_timer.Enabled = true;
_timer.DisposeWith(_compositeDisposable);
_prev = _resources.Select(x => (x.Name, (long)0)).ToArray();
RxApp.MainThreadScheduler.ScheduleRecurringAction(PollInterval, Elapsed)
.DisposeWith(_compositeDisposable);
_tasks.Connect()
.Bind(out _tasksFiltered)
.Subscribe()
.DisposeWith(_compositeDisposable);
}
private void Elapsed(object? sender, ElapsedEventArgs e)
private void Elapsed()
{
var current = _resources.Select(x => (x.Name, x.StatusReport.Transferred)).ToArray();
var diff = _prev.Zip(current)
.Select(t => (t.First.Name, (long)((t.Second.Transferred - t.First.Throughput) / (_timer.Interval / 1000.0))))
.Select(t => (t.First.Name, (long)((t.Second.Transferred - t.First.Throughput) / PollInterval.TotalSeconds)))
.ToArray();
_prev = current;
_updates.OnNext(diff);
_tasks.Edit(l =>
{
var used = new HashSet<ulong>();
@ -71,7 +70,7 @@ public class ResourceMonitor : IDisposable
{
var t = tsk.Value;
t.Msg = job.Description;
t.ProgressPercent = Percent.FactoryPutInRange(job.Current, (long)job.Size);
t.ProgressPercent = job.Size == 0 ? Percent.Zero : Percent.FactoryPutInRange(job.Current, (long)job.Size);
}
// Create
@ -82,7 +81,7 @@ public class ResourceMonitor : IDisposable
ID = job.ID,
StartTime = DateTime.Now,
Msg = job.Description,
ProgressPercent = Percent.FactoryPutInRange(job.Current, (long) job.Size)
ProgressPercent = job.Size == 0 ? Percent.Zero : Percent.FactoryPutInRange(job.Current, (long) job.Size)
};
l.AddOrUpdate(vm);
}

89
Wabbajack.App.Wpf/View Models/Compilers/CompilerVM.cs
View File

@ -29,6 +29,7 @@ using Wabbajack.DTOs;
using Wabbajack.DTOs.Interventions;
using Wabbajack.DTOs.JsonConverters;
using Wabbajack.Installer;
using Wabbajack.Models;
using Wabbajack.Networking.WabbajackClientApi;
using Wabbajack.Paths;
using Wabbajack.Paths.IO;
@ -46,12 +47,14 @@ namespace Wabbajack
Completed,
Errored
}
public class CompilerVM : BackNavigatingVM
public class CompilerVM : BackNavigatingVM, ICpuStatusVM
{
private const string LastSavedCompilerSettings = "last-saved-compiler-settings";
private readonly DTOSerializer _dtos;
private readonly SettingsManager _settingsManager;
private readonly ServiceProvider _serviceProvider;
private readonly IServiceProvider _serviceProvider;
private readonly ILogger<CompilerVM> _logger;
private readonly ResourceMonitor _resourceMonitor;
[Reactive]
public CompilerState State { get; set; }
@ -91,13 +94,19 @@ namespace Wabbajack
public ReactiveCommand<Unit, Unit> ExecuteCommand { get; }
public LoggerProvider LoggerProvider { get; }
public ReadOnlyObservableCollection<CPUDisplayVM> StatusList => _resourceMonitor.Tasks;
public CompilerVM(ILogger<CompilerVM> logger, DTOSerializer dtos, SettingsManager settingsManager,
ServiceProvider serviceProvider) : base(logger)
IServiceProvider serviceProvider, LoggerProvider loggerProvider, ResourceMonitor resourceMonitor) : base(logger)
{
_logger = logger;
_dtos = dtos;
_settingsManager = settingsManager;
_serviceProvider = serviceProvider;
LoggerProvider = loggerProvider;
_resourceMonitor = resourceMonitor;
BackCommand =
ReactiveCommand.CreateFromTask(async () =>
@ -216,46 +225,52 @@ namespace Wabbajack
private async Task StartCompilation()
{
try
var tsk = Task.Run(async () =>
{
State = CompilerState.Compiling;
var mo2Settings = new MO2CompilerSettings
try
{
ModListName = ModListName,
ModListAuthor = Author,
ModlistReadme = Readme,
Source = Source,
Downloads = DownloadLocation.TargetPath,
OutputFile = OutputLocation.TargetPath,
Profile = SelectedProfile,
OtherProfiles = OtherProfiles,
AlwaysEnabled = AlwaysEnabled
};
State = CompilerState.Compiling;
var compiler = new MO2Compiler(_serviceProvider.GetRequiredService<ILogger<MO2Compiler>>(),
_serviceProvider.GetRequiredService<FileExtractor.FileExtractor>(),
_serviceProvider.GetRequiredService<FileHashCache>(),
_serviceProvider.GetRequiredService<Context>(),
_serviceProvider.GetRequiredService<TemporaryFileManager>(),
mo2Settings,
_serviceProvider.GetRequiredService<ParallelOptions>(),
_serviceProvider.GetRequiredService<DownloadDispatcher>(),
_serviceProvider.GetRequiredService<Client>(),
_serviceProvider.GetRequiredService<IGameLocator>(),
_serviceProvider.GetRequiredService<DTOSerializer>(),
_serviceProvider.GetRequiredService<IResource<ACompiler>>(),
_serviceProvider.GetRequiredService<IBinaryPatchCache>());
await compiler.Begin(CancellationToken.None);
var mo2Settings = new MO2CompilerSettings
{
Game = BaseGame,
ModListName = ModListName,
ModListAuthor = Author,
ModlistReadme = Readme,
Source = Source,
Downloads = DownloadLocation.TargetPath,
OutputFile = OutputLocation.TargetPath,
Profile = SelectedProfile,
OtherProfiles = OtherProfiles,
AlwaysEnabled = AlwaysEnabled
};
State = CompilerState.Completed;
}
catch (Exception ex)
{
State = CompilerState.Errored;
}
var compiler = new MO2Compiler(_serviceProvider.GetRequiredService<ILogger<MO2Compiler>>(),
_serviceProvider.GetRequiredService<FileExtractor.FileExtractor>(),
_serviceProvider.GetRequiredService<FileHashCache>(),
_serviceProvider.GetRequiredService<Context>(),
_serviceProvider.GetRequiredService<TemporaryFileManager>(),
mo2Settings,
_serviceProvider.GetRequiredService<ParallelOptions>(),
_serviceProvider.GetRequiredService<DownloadDispatcher>(),
_serviceProvider.GetRequiredService<Client>(),
_serviceProvider.GetRequiredService<IGameLocator>(),
_serviceProvider.GetRequiredService<DTOSerializer>(),
_serviceProvider.GetRequiredService<IResource<ACompiler>>(),
_serviceProvider.GetRequiredService<IBinaryPatchCache>());
await compiler.Begin(CancellationToken.None);
State = CompilerState.Completed;
}
catch (Exception ex)
{
State = CompilerState.Errored;
_logger.LogInformation(ex, "Failed Compilation : {Message}", ex.Message);
}
});
await tsk;
}
private async Task SaveSettingsFile()

15
Wabbajack.App.Wpf/View Models/Installers/InstallerVM.cs
View File

@ -2,40 +2,28 @@
using System.Collections.ObjectModel;
using ReactiveUI;
using System.Reactive.Disposables;
using System.Reactive.Linq;
using System.Windows.Media.Imaging;
using ReactiveUI.Fody.Helpers;
using System.Windows.Media;
using DynamicData;
using DynamicData.Binding;
using System.Reactive;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Shell;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Microsoft.WindowsAPICodePack.Dialogs;
using Microsoft.WindowsAPICodePack.Shell;
using Wabbajack.Common;
using Wabbajack.Downloaders.GameFile;
using Wabbajack.DTOs;
using Wabbajack.DTOs.JsonConverters;
using Wabbajack.Extensions;
using Wabbajack.Hashing.xxHash64;
using Wabbajack.Installer;
using Wabbajack.Interventions;
using Wabbajack.Messages;
using Wabbajack.Models;
using Wabbajack.Paths;
using Wabbajack.RateLimiter;
using Wabbajack.View_Models;
using Wabbajack.Paths.IO;
using Wabbajack.Services.OSIntegrated;
using Wabbajack.Util;
using Configuration = Wabbajack.Networking.WabbajackClientApi.Configuration;
using Consts = Wabbajack.Consts;
using KnownFolders = Wabbajack.Paths.IO.KnownFolders;
namespace Wabbajack;
@ -118,8 +106,7 @@ public class InstallerVM : BackNavigatingVM, IBackNavigatingVM, ICpuStatusVM
[Reactive]
public bool Installing { get; set; }
[Reactive]
public LoggerProvider LoggerProvider { get; set; }
public LoggerProvider LoggerProvider { get; }
// Command properties

3
Wabbajack.App.Wpf/Views/Compilers/CompilerView.xaml.cs
View File

@ -22,7 +22,8 @@ namespace Wabbajack
{
this.BindCommand(ViewModel, vm => vm.ExecuteCommand, view => view.BeginButton)
ViewModel.WhenAnyValue(vm => vm.ExecuteCommand)
.BindToStrict(this, view => view.BeginButton.Command)
.DisposeWith(disposables);
ViewModel.WhenAnyValue(vm => vm.BackCommand)

2
Wabbajack.VFS/FileHashCache.cs
View File

@ -118,7 +118,7 @@ public class FileHashCache
{
if (TryGetHashCache(file, out var foundHash)) return foundHash;
using var job = await _limiter.Begin($"Hasing {file.FileName}", file.Size(), token);
using var job = await _limiter.Begin($"Hashing {file.FileName}", file.Size(), token);
await using var fs = file.Open(FileMode.Open, FileAccess.Read, FileShare.Read);
var hash = await fs.HashingCopy(Stream.Null, token, job);