Introduce copy operation start/stop callsv0.6.73

This is the first step for a rapid extraction speed increase as we
don't need to open&seek for every file. Sorting by inode is still
need to be written but most archives work fine as they are.

TODO: writing into the archive needs special care (see TODO in zip plugin)

1 files changed, 51 insertions, 38 deletions

diff --git a/UCoreWorkers.pas b/UCoreWorkers.pas
index b2b6479..2b5c4d5 100644
--- a/UCoreWorkers.pas
+++ b/UCoreWorkers.pas
@@ -996,16 +996,14 @@ var DefResponse: integer;   //  Global variables for this function
         if (SrcEngine is TLocalTreeEngine) and (DestEngine is TVFSEngine) then
         begin
           AEngine := DestEngine;
-          Result := (DestEngine as TVFSEngine).CopyFileInEx(SenderThread, SourceFile, DestFile, @CopyFilesWorker_ErrorFunc, Append,
-                                                            @vfs_ask_question_callback, @vfs_ask_password_callback, @vfs_progress_callback, SenderThread);
+          Result := (DestEngine as TVFSEngine).CopyFileInEx(SenderThread, SourceFile, DestFile, @CopyFilesWorker_ErrorFunc, Append);
         end else
 
         //  from VFS engine to local (most common use)
         if (SrcEngine is TVFSEngine) and (DestEngine is TLocalTreeEngine) then
         begin
           AEngine := SrcEngine;
-          Result := (SrcEngine as TVFSEngine).CopyFileOutEx(SenderThread, SourceFile, DestFile, @CopyFilesWorker_ErrorFunc, Append,
-                                                            @vfs_ask_question_callback, @vfs_ask_password_callback, @vfs_progress_callback, SenderThread);
+          Result := (SrcEngine as TVFSEngine).CopyFileOutEx(SenderThread, SourceFile, DestFile, @CopyFilesWorker_ErrorFunc, Append);
         end
 
         //  VFS to VFS (not supported yet)
@@ -1322,6 +1320,7 @@ var i: longint;
     List: TList;
     CurrPath, SaveDestPath, SaveSrcPath, s: string;
     MaxSize: Int64;
+    StartPassed: boolean;
 begin
   List := TList.Create;
   List.Clear;
@@ -1395,45 +1394,59 @@ begin
     ParamBool2 := False;
 
     if MaxSize < 2 then ParamFloat1 := 1 else ParamFloat1 := 100 / (MaxSize - 1);
-    if List.Count > 0 then
-      for i := 0 to List.Count - 1 do begin
-        if Assigned(PDataItemSL(List[i])^.ADestination)
-          then s := string(PDataItemSL(List[i])^.ADestination)
-          else
-        begin
-          s := ProcessPattern(DestEngine, ParamString1, CurrPath, Copy(PDataItemSL(List[i])^.DataItem^.FName, Length(CurrPath) + 1, Length(PDataItemSL(List[i])^.DataItem^.FName) - Length(CurrPath)),
-                              PDataItemSL(List[i])^.DataItem^.IsDir and (not PDataItemSL(List[i])^.DataItem^.IsLnk));
-//          DebugMsg(['s2 = ', Copy(PDataItemSL(List[i])^.AName, Length(CurrPath) + 1, Length(PDataItemSL(List[i])^.AName) - Length(CurrPath)), ', s = ', s]);
-        end;
+    if List.Count > 0 then begin
+      StartPassed := True;
+      if (SrcEngine is TVFSEngine) and (SrcEngine as TVFSEngine).ArchiveMode then
+        StartPassed := StartPassed and (SrcEngine as TVFSEngine).StartCopyOperation(SenderThread, @CopyFilesWorker_ErrorFunc, @vfs_ask_question_callback, @vfs_ask_password_callback, @vfs_progress_callback, SenderThread);
+      if (DestEngine is TVFSEngine) and (DestEngine as TVFSEngine).ArchiveMode then
+        StartPassed := StartPassed and (DestEngine as TVFSEngine).StartCopyOperation(SenderThread, @CopyFilesWorker_ErrorFunc, @vfs_ask_question_callback, @vfs_ask_password_callback, @vfs_progress_callback, SenderThread);
+
+      if StartPassed then
+        for i := 0 to List.Count - 1 do begin
+          if Assigned(PDataItemSL(List[i])^.ADestination)
+            then s := string(PDataItemSL(List[i])^.ADestination)
+            else
+          begin
+            s := ProcessPattern(DestEngine, ParamString1, CurrPath, Copy(PDataItemSL(List[i])^.DataItem^.FName, Length(CurrPath) + 1, Length(PDataItemSL(List[i])^.DataItem^.FName) - Length(CurrPath)),
+                                PDataItemSL(List[i])^.DataItem^.IsDir and (not PDataItemSL(List[i])^.DataItem^.IsLnk));
+  //          DebugMsg(['s2 = ', Copy(PDataItemSL(List[i])^.AName, Length(CurrPath) + 1, Length(PDataItemSL(List[i])^.AName) - Length(CurrPath)), ', s = ', s]);
+          end;
 
