Mostly Storage

dedouwe26 · dedouwe26 · commit 1be59446866c · 2025-10-16T18:15:18.000+01:00
diff --git a/GAIL.Networking/Container/Connection.cs b/GAIL.Networking/Container/Connection.cs
@@ -19,7 +19,7 @@ public static byte[] CreateID(IPEndPoint ip) {
     }
 
     /// <summary>
-    /// The 6-byte-long ID from the IP and port of the client.
+    /// The ID from the IP and port of the client.
     /// </summary>
     public readonly byte[] ID;
     /// <summary>
@@ -68,7 +68,7 @@ internal Connection(TcpClient client) {
             throw new ArgumentException("Client is not connected", nameof(client));
         }
         IP = (client.Client.RemoteEndPoint as IPEndPoint)!;
-        ID = CreateID(IP);
+		ID = CreateID(IP);
         TcpClient = client;
         Stream = client.GetStream();
     }
diff --git a/GAIL.Networking/Packet/Packet.cs b/GAIL.Networking/Packet/Packet.cs
@@ -163,7 +163,7 @@ public virtual void Serialize(Serializer serializer) {
             } catch (Exception e) {
                 throw new InvalidOperationException($"Failed at getting field {field.Property.Name} in packet ({PacketInfo.fullyQualifiedName})", e);
             }
-            if (gainedValue is not IRawSerializable serializable) {
+            if (gainedValue is not ISerializable serializable) {
                 throw new InvalidOperationException($"Field {field.Property.Name} in {PacketInfo.fullyQualifiedName} is not a serializable");
             }
 
diff --git a/GAIL.Networking/Streams/NetworkSerializer.cs b/GAIL.Networking/Streams/NetworkSerializer.cs
@@ -1,4 +1,3 @@
-using GAIL.Serializing;
 using GAIL.Serializing.Formatters;
 using GAIL.Serializing.Streams;
 
@@ -40,12 +39,4 @@ public void WritePacket(Packet packet, IFormatter? formatter = null) {
         }
         
     }
-    /// <inheritdoc/>
-    public override void Dispose() {
-        if (Disposed) { return; }
-        
-        base.Dispose();
-        
-        GC.SuppressFinalize(this);
-    }
 }
diff --git a/GAIL.Serializing/Streams/Parser.cs b/GAIL.Serializing/Streams/Parser.cs
@@ -163,9 +163,7 @@ public virtual void Dispose() {
 
         Disposed = true;
 
-        if (!ShouldCloseStream) { return; }
-        
-        BaseStream.Close();
+        if (!ShouldCloseStream) BaseStream.Close();
 
         GC.SuppressFinalize(this);
     }
diff --git a/GAIL.Serializing/Streams/Serializer.cs b/GAIL.Serializing/Streams/Serializer.cs
@@ -112,12 +112,11 @@ public virtual void WriteString(string value, IFormatter? formatter = null) {
     /// </remarks>
     public virtual void Dispose() {
         if (Disposed) { return; }
-        GC.SuppressFinalize(this);
 
         Disposed = true;
 
-        if (!ShouldCloseStream) { return; }
+        if (ShouldCloseStream) BaseStream.Close();
 
-        BaseStream.Close();
+        GC.SuppressFinalize(this);
     }
 }
diff --git a/GAIL.Storage/BaseStorage.cs b/GAIL.Storage/BaseStorage.cs
@@ -2,7 +2,6 @@
 using GAIL.Serializing.Formatters;
 using GAIL.Serializing.Streams;
 using GAIL.Storage.Hierarchy;
-using GAIL.Storage.Streams;
 using LambdaKit.Logging;
 
 namespace GAIL.Storage;
