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

Return null instead of Hash.Empty on exception during hashing

Browse Source
This commit is contained in:
erri120 2021-01-09 19:44:52 +01:00
parent a5088bc10e
commit 37683d73a5
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Wabbajack.Common/Hash.cs
View File

@ -274,17 +274,17 @@ namespace Wabbajack.Common
WriteHashCache(file, hash);
}
public static async Task<Hash> FileHashCachedAsync(this AbsolutePath file, bool nullOnIOError = false)
public static async Task<Hash?> FileHashCachedAsync(this AbsolutePath file)
{
if (TryGetHashCache(file, out var foundHash)) return foundHash;
var hash = await file.FileHashAsync(nullOnIOError);
if (hash != Hash.Empty)
WriteHashCache(file, hash);
var hash = await file.FileHashAsync();
if (hash != null && hash != Hash.Empty)
WriteHashCache(file, hash.Value);
return hash;
}
public static async Task<Hash> FileHashAsync(this AbsolutePath file, bool nullOnIOError = false)
public static async Task<Hash?> FileHashAsync(this AbsolutePath file)
{
try
{
@ -294,10 +294,10 @@ namespace Wabbajack.Common
var value = await xxHashFactory.Instance.Create(config).ComputeHashAsync(hs);
return new Hash(BitConverter.ToUInt64(value.Hash));
}
catch (IOException)
catch (IOException e)
{
if (nullOnIOError) return Hash.Empty;
throw;
Utils.Error(e, $"Unable to hash file {file}");
return null;
}
}
}