Changeset 457 for CoolStreaming/UVarBlockSerializer.pas

Timestamp:

Nov 28, 2012, 7:49:20 AM (12 years ago)

Author:

chronos

Message:

• Modified: CoolStreaming TStreamHelper can own stream.
• Added: TVarBlockSerializer support Double and Buffer type.

File:

• CoolStreaming/UVarBlockSerializer.pas (modified) (18 diffs)

CoolStreaming/UVarBlockSerializer.pas

@@ -12 +12 @@
 uses
   Classes, DateUtils, UStreamHelper, Math, SysUtils, USubStream,
-  Contnrs, SpecializedList, LCLProc;
+  SpecializedList, LCLProc;
 
 const
@@ -40 +40 @@
     procedure WriteVarList(List: TListByte);
     procedure ReadVarList(List: TListByte);
+    procedure WriteVarBuffer(var Buffer; Count: Integer);
+    procedure ReadVarBuffer(var Buffer; Count: Integer);
     function GetVarSize: Integer;
     function GetVarCount: Integer;
@@ -51 +53 @@
     procedure WriteVarString(Value: string);
     function ReadVarString: string;
+    procedure WriteVarDouble(Value: Double);
+    function ReadVarDouble: Double;
 
     // Misc methods
@@ -70 +74 @@
   private
   public
-    Items: TObjectList; // TObjectList<TVarBlockSerializer>
+    Items: TListObject; // TListObject<TVarBlockSerializer>
     Enclose: Boolean;
     procedure CheckItem(Index: Integer);
@@ -86 +90 @@
     procedure WriteVarIndexedBlock(Index: Integer; Block: TVarBlockIndexed);
     procedure ReadVarIndexedBlock(Index: Integer; Block: TVarBlockIndexed);
+    procedure WriteVarBuffer(Index: Integer; var Buffer; Count: Integer);
+    procedure ReadVarBuffer(Index: Integer; var Buffer; Count: Integer);
 
     // Advanced data types
@@ -92 +98 @@
     procedure WriteVarFloat(Index: Integer; Value: Double; Base: Integer = 2);
     function ReadVarFloat(Index: Integer; Base: Integer = 2): Double;
+    procedure WriteVarDouble(Index: Integer; Value: Double);
+    function ReadVarDouble(Index: Integer): Double;
     procedure WriteVarString(Index: Integer; Value: string);
     function ReadVarString(Index: Integer): string;
@@ -324 +332 @@
     Block.Free;
   end;
+end;
+
+procedure TVarBlockSerializer.WriteVarDouble(Value: Double);
+begin
+  WriteVarBuffer(Value, 8);
+end;
+
+function TVarBlockSerializer.ReadVarDouble: Double;
+begin
+  Result := 0;
+  ReadVarBuffer(Result, 8);
 end;
 
@@ -428 +447 @@
     WriteVarStream(Mem);
   finally
-    Mem.Free
+    Mem.Free;
   end;
 end;
@@ -439 +458 @@
     Mem := TMemoryStream.Create;
     ReadVarStream(Mem);
+    Mem.Position := 0;
     List.Count := Mem.Size;
     List.ReplaceStream(Mem);
   finally
-    Mem.Free
+    Mem.Free;
+  end;
+end;
+
+procedure TVarBlockSerializer.WriteVarBuffer(var Buffer; Count: Integer);
+var
+  Mem: TMemoryStream;
+begin
+  try
+    Mem := TMemoryStream.Create;
+    Mem.WriteBuffer(Buffer, Count);
+    WriteVarStream(Mem);
+  finally
+    Mem.Free;
+  end;
+end;
+
+procedure TVarBlockSerializer.ReadVarBuffer(var Buffer; Count: Integer);
+var
+  Mem: TMemoryStream;
+begin
+  try
+    Mem := TMemoryStream.Create;
+    ReadVarStream(Mem);
+    Mem.Position := 0;
+    Mem.ReadBuffer(Buffer, Count);
+  finally
+    Mem.Free;
   end;
 end;
@@ -542 +589 @@
   I: Integer;
   StreamHelper: TStreamHelper;
-  RequestedSize: Integer;
 begin
   try
@@ -552 +598 @@
       I := 0;
       while (Stream.Position < Stream.Size) and (I < Index) do begin
-        if TestMask(Mask, I) then Stream.Position := Stream.Position + GetVarSize;
+        if TestMask(Mask, I) then
+          Stream.Position := Stream.Position + GetVarSize;
         Inc(I);
       end;
@@ -738 +785 @@
 procedure TVarBlockIndexed.ReadVarList(Index: Integer; List: TListByte);
 begin
+  TVarBlockSerializer(Items[Index]).Stream.Position := 0;
   TVarBlockSerializer(Items[Index]).ReadVarList(List);
 end;
@@ -771 +819 @@
 end;
 
