Skip to content

Commit c4f96fc

Browse files
committed
Break out of batch loop if canceled, show queue total time after completion
1 parent 3c6fff7 commit c4f96fc

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

ff-utils-winforms/Main/RunTask.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ public static async Task Start(TaskType batchTask = TaskType.Null)
9595

9696
public static async Task StartBatch()
9797
{
98+
canceled = false;
9899
TaskType batchTask = Program.mainForm.GetCurrentTaskType();
99100

100101
if (batchTask == TaskType.None)
@@ -110,19 +111,25 @@ public static async Task StartBatch()
110111
fileList.Items.CopyTo(taskItems, 0);
111112

112113
runningBatch = true;
114+
int finishedTasks = 0;
115+
NmkdStopwatch sw = new NmkdStopwatch();
113116

114117
for (int i = 0; i < taskItems.Length; i++)
115118
{
119+
if (canceled)
120+
break;
121+
116122
FileListEntry entry = (FileListEntry)taskItems[i].Tag;
117123
Logger.Log($"Queue: Starting task {i + 1}/{taskItems.Length} for {entry.File.Name}.");
118124
TrackList.ClearCurrentFile();
119125
await TrackList.SetAsMainFile(taskItems[i], false, false); // Load file info
120126
await Start(batchTask); // Run task
127+
finishedTasks++;
121128
}
122129

123130
runningBatch = false;
124131

125-
Logger.Log($"Queue: Completed {taskItems.Length} tasks.");
132+
Logger.Log($"Queue: Completed {finishedTasks}/{taskItems.Length} tasks{(canceled ? " (Canceled)" : "")}. Total time: {sw}");
126133
}
127134

128135
public static bool RunInstantly()

0 commit comments

Comments
 (0)