Changeset 238 for branches/eraser6/Eraser/Program.cs

Timestamp:

3/11/2008 1:38:02 PM (5 years ago)

Author:

lowjoel

Message:

-Check for --restart before running those run-on-restart tasks
-Moved the Settings initialization to the Program startup code instead in the SettingsPanel? constructor

File:

• branches/eraser6/Eraser/Program.cs (modified) (3 diffs)

branches/eraser6/Eraser/Program.cs

@@ -23 +23 @@
             using (eraserClient = new DirectExecutor())
             {
+                //Set the defaults for the library
+                Globals.Settings = new Settings();
+
                 //Load the task list
                 RegistryKey key = Application.UserAppDataRegistry;
@@ -31 +34 @@
                 }
 
+                //Create the main form
+                MainForm form = new MainForm();
+
                 //Run tasks which are meant to be run on restart
-                eraserClient.QueueRestartTasks();
+                int restartPos = Environment.CommandLine.ToLower().IndexOf("restart");
+                if ((restartPos > 1 &&
+                    Environment.CommandLine[restartPos - 1] == '/') ||
+                    (restartPos > 2 &&
+                    Environment.CommandLine[restartPos - 1] == '-' &&
+                    Environment.CommandLine[restartPos - 2] == '-'))
+                {
+                    eraserClient.QueueRestartTasks();
+                }
 
                 //Run the program
-                Application.Run(new MainForm());
+                Application.Run(form);
 
                 //Save the task list
@@ -48 +62 @@
         public static DirectExecutor eraserClient;
     }
+
+    public class Settings : Manager.Settings
+    {
+        public Settings()
+        {
+            RegistryKey key = Application.UserAppDataRegistry;
+            ActivePRNG = new Guid((string)
+                key.GetValue("PRNG", (object)Guid.Empty));
+            EraseLockedFilesOnRestart =
+                (int)key.GetValue("EraseOnRestart", (object)true) != 0;
+            ConfirmEraseOnRestart =
+                (int)key.GetValue("ConfirmEraseOnRestart", (object)true) != 0;
+            DefaultFileErasureMethod = new Guid((string)
+                key.GetValue("DefaultFileErasureMethod", (object)Guid.Empty));
+            DefaultUnusedSpaceErasureMethod = new Guid((string)
+                key.GetValue("DefaultUnusedSpaceErasureMethod", (object)Guid.Empty));
+            ExecuteMissedTasksImmediately =
+                (int)key.GetValue("ExecuteMissedTasksImmediately", (object)true) != 0;
+        }
+
+        ~Settings()
+        {
+            RegistryKey key = Application.UserAppDataRegistry;
+            key.SetValue("PRNG", ActivePRNG);
+            key.SetValue("EraseOnRestart", EraseLockedFilesOnRestart,
+                RegistryValueKind.DWord);
+            key.SetValue("ConfirmEraseOnRestart", ConfirmEraseOnRestart,
+                RegistryValueKind.DWord);
+            key.SetValue("DefaultFileErasureMethod", DefaultFileErasureMethod);
+            key.SetValue("DefaultUnusedSpaceErasureMethod",
+                DefaultUnusedSpaceErasureMethod);
+            key.SetValue("ExecuteMissedTasksImmediately",
+                ExecuteMissedTasksImmediately, RegistryValueKind.DWord);
+        }
+    }
 }