Fix file identifiers not checked on existing files, lost by the merge 4…

…99eb8d
CnCNet · Feb 24, 2024 · 46245b8 · 46245b8
1 parent 25b5ae6
commit 46245b8
Showing 1 changed file with 12 additions and 14 deletions.
diff --git a/ClientUpdater/Updater.cs b/ClientUpdater/Updater.cs
@@ -1428,9 +1428,7 @@ private static async ValueTask<string> DownloadFileAsync(UpdaterFileInfo fileInf
             if (downloadFile.Exists &&
                 (fileInfo.Archived ? fileInfo.Identifier : fileInfo.ArchiveIdentifier) == GetUniqueIdForFile(fileRelativePath))
             {
-                string msg = "File " + filename + " has already been downloaded, skipping downloading.";
-                Logger.Log("Updater: " + msg);
-                return msg;
+                Logger.Log("Updater: File " + filename + " has already been downloaded, skipping downloading.");
             }
             else
             {
@@ -1487,21 +1485,21 @@ private static async ValueTask<string> DownloadFileAsync(UpdaterFileInfo fileInf
                     Logger.Log($"Updater: File {downloadFile.Name} execute permission added. Current permission flags: " + downloadFile.UnixFileMode);
                 }
 #endif
+            }
 
-                string fileIdentifier = CheckFileIdentifiers(filename, SafePath.CombineFilePath(prefixPath, filename), fileInfo.Identifier);
-                if (string.IsNullOrEmpty(fileIdentifier))
-                {
-                    Logger.Log("Updater: File " + filename + " is intact.");
+            string fileIdentifier = CheckFileIdentifiers(filename, SafePath.CombineFilePath(prefixPath, filename), fileInfo.Identifier);
+            if (string.IsNullOrEmpty(fileIdentifier))
+            {
+                Logger.Log("Updater: File " + filename + " is intact.");
 
-                    return null;
-                }
+                return null;
+            }
 
-                string msg = "Downloaded file " + filename + " has a non-matching identifier: " + fileIdentifier + " against " + fileInfo.Identifier;
-                Logger.Log("Updater: " + msg);
-                DeleteFileAndWait(decompressedFile.FullName);
+            string msg = "Downloaded file " + filename + " has a non-matching identifier: " + fileIdentifier + " against " + fileInfo.Identifier;
+            Logger.Log("Updater: " + msg);
+            DeleteFileAndWait(decompressedFile.FullName);
 
-                return msg;
-            }
+            return msg;
         }
         catch (Exception exception)
         {