diff --git a/Wabbajack.Common.Test/MiscTests.cs b/Wabbajack.Common.Test/MiscTests.cs index eb22d2b3..df0f159d 100644 --- a/Wabbajack.Common.Test/MiscTests.cs +++ b/Wabbajack.Common.Test/MiscTests.cs @@ -11,7 +11,7 @@ namespace Wabbajack.Common.Test { using (var queue = new WorkQueue()) { - var speed = Utils.TestDiskSpeed(queue, @".\"); + var speed = Utils.TestDiskSpeed(queue, AbsolutePath.EntryPoint); } } diff --git a/Wabbajack.Lib/Downloaders/MediaFireDownloader.cs b/Wabbajack.Lib/Downloaders/MediaFireDownloader.cs index a9678fd8..b4d21c24 100644 --- a/Wabbajack.Lib/Downloaders/MediaFireDownloader.cs +++ b/Wabbajack.Lib/Downloaders/MediaFireDownloader.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Net.Http; using System.Threading.Tasks; using Wabbajack.Common; +using Wabbajack.Common.Serialization.Json; using Wabbajack.Lib.Validation; using Wabbajack.Lib.WebAutomation; @@ -18,6 +19,7 @@ namespace Wabbajack.Lib.Downloaders return new State(url.ToString()); } + [JsonName("MediaFireDownloader+State")] public class State : AbstractDownloadState { public string Url { get; } diff --git a/Wabbajack.Test/DownloaderTests.cs b/Wabbajack.Test/DownloaderTests.cs index 49c1a900..19ff57dc 100644 --- a/Wabbajack.Test/DownloaderTests.cs +++ b/Wabbajack.Test/DownloaderTests.cs @@ -193,7 +193,7 @@ namespace Wabbajack.Test //Assert.Equal(File.ReadAllText(filename.Path), "Cheese for Everyone!"); } - /* + [Fact] public async Task MediaFireDownload() { @@ -211,18 +211,18 @@ namespace Wabbajack.Test ((MediaFireDownloader.State) url_state).Url); var converted = RoundTripState(state); - Assert.True(await converted.Verify()); + Assert.True(await converted.Verify(new Archive(state: null!) { Size = 20 })); using var filename = new TempFile(); Assert.True(converted.IsWhitelisted(new ServerWhitelist {AllowedPrefixes = new List {"http://www.mediafire.com/file/agiqzm1xwebczpx/"}})); Assert.False(converted.IsWhitelisted(new ServerWhitelist {AllowedPrefixes = new List()})); - await converted.Download(new Archive {Name = "Media Fire Test.txt"}, filename.Path); + await converted.Download(new Archive(state: null!) { Name = "Media Fire Test.zip" }, filename.Path); - Assert.Equal(File.ReadAllText(filename.Path), "Cheese for Everyone!"); + Assert.Equal("Cheese for Everyone!", await filename.Path.ReadAllTextAsync()); - }*/ + } [Fact] public async Task NexusDownload()