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

IPS4 reworks

Browse Source
This commit is contained in:
Timothy Baldridge 2020-09-09 06:51:38 -06:00
parent 2a1517ca0a
commit 1f002b5f77
10 changed files with 47 additions and 17 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
#### Version - 2.3.0.0 - ???
* Rewrote the file extraction routines. New code uses less memory, less disk space, and performs less thrashing on HDDs
* Reworked IPS4 integration to reduce download failures
#### Version - 2.2.2.0 - 8/31/2020
* Route CDN requests through a reverse proxy to improve reliability

2
Compression.BSA/Compression.BSA.csproj
View File

@ -20,7 +20,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Genbox.AlphaFS" Version="2.2.2.1" />
<PackageReference Include="K4os.Compression.LZ4.Streams" Version="1.2.4-alpha" />
<PackageReference Include="K4os.Compression.LZ4.Streams" Version="1.2.5" />
<PackageReference Include="SharpZipLib" Version="1.2.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-preview.8.20407.11" />
</ItemGroup>

2
Wabbajack.Common/Consts.cs
View File

@ -131,6 +131,8 @@ namespace Wabbajack.Common
public static AbsolutePath SettingsFile => LocalAppDataPath.Combine("settings.json");
public static RelativePath SettingsIni = (RelativePath)"settings.ini";
public static byte SettingsVersion => 2;
public static bool IsServer = false;
public static string CompressedBodyHeader = "x-compressed-body";
public static AbsolutePath CefCacheLocation = @"CEF".RelativeTo(LocalAppDataPath);

12
Wabbajack.Lib/ClientAPI.cs
View File

@ -13,8 +13,9 @@ using System.Threading.Tasks;
using Wabbajack.Common.Exceptions;
using Wabbajack.Common.Serialization.Json;
using Wabbajack.Lib.Downloaders;
namespace Wabbajack.Lib
using Wabbajack.Lib.LibCefHelpers;
namespace Wabbajack.Lib
{
public static class BuildServerStatus
{
@ -254,5 +255,12 @@ namespace Wabbajack.Lib
return null;
}
}
public static async Task<Helpers.Cookie[]> GetAuthInfo<T>(string key)
{
var client = await GetClient();
return await client.GetJsonAsync<Helpers.Cookie[]>(
$"{Consts.WabbajackBuildServerUri}site-integration/auth-info/{key}");
}
}
}

22
Wabbajack.Lib/Downloaders/AbstractNeedsLoginDownloader.cs
View File

@ -86,18 +86,24 @@ namespace Wabbajack.Lib.Downloaders
return cookies;
}
public async Task<Wabbajack.Lib.Http.Client> GetAuthedClient()
public async Task<Http.Client> GetAuthedClient()
{
Helpers.Cookie[] cookies;
try
if (Consts.IsServer)
{
cookies = await Utils.FromEncryptedJson<Helpers.Cookie[]>(_encryptedKeyName);
if (cookies != null)
return Helpers.GetClient(cookies, SiteURL.ToString());
}
catch (FileNotFoundException) { }
try
{
cookies = await Utils.FromEncryptedJson<Helpers.Cookie[]>(_encryptedKeyName);
if (cookies != null)
return Helpers.GetClient(cookies, SiteURL.ToString());
}
catch (FileNotFoundException) { }
cookies = await Utils.Log(new RequestSiteLogin(this)).Task;
cookies = await Utils.Log(new RequestSiteLogin(this)).Task;
return Helpers.GetClient(cookies, SiteURL.ToString());
}
cookies = await ClientAPI.GetAuthInfo<Helpers.Cookie[]>(_encryptedKeyName);
return Helpers.GetClient(cookies, SiteURL.ToString());
}

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

@ -56,8 +56,13 @@ namespace Wabbajack.Lib.Downloaders
if (state != null)
return state;
}
return null;
var meta = string.Join("\n", new string[]
{
"[General]",
$"directURL={uri}"
});
return (AbstractDownloadState)(await ResolveArchive(meta.LoadIniString()));
}
public static T GetInstance<T>() where T : IDownloader

4
Wabbajack.Lib/Wabbajack.Lib.csproj
View File

@ -17,7 +17,9 @@
<Version>3.1.0</Version>
</PackageReference>
<PackageReference Include="Fody">
<Version>6.2.4</Version>
<Version>6.2.5</Version>
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Genbox.AlphaFS">
<Version>2.2.2.1</Version>

2
Wabbajack.Server/Program.cs
View File

@ -4,6 +4,7 @@ using System.Net;
using System.Security.Cryptography.X509Certificates;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Hosting;
using Wabbajack.Common;
namespace Wabbajack.Server
{
@ -11,6 +12,7 @@ namespace Wabbajack.Server
{
public static void Main(string[] args)
{
Consts.IsServer = true;
bool testMode = args.Contains("TESTMODE");
CreateHostBuilder(args, testMode).Build().Run();
}

2
Wabbajack.Server/Wabbajack.Server.csproj
View File

@ -18,7 +18,7 @@
<PackageReference Include="Dapper" Version="2.0.35" />
<PackageReference Include="FluentFTP" Version="32.4.4" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.7" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.8" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
<PackageReference Include="Nettle" Version="1.3.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.5.1" />

4
Wabbajack/Wabbajack.csproj
View File

@ -56,9 +56,9 @@
<ItemGroup>
<PackageReference Include="CefSharp.Wpf" Version="84.4.10" />
<PackageReference Include="DynamicData" Version="6.16.8" />
<PackageReference Include="DynamicData" Version="6.16.9" />
<PackageReference Include="Extended.Wpf.Toolkit" Version="4.0.1" />
<PackageReference Include="Fody" Version="6.2.4">
<PackageReference Include="Fody" Version="6.2.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>