Changeset 1102 for trunk/eraser6/Eraser.Manager/Task.cs

Timestamp:

6/3/2009 3:55:56 AM (4 years ago)

Author:

lowjoel

Message:

A whole host of scheduler fixes:

• When cancelling scheduled tasks we removed the scheduled version of the task as well so tasks will no longer run on the schedule
• When editing tasks the schedules were not updated and scheduled tasks still ran on the old schedule
• Determining whether the task was queued manually for execution was a little unpredictable, this is now fixed
• For consistency, when tasks are queued we will prevent editing of tasks

And a few stylistic fixes

• Do not catch general exception types
• Use automatic properties where possible
• Don't use multiple casts

File:

• trunk/eraser6/Eraser.Manager/Task.cs (modified) (8 diffs)

trunk/eraser6/Eraser.Manager/Task.cs

@@ -47 +47 @@
             Targets.Owner = this;
             Log = (Logger)info.GetValue("Log", typeof(Logger));
+            Canceled = false;
 
             Schedule schedule = (Schedule)info.GetValue("Schedule", typeof(Schedule));
@@ -80 +81 @@
             Targets = new ErasureTargetsCollection(this);
             Schedule = Schedule.RunNow;
+            Canceled = false;
             Log = new Logger();
         }
@@ -138 +140 @@
         /// executor is idle.
         /// </summary>
-        public bool Queued { get; internal set; }
+        public bool Queued
+        {
+            get
+            {
+                return Executor.IsTaskQueued(this);
+            }
+        }
 
         /// <summary>
@@ -153 +161 @@
         /// The schedule for running the task.
         /// </summary>
-        public Schedule Schedule { get; set; }
+        public Schedule Schedule
+        {
+            get
+            {
+                return schedule;
+            }
+            set
+            {
+                if (schedule.Owner != null)
+                    throw new ArgumentException(S._("The schedule provided can only " +
+                        "belong to one task at a time"));
+
+                if (schedule is RecurringSchedule)
+                    ((RecurringSchedule)schedule).Owner = null;
+                schedule = value;
+                if (schedule is RecurringSchedule)
+                    ((RecurringSchedule)schedule).Owner = this;
+                OnTaskEdited();
+            }
+        }
 
         /// <summary>
@@ -160 +187 @@
         public Logger Log { get; private set; }
 
+        private Schedule schedule;
+
         #region Events
         /// <summary>
+        /// The task has been edited.
+        /// </summary>
+        public EventHandler<TaskEventArgs> TaskEdited { get; set; }
+
+        /// <summary>
         /// The start of the execution of a task.
         /// </summary>
@@ -175 +209 @@
         /// </summary>
         public EventHandler<TaskEventArgs> TaskFinished { get; set; }
+
+        /// <summary>
+        /// Broadcasts the task edited event.
+        /// </summary>
+        internal void OnTaskEdited()
+        {
+            if (TaskEdited != null)
+                TaskEdited(this, new TaskEventArgs(this));
+        }
 
         /// <summary>
@@ -613 +656 @@
                         result.AddRange(GetFiles(dir));
                     }
-                    catch (Exception e)
+                    catch (DirectoryNotFoundException e)
                     {
                         //Ignore, but log.
@@ -720 +763 @@
                 foreach (FileSystemInfo fsInfo in info.GetFileSystemInfos())
                 {
-                    if (fsInfo is FileInfo)
+                    FileInfo fileInfo = fsInfo as FileInfo;
+                    if (fileInfo != null)
                     {
-                        totalSize += ((FileInfo)fsInfo).Length;
-                        GetPathADSes(paths, out totalSize, fsInfo.FullName);
-                        paths.Add(fsInfo.FullName);
+                        totalSize += fileInfo.Length;
+                        GetPathADSes(paths, out totalSize, fileInfo.FullName);
+                        paths.Add(fileInfo.FullName);
                     }
                     else