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

#### Version - 2.5.3.22 - 6/13/2022

Browse Source 
* Stop WJ from attempting to proxy all manual files
* Stop downloading the app twice when upgrading via the launcher
* Fall back to Github when we get an error from the Nexus in the launcher
This commit is contained in:
Timothy Baldridge 2022-06-13 08:35:34 -06:00
parent 9c6145ae39
commit 69de8f0e7a
6 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -1,5 +1,10 @@
### Changelog ### Changelog
#### Version - 2.5.3.22 - 6/13/2022
* Stop WJ from attempting to proxy all manual files
* Stop downloading the app twice when upgrading via the launcher
* Fall back to Github when we get an error from the Nexus in the launcher
#### Version - 2.5.3.21 - 6/9/2022 #### Version - 2.5.3.21 - 6/9/2022
* Fix a bug in the streaming MediaFire downloader * Fix a bug in the streaming MediaFire downloader
* Improve the reliability of MediaFire, and Manual downloaders * Improve the reliability of MediaFire, and Manual downloaders

4
Wabbajack.CLI/Wabbajack.CLI.csproj
View File

@ -6,8 +6,8 @@
<AssemblyName>wabbajack-cli</AssemblyName> <AssemblyName>wabbajack-cli</AssemblyName>
<Company>Wabbajack</Company> <Company>Wabbajack</Company>
<Platforms>x64</Platforms> <Platforms>x64</Platforms>
<AssemblyVersion>2.5.3.21</AssemblyVersion> <AssemblyVersion>2.5.3.22</AssemblyVersion>
<FileVersion>2.5.3.21</FileVersion> <FileVersion>2.5.3.22</FileVersion>
<Copyright>Copyright © 2019-2022</Copyright> <Copyright>Copyright © 2019-2022</Copyright>
<Description>An automated ModList installer</Description> <Description>An automated ModList installer</Description>
<PublishReadyToRun>true</PublishReadyToRun> <PublishReadyToRun>true</PublishReadyToRun>

4
Wabbajack.Launcher/Wabbajack.Launcher.csproj
View File

@ -4,8 +4,8 @@
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>net5.0-windows</TargetFramework> <TargetFramework>net5.0-windows</TargetFramework>
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
<AssemblyVersion>2.5.3.21</AssemblyVersion> <AssemblyVersion>2.5.3.22</AssemblyVersion>
<FileVersion>2.5.3.21</FileVersion> <FileVersion>2.5.3.22</FileVersion>
<Copyright>Copyright © 2019-2022</Copyright> <Copyright>Copyright © 2019-2022</Copyright>
<Description>Wabbajack Application Launcher</Description> <Description>Wabbajack Application Launcher</Description>
<PublishReadyToRun>true</PublishReadyToRun> <PublishReadyToRun>true</PublishReadyToRun>

13
Wabbajack.Lib/AInstaller.cs
View File

@ -236,17 +236,8 @@ namespace Wabbajack.Lib
var upgrades = (await client.GetJsonAsync<ValidatedArchive[]>(Consts.UpgradedFilesURL)); var upgrades = (await client.GetJsonAsync<ValidatedArchive[]>(Consts.UpgradedFilesURL));
var tmp = new List<Archive>(); var tmp = new List<Archive>();
foreach (var miss in missing) foreach (var miss in missing)
{ tmp.Add(await DownloadDispatcher.MaybeProxy(miss));
if (miss.State is ManualDownloader.State ms && await DownloadDispatcher.ProxyHas(new Uri(ms.Url)))
{
tmp.Add(DownloadDispatcher.MaybeProxy(miss));
}
else
{
tmp.Add(DownloadDispatcher.MaybeProxy(miss));
}
}
missing = tmp; missing = tmp;
if (download) if (download)

7
Wabbajack.Lib/Downloaders/DownloadDispatcher.cs
View File

@ -107,7 +107,7 @@ namespace Wabbajack.Lib.Downloaders
public static async Task<DownloadResult> DownloadWithPossibleUpgrade(Archive archive, AbsolutePath destination, ValidatedArchive[]? upgrades = null) public static async Task<DownloadResult> DownloadWithPossibleUpgrade(Archive archive, AbsolutePath destination, ValidatedArchive[]? upgrades = null)
{ {
archive = MaybeProxy(archive); archive = await MaybeProxy(archive);
bool ShouldTry(Archive archive) bool ShouldTry(Archive archive)
{ {
@ -182,7 +182,7 @@ namespace Wabbajack.Lib.Downloaders
return DownloadResult.Update; return DownloadResult.Update;
} }
public static Archive MaybeProxy(Archive archive) public static async ValueTask<Archive> MaybeProxy(Archive archive)
{ {
if (archive.State is (not GoogleDriveDownloader.State if (archive.State is (not GoogleDriveDownloader.State
and not MegaDownloader.State and not MegaDownloader.State
@ -191,6 +191,9 @@ namespace Wabbajack.Lib.Downloaders
and not ManualDownloader.State)) and not ManualDownloader.State))
return archive; return archive;
if (archive.State is ManualDownloader.State ms && !await ProxyHas(new Uri(ms.Url)))
return archive;
var uri = archive.State.GetManifestURL(archive); var uri = archive.State.GetManifestURL(archive);
var hash = archive.Hash != default ? $"&hash={archive.Hash.ToHex()}" : ""; var hash = archive.Hash != default ? $"&hash={archive.Hash.ToHex()}" : "";
Utils.Log($"Downloading via proxy ({Encoding.UTF8.GetBytes(uri!).xxHash().ToHex()}) {uri}"); Utils.Log($"Downloading via proxy ({Encoding.UTF8.GetBytes(uri!).xxHash().ToHex()}) {uri}");

4
Wabbajack/Wabbajack.csproj
View File

@ -6,8 +6,8 @@
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
<Platforms>x64</Platforms> <Platforms>x64</Platforms>
<RuntimeIdentifier>win10-x64</RuntimeIdentifier> <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
<AssemblyVersion>2.5.3.21</AssemblyVersion> <AssemblyVersion>2.5.3.22</AssemblyVersion>
<FileVersion>2.5.3.21</FileVersion> <FileVersion>2.5.3.22</FileVersion>
<Copyright>Copyright © 2019-2022</Copyright> <Copyright>Copyright © 2019-2022</Copyright>
<Description>An automated ModList installer</Description> <Description>An automated ModList installer</Description>
<PublishReadyToRun>true</PublishReadyToRun> <PublishReadyToRun>true</PublishReadyToRun>