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 LL downloads via HTML decode 2.2.1.6

Browse Source
This commit is contained in:
halgari 2020-08-24 16:20:50 -06:00
parent babb7b07dc
commit 573e661b03
8 changed files with 45 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -1,5 +1,11 @@
### Changelog ### Changelog
#### Version - 2.2.1.6 - 8/21/2020
* HOTFIX - Make LoversLab auto-update work again
#### Version - 2.2.1.5 - 8/21/2020
* HOTFIX - Fix for broken patching in RGE and other lists
#### Version - 2.2.1.4 - 8/21/2020 #### Version - 2.2.1.4 - 8/21/2020
* HOTFIX - No really...stop doing that * HOTFIX - No really...stop doing that

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.2.1.5</AssemblyVersion> <AssemblyVersion>2.2.1.6</AssemblyVersion>
<FileVersion>2.2.1.5</FileVersion> <FileVersion>2.2.1.6</FileVersion>
<Copyright>Copyright © 2019-2020</Copyright> <Copyright>Copyright © 2019-2020</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>WinExe</OutputType> <OutputType>WinExe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
<AssemblyVersion>2.2.1.5</AssemblyVersion> <AssemblyVersion>2.2.1.6</AssemblyVersion>
<FileVersion>2.2.1.5</FileVersion> <FileVersion>2.2.1.6</FileVersion>
<Copyright>Copyright © 2019-2020</Copyright> <Copyright>Copyright © 2019-2020</Copyright>
<Description>Wabbajack Application Launcher</Description> <Description>Wabbajack Application Launcher</Description>
<PublishReadyToRun>true</PublishReadyToRun> <PublishReadyToRun>true</PublishReadyToRun>

32
Wabbajack.Lib/Downloaders/AbstractIPS4Downloader.cs
View File

@ -122,7 +122,7 @@ namespace Wabbajack.Lib.Downloaders
{ {
get get
{ {
return FileID == null return string.IsNullOrWhiteSpace(FileID)
? IsAttachment ? IsAttachment
? new object[] {Downloader.SiteURL, IsAttachment, FullURL} ? new object[] {Downloader.SiteURL, IsAttachment, FullURL}
: new object[] {Downloader.SiteURL, FileName} : new object[] {Downloader.SiteURL, FileName}
@ -240,22 +240,23 @@ namespace Wabbajack.Lib.Downloaders
{ {
var files = await GetFilesInGroup(); var files = await GetFilesInGroup();
var nl = new Levenshtein(); var nl = new Levenshtein();
var newFile = files.OrderBy(f => nl.Distance(a.Name.ToLowerInvariant(), f.Name.ToLowerInvariant())).FirstOrDefault();
if (newFile == null) return default;
var existing = await downloadResolver(newFile); foreach (var newFile in files.OrderBy(f => nl.Distance(a.Name.ToLowerInvariant(), f.Name.ToLowerInvariant())))
if (existing != default) return (newFile, new TempFile());
var tmp = new TempFile();
await DownloadDispatcher.PrepareAll(new []{newFile.State});
if (await newFile.State.Download(newFile, tmp.Path))
{ {
newFile.Size = tmp.Path.Size; var existing = await downloadResolver(newFile);
newFile.Hash = await tmp.Path.FileHashAsync(); if (existing != default) return (newFile, new TempFile());
return (newFile, tmp);
}
await tmp.DisposeAsync(); var tmp = new TempFile();
await DownloadDispatcher.PrepareAll(new[] {newFile.State});
if (await newFile.State.Download(newFile, tmp.Path))
{
newFile.Size = tmp.Path.Size;
newFile.Hash = await tmp.Path.FileHashAsync();
return (newFile, tmp);
}
await tmp.DisposeAsync();
}
return default; return default;
} }
@ -271,7 +272,8 @@ namespace Wabbajack.Lib.Downloaders
List<Archive> archives = new List<Archive>(); List<Archive> archives = new List<Archive>();
foreach (var (url, name) in pairs) foreach (var (url, name) in pairs)
{ {
var ini = new[] {"[General]", $"directURL={url}"}; var urlDecoded = HttpUtility.HtmlDecode(url);
var ini = new[] {"[General]", $"directURL={urlDecoded}"};
var state = (AbstractDownloadState)(await DownloadDispatcher.ResolveArchive( var state = (AbstractDownloadState)(await DownloadDispatcher.ResolveArchive(
string.Join("\n", ini).LoadIniString(), false)); string.Join("\n", ini).LoadIniString(), false));
if (state == null) continue; if (state == null) continue;

6
Wabbajack.Server/Services/ListValidator.cs
View File

@ -240,6 +240,12 @@ namespace Wabbajack.Server.Services
return (archive, ArchiveStatus.InValid); return (archive, ArchiveStatus.InValid);
} }
if (destDownload.Archive.Hash == default)
{
_logger.Log(LogLevel.Information, "Can't heal because we got back a default hash for the downloaded file");
return (archive, ArchiveStatus.InValid);
}
var existing = await _sql.FindPatch(srcDownload.Id, destDownload.Id); var existing = await _sql.FindPatch(srcDownload.Id, destDownload.Id);
if (existing == null) if (existing == null)

4
Wabbajack.Server/Wabbajack.Server.csproj
View File

@ -3,8 +3,8 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<AssemblyVersion>2.2.1.5</AssemblyVersion> <AssemblyVersion>2.2.1.6</AssemblyVersion>
<FileVersion>2.2.1.5</FileVersion> <FileVersion>2.2.1.6</FileVersion>
<Copyright>Copyright © 2019-2020</Copyright> <Copyright>Copyright © 2019-2020</Copyright>
<Description>Wabbajack Server</Description> <Description>Wabbajack Server</Description>
<RuntimeIdentifier>win-x64</RuntimeIdentifier> <RuntimeIdentifier>win-x64</RuntimeIdentifier>

8
Wabbajack.Test/DownloaderTests.cs
View File

@ -313,12 +313,20 @@ namespace Wabbajack.Test
Assert.NotEmpty(files); Assert.NotEmpty(files);
Assert.Equal("WABBAJACK_TEST_FILE.zip", files.First().Name); Assert.Equal("WABBAJACK_TEST_FILE.zip", files.First().Name);
Assert.True(files.All(f => !string.IsNullOrWhiteSpace(((LoversLabDownloader.State)f.State).FileID)));
((LoversLabDownloader.State)converted).FileID = "42"; ((LoversLabDownloader.State)converted).FileID = "42";
var upgrade = await DownloadDispatcher.FindUpgrade(new Archive(converted) {Name = "WABBAJACK_TEST_FILE.zip"}); var upgrade = await DownloadDispatcher.FindUpgrade(new Archive(converted) {Name = "WABBAJACK_TEST_FILE.zip"});
Assert.True(upgrade != default); Assert.True(upgrade != default);
var newState = ((LoversLabDownloader.State)upgrade.Archive.State);
Assert.False(string.IsNullOrWhiteSpace(newState.FileID));
var roundTripped = newState.ViaJSON();
Assert.False(string.IsNullOrWhiteSpace(roundTripped.FileID));
} }

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.2.1.5</AssemblyVersion> <AssemblyVersion>2.2.1.6</AssemblyVersion>
<FileVersion>2.2.1.5</FileVersion> <FileVersion>2.2.1.6</FileVersion>
<Copyright>Copyright © 2019-2020</Copyright> <Copyright>Copyright © 2019-2020</Copyright>
<Description>An automated ModList installer</Description> <Description>An automated ModList installer</Description>
<PublishReadyToRun>true</PublishReadyToRun> <PublishReadyToRun>true</PublishReadyToRun>