Changeset 2129 for trunk/eraser/Eraser.Manager/DirectExecutor.cs

Timestamp:

5/15/2010 1:22:08 PM (3 years ago)

Author:

lowjoel

Message:

• Define the behaviour of Run immediately (run now tasks) and Run manually: after a run now task is complete, it is reset to run manually; if a run immediately task is saved to the task list, upon load, it is automatically queued for running.
• As a result, we don't need to worry about having blank "task status" entries when the task is set to run immediately upon creation. This would revert r1969

File:

• trunk/eraser/Eraser.Manager/DirectExecutor.cs (modified) (4 diffs)

trunk/eraser/Eraser.Manager/DirectExecutor.cs

@@ -323 +323 @@
                     ((RecurringSchedule)task.Schedule).Reschedule(DateTime.Now);
 
-                //If the task is an execute on restart task, it is only run
-                //once and can now be restored to an immediately executed task
-                if (task.Schedule == Schedule.RunOnRestart)
-                    task.Schedule = Schedule.RunNow;
+                //If the task is an execute on restart task or run immediately task, it is
+                //only run once and can now be restored to a manually run task
+                if (task.Schedule == Schedule.RunOnRestart || task.Schedule == Schedule.RunNow)
+                    task.Schedule = Schedule.RunManually;
 
                 //And the task finished event.
@@ -396 +396 @@
                     list.Insert(index, item);
 
+                //Call all the event handlers who registered to be notified of tasks
+                //being added.
+                Owner.OnTaskAdded(new TaskEventArgs(item));
+
                 //If the task is scheduled to run now, break the waiting thread and
                 //run it immediately
@@ -408 +412 @@
                     Owner.ScheduleTask(item);
                 }
-
-                //Call all the event handlers who registered to be notified of tasks
-                //being added.
-                Owner.OnTaskAdded(new TaskEventArgs(item));
             }
 
@@ -519 +519 @@
                     {
                         Owner.OnTaskAdded(new TaskEventArgs(task));
-                        if (task.Schedule is RecurringSchedule)
+                        if (task.Schedule == Schedule.RunNow)
+                            Owner.QueueTask(task);
+                        else if (task.Schedule is RecurringSchedule)
                             Owner.ScheduleTask(task);
                     }