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

Add TES4RU support back in

Browse Source
This commit is contained in:
Timothy Baldridge
2020-12-15 17:09:59 -07:00
parent b79830ad54
commit aa591bafa7
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,6 +69,16 @@ namespace Wabbajack.Lib.Downloaders
}; };
} }
if (url.PathAndQuery.StartsWith("/files/download/") && long.TryParse(url.PathAndQuery.Split("/").Last(), out var fileId))
{
return new TState
{
FullURL = url.ToString(),
IsAttachment = true
};
}
if (!url.PathAndQuery.StartsWith("/files/file/")) if (!url.PathAndQuery.StartsWith("/files/file/"))
{ {
if (string.IsNullOrWhiteSpace(url.Query)) return null; if (string.IsNullOrWhiteSpace(url.Query)) return null;
@ -76,6 +86,7 @@ namespace Wabbajack.Lib.Downloaders
absolute = false; absolute = false;
} }
var id = HttpUtility.ParseQueryString(url.Query)["r"]; var id = HttpUtility.ParseQueryString(url.Query)["r"];
var file = absolute var file = absolute
? url.AbsolutePath.Split('/').Last(s => s != "") ? url.AbsolutePath.Split('/').Last(s => s != "")

4
Wabbajack.Test/DownloaderTests.cs
View File

@ -407,13 +407,12 @@ namespace Wabbajack.Test
Assert.Equal("Cheese for Everyone!", await filename.Path.ReadAllTextAsync()); Assert.Equal("Cheese for Everyone!", await filename.Path.ReadAllTextAsync());
} }
/* Site is down
[Fact] [Fact]
public async Task TESAllDownloader() public async Task TESAllDownloader()
{ {
await DownloadDispatcher.GetInstance<TESAllDownloader>().Prepare(); await DownloadDispatcher.GetInstance<TESAllDownloader>().Prepare();
const string ini = "[General]\n" + const string ini = "[General]\n" +
"directURL=https://tesall.ru/files/getdownload/594545-wabbajack-test-file/"; "directURL=https://tesall.ru/files/download/594545";
var state = (AbstractDownloadState)await DownloadDispatcher.ResolveArchive(ini.LoadIniString()); var state = (AbstractDownloadState)await DownloadDispatcher.ResolveArchive(ini.LoadIniString());
@ -431,7 +430,6 @@ namespace Wabbajack.Test
Assert.Equal("Cheese for Everyone!", await filename.Path.ReadAllTextAsync()); Assert.Equal("Cheese for Everyone!", await filename.Path.ReadAllTextAsync());
} }
*/
/* WAITING FOR APPROVAL BY MODERATOR /* WAITING FOR APPROVAL BY MODERATOR
[Fact] [Fact]