Merge branch 'develop'

Quick.Azure.pas

@@ -1,13 +1,13 @@
 { ***************************************************************************
 
-  Copyright (c) 2015-2017 Kike Pérez
+  Copyright (c) 2015-2019 Kike Pérez
 
   Unit        : Quick.Azure
   Description : Azure blobs operations
   Author      : Kike Pérez
   Version     : 1.2
   Created     : 27/08/2015
-  Modified    : 13/09/2017
+  Modified    : 11/03/2019
 
   This file is part of QuickLib: https://github.com/exilon/QuickLib
 
@@ -281,7 +281,8 @@ begin
     try
       BlobService.Timeout := fTimeout;
       Content := FileToArray(cFilename);
-      if azBlobName = '' then blobname := cFilename;
+      if azBlobName = '' then blobname := cFilename
+        else blobname := azBlobName;
       if blobname.StartsWith('/') then blobname := Copy(blobname,2,Length(blobname));
       Result := BlobService.PutBlockBlob(container,blobname,Content,EmptyStr,nil,nil,CloudResponseInfo);
       azResponseInfo := GetResponseInfo(CloudResponseInfo);

Quick.Commons.pas

@@ -270,6 +270,8 @@ type
   function CountDigits(anInt: Cardinal): Cardinal; inline;
   //save stream to file
   procedure SaveStreamToFile(stream : TStream; const filename : string);
+  //save stream to string
+  function StreamToString(stream : TStream) : string;
   //returns a real comma separated text from stringlist
   function CommaText(aList : TStringList) : string;
   {$IFDEF MSWINDOWS}
@@ -1180,6 +1182,22 @@ begin
   end;
 end;
 
+function StreamToString(stream : TStream) : string;
+var
+  ss : TStringStream;
+begin
+  if stream = nil then Exit;
+  ss := TStringStream.Create;
+  try
+    stream.Seek(0,soBeginning);
+    ss.CopyFrom(stream,stream.Size);
+    Result := ss.DataString;
+  finally
+    ss.Free;
+  end;
+end;
+
+
 function CommaText(aList : TStringList) : string;
 var
   value : string;

Quick.Console.pas

@@ -1064,7 +1064,11 @@ InitCriticalSection(CSConsole);
   {$IFNDEF DELPHILINUX}
   InitializeCriticalSection(CSConsole);
   //init stdout if not a service
-  if GetStdHandle(STD_OUTPUT_HANDLE) <> 0 then InitConsole;
+  try
+    if GetStdHandle(STD_OUTPUT_HANDLE) <> 0 then InitConsole;
+  except
+    //avoid raise exception
+  end;
   {$ELSE}
   CSConsole := TRTLCriticalSection.Create;
   {$ENDIF}

Quick.Json.Serializer.pas

@@ -844,7 +844,6 @@ end;
 function TRTTIJson.GetPropertyValue(Instance : TObject; const PropertyName : string) : TValue;
 var
   pinfo : PPropInfo;
-  enum : Integer;
 begin
   Result := nil;
   pinfo := GetPropInfo(Instance,PropertyName);

Quick.Value.pas

@@ -7,7 +7,7 @@
   Author      : Kike Pérez
   Version     : 1.4
   Created     : 07/01/2019
-  Modified    : 24/01/2019
+  Modified    : 11/03/2019
 
   This file is part of QuickLib: https://github.com/exilon/QuickLib
 
@@ -213,7 +213,7 @@ type
     function CastToDateTime : TDateTime;
     function CastToObject: TObject;
     function CastToPointer: Pointer;
-    function CastToInterface: Pointer;
+    function CastToInterface: IInterface;
     function CastToVariant: Variant;
     function CastToCardinal : Cardinal;
     procedure SetAsString(const Value : string);
@@ -231,6 +231,7 @@ type
     procedure SetAsDateTime(const Value : TDateTime);
     procedure SetAsVariant(const Value: Variant);
     procedure SetAsCardinal(const Value : Cardinal);
+    procedure SetAsInterface(const Value: IInterface);
   public
     constructor Create(const Value: TVarRec);
     property DataType : TValueDataType read fDataType;
@@ -245,7 +246,7 @@ type
     property AsBoolean : Boolean read CastToBoolean write SetAsBoolean;
     property AsPointer : Pointer read CastToPointer write SetAsPointer;
     property AsClass : TClass read CastToClass write SetAsClass;
-    property AsInterface : Pointer read CastToInterface write SetAsPointer;
+    property AsInterface : IInterface read CastToInterface write SetAsInterface;
     property AsObject : TObject read CastToObject write SetAsObject;
     property AsVariant : Variant  read CastToVariant write SetAsVariant;
     property AsCardinal : Cardinal read CastToCardinal write SetAsCardinal;
@@ -515,12 +516,13 @@ begin
   end;
 end;
 
-function TFlexValue.CastToInterface: Pointer;
+function TFlexValue.CastToInterface: IInterface;
 begin
   try
     case fDataType of
       dtNull : Result := nil;
-      dtInterface : Result := IInterface(fDataIntf);
+      dtInterface : Result := fDataIntf;
+      dtPointer : Result := IInterface(fDataIntf);
       else raise Exception.Create('DataType not supported');
     end;
   except
@@ -720,6 +722,12 @@ begin
   fDataType := TValueDataType.dtInteger;
 end;
 
+procedure TFlexValue.SetAsInterface(const Value: IInterface);
+begin
+  fDataIntf := Value;
+  fDataType := TValueDataType.dtInterface;
+end;
+
 procedure TFlexValue.SetAsObject(const Value: TObject);
 begin
   Clear;