ADD: improove Busy flag

Author: PascalCorpsman

src/rest.md

@@ -1,4 +1,4 @@
-# REST-API
+# CopyCommander2, REST-API
 
 This is the CopyCommander2 Rest API Documentation.
 

src/ucopycommander.pas

@@ -92,6 +92,7 @@
 
   TWorkThread = Class(TThread)
   private
+    fBusy: integer; // 0 = nichts mehr zu tun, > 0 Wir arbeiten noch irgendwas..
     fAJob: TJob; // Der Job der Im Moment Abgearbeitet wird.
     fJobProgress: Byte; // Fortschritt in Prozent füf den Aktuellen Job
     fStatistic: TTransfereStatistic;
@@ -146,7 +147,7 @@
     Procedure AddJob(Const Job: TJob);
     Function ExistJob(Const Job: TJob): Boolean;
 
-    Function JobsPending(): Boolean; // True, wenn der Worker noch irgendwas zu tun hat...
+    Function Busy: Boolean; // True, wenn der Worker noch irgendwas zu tun hat...
 
     Procedure CancelAllJobs();
 
@@ -533,25 +534,29 @@
   BufferSize: Integer;
   FreeDiskSpace: Int64;
 Begin
+  inc(fBusy);
   fCopyFileDetailError := 'Unknown error';
   Result := False;
   If FCancelallJobs Or fCancelActualJob Or (source = dest) Then Begin
     fCopyFileDetailError := '';
     result := true;
+    dec(fBusy);
     exit;
   End;
   // Sicherstellen das dest nicht existiert, Die Fälle wo es existieren darf und
   // Nicht "überschrieben" werden soll klärt der Aufrufer!.
   If FileExistsUTF8(dest) Then Begin
     If Not DeleteFileUTF8(dest) Then Begin
       fCopyFileDetailError := 'Could not delete dest file';
+      dec(fBusy);
       exit;
     End;
   End;
   Try
     SourceFile := FileOpen(utf8tosys(source), fmOpenRead);
     If SourceFile = 0 Then Begin
       fCopyFileDetailError := 'Unable to read source file';
