diff --git a/src/NAppUpdate.Framework/Conditions/FileChecksumCondition.cs b/src/NAppUpdate.Framework/Conditions/FileChecksumCondition.cs index 8632e451..7311ef23 100644 --- a/src/NAppUpdate.Framework/Conditions/FileChecksumCondition.cs +++ b/src/NAppUpdate.Framework/Conditions/FileChecksumCondition.cs @@ -2,6 +2,7 @@ using System.IO; using NAppUpdate.Framework.Common; using NAppUpdate.Framework.Tasks; +using NAppUpdate.Framework.Utils; namespace NAppUpdate.Framework.Conditions { @@ -33,7 +34,7 @@ public bool IsMet(IUpdateTask task) if ("sha256".Equals(ChecksumType, StringComparison.InvariantCultureIgnoreCase)) { - var sha256 = Utils.FileChecksum.GetSHA256Checksum(localPath); + var sha256 = FileChecksum.GetSHA256Checksum(localPath); if (!string.IsNullOrEmpty(sha256) && sha256.Equals(Checksum, StringComparison.InvariantCultureIgnoreCase)) return true; } diff --git a/src/NAppUpdate.Framework/Tasks/FileUpdateTask.cs b/src/NAppUpdate.Framework/Tasks/FileUpdateTask.cs index 2701dbe6..3830f2bf 100644 --- a/src/NAppUpdate.Framework/Tasks/FileUpdateTask.cs +++ b/src/NAppUpdate.Framework/Tasks/FileUpdateTask.cs @@ -1,7 +1,5 @@ using System; using System.IO; -using System.Security.AccessControl; -using System.Security.Principal; using System.Threading; using NAppUpdate.Framework.Common; using NAppUpdate.Framework.Utils; @@ -60,7 +58,7 @@ public override void Prepare(Sources.IUpdateSource source) if (!string.IsNullOrEmpty(Sha256Checksum)) { - string checksum = Utils.FileChecksum.GetSHA256Checksum(_tempFile); + string checksum = FileChecksum.GetSHA256Checksum(_tempFile); if (!checksum.Equals(Sha256Checksum)) throw new UpdateProcessFailedException(string.Format("FileUpdateTask: Checksums do not match; expected {0} but got {1}", Sha256Checksum, checksum)); } @@ -78,7 +76,6 @@ public override TaskExecutionStatus Execute(bool coldRun) } var dirName = Path.GetDirectoryName(_destinationFile); - if (!Directory.Exists(dirName)) { Utils.FileSystem.CreateDirectoryStructure(dirName, false); @@ -92,7 +89,6 @@ public override TaskExecutionStatus Execute(bool coldRun) string backupPath = Path.GetDirectoryName(Path.Combine(UpdateManager.Instance.Config.BackupFolder, LocalPath)); Utils.FileSystem.CreateDirectoryStructure(backupPath, false); } - _backupFile = Path.Combine(UpdateManager.Instance.Config.BackupFolder, LocalPath); File.Copy(_destinationFile, _backupFile, true); } @@ -118,12 +114,11 @@ public override TaskExecutionStatus Execute(bool coldRun) try { if (File.Exists(_destinationFile)) - { - FileSystem.CopyAccessControl(new FileInfo(_destinationFile), new FileInfo(_tempFile)); + { + FileSystem.CopyAccessControl(new FileInfo(_destinationFile), new FileInfo(_tempFile)); File.Delete(_destinationFile); } - File.Move(_tempFile, _destinationFile); _tempFile = null; } @@ -150,8 +145,7 @@ public override TaskExecutionStatus Execute(bool coldRun) return TaskExecutionStatus.RequiresPrivilegedAppRestart; } return TaskExecutionStatus.RequiresAppRestart; - } - + } public override bool Rollback() { @@ -165,7 +159,6 @@ public override bool Rollback() return true; } - /// /// To mitigate problems with the files being locked even though the application mutex has been released. /// https://github.com/synhershko/NAppUpdate/issues/35 diff --git a/src/NAppUpdate.Framework/Utils/FileChecksum.cs b/src/NAppUpdate.Framework/Utils/FileChecksum.cs index 5c49cd07..b7503217 100644 --- a/src/NAppUpdate.Framework/Utils/FileChecksum.cs +++ b/src/NAppUpdate.Framework/Utils/FileChecksum.cs @@ -14,7 +14,7 @@ public static string GetSHA256Checksum(string filePath) { SHA256Managed sha = new SHA256Managed(); byte[] checksum = sha.ComputeHash(stream); - return BitConverter.ToString(checksum).Replace("-", String.Empty); + return BitConverter.ToString(checksum).Replace("-", string.Empty); } }