From 648ee949c3211540206fc915084130d0317c919d Mon Sep 17 00:00:00 2001
From: Timothy Baldridge <tbaldridge@gmail.com>
Date: Mon, 27 Dec 2021 08:43:10 -0700
Subject: [PATCH] Fixup download VM
---
.../View Models/Gallery/ModListMetadataVM.cs | 72 +++----------------
.../Services/ModListDownloadMaintainer.cs | 29 ++++----
2 files changed, 28 insertions(+), 73 deletions(-)
diff --git a/Wabbajack.App.Wpf/View Models/Gallery/ModListMetadataVM.cs b/Wabbajack.App.Wpf/View Models/Gallery/ModListMetadataVM.cs
index 3327acf3..2d435317 100644
--- a/Wabbajack.App.Wpf/View Models/Gallery/ModListMetadataVM.cs
+++ b/Wabbajack.App.Wpf/View Models/Gallery/ModListMetadataVM.cs
@@ -1,28 +1,20 @@
using System;
using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Net;
using System.Reactive;
using System.Reactive.Linq;
using System.Reactive.Subjects;
-using System.Text;
using System.Threading.Tasks;
-using System.Windows;
using System.Windows.Input;
using System.Windows.Media.Imaging;
-using Alphaleonis.Win32.Filesystem;
using DynamicData;
using Microsoft.Extensions.Logging;
using ReactiveUI;
using ReactiveUI.Fody.Helpers;
using Wabbajack.Common;
-using Wabbajack.Downloaders;
using Wabbajack.DTOs;
using Wabbajack.Lib;
-using Wabbajack.Lib.Downloaders;
using Wabbajack.Lib.Extensions;
-using Wabbajack.Lib.ModListRegistry;
+using Wabbajack.Networking.WabbajackClientApi;
using Wabbajack.Paths;
using Wabbajack.Paths.IO;
using Wabbajack.RateLimiter;
@@ -89,14 +81,16 @@ namespace Wabbajack
private Subject<bool> IsLoadingIdle;
private readonly ILogger<ModListMetadataVM> _logger;
private readonly ModListDownloadMaintainer _maintainer;
+ private readonly Client _wjClient;
public ModListMetadataVM(ILogger<ModListMetadataVM> logger, ModListGalleryVM parent, ModlistMetadata metadata,
- ModListDownloadMaintainer maintainer)
+ ModListDownloadMaintainer maintainer, Client wjClient)
{
_logger = logger;
_parent = parent;
_maintainer = maintainer;
Metadata = metadata;
+ _wjClient = wjClient;
Location = LauncherUpdater.CommonFolder.Value.Combine("downloaded_mod_lists", Metadata.Links.MachineURL).WithExtension(Ext.Wabbajack);
ModListTagList = new List<ModListTag>();
@@ -147,12 +141,7 @@ namespace Wabbajack
{
try
{
- var success = await Download();
- if (!success)
- {
- Error = ErrorResponse.Fail("Download was marked unsuccessful");
- return false;
- }
+ await Download();
}
catch (Exception ex)
{
@@ -221,54 +210,15 @@ namespace Wabbajack
- private async Task<bool> Download()
+ private async Task Download()
{
- ProgressPercent = Percent.Zero;
- using (var queue = new WorkQueue(1))
- using (queue.Status.Select(i => i.ProgressPercent)
- .ObserveOnGuiThread()
- .Subscribe(percent => ProgressPercent = percent))
- {
- var tcs = new TaskCompletionSource<bool>();
- queue.QueueTask(async () =>
- {
- try
- {
- IsDownloading = true;
- _logger.LogInformation("Starting Download of {MachineUrl}", Metadata.Links.MachineURL);
- var downloader = await DownloadDispatcher.ResolveArchive(Metadata.Links.Download);
- var result = await downloader.Download(
- new Archive(state: null!)
- {
- Name = Metadata.Title, Size = Metadata.DownloadMetadata?.Size ?? 0
- }, Location);
- Utils.Log($"Done downloading {Metadata.Links.MachineURL}");
+ var (progress, task) = _maintainer.DownloadModlist(Metadata);
+ var dispose = progress.Subscribe(p => ProgressPercent = p);
- // Want to rehash to current file, even if failed?
- await Location.FileHashCachedAsync();
- Utils.Log($"Done hashing {Metadata.Links.MachineURL}");
+ await task;
- await Metadata.ToJsonAsync(Location.WithExtension(Consts.ModlistMetadataExtension));
-
- tcs.SetResult(result);
- }
- catch (Exception ex)
- {
- Utils.Error(ex, $"Error Downloading of {Metadata.Links.MachineURL}");
- tcs.SetException(ex);
- }
- finally
- {
- IsDownloading = false;
- }
- });
-
-
- Task.Run(async () => await Metrics.Send(Metrics.Downloading, Metadata.Title))
- .FireAndForget(ex => Utils.Error(ex, "Error sending download metric"));
-
- return await tcs.Task;
- }
+ await _wjClient.SendMetric("downloading", Metadata.Title);
+ dispose.Dispose();
}
}
}
diff --git a/Wabbajack.Services.OSIntegrated/Services/ModListDownloadMaintainer.cs b/Wabbajack.Services.OSIntegrated/Services/ModListDownloadMaintainer.cs
index 9e84f2f2..c3762481 100644
--- a/Wabbajack.Services.OSIntegrated/Services/ModListDownloadMaintainer.cs
+++ b/Wabbajack.Services.OSIntegrated/Services/ModListDownloadMaintainer.cs
@@ -56,21 +56,26 @@ public class ModListDownloadMaintainer
var tsk = Task.Run(async () =>
{
- var job = await _rateLimiter.Begin($"Downloading {metadata.Title}", metadata.DownloadMetadata!.Size, token.Value);
-
- job.OnUpdate += (_, pr) =>
+ try
{
- progress.OnNext(pr.Progress);
- };
+ var job = await _rateLimiter.Begin($"Downloading {metadata.Title}", metadata.DownloadMetadata!.Size,
+ token.Value);
- var hash = await _dispatcher.Download(new Archive()
+ job.OnUpdate += (_, pr) => { progress.OnNext(pr.Progress); };
+
+ var hash = await _dispatcher.Download(new Archive()
+ {
+ State = _dispatcher.Parse(new Uri(metadata.Links.Download))!,
+ Size = metadata.DownloadMetadata.Size,
+ Hash = metadata.DownloadMetadata.Hash
+ }, path, job, token.Value);
+
+ _hashCache.FileHashWriteCache(path, hash);
+ }
+ finally
{
- State = _dispatcher.Parse(new Uri(metadata.Links.Download))!,
- Size = metadata.DownloadMetadata.Size,
- Hash = metadata.DownloadMetadata.Hash
- }, path, job, token.Value);
-
- _hashCache.FileHashWriteCache(path, hash);
+ progress.OnCompleted();
+ }
});
return (progress, tsk);