diff --git a/Code/Flowframes.csproj b/Code/Flowframes.csproj index 25eb4f4..8159c17 100644 --- a/Code/Flowframes.csproj +++ b/Code/Flowframes.csproj @@ -77,6 +77,8 @@ prompt MinimumRecommendedRules.ruleset true + true + Off @@ -101,11 +103,11 @@ packages\HTAlt.Standart.0.1.6\lib\netstandard2.0\HTAlt.Standart.dll - - packages\Magick.NET-Q8-AnyCPU.7.23.2.1\lib\net40\Magick.NET-Q8-AnyCPU.dll + + packages\Magick.NET-Q8-AnyCPU.7.21.1\lib\net40\Magick.NET-Q8-AnyCPU.dll - - packages\Magick.NET.Core.6.1.2\lib\net40\Magick.NET.Core.dll + + packages\Magick.NET.Core.4.1.0\lib\net40\Magick.NET.Core.dll @@ -127,9 +129,6 @@ - - packages\Standart.Hash.xxHash.3.1.0\lib\netstandard2.0\Standart.Hash.xxHash.dll - packages\System.AppContext.4.3.0\lib\net463\System.AppContext.dll @@ -146,12 +145,6 @@ True - - packages\System.Data.HashFunction.Core.2.0.0\lib\net45\System.Data.HashFunction.Core.dll - - - packages\System.Data.HashFunction.Interfaces.2.0.0\lib\net45\System.Data.HashFunction.Interfaces.dll - packages\System.Diagnostics.DiagnosticSource.4.3.0\lib\net46\System.Diagnostics.DiagnosticSource.dll diff --git a/Code/FodyWeavers.xml b/Code/FodyWeavers.xml index fc8a086..2f2d0e9 100644 --- a/Code/FodyWeavers.xml +++ b/Code/FodyWeavers.xml @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/Code/IO/IOUtils.cs b/Code/IO/IOUtils.cs index 6a8368b..2a150d0 100644 --- a/Code/IO/IOUtils.cs +++ b/Code/IO/IOUtils.cs @@ -4,7 +4,6 @@ using Flowframes.Media; using Flowframes.MiscUtils; using Flowframes.UI; using Force.Crc32; -using Standart.Hash.xxHash; using System; using System.Collections.Generic; using System.Diagnostics; @@ -535,8 +534,8 @@ namespace Flowframes.IO } } - public enum Hash { MD5, CRC32, xxHash } - public static string GetHash (string path, Hash hashType, bool log = true, bool quick = true) + public enum Hash { MD5, CRC32 } + public static string GetHash (string path, Hash hashType, bool log = true) { Benchmarker.Start(); string hashStr = ""; @@ -563,13 +562,7 @@ namespace Flowframes.IO hashStr = BitConverter.ToUInt32(crc32bytes, 0).ToString(); } - if (hashType == Hash.xxHash) - { - ulong xxh64 = xxHash64.ComputeHash(stream, 8192, (ulong)GetFilesize(path)); - hashStr = xxh64.ToString(); - } - - stream.Close(); + stream.Close(); } catch (Exception e) { @@ -584,7 +577,7 @@ namespace Flowframes.IO public static async Task GetHashAsync(string path, Hash hashType, bool log = true, bool quick = true) { await Task.Delay(1); - return GetHash(path, hashType, log, quick); + return GetHash(path, hashType, log); } public static bool CreateDir (string path) // Returns whether the dir already existed diff --git a/Code/packages.config b/Code/packages.config index 2257dd1..8b293d9 100644 --- a/Code/packages.config +++ b/Code/packages.config @@ -8,8 +8,8 @@ - - + + @@ -17,14 +17,11 @@ - - -