enhanced TStreamRedirect remaining time accuracy

synopse · Aug 11, 2021 · 261554b · 261554b
1 parent 7cb6823
commit 261554b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/src/core/mormot.core.base.pas b/src/core/mormot.core.base.pas
@@ -3547,6 +3547,7 @@   TFakeWriterStream = class(TStream)
     function Seek(Offset: Longint; Origin: Word): Longint; override;
   end;
 
+  {$M+}
   /// TStream with a protected fPosition field
   TStreamWithPosition = class(TStream)
   protected
@@ -3560,6 +3561,7 @@   TStreamWithPosition = class(TStream)
     /// call the 64-bit Seek() overload
     function Seek(Offset: Longint; Origin: Word): Longint; override;
   end;
+  {$M-}
 
   /// TStream using a RawByteString as internal storage
   // - default TStringStream uses UTF-16 WideChars since Delphi 2009, so it is

diff --git a/src/core/mormot.core.buffers.pas b/src/core/mormot.core.buffers.pas
@@ -1779,7 +1779,7 @@   TStreamRedirect = class(TStreamWithPosition)
     fConsoleLen: byte;
     fMode: (mUnknown, mRead, mWrite);
     function GetSize: Int64; override;
-    procedure DoReport;
+    procedure DoReport(ReComputeElapsed: boolean);
     procedure DoHash(data: pointer; len: integer); virtual; // do nothing
     procedure SetExpectedSize(Value: Int64);
     procedure ReadWriteHash(const Buffer; Count: Longint); virtual;
@@ -8290,6 +8290,12 @@ function TStreamRedirect.GetProgress: RawUtf8;
 var
   ctx: shortstring;
 begin
+  if (self = nil) or
+     fTerminated then
+  begin
+    result := '';
+    exit;
+  end;
   Ansi7StringToShortString(Context, ctx);
   if ctx[0] > #30 then
   begin
@@ -8340,8 +8346,10 @@ class procedure TStreamRedirect.ProgressToConsole(Sender: TStreamRedirect);
 end;
 {$I+}
 
-procedure TStreamRedirect.DoReport;
+procedure TStreamRedirect.DoReport(ReComputeElapsed: boolean);
 begin
+  if ReComputeElapsed then
+    fElapsed := GetTickCount64 - fStartTix; // may have changed in-between
   if (fCurrentSize <> fExpectedSize) and
      (fElapsed < fReportTix) then
     exit;
@@ -8450,7 +8458,7 @@ procedure TStreamRedirect.Ended;
   fExpectedSize := fCurrentSize; // reached 100%
   if Assigned(fOnProgress) or
      Assigned(fOnLog) then
-    DoReport; // notify finished
+    DoReport(true); // notify finished
 end;
 
 procedure TStreamRedirect.Terminate;
@@ -8495,7 +8503,7 @@ procedure TStreamRedirect.ReadWriteReport(const Caller: ShortString);
               SleepHiRes(300); // show progress on very low bandwidth
               if Assigned(fOnProgress) or
                  Assigned(fOnLog) then
-                DoReport;
+                DoReport(true);
               dec(tosleep, 300);
               if fTerminated then
                 raise ESynException.CreateUtf8('%.%(%) Terminated',
@@ -8509,7 +8517,7 @@ procedure TStreamRedirect.ReadWriteReport(const Caller: ShortString);
   end;
   if Assigned(fOnProgress) or
      Assigned(fOnLog) then
-    DoReport;
+    DoReport(false);
   if fTerminated then
     raise ESynException.CreateUtf8('%.%(%) Terminated',
       [self, Caller, fContext]);