-        if not (SrcEngine is TVFSEngine) then UpdateCaption1(Format(LANGFromS, [string(PDataItemSL(List[i])^.DataItem^.FDisplayName)])) else
-        if (SrcEngine as TVFSEngine).ArchiveMode then UpdateCaption1(Format(LANGFromS, [Format(ConstFullPathFormatStr, [(SrcEngine as TVFSEngine).ArchivePath, string(PDataItemSL(List[i])^.DataItem^.FDisplayName)])]))
-                                                 else UpdateCaption1(Format(LANGFromS, [GetURIPrefix((SrcEngine as TVFSEngine).GetPathURI) + StrToUTF8(string(PDataItemSL(List[i])^.DataItem^.FDisplayName))]));
-        if not (DestEngine is TVFSEngine) then UpdateCaption2(Format(LANGToS, [StrToUTF8(s)])) else
-        if (DestEngine as TVFSEngine).ArchiveMode then UpdateCaption2(Format(LANGToS, [Format(ConstFullPathFormatStr, [(DestEngine as TVFSEngine).ArchivePath, StrToUTF8(s)])]))
-                                                  else UpdateCaption2(Format(LANGToS, [GetURIPrefix((DestEngine as TVFSEngine).GetPathURI) + StrToUTF8(s)]));
-        CommitGUIUpdate;
-        if TwoSameFiles(s, string(PDataItemSL(List[i])^.DataItem^.FName), ParamBool3) and (not PDataItemSL(List[i])^.DataItem^.IsDir) then begin
-          FCancelMessage := LANGCannotCopyFileToItself;
-          FShowCancelMessage := True;
-          ErrorHappened := True;
-          Break;
-        end;
-// * FIXME: why the hell we had something like this here??
-//        if s <> string(PDataItemSL(List[i])^.DataItem^.FName) then
-          if not HandleCopy(List[i], s) then begin
+          if not (SrcEngine is TVFSEngine) then UpdateCaption1(Format(LANGFromS, [string(PDataItemSL(List[i])^.DataItem^.FDisplayName)])) else
+          if (SrcEngine as TVFSEngine).ArchiveMode then UpdateCaption1(Format(LANGFromS, [Format(ConstFullPathFormatStr, [(SrcEngine as TVFSEngine).ArchivePath, string(PDataItemSL(List[i])^.DataItem^.FDisplayName)])]))
+                                                   else UpdateCaption1(Format(LANGFromS, [GetURIPrefix((SrcEngine as TVFSEngine).GetPathURI) + StrToUTF8(string(PDataItemSL(List[i])^.DataItem^.FDisplayName))]));
+          if not (DestEngine is TVFSEngine) then UpdateCaption2(Format(LANGToS, [StrToUTF8(s)])) else
+          if (DestEngine as TVFSEngine).ArchiveMode then UpdateCaption2(Format(LANGToS, [Format(ConstFullPathFormatStr, [(DestEngine as TVFSEngine).ArchivePath, StrToUTF8(s)])]))
+                                                    else UpdateCaption2(Format(LANGToS, [GetURIPrefix((DestEngine as TVFSEngine).GetPathURI) + StrToUTF8(s)]));
+          CommitGUIUpdate;
+          if TwoSameFiles(s, string(PDataItemSL(List[i])^.DataItem^.FName), ParamBool3) and (not PDataItemSL(List[i])^.DataItem^.IsDir) then begin
+            FCancelMessage := LANGCannotCopyFileToItself;
+            FShowCancelMessage := True;
+            ErrorHappened := True;
+            Break;
+          end;
+  // * FIXME: why the hell we had something like this here??
+  //        if s <> string(PDataItemSL(List[i])^.DataItem^.FName) then
+            if not HandleCopy(List[i], s) then begin
+              ErrorHappened := True;
+              Break;
+            end;
+          if (not PDataItemSL(List[i])^.DataItem^.IsDir) and (not PDataItemSL(List[i])^.DataItem^.IsLnk)
+            then Inc(ParamInt64, PDataItemSL(List[i])^.DataItem^.Size);
+          if Cancelled then begin
+            FCancelMessage := LANGUserCancelled;
+            FShowCancelMessage := True;
             ErrorHappened := True;
             Break;
           end;
-        if (not PDataItemSL(List[i])^.DataItem^.IsDir) and (not PDataItemSL(List[i])^.DataItem^.IsLnk)
-          then Inc(ParamInt64, PDataItemSL(List[i])^.DataItem^.Size);
-        if Cancelled then begin
-          FCancelMessage := LANGUserCancelled;
-          FShowCancelMessage := True;
-          ErrorHappened := True;
-          Break;
         end;
-      end;
+
+      //  We need to ensure these to be called in case of error
+      if (SrcEngine is TVFSEngine) and (SrcEngine as TVFSEngine).ArchiveMode then
+        (SrcEngine as TVFSEngine).StopCopyOperation(SenderThread, @CopyFilesWorker_ErrorFunc);
+      if (DestEngine is TVFSEngine) and (DestEngine as TVFSEngine).ArchiveMode then
+        (DestEngine as TVFSEngine).StopCopyOperation(SenderThread, @CopyFilesWorker_ErrorFunc);
+    end;
 
     //  Free the objects
     if List.Count > 0 then