+procedure TVarBlockIndexed.WriteVarBuffer(Index: Integer; var Buffer;
+  Count: Integer);
+begin
+  CheckItem(Index);
+  TVarBlockSerializer(Items[Index]).WriteVarBuffer(Buffer, Count);
+end;
+
+procedure TVarBlockIndexed.ReadVarBuffer(Index: Integer; var Buffer;
+  Count: Integer);
+begin
+  CheckItem(Index);
+  TVarBlockSerializer(Items[Index]).ReadVarBuffer(Buffer, Count);
+end;
+
 procedure TVarBlockIndexed.WriteVarSInt(Index: Integer; Value:Int64);
 begin
@@ -793 +855 @@
   TVarBlockSerializer(Items[Index]).Stream.Position := 0;
   Result := TVarBlockSerializer(Items[Index]).ReadVarFloat(Base);
+end;
+
+procedure TVarBlockIndexed.WriteVarDouble(Index: Integer; Value: Double);
+begin
+  CheckItem(Index);
+  TVarBlockSerializer(Items[Index]).WriteVarDouble(Value);
+end;
+
+function TVarBlockIndexed.ReadVarDouble(Index: Integer): Double;
+begin
+  TVarBlockSerializer(Items[Index]).Stream.Position := 0;
+  Result := TVarBlockSerializer(Items[Index]).ReadVarDouble;
 end;
 
@@ -892 +966 @@
   I: Integer;
   StreamHelper: TStreamHelper;
-begin
-  try
-    StreamHelper := TStreamHelper.Create(VarBlock.Stream);
-    VarBlock.Stream.Size := 0;
+  Temp: TVarBlockSerializer;
+  Output: TVarBlockSerializer;
+begin
+  try
+    if Enclose then begin
+      Temp := TVarBlockSerializer.Create;
+      Output := Temp;
+    end else begin
+      Temp := nil;
+      Output := VarBlock;
+    end;
+    StreamHelper := TStreamHelper.Create(Output.Stream);
+
+    Output.Stream.Size := 0;
     Mask := 0;
     for I := 0 to Items.Count - 1 do
       if Assigned(Items[I]) then Mask := Mask or (1 shl I);
-    VarBlock.WriteVarUInt(Mask);
+    Output.WriteVarUInt(Mask);
     for I := 0 to Items.Count - 1 do
-      if Assigned(Items[I]) then StreamHelper.WriteStream(TVarBlockSerializer(Items[I]).Stream,
+      if Assigned(Items[I]) then
+        StreamHelper.WriteStream(TVarBlockSerializer(Items[I]).Stream,
         TVarBlockSerializer(Items[I]).Stream.Size);
-    if Enclose then VarBlock.BlockEnclose;
-  finally
+
+    if Enclose then VarBlock.WriteVarBlock(Temp);
+  finally
+    if Assigned(Temp) then Temp.Free;
     StreamHelper.Free;
   end;
@@ -913 +1000 @@
   Mask: Integer;
   I: Integer;
-begin
-  if Enclose then VarBlock.BlockUnclose;
-  VarBlock.Stream.Position := 0;
-  Mask := VarBlock.ReadVarUInt;
+  Temp: TVarBlockSerializer;
+  Input: TVarBlockSerializer;
+  StreamHelper: TStreamHelper;
+begin
+  try
+    StreamHelper := TStreamHelper.Create;
+  if Enclose then begin
+    Temp := TVarBlockSerializer.Create;
+    Temp.ReadVarBlock(VarBlock);
+    Input := Temp;
+  end else begin
+    Temp := nil;
+    Input := VarBlock;
+  end;
+  StreamHelper.Stream := Input.Stream;
+
+  Input.Stream.Position := 0;
+  Mask := Input.ReadVarUInt;
   Items.Clear;
   I := 0;
-  while Mask <> 0 do begin
-    if VarBlock.TestMask(Mask, I) then begin
-      if Items.Count <= I then Items.Count := I + 1;
-      Items[I] := TVarBlockSerializer.Create;
-      VarBlock.ReadItemByMaskIndex(I, TVarBlockSerializer(Items[I]));
+  while (Mask <> 0) and (Input.Stream.Position < Input.Stream.Size) do begin
+    if Input.TestMask(Mask, I) then begin
+      CheckItem(I);
+      TVarBlockSerializer(Items[I]).Stream.Size := 0;
+      StreamHelper.ReadStream(TVarBlockSerializer(Items[I]).Stream, Input.GetVarSize);
+      //Input.ReadItemByMaskIndex(I, TVarBlockSerializer(Items[I]));
       Mask := Mask xor (1 shl I); // Clear bit on current index
     end;
     Inc(I);
+  end;
+  finally
+    if Assigned(Temp) then Temp.Free;
+    StreamHelper.Free;
   end;
 end;
@@ -988 +1094 @@
 constructor TVarBlockIndexed.Create;
 begin
-  Items := TObjectList.Create;
+  Items := TListObject.Create;
   Enclose := True;
 end;
@@ -994 +1100 @@
 destructor TVarBlockIndexed.Destroy;
 begin
-  Items.Free;
-  inherited Destroy;
+  FreeAndNil(Items);
+  inherited;
 end;