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 a few tests

Browse Source
This commit is contained in:
Timothy Baldridge
2020-04-02 15:46:11 -06:00
parent 55fb7e1467
commit aaba7267bd
3 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Wabbajack.Common/Paths.cs
View File

@ -295,16 +295,9 @@ namespace Wabbajack.Common
File.AppendAllText(_path, text); File.AppendAllText(_path, text);
} }
public void CopyTo(AbsolutePath dest, bool useMove = false) public void CopyTo(AbsolutePath dest)
{ {
if (useMove) File.Copy(_path, dest._path);
{
File.Move(_path, dest._path, MoveOptions.ReplaceExisting);
}
else
{
File.Copy(_path, dest._path);
}
} }
public async Task<IEnumerable<string>> ReadAllLinesAsync() public async Task<IEnumerable<string>> ReadAllLinesAsync()

8
Wabbajack.Lib/Downloaders/NexusDownloader.cs
View File

@ -57,14 +57,12 @@ namespace Wabbajack.Lib.Downloaders
if (general.modID != null && general.fileID != null && general.gameName != null) if (general.modID != null && general.fileID != null && general.gameName != null)
{ {
var name = (string)general.gameName; var game = GameRegistry.GetByFuzzyName((string)general.gameName).Game;
var gameMeta = GameRegistry.GetByMO2ArchiveName(name);
var game = gameMeta != null ? GameRegistry.GetByMO2ArchiveName(name).Game : GameRegistry.GetByNexusName(name).Game;
var client = await NexusApiClient.Get(); var client = await NexusApiClient.Get();
dynamic info; ModInfo info;
try try
{ {
info = await client.GetModInfo(game, general.modID); info = await client.GetModInfo(game, long.Parse((string)general.modID));
} }
catch (Exception) catch (Exception)
{ {

2
Wabbajack.Test/DownloaderTests.cs
View File

@ -469,7 +469,7 @@ namespace Wabbajack.Test
using var tempFile = new TempFile(); using var tempFile = new TempFile();
await converted.Download(new Archive {Name = "yt_test.zip"}, tempFile.Path); await converted.Download(new Archive {Name = "yt_test.zip"}, tempFile.Path);
Assert.Equal(Hash.FromBase64("H166oHG0wpY="), await tempFile.Path.FileHashAsync()); Assert.Equal(Hash.FromBase64("kD36zbA2X9Q="), await tempFile.Path.FileHashAsync());
} }