Fixed code diff with matching code bodies

Author: thesupersonic16

Source/HedgeModManager.UI/ViewModels/MainWindowViewModel.cs

@@ -633,7 +633,14 @@ public async Task UpdateCodesAsync(bool force, bool append)
                 await CreateSimpleDownload("Download.Text.DownloadCodes", "Failed to download community codes",
                     async (d, p, c) =>
                     {
-                        await gameGeneric.DownloadCodes(null);
+                        var diff = await gameGeneric.UpdateCodes();
+                        var blocks = diff.ToList();
+
+                        // Print to logger for now
+                        Logger.Debug($"Updated codes with {blocks.Count} blocks:");
+                        foreach (var block in blocks)
+                            Logger.Debug($"  {block.Type} {block.Description}");
+
                         if (append)
                             gameGeneric.ModDatabase.LoadSingleCodeFile(mainCodesPath);
                         else

Source/HedgeModManager/ModdableGameGeneric.cs

@@ -1,8 +1,11 @@
 namespace HedgeModManager;
 using CoreLib;
 using Foundation;
+using HedgeModManager.CodeCompiler;
+using HedgeModManager.Diagnostics;
 using HedgeModManager.IO;
 using HedgeModManager.Properties;
+using System;
 
 public class ModdableGameGeneric : IModdableGameTDatabase<ModDatabaseGeneric>, IModdableGameTConfiguration<ModLoaderConfiguration>
 {
@@ -47,17 +50,32 @@ public ModdableGameGeneric(IGame game)
         NativeOS = game.NativeOS;
     }
 
-    public async Task DownloadCodes(string? url)
+    public async Task<Diff> UpdateCodes(bool dryRun = false, string? downloadUrl = null)
     {
-        url ??= Resources.CommunityCodesURL;
-        if (url.EndsWith('/'))
-            url += $"{Name}.hmm";
+        downloadUrl ??= Resources.CommunityCodesURL;
+        if (downloadUrl.EndsWith('/'))
+            downloadUrl += $"{Name}.hmm?t={DateTime.Now:yyyyMMddHHmmss}";
 
-        string contents = await Network.Client.GetStringAsync(url);
-        string modsRoot = PathEx.GetDirectoryName(ModLoaderConfiguration.DatabasePath).ToString();
+        string codesPath = Path.Combine(PathEx.GetDirectoryName(ModLoaderConfiguration.DatabasePath).ToString(), ModDatabaseGeneric.MainCodesFileName);
 
-        Directory.CreateDirectory(modsRoot);
-        File.WriteAllText(Path.Combine(modsRoot, ModDatabaseGeneric.MainCodesFileName), contents);
+        var remoteContents = await Network.Client.GetStringAsync(downloadUrl);
+
+        Diff? diff = null;
+        if (File.Exists(codesPath))
+        {
+            var localCodes = CodeFile.FromText(File.ReadAllText(codesPath));
+            var remoteCodes = CodeFile.FromText(remoteContents);
+
+            diff = remoteCodes.CalculateDiff(localCodes);
+        }
+
+        if (!dryRun)
+        {
+            Directory.CreateDirectory(PathEx.GetDirectoryName(codesPath).ToString());
+            File.WriteAllText(codesPath, remoteContents);
+        }
+
+        return diff ?? new Diff();
     }
 
     public async Task InitializeAsync()

Source/Libraries/HedgeModManager.CodeCompiler/CodeFile.cs

@@ -65,10 +65,7 @@ string GetCodeDiffName(CSharpCode code, bool showCodeCategory = false)
         {
             // Added
             if (old.Codes.All(x => x != code))
-            {
                 addedCodes.Add(code);
-                continue;
-            }
         }
 
         foreach (var code in old.Codes)
@@ -99,7 +96,13 @@ void CreateMetadataDiff(CSharpCode compare)
 
             try
             {
-                if (Codes.SingleOrDefault(x => x.Body.Trim() == code.Body.Trim()) is { } renamed)
+                if (Codes.SingleOrDefault(x => x.Name == code.Name && x.Category == code.Category && x.Body.Trim() == code.Body.Trim()) is { } unchanged)
+                {
+                    if (addedCodes.Contains(unchanged))
+                        addedCodes.Remove(unchanged);
+                }
+                else if (Codes.Count(x => x.Body.Trim() == code.Body.Trim()) == 1 &&
+                    Codes.SingleOrDefault(x => x.Body.Trim() == code.Body.Trim()) is { } renamed)
                 {
                     CreateMetadataDiff(renamed);
                 }