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

2.5.0.5

Browse Source
This commit is contained in:
Timothy Baldridge 2021-06-28 21:02:01 -06:00
parent c8d4e3651c
commit 89404a9b03
8 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,5 +1,9 @@
### Changelog
#### Version - 2.5.0.5 - 6/28/2021
* Fix another NPE on texture matching
* Better logging on bad calls to IPS4 sites
#### Version - 2.5.0.4 - 6/27/2021
* Fix for NPE in Texture analysis compiler step
* Implemented attachment support in IPS4 sites

2
Wabbajack.CLI/Properties/launchSettings.json
View File

@ -2,7 +2,7 @@
"profiles": {
"Wabbajack.CLI": {
"commandName": "Project",
"commandLineArgs": "download-from-meta -m c:\\tmp\\test.meta -o c:\\tmp\\out.7z"
"commandLineArgs": "download-from-meta -m \"c:\\tmp\\test (2).meta\" -o c:\\tmp\\out.7z"
}
}
}

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

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

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

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

2
Wabbajack.Lib/CompilationSteps/MatchSimilarTextures.cs
View File

@ -22,7 +22,7 @@ namespace Wabbajack.Lib.CompilationSteps
public override async ValueTask<Directive?> Run(RawSourceFile source)
{
if (source.Path.Extension == DDS)
if (source.Path.Extension == DDS && source.File.ImageState != null)
{
var found = _byName[source.Path.FileNameWithoutExtension]
.Select(f => (f.ImageState.PerceptualHash.Similarity(source.File.ImageState.PerceptualHash), f))

21
Wabbajack.Lib/Downloaders/AbstractIPS4OAuthDownloader.cs
View File

@ -13,6 +13,7 @@ using F23.StringSimilarity;
using Newtonsoft.Json;
using ReactiveUI;
using Wabbajack.Common;
using Wabbajack.Common.Exceptions;
using Wabbajack.Common.Serialization.Json;
using Wabbajack.Lib.Downloaders.DTOs;
using Wabbajack.Lib.Http;
@ -93,8 +94,24 @@ namespace Wabbajack.Lib.Downloaders
public async Task<IPS4OAuthFilesResponse.Root> GetDownloads(long modID)
{
var responseString = await (await GetAuthedClient())!.GetStringAsync(SiteURL+ $"api/downloads/files/{modID}") ;
return responseString.FromJsonString<IPS4OAuthFilesResponse.Root>();
var url = SiteURL + $"api/downloads/files/{modID}";
var client = await GetAuthedClient();
using var response = await client!.GetAsync(url, HttpCompletionOption.ResponseHeadersRead, errorsAsExceptions: false);
string body = "";
try
{
body = await response.Content.ReadAsStringAsync();
}
catch (Exception _)
{
// ignored
}
if (response.IsSuccessStatusCode)
return body.FromJsonString<IPS4OAuthFilesResponse.Root>();
Utils.Log($"IPS4 Request Error {response.StatusCode} {response.ReasonPhrase} - \n {url} \n {body}");
throw new HttpException(response);
}

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

@ -3,8 +3,8 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0-windows</TargetFramework>
<AssemblyVersion>2.5.0.4</AssemblyVersion>
<FileVersion>2.5.0.4</FileVersion>
<AssemblyVersion>2.5.0.5</AssemblyVersion>
<FileVersion>2.5.0.5</FileVersion>
<Copyright>Copyright © 2019-2020</Copyright>
<Description>Wabbajack Server</Description>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>

4
Wabbajack/Wabbajack.csproj
View File

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