adding + merging metadata

ThemModdingHerds · Nov 10, 2024 · b6245bb · b6245bb
1 parent aec9100
commit b6245bb
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 2 deletions.
diff --git a/GFS/GFS.csproj b/GFS/GFS.csproj
@@ -4,7 +4,7 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <AssemblyName>ThemModdingHerds.$(MSBuildProjectName)</AssemblyName>
-        <Version>2.1.0</Version>
+        <Version>2.1.1</Version>
         <Authors>NightTheFox</Authors>
         <Description>GFS parser library for C#</Description>
         <PackageProjectUrl>https://github.com/ThemModdingHerds</PackageProjectUrl>

diff --git a/GFS/RevergePackage.cs b/GFS/RevergePackage.cs
@@ -12,7 +12,10 @@ public static RevergePackage Merge(string id,string ver,params RevergePackage[]
         RevergePackageHeader header = new(id,ver);
         RevergePackage gfs = new(header);
         foreach(RevergePackage pak in files)
+        {
+            gfs.Metadata.Add(pak.Metadata);
             gfs.AddRange(pak);
+        }
         gfs.RecalculateEntries();
         return gfs;
     }
@@ -53,8 +56,16 @@ public static RevergePackage Create(string path,string id,string ver)
             entry.Offset = runningOffset;
             runningOffset += entry.Size;
         }
+        RevergePackage gfs = new(header,entries);
+        // check if perhaps a metadata file exists
+        string metadatapath = $"{path}.metadata";
+        if(File.Exists(metadatapath))
+        {
+            RevergePackageMetadata metadata = RevergePackageMetadata.Read(metadatapath);
+            gfs.Metadata.Merge(metadata);
+        }
         // create the package
-        return new(header,entries);
+        return gfs;
     }
     public static RevergePackage Open(string path)
     {

diff --git a/GFS/RevergePackageMetadata.cs b/GFS/RevergePackageMetadata.cs
@@ -34,6 +34,37 @@ public void Save(string output)
         writer.Write(this);
         writer.Close();
     }
+    public void Add(RevergePackageMetadata other)
+    {
+        foreach(var pair in other)
+        {
+            if(ContainsKey(pair.Key))
+                continue;
+            Add(pair.Key,pair.Value);
+        }
+    }
+    public void Merge(RevergePackageMetadata other)
+    {
+        foreach(var pair in other)
+        {
+            if(ContainsKey(pair.Key))
+            {
+                this[pair.Key] = pair.Value;
+                continue;
+            }
+            Add(pair.Key,pair.Value);
+        }
+    }
+    public void Add(IEnumerable<RevergePackageMetadata> others)
+    {
+        foreach(RevergePackageMetadata metadata in others)
+            Add(metadata);
+    }
+    public void Merge(IEnumerable<RevergePackageMetadata> others)
+    {
+        foreach(RevergePackageMetadata metadata in others)
+            Merge(metadata);
+    }
 }
 public static class RevergePackageMetadataExt
 {