Add TESAll download support

This commit is contained in:
Timothy Baldridge 2020-05-28 17:44:58 -06:00
parent 8c70771f0e
commit c5dd1d6388
5 changed files with 59 additions and 2 deletions

View File

@ -38,6 +38,7 @@ namespace Wabbajack.Lib.Downloaders
typeof(VectorPlexusDownloader.State),
typeof(DeadlyStreamDownloader.State),
typeof(TESAllianceDownloader.State),
typeof(TESAllDownloader.State),
typeof(BethesdaNetDownloader.State),
typeof(YouTubeDownloader.State),
typeof(WabbajackCDNDownloader.State)

View File

@ -19,8 +19,8 @@ namespace Wabbajack.Lib.Downloaders
where TState : AbstractIPS4Downloader<TDownloader, TState>.State<TDownloader>, new()
where TDownloader : IDownloader
{
protected AbstractIPS4Downloader(Uri loginUri, string encryptedKeyName, string cookieDomain)
: base(loginUri, encryptedKeyName, cookieDomain, "ips4_member_id")
protected AbstractIPS4Downloader(Uri loginUri, string encryptedKeyName, string cookieDomain, string loginCookie = "ips4_member_id")
: base(loginUri, encryptedKeyName, cookieDomain, loginCookie)
{
}
@ -53,6 +53,15 @@ namespace Wabbajack.Lib.Downloaders
};
}
if (url.PathAndQuery.StartsWith("/files/getdownload"))
{
return new TState
{
FullURL = url.ToString(),
IsAttachment = true
};
}
if (!url.PathAndQuery.StartsWith("/files/file/"))
{
if (string.IsNullOrWhiteSpace(url.Query)) return null;

View File

@ -26,6 +26,7 @@ namespace Wabbajack.Lib.Downloaders
new DeadlyStreamDownloader(),
new BethesdaNetDownloader(),
new TESAllianceDownloader(),
new TESAllDownloader(),
new YouTubeDownloader(),
new WabbajackCDNDownloader(),
new HTTPDownloader(),

View File

@ -0,0 +1,22 @@
using System;
using Wabbajack.Common.Serialization.Json;
namespace Wabbajack.Lib.Downloaders
{
public class TESAllDownloader : AbstractIPS4Downloader<TESAllDownloader, TESAllDownloader.State>
{
#region INeedsDownload
public override string SiteName => "TESALL";
public override Uri SiteURL => new Uri("http://tesall.ru");
public override Uri IconUri => new Uri("http://tesall.ru/favicon.ico");
#endregion
public TESAllDownloader() : base(new Uri("https://tesall.ru/index.php?app=core&module=global&section=login"),
"tesall", "tesall.ru", "member_id")
{
}
[JsonName("TESAllDownloader")]
public class State : State<TESAllDownloader>{}
}
}

View File

@ -363,6 +363,30 @@ namespace Wabbajack.Test
Assert.Equal("Cheese for Everyone!", await filename.Path.ReadAllTextAsync());
}
[Fact]
public async Task TESAllDownloader()
{
await DownloadDispatcher.GetInstance<TESAllDownloader>().Prepare();
const string ini = "[General]\n" +
"directURL=https://tesall.ru/files/getdownload/594545-wabbajack-test-file/";
var state = (AbstractDownloadState)await DownloadDispatcher.ResolveArchive(ini.LoadIniString());
Assert.NotNull(state);
var converted = RoundTripState(state);
Assert.True(await converted.Verify(new Archive(state: null!) { Size = 20}));
await using var filename = new TempFile();
Assert.True(converted.IsWhitelisted(new ServerWhitelist { AllowedPrefixes = new List<string>() }));
await converted.Download(new Archive(state: null!) { Name = "TESAll Test.zip" }, filename.Path);
Assert.Equal(Hash.FromBase64("eSIyd+KOG3s="), await filename.Path.FileHashAsync());
Assert.Equal("Cheese for Everyone!", await filename.Path.ReadAllTextAsync());
}
/* WAITING FOR APPROVAL BY MODERATOR
[Fact]
public async Task DeadlyStreamDownloader()