@@ -47,7 +46,7 @@ public static Logger Logger { get {
     /// <returns>True if it succeeded.</returns>
     public virtual bool Load(Stream stream, bool shouldCloseStream = true) {
         try {
-            using StorageParser parser = new(stream, shouldCloseStream);
+            using Serializer parser = new(stream, shouldCloseStream);
             Parse(parser, Formatter);
         } catch (Exception e) {
             Logger.LogError("Failed to load storage file:");
@@ -78,7 +77,7 @@ public virtual bool Load(string filePath) {
     /// <returns>True if it succeeded.</returns>
     public virtual bool Save(Stream stream, bool shouldCloseStream = true) {
         try {
-            using StorageSerializer serializer = new(stream, shouldCloseStream);
+            using Serializer serializer = new(stream, shouldCloseStream);
             Serialize(serializer, Formatter);
         } catch (Exception e) {
             Logger.LogError("Failed to save storage file:");
@@ -103,9 +102,9 @@ public virtual bool Save(string filePath) {
         return Save(fs);
     }
 
-    /// <inheritdoc/>
-    public abstract void Serialize(Serializer serializer, IFormatter? formatter = null);
+	/// <inheritdoc/>
+	public abstract void Serialize(Serializer serializer, IFormatter? formatter = null);
 
-    /// <inheritdoc/>
-    public abstract void Parse(Parser parser, IFormatter? formatter = null);
+	/// <inheritdoc/>
+	public abstract void Parse(Parser parser, IFormatter? formatter = null);
 }
diff --git a/GAIL.Storage/LookupStorage.cs b/GAIL.Storage/LookupStorage.cs
@@ -1,19 +1,44 @@
+using GAIL.Serializing;
 using GAIL.Serializing.Formatters;
 using GAIL.Serializing.Streams;
+using GAIL.Storage.Hierarchy;
 
 namespace GAIL.Storage;
 
 /// <summary>
 /// A file containing data and a lookup table.
 /// </summary>
 public class LookupStorage : BaseStorage {
-    public LookupTable lookupTable;
-    /// <inheritdoc/>
-    public override void Parse(Parser parser, IFormatter? formatter = null) {
-        lookupTable = parser.ReadSerializable(LookupTable.Info);
+    public LookupTable LookupTable { get; private set; }
+	/// <inheritdoc/>
+	public override void Parse(Parser parser, IFormatter? formatter = null) {
+		if (formatter != null) {
+			parser.Decode((p) => {
+				Parse(p, null);
+			}, formatter);
+		}
+        LookupTable = parser.ReadSerializable(LookupTable.Info);
     }
 
-    /// <inheritdoc/>
-    public override void Serialize(Serializer serializer, IFormatter? formatter = null) {
+	private void WriteChild(Serializer serializer, IChildNode child) {
+		if (child is IParentNode parent) {
+			foreach (IChildNode c in parent.Children.Values) {
+				WriteChild(serializer, c);
+			}
+		} else if (child is ISerializable serializable) {
+			serializer.WriteSerializable(serializable);
+		}
+	}
+	/// <inheritdoc/>
+	public override void Serialize(Serializer serializer, IFormatter? formatter = null) {
+		if (formatter != null) {
+			serializer.Encode((s) => {
+				Serialize(s, null);
+			}, formatter);
+		}
+        serializer.WriteSerializable(LookupTable);
+		foreach (IChildNode child in children.Values) {
+			
+		}
     }
 }
diff --git a/GAIL.Storage/LookupTable.cs b/GAIL.Storage/LookupTable.cs
@@ -15,17 +15,26 @@ private static Dictionary<string, uint> GenerateLookupTable(LookupStorage storag
 
     }
 
-    public Dictionary<string, uint> lookup;
+    public readonly Dictionary<string, uint> lookup;
 
     public LookupTable(Dictionary<string, uint> lookupDictionary) {
         lookup = lookupDictionary;
     }
     public LookupTable() : this([]) { }
     public LookupTable(LookupStorage storage) : this(GenerateLookupTable(storage)) { }
 
+    private static KeyValuePair<string, uint> ReadPair(Parser p) {
+		return new(p.ReadString(), p.ReadUInt());
+	}
     /// <inheritdoc/>
     public void Parse(Parser parser, IFormatter? formatter = null) {
-        throw new NotImplementedException();
+        if (formatter != null) {
+			parser.Decode((p) => {
+				ReadPair(p);
+			}, formatter);
+		} else {
+			ReadPair(p);
+        }
     }
 
     /// <inheritdoc/>
diff --git a/GAIL.Storage/Members/Container.cs b/GAIL.Storage/Members/Container.cs
@@ -1,11 +1,13 @@
+using GAIL.Serializing.Formatters;
+using GAIL.Serializing.Streams;
 using GAIL.Storage.Hierarchy;
 
 namespace GAIL.Storage.Members;
 
 /// <summary>
 /// A container can contain more members with keys.
 /// </summary>
-public sealed class Container : Node {
+public sealed class Container : Node, IField {
     /// <summary>
     /// Creates a new container.
     /// </summary>
@@ -24,4 +26,14 @@ public Container(string key, Dictionary<string, IChildNode>? members = null) : b
     public Container(string key, IParentNode parent, Dictionary<string, IChildNode>? members = null) : base(key, parent) {
         children = members??[];
     }
+
+	public void Parse(Parser parser, IFormatter? formatter = null)
+	{
+		throw new NotImplementedException();
+	}
+
+	public void Serialize(Serializer serializer, IFormatter? formatter = null)
+	{
+		throw new NotImplementedException();
+	}
 }
diff --git a/GAIL.Storage/Members/Field.cs b/GAIL.Storage/Members/Field.cs
@@ -1,3 +1,4 @@
+using System.Diagnostics.Contracts;
 using GAIL.Serializing;
 using GAIL.Serializing.Formatters;
 using GAIL.Serializing.Streams;
@@ -7,23 +8,14 @@ namespace GAIL.Storage.Members;
 
 
 /// <summary>
-/// Represents a node in a storage file with actual data.
+/// Represents a node in a storage file with data.
 /// </summary>
 public interface IField : IChildNode, ISerializable {
     /// <summary>
-    /// Creates this class from bytes.
-    /// </summary>
-    /// <param name="parser">The parser to read from.</param>
-    /// <param name="readKey">Whether the key of the field should be read.</param>
-    /// <param name="formatter">The formatter to use.</param>
-    public void Parse(Parser parser, bool readKey = true, IFormatter? formatter = null);
-    /// <summary>
-    /// Turns this class into bytes.
-    /// </summary>
-    /// <param name="serializer">The serializer to write to.</param>
-    /// <param name="writeKey">Whether the key of the field should be written.</param>
-    /// <param name="formatter">The formatter to use.</param>
-    public void Serialize(Serializer serializer, bool writeKey = true, IFormatter? formatter = null);
+	/// The type of this field.
+	/// </summary>
+    [Pure]
+    public MemberType Type { get; }
 }
 /// <summary>
 /// Represents a node in a storage file with an actual value.
diff --git a/GAIL.Storage/Members/MemberType.cs b/GAIL.Storage/Members/MemberType.cs
@@ -0,0 +1,8 @@
+namespace GAIL.Storage.Members;
+
+public enum MemberType : byte {
+	End,
+	Container,
+	List,
+	Serializable
+}
diff --git a/GAIL.Storage/Members/SerializableExtensions.cs b/GAIL.Storage/Members/SerializableExtensions.cs
diff --git a/GAIL.Storage/SimpleStorage.cs b/GAIL.Storage/SimpleStorage.cs
@@ -1,46 +1,36 @@
 using GAIL.Serializing.Formatters;
+using GAIL.Serializing.Streams;
+using GAIL.Storage.Hierarchy;
 using GAIL.Storage.Streams;
 
 namespace GAIL.Storage;
 
 /// <summary>
 /// Represents a file containing data.
 /// </summary>
-public sealed class SimpleStorage : BaseStorage {
+public sealed class SimpleStorage : BaseStorage, IParentNode {
     /// <inheritdoc/>
     public SimpleStorage(IFormatter? formatter = null) : base(formatter) { }
 
-    /// <inheritdoc/>
-    public override bool Load(Stream stream) {
-        StorageParser parser;
-
-        try {
-            parser = new(stream, false);
-        } catch (InvalidOperationException) {
-            return false;
-        }
-
-        try {
-            children = parser.Parse(Formatter);
-        } catch (KeyNotFoundException) {
-            return false;
-        }
-        parser.Dispose();
-
-        return true;
-    }
-
-    /// <inheritdoc/>
-    public override bool Save(Stream stream) {
-        StorageSerializer serializer = new(stream, false);
-
-        try {
-            serializer.Serialize(Children, Formatter);
-        } catch (InvalidOperationException) {
-            return false;
+	/// <inheritdoc/>
+	public override void Parse(Parser parser, IFormatter? formatter = null) {
+		if (formatter != null) {
+			parser.Decode((p) => {
+				Parse(p, null);
+			}, formatter);
+		} else {
+			children = parser.ReadChildren().ToDictionary(static x => x.Key, static x => x);
+		}
+	}
+
+	/// <inheritdoc/>
+	public override void Serialize(Serializer serializer, IFormatter? formatter = null) {
+		if (formatter != null) {
+			serializer.Encode((s) => {
+				Serialize(s, null);
+			}, formatter);
+		} else {
+            serializer.WriteChildren([.. children.Values]);
         }
-        serializer.Dispose();
-
-        return true;
-    }
+	}
 }
diff --git a/GAIL.Storage/Streams/ParserExtensions.cs b/GAIL.Storage/Streams/ParserExtensions.cs
@@ -0,0 +1,53 @@
+using GAIL.Serializing.Streams;
+using GAIL.Storage.Hierarchy;
+using GAIL.Storage.Members;
+
+namespace GAIL.Storage.Streams;
+
+/// <summary>
+/// Adds methods to read storage specific data.
+/// </summary>
+public static class ParserExtensions {
+	/// <summary>
+	/// Reads the type from the parser.
+	/// </summary>
+	/// <param name="parser">The parser to read from.</param>
+	/// <returns>The read member type.</returns>
+	public static MemberType ReadType(this Parser parser) {
+		return (MemberType)parser.ReadByte();
+	}
+	/// <summary>
+	/// Reads any valid member from the stream.
+	/// </summary>
+	/// <param name="parser">The parser to read from.</param>
+	/// <param name="hasKey">True if there is a key to read.</param>
+	/// <returns>The new parsed member, null if it is an end.</returns>
+	public static IChildNode? ReadMember(this Parser parser, bool hasKey = true) {
+		MemberType type = ReadType(parser);
+		string key = "";
+        if (hasKey) {
+            key = parser.ReadString();
+        }
+
+		return parser.ReadSerializable(info) as IChildNode;
+	}
+	/// <summary>
+	/// Reads multiple members.
+	/// </summary>
+	/// <param name="parser">The parser to read from.</param>
+	/// <param name="hasKey">If it should read keys.</param>
+	/// <returns>A list of parsed members.</returns>
+	public static List<IChildNode> ReadChildren(this Parser parser, bool hasKey = true) {
+        IChildNode? member;
+        try {
+            member = ReadMember(parser, hasKey);
+        } catch (EndOfStreamException) {
+            return [];
+        }
+        if (member==null) {
+            return [];
+        } else {
+            return [member, .. ReadChildren(parser, hasKey)];
+        }
+    }
+}
diff --git a/GAIL.Storage/Streams/SerializerExtensions.cs b/GAIL.Storage/Streams/SerializerExtensions.cs
diff --git a/GAIL.Storage/Streams/StorageParser.cs b/GAIL.Storage/Streams/StorageParser.cs
diff --git a/GAIL.Storage/Streams/StorageSerializer.cs b/GAIL.Storage/Streams/StorageSerializer.cs

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public static byte[] CreateID(IPEndPoint ip) {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`/// <summary>`
`22`		`- /// The 6-byte-long ID from the IP and port of the client.`
	`22`	`+ /// The ID from the IP and port of the client.`
`23`	`23`	`/// </summary>`
`24`	`24`	`public readonly byte[] ID;`
`25`	`25`	`/// <summary>`
`@@ -68,7 +68,7 @@ internal Connection(TcpClient client) {`
`68`	`68`	`throw new ArgumentException("Client is not connected", nameof(client));`
`69`	`69`	`}`
`70`	`70`	`IP = (client.Client.RemoteEndPoint as IPEndPoint)!;`
`71`		`- ID = CreateID(IP);`
	`71`	`+ ID = CreateID(IP);`
`72`	`72`	`TcpClient = client;`
`73`	`73`	`Stream = client.GetStream();`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ public virtual void Serialize(Serializer serializer) {`
`163`	`163`	`} catch (Exception e) {`
`164`	`164`	`throw new InvalidOperationException($"Failed at getting field {field.Property.Name} in packet ({PacketInfo.fullyQualifiedName})", e);`
`165`	`165`	`}`
`166`		`- if (gainedValue is not IRawSerializable serializable) {`
	`166`	`+ if (gainedValue is not ISerializable serializable) {`
`167`	`167`	`throw new InvalidOperationException($"Field {field.Property.Name} in {PacketInfo.fullyQualifiedName} is not a serializable");`
`168`	`168`	`}`
`169`	`169`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-using GAIL.Serializing;`
`2`	`1`	`using GAIL.Serializing.Formatters;`
`3`	`2`	`using GAIL.Serializing.Streams;`
`4`	`3`
`@@ -40,12 +39,4 @@ public void WritePacket(Packet packet, IFormatter? formatter = null) {`
`40`	`39`	`}`
`41`	`40`
`42`	`41`	`}`
`43`		`- /// <inheritdoc/>`
`44`		`- public override void Dispose() {`
`45`		`- if (Disposed) { return; }`
`46`		`-`
`47`		`- base.Dispose();`
`48`		`-`
`49`		`- GC.SuppressFinalize(this);`
`50`		`- }`
`51`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -163,9 +163,7 @@ public virtual void Dispose() {`
`163`	`163`
`164`	`164`	`Disposed = true;`
`165`	`165`
`166`		`- if (!ShouldCloseStream) { return; }`
`167`		`-`
`168`		`- BaseStream.Close();`
	`166`	`+ if (!ShouldCloseStream) BaseStream.Close();`
`169`	`167`
`170`	`168`	`GC.SuppressFinalize(this);`
`171`	`169`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,12 +112,11 @@ public virtual void WriteString(string value, IFormatter? formatter = null) {`
`112`	`112`	`/// </remarks>`
`113`	`113`	`public virtual void Dispose() {`
`114`	`114`	`if (Disposed) { return; }`
`115`		`- GC.SuppressFinalize(this);`
`116`	`115`
`117`	`116`	`Disposed = true;`
`118`	`117`
`119`		`- if (!ShouldCloseStream) { return; }`
	`118`	`+ if (ShouldCloseStream) BaseStream.Close();`
`120`	`119`
`121`		`- BaseStream.Close();`
	`120`	`+ GC.SuppressFinalize(this);`
`122`	`121`	`}`
`123`	`122`	`}`