Changeset 213 for branches/eraser6/Manager/DirectExecutor.cs

Timestamp:

3/11/2008 2:53:20 AM (5 years ago)

Author:

lowjoel

Message:

-Define the Task start and completion events
-Added the UIText property. This was a copy from the GenerateTaskName? function in the Scheduler panel earlier
-Added the TaskEventArgs? base class to allow for other simpler events (mainly start and finish events)
-Added the current erasure target for erase tasks.

File:

• branches/eraser6/Manager/DirectExecutor.cs (modified) (5 diffs)

branches/eraser6/Manager/DirectExecutor.cs

@@ -20 +20 @@
             thread = new Thread(delegate()
             {
-                this.Main();
+                Main();
             });
 
@@ -39 +39 @@
                 if (unusedIds.Count != 0)
                 {
-                    task.ID = unusedIds[0];
+                    task.id = unusedIds[0];
                     unusedIds.RemoveAt(0);
                 }
                 else
-                    task.ID = ++nextId;
+                    task.id = ++nextId;
             }
 
@@ -119 +119 @@
                     try
                     {
+                        //Broadcast the task started event.
+                        task.OnTaskStarted(new TaskEventArgs(task));
+
                         //Run the task
                         foreach (Task.ErasureTarget target in task.Entries)
@@ -143 +146 @@
                         task.LogEntry(new LogEntry(e.Message, LogLevel.FATAL));
                     }
-
-                    //If the task is a recurring task, reschedule it since we are done.
-                    if (task.Schedule is RecurringSchedule)
-                        ((RecurringSchedule)task.Schedule).Reschedule(DateTime.Now);
+                    finally
+                    {
+                        //And the task finished event.
+                        task.OnTaskFinished(new TaskEventArgs(task));
+
+                        //If the task is a recurring task, reschedule it since we are done.
+                        if (task.Schedule is RecurringSchedule)
+                            ((RecurringSchedule)task.Schedule).Reschedule(DateTime.Now);
+                    }
                 }
 
@@ -183 +191 @@
                 //Update the task progress
                 eventArgs.overallProgress = (i * 100) / paths.Count;
+                eventArgs.currentTarget = target;
                 eventArgs.currentItemName = paths[i];
                 eventArgs.currentItemProgress = 0;