From a5843e12fa14b30325c364978de70190675f6880 Mon Sep 17 00:00:00 2001 From: erri120 Date: Mon, 27 Apr 2020 20:46:47 +0200 Subject: [PATCH 1/3] Fixed mediafire downloader never resolving the url --- Wabbajack.Lib/Downloaders/MediaFireDownloader.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Wabbajack.Lib/Downloaders/MediaFireDownloader.cs b/Wabbajack.Lib/Downloaders/MediaFireDownloader.cs index b4d21c24..32c279e5 100644 --- a/Wabbajack.Lib/Downloaders/MediaFireDownloader.cs +++ b/Wabbajack.Lib/Downloaders/MediaFireDownloader.cs @@ -52,7 +52,7 @@ namespace Wabbajack.Lib.Downloaders { using (var d = await Driver.Create()) { - await d.NavigateTo(new Uri("http://www.mediafire.com/file/agiqzm1xwebczpx/WABBAJACK_TEST_FILE.tx")); + await d.NavigateTo(new Uri(Url)); // MediaFire creates the link after all the JS loads await Task.Delay(1000); var newURL = await d.GetAttr("a.input", "href"); From 514d2f70fccb0323dfc881af431740a27c206aed Mon Sep 17 00:00:00 2001 From: erri120 Date: Mon, 27 Apr 2020 20:49:22 +0200 Subject: [PATCH 2/3] Fixed new mega links not being resolved --- Wabbajack.Common/Consts.cs | 1 + Wabbajack.Lib/Downloaders/MEGADownloader.cs | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Wabbajack.Common/Consts.cs b/Wabbajack.Common/Consts.cs index e67c93de..dc3825c1 100644 --- a/Wabbajack.Common/Consts.cs +++ b/Wabbajack.Common/Consts.cs @@ -21,6 +21,7 @@ namespace Wabbajack.Common public static AbsolutePath ModListDownloadFolder => "downloaded_mod_lists".RelativeTo(AbsolutePath.EntryPoint); public static string MegaPrefix = "https://mega.nz/#!"; + public static string MegaFilePrefix = "https://mega.nz/file/"; public static readonly HashSet SupportedArchives = new[]{".zip", ".rar", ".7z", ".7zip", ".fomod", ".omod", ".exe", ".dat", ".gz", ".tar"} .Select(s => new Extension(s)).ToHashSet(); diff --git a/Wabbajack.Lib/Downloaders/MEGADownloader.cs b/Wabbajack.Lib/Downloaders/MEGADownloader.cs index f3a0d131..ecf60c8e 100644 --- a/Wabbajack.Lib/Downloaders/MEGADownloader.cs +++ b/Wabbajack.Lib/Downloaders/MEGADownloader.cs @@ -77,7 +77,7 @@ namespace Wabbajack.Lib.Downloaders public AbstractDownloadState? GetDownloaderState(string url) { - if (url != null && url.StartsWith(Consts.MegaPrefix)) + if (url != null && (url.StartsWith(Consts.MegaPrefix) || url.StartsWith(Consts.MegaFilePrefix))) return new State(url); return null; } @@ -132,7 +132,7 @@ namespace Wabbajack.Lib.Downloaders try { var node = await MegaApiClient.GetNodeFromLinkAsync(fileLink); - return true; + return node != null; } catch (Exception) { From 85a9b4accd466e4535c01792cacd10b2083992f8 Mon Sep 17 00:00:00 2001 From: erri120 Date: Mon, 27 Apr 2020 20:58:06 +0200 Subject: [PATCH 3/3] Updated changelog --- CHANGELOG.md | 4 ++++ Wabbajack/App.xaml.cs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 053ccd19..028420d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ### Changelog +#### Version - 2.0.1.1 - 4/27/2020 +* Fixed mediafire links not getting resolved +* Fixed new mega links not being accepted + #### Version - 2.0.1.0 - 4/27/2020 * Fixed "FileNotFound" and "File is open by another process" bugs during installation * Raised the BSA limit from 2,000,000,000 bytes to 2 ^ 31 bytes diff --git a/Wabbajack/App.xaml.cs b/Wabbajack/App.xaml.cs index 033b3fa5..df6ec105 100644 --- a/Wabbajack/App.xaml.cs +++ b/Wabbajack/App.xaml.cs @@ -21,7 +21,7 @@ namespace Wabbajack public App() { TempFolder.EnsureInited(); - RenderOptions.ProcessRenderMode = RenderMode.SoftwareOnly; + RenderOptions.ProcessRenderMode = RenderMode.Default; CLIOld.ParseOptions(Environment.GetCommandLineArgs()); if (CLIArguments.Help) CLIOld.DisplayHelpText();