Changeset 1417 for branches/eraser6/BlackBox

Timestamp:

12/23/2009 3:17:17 AM (3 years ago)

Author:

lowjoel

Message:

Only display the BlackBox? UI if the user has unsubmitted reports.

Location:

branches/eraser6/BlackBox

Files:

• Eraser.Util/BlackBox.cs (modified) (3 diffs)
• Eraser/BlackBoxMainForm.cs (modified) (1 diff)
• Eraser/BlackBoxUploadForm.cs (modified) (5 diffs)
• Eraser/Program.cs (modified) (1 diff)

branches/eraser6/BlackBox/Eraser.Util/BlackBox.cs

@@ -530 +530 @@
                 DirectoryInfo directory = new DirectoryInfo(Path);
                 foreach (FileInfo file in directory.GetFiles())
-                    if (file.Name != BlackBox.StackTraceFileName)
+                    if (!InternalFiles.Contains(file.Name))
                         result.Add(file);
 
@@ -560 +560 @@
         }
 
+        /// <summary>
+        /// Gets or sets whether the given report has been uploaded to the server.
+        /// </summary>
+        public bool Submitted
+        {
+            get
+            {
+                byte[] buffer = new byte[1];
+                using (FileStream stream = new FileStream(System.IO.Path.Combine(Path, StatusFileName),
+                    FileMode.OpenOrCreate, FileAccess.Read, FileShare.Read))
+                {
+                    stream.Read(buffer, 0, buffer.Length);
+                }
+
+                return buffer[0] == 1;
+            }
+
+            set
+            {
+                byte[] buffer = { Convert.ToByte(value) };
+                using (FileStream stream = new FileStream(System.IO.Path.Combine(Path, StatusFileName),
+                    FileMode.OpenOrCreate, FileAccess.Write, FileShare.Read))
+                {
+                    stream.Write(buffer, 0, buffer.Length);
+                }
+            }
+        }
+
         public override string ToString()
         {
@@ -574 +602 @@
         /// </summary>
         private List<BlackBoxExceptionEntry> StackTraceCache;
+
+        /// <summary>
+        /// The file name for the status file.
+        /// </summary>
+        private static readonly string StatusFileName = "Status.txt";
+
+        /// <summary>
+        /// The list of files internal to the report.
+        /// </summary>
+        private static readonly List<string> InternalFiles = new List<string>(
+            new string[] {
+                 BlackBox.StackTraceFileName,
+                 "Status.txt"
+            }
+        );
     }
 

branches/eraser6/BlackBox/Eraser/BlackBoxMainForm.cs

@@ -41 +41 @@
             foreach (BlackBoxReport report in BlackBox.GetDumps())
             {
+                if (report.Submitted)
+                    continue;
+
                 ReportsLb.Items.Add(report);
                 ReportsLb.SetItemChecked(ReportsLb.Items.Count - 1, true);

branches/eraser6/BlackBox/Eraser/BlackBoxUploadForm.cs

@@ -47 +47 @@
             InitializeComponent();
             UXThemeApi.UpdateControlTheme(this);
-
-            Reports = reports;
             UploadWorker.RunWorkerAsync(reports);
         }
@@ -106 +104 @@
             {
                 ProgressLbl.Text = S._("Reports submitted successfully.");
+                ProgressPb.Value = ProgressPb.Maximum;
                 CancelBtn.Text = S._("Close");
             }
@@ -125 +124 @@
                 Close();
         }
-
-        private IList<BlackBoxReport> Reports;
     }
 
@@ -180 +177 @@
                     {
                         case "exists":
+                            Report.Submitted = true;
                             return false;
 
@@ -279 +277 @@
                 {
                     reportRequest.GetResponse();
+                    Report.Submitted = true;
                 }
                 catch (WebException e)

branches/eraser6/BlackBox/Eraser/Program.cs

@@ -221 +221 @@
             Application.Idle -= OnGUIIdle;
             BlackBox blackBox = BlackBox.Get();
-            if (blackBox.GetDumps().Length == 0)
+
+            bool allSubmitted = true;
+            foreach (BlackBoxReport report in blackBox.GetDumps())
+                if (!report.Submitted)
+                {
+                    allSubmitted = false;
+                    break;
+                }
+
+            if (allSubmitted)
                 return;