+      dec(fBusy);
       exit;
     End;
     (*
@@ -564,12 +569,14 @@
     FreeDiskSpace := GetFreeDiskSpaceOf(ExtractFilePath(dest));
     If FreeDiskSpace <= RemainingFileSize Then Begin
       fCopyFileDetailError := 'Not enough diskspace at destination available';
+      dec(fBusy);
       exit;
     End;
     DestFile := FileCreate(utf8tosys(dest));
     If DestFile = 0 Then Begin
       fCopyFileDetailError := 'Unable to create destination file';
       FileClose(SourceFile);
+      dec(fBusy);
       exit;
     End;
     FileSeek(SourceFile, 0, fsFromBeginning);
@@ -580,6 +587,7 @@
         FileClose(SourceFile);
         fCopyFileDetailError := '';
         result := true; // Das Stimmt zwar nicht, erzeugt aber im Abgang die wenigsten Fehler, Störungen
+        dec(fBusy);
         exit;
       End;
       If JobPause Then Begin
@@ -593,13 +601,15 @@
           FileClose(SourceFile);
           FileClose(DestFile);
           fCopyFileDetailError := 'Sourcefile read error';
+          dec(fBusy);
           exit;
         End;
         If FileWrite(DestFile, buffer, BufferSize) = -1 Then Begin
           // Irgendwas hat nen Fehler ausgelöst
           FileClose(SourceFile);
           FileClose(DestFile);
           fCopyFileDetailError := 'Destfile write error';
+          dec(fBusy);
           exit;
         End;
         // Und noch die Statistik Nach ziehen
@@ -625,10 +635,12 @@
     // KA was ich da noch Vergessen habe
     On AV: Exception Do Begin
       fCopyFileDetailError := av.Message;
+      dec(fBusy);
       exit;
     End;
   End;
   fCopyFileDetailError := '';
+  dec(fBusy);
   Result := True;
 End;
 
@@ -666,6 +678,7 @@
 
 Procedure TWorkThread.Init;
 Begin
+  fBusy := 0;
   fLCLSubJobArray := Nil;
   fAllResult := jaNotChoosen;
   FCancelallJobs := false;
@@ -831,12 +844,14 @@
 Begin
   result := false;
   If Not assigned(fAJob) Then exit;
+  inc(fBusy);
   If FCancelallJobs Or fCancelActualJob Then Begin
     // Beim Abcanceln der Jobs rufen wir den FinishJob dennoch auf, damit die LCL die Chance hat diesen aus ihren Listen zu streichen..
     If Assigned(OnFinishJob) Then Begin
       Synchronize(@LCLOnFinishJob);
     End;
     result := true;
+    dec(fbusy);
     exit;
   End;
   If Assigned(OnStartJob) Then Begin
@@ -848,11 +863,13 @@
     jtMoveFile, jtCopyFile: Begin
         If Not FileExistsUTF8(fAJob.Source) Then Begin
           AddToErrorLog('Source file does not exist anymore.');
+          dec(fBusy);
           exit;
         End;
         // Ziel Verzeichnis erstellen
         If Not ForceDirectoriesUTF8(ExtractFileDir(fAJob.Dest)) Then Begin
           AddToErrorLog('Unable to create destination folder.');
+          dec(fBusy);
           exit;
         End;
         If FileExistsUTF8(fAJob.Dest) Then Begin
@@ -864,6 +881,7 @@
               Synchronize(@LCLOnFinishJob);
             End;
             result := true;
+            dec(fBusy);
             exit;
           End
           Else Begin
@@ -878,6 +896,7 @@
                     Synchronize(@LCLOnFinishJob);
                   End;
                   FQuestionJobFifo.Push(fAJob);
+                  dec(fBusy);
                   exit;
                 End;
               jaSkip: Begin
@@ -886,11 +905,13 @@
                     Synchronize(@LCLOnFinishJob);
                   End;
                   result := true;
+                  dec(fBusy);
                   exit;
                 End;
               jaReplace: Begin
                   If Not DeleteFileUTF8(fAJob.Dest) Then Begin
                     AddToErrorLog('Unable to delete destination file.');
+                    dec(fBusy);
                     exit;
                   End;
                 End;
@@ -899,24 +920,28 @@
         End;
         If Not FileCopy(fAJob.Source, fAJob.Dest) Then Begin
           AddToErrorLog('Unable to copy file to destination folder: ' + fCopyFileDetailError);
+          dec(fBusy);
           exit;
         End;
         If fAJob.JobType = jtMoveFile Then Begin
           If Not DeleteFileUTF8(fAJob.Source) Then Begin
             AddToErrorLog('Unable to delete file.');
+            dec(fBusy);
             exit;
           End;
         End;
       End;
     jtMoveDir, jtCopyDir: Begin
         If Not DirectoryExistsUTF8(fAJob.Source) Then Begin
           AddToErrorLog('Source directory does not exist anymore.');
+          dec(fBusy);
           exit;
         End;
         // Ziel Ordner Erstellen
         s := extractfilename(ExcludeTrailingPathDelimiter(fAJob.Source));
         If Not ForceDirectoriesUTF8(IncludeTrailingPathDelimiter(fAJob.Dest) + s) Then Begin
           AddToErrorLog('Unable to create dest dir.');
+          dec(fBusy);
           exit;
         End;
         // Rekursiv Verschieben / Kopieren
@@ -949,6 +974,7 @@
     jtDelFile: Begin
         If Not DeleteFileUTF8(fAJob.Source) Then Begin
           AddToErrorLog('Unable to delete file.');
+          dec(fBusy);
           exit;
         End;
       End;
@@ -967,6 +993,7 @@
     jtDelDir: Begin
         If Not DelFolder(fAJob.Source) Then Begin
           AddToErrorLog('Unable to delete folder.');
+          dec(fBusy);
           exit;
         End;
       End;
@@ -975,6 +1002,7 @@
     Synchronize(@LCLOnFinishJob);
   End;
   result := true;
+  dec(fbusy);
 End;
 
 Procedure TWorkThread.CheckForOnFileTransfereStatistic;
@@ -1149,9 +1177,9 @@
   result := FInJobFifo.ContainsElement(job, @CompareJobs);
 End;
 
-Function TWorkThread.JobsPending: Boolean;
+Function TWorkThread.Busy: Boolean;
 Begin
-  result := getPendingJobs() <> 0;
+  result := (getPendingJobs() <> 0) Or (fBusy > 0);
 End;
 
 Procedure TWorkThread.CancelAllJobs;

src/unit1.pas

@@ -646,10 +646,10 @@
   FreeRestAPI;
   Workthread_reference := fWorkThread;
   fWorkThread := Nil; // Das sorgt dafür, dass der On Idle Handler nichts mehr macht ;)
-  If Workthread_reference.JobsPending Then Begin
+  If Workthread_reference.Busy Then Begin
     Workthread_reference.OnFinishJob := Nil; // Der User Braucht auch nicht mehr sehen dass wir die Löschen
     Workthread_reference.CancelAllJobs();
-    While Workthread_reference.JobsPending Do Begin
+    While Workthread_reference.Busy Do Begin
       sleep(1);
     End;
   End;
@@ -679,7 +679,7 @@
 
 Procedure TForm1.FormCloseQuery(Sender: TObject; Var CanClose: Boolean);
 Begin
-  If fWorkThread.JobsPending Then Begin
+  If fWorkThread.Busy Then Begin
     If ID_NO = Application.MessageBox(pchar('File / Dir copying not yet finished.' + LineEnding + 'Are you shure you want to close, this will cancel all your jobs.'), 'Warning', MB_YESNO Or MB_ICONWARNING) Then Begin
       CanClose := false;
     End;

src/urestapi.pas

@@ -136,10 +136,12 @@
 Var
   jn: TJSONNode;
   iqc: integer;
+  busy: Boolean;
 Begin
   iqc := form1.fWorkThread.PendingJobs;
+  busy := form1.fWorkThread.Busy Or form1.fWorkThread.HasQuestions;
   jn := TJSONNode.Create;
-  jn.AddObj(TJSONValue.Create('State', specialize ifthen < String > (iqc = 0, '0', '1'), false));
+  jn.AddObj(TJSONValue.Create('State', specialize ifthen < String > (Busy, '0', '1'), false));
   jn.AddObj(TJSONValue.Create('JobQueueCount', inttostr(iqc), false));
   jn.AddObj(TJSONValue.Create('LeftDir', form1.fLeftView.aDirectory, true));
   jn.AddObj(TJSONValue.Create('RightDir', form1.fRightView.aDirectory, true));