Merge pull request #57 from julien-wff/fix-pause

fix: pause
julien-wff · Dec 15, 2023 · a774d4d · a774d4d
2 parents f90cd67 + fcd5fd3
commit a774d4d
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 10 deletions.
diff --git a/EasyGUI/Controls/Buttons/BaseButton.xaml b/EasyGUI/Controls/Buttons/BaseButton.xaml
@@ -20,6 +20,12 @@
                         CornerRadius="6">
                         <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
                     </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" Value="0.5" />
+                            <Setter Property="Cursor" Value="No" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Button.Template>
 

diff --git a/EasyGUI/Controls/JobDisplay.xaml.cs b/EasyGUI/Controls/JobDisplay.xaml.cs
@@ -104,6 +104,7 @@ protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName
             UpdateJobProgress();
             UpdateBreadcrumbs();
             UpdateButtons();
+            SetButtonsState(true);
         }
 
         if (propertyName == nameof(SelectedJobs) && !_selectedJobsLocked)
@@ -138,6 +139,16 @@ private void UpdateButtons()
         SetElementVisibility(PauseButton, Job.State != JobState.End && Job.CurrentlyRunning);
     }
 
+    private void SetButtonsState(bool enabled)
+    {
+        EditButton.IsEnabled = enabled;
+        StartButton.IsEnabled = enabled;
+        DeleteButton.IsEnabled = enabled;
+        ResumeButton.IsEnabled = enabled;
+        DiscardButton.IsEnabled = enabled;
+        PauseButton.IsEnabled = enabled;
+    }
+
     private void UpdateJobProgress()
     {
         if (Job.State == JobState.End)
@@ -168,6 +179,7 @@ private static void SetElementVisibility(UIElement element, bool visible)
 
     private void StartButton_OnClick(object sender, RoutedEventArgs e)
     {
+        SetButtonsState(false);
         JobStarted?.Invoke(this, new JobEventArgs(Job));
     }
 
@@ -207,21 +219,25 @@ private void EditButton_OnClick(object sender, RoutedEventArgs e)
 
     private void ResumeButton_OnClick(object sender, RoutedEventArgs e)
     {
+        SetButtonsState(false);
         JobResumed?.Invoke(this, new JobEventArgs(Job));
     }
 
     private void DeleteButton_OnClick(object sender, RoutedEventArgs e)
     {
+        SetButtonsState(false);
         JobDeleted?.Invoke(this, new JobEventArgs(Job));
     }
 
     private void DiscardButton_OnClick(object sender, RoutedEventArgs e)
     {
+        SetButtonsState(false);
         JobDiscarded?.Invoke(this, new JobEventArgs(Job));
     }
 
     private void PauseButton_OnClick(object sender, RoutedEventArgs e)
     {
+        SetButtonsState(false);
         JobPaused?.Invoke(this, new JobEventArgs(Job));
     }
 

diff --git a/EasyLib/Job/Job.cs b/EasyLib/Job/Job.cs
@@ -57,7 +57,7 @@ public Job(JsonJob job) : this(job.name, job.source_folder, job.destination_fold
     public string CurrentFileSource { get; set; } = string.Empty;
     public string CurrentFileDestination { get; set; } = string.Empty;
     public bool CurrentlyRunning { get; private set; }
-    public CancellationTokenSource CancellationToken { get; } = new();
+    public CancellationTokenSource CancellationToken { get; private set; } = new();
 
     public void Subscribe(IJobStatusSubscriber subscriber)
     {
@@ -182,16 +182,41 @@ private void JobSteps(TransferManager transferManager, List<List<string>> folder
     {
         transferManager.Subscribe(this);
         CurrentlyRunning = true;
-        _setJobState(JobState.SourceScan);
-        transferManager.ScanSource();
-        _setJobState(JobState.DifferenceCalculation);
-        transferManager.ComputeDifference(folders);
-        _setJobState(JobState.DestinationStructureCreation);
-        transferManager.CreateDestinationStructure();
-        _setJobState(JobState.Copy);
-        transferManager.TransferFiles();
+
+        if (!CancellationToken.IsCancellationRequested)
+        {
+            _setJobState(JobState.SourceScan);
+            transferManager.ScanSource();
+        }
+
+        if (!CancellationToken.IsCancellationRequested)
+        {
+            _setJobState(JobState.DifferenceCalculation);
+            transferManager.ComputeDifference(folders);
+        }
+
+        if (!CancellationToken.IsCancellationRequested)
+        {
+            _setJobState(JobState.DestinationStructureCreation);
+            transferManager.CreateDestinationStructure();
+        }
+
+        if (!CancellationToken.IsCancellationRequested)
+        {
+            _setJobState(JobState.Copy);
+            transferManager.TransferFiles();
+        }
+
         CurrentlyRunning = false;
-        _setJobState(JobState.End);
+
+        // If the job is cancelled, re-send the state to the subscribers so they can update their UI
+        // Otherwise, set the state to "End"
+        _setJobState(!CancellationToken.IsCancellationRequested ? JobState.End : State);
+
+        // Make the cancellation token available for the next job
+        CancellationToken.Dispose();
+        CancellationToken = new CancellationTokenSource();
+
         transferManager.Unsubscribe(this);
     }