Changeset 1405 for branches/eraser6/BlackBox

Timestamp:

12/22/2009 4:31:17 AM (3 years ago)

Author:

lowjoel

Message:

-Parse the stack trace and then verify against the server to see if it is new.
-Create a new FormField? constructor overload that takes strings.

Location:

branches/eraser6/BlackBox/Eraser

Files:

• BlackBoxUploadForm.cs (modified) (6 diffs)
• Strings.NL.resx (modified) (1 diff)
• Strings.en.resx (modified) (1 diff)
• Strings.it.resx (modified) (1 diff)
• Strings.resx (modified) (1 diff)

branches/eraser6/BlackBox/Eraser/BlackBoxUploadForm.cs

@@ -33 +33 @@
 using ICSharpCode.SharpZipLib.BZip2;
 using System.Net;
+using System.Xml;
 
 namespace Eraser
@@ -139 +140 @@
         public bool ReportIsNew()
         {
-            throw new NotImplementedException();
+            string[] stackTrace = Report.StackTrace.Split(new char[] { '\n' });
+            MultipartFormDataBuilder builder = new MultipartFormDataBuilder();
+            builder.AddPart(new FormField("action", "status"));
+            int exceptionIndex = 0;
+
+            foreach (string str in stackTrace)
+            {
+                if (str.StartsWith("Exception "))
+                    ++exceptionIndex;
+                else if (!string.IsNullOrEmpty(str.Trim()))
+                    builder.AddPart(new FormField(
+                        string.Format("stackTrace[{0}][]", exceptionIndex), str.Trim()));
+            }
+
+            WebRequest reportRequest = HttpWebRequest.Create(BlackBoxServer);
+            reportRequest.ContentType = "multipart/form-data; boundary=" + builder.Boundary;
+            reportRequest.Method = "POST";
+            using (Stream formStream = builder.Stream)
+            {
+                reportRequest.ContentLength = formStream.Length;
+                using (Stream requestStream = reportRequest.GetRequestStream())
+                {
+                    int lastRead = 0;
+                    byte[] buffer = new byte[32768];
+                    while ((lastRead = formStream.Read(buffer, 0, buffer.Length)) != 0)
+                        requestStream.Write(buffer, 0, lastRead);
+                }
+            }
+
+            HttpWebResponse response = reportRequest.GetResponse() as HttpWebResponse;
+            if (response.StatusCode != HttpStatusCode.OK)
+                throw new InvalidDataException(response.StatusDescription);
+
+            using (Stream responseStream = response.GetResponseStream())
+            using (StreamReader rdr = new StreamReader(responseStream))
+            {
+                string str = rdr.ReadToEnd();
+                XmlReader reader = XmlReader.Create(new MemoryStream(Encoding.UTF8.GetBytes(str)));
+                reader.ReadToFollowing("crashReport");
+                string reportStatus = reader.GetAttribute("status");
+                switch (reportStatus)
+                {
+                    case "exists":
+                        return false;
+
+                    case "new":
+                        return true;
+
+                    default:
+                        throw new InvalidDataException(S._("Unknown crash report server response."));
+                }
+            }
         }
 
@@ -184 +236 @@
                 //Build the POST request
                 MultipartFormDataBuilder builder = new MultipartFormDataBuilder();
-                builder.AddPart(new FormFileField("CrashReport", "Report.tbz", bzipFile));
-                builder.AddPart(new FormFileField("DebugLog", "Debug.log", logFile));
+                builder.AddPart(new FormField("action", "upload"));
+                builder.AddPart(new FormFileField("crashReport", "Report.tbz", bzipFile));
 
                 //Upload the POST request
-                Uri blackBoxServer = new Uri("http://eraser.heidi.ie/BlackBox/upload.php");
-                WebRequest reportRequest = HttpWebRequest.Create(blackBoxServer);
+                WebRequest reportRequest = HttpWebRequest.Create(BlackBoxServer);
                 reportRequest.ContentType = "multipart/form-data; boundary=" + builder.Boundary;
                 reportRequest.Method = "POST";
@@ -210 +261 @@
                 HttpWebResponse response = reportRequest.GetResponse() as HttpWebResponse;
                 if (response.StatusCode != HttpStatusCode.OK)
-                {
-                    using (Stream responseStream = response.GetResponseStream())
-                    using (TextReader reader = new StreamReader(responseStream))
-                        throw new ArgumentException(reader.ReadToEnd());
-                }
+                    throw new InvalidDataException(response.StatusDescription);
             }
         }
@@ -223 +270 @@
         private static readonly string UploadTempDir =
             Path.Combine(Path.GetTempPath(), "Eraser Crash Reports");
+
+        /// <summary>
+        /// The URI to the BlackBox server.
+        /// </summary>
+        private static readonly Uri BlackBoxServer =
+            new Uri("http://eraser.joelsplace.dyndns.org/BlackBox/upload.php");
 
         /// <summary>
@@ -333 +386 @@
 
         /// <summary>
+        /// Constructor.
+        /// </summary>
+        /// <param name="fieldName">The name of the field.</param>
+        /// <param name="stream">The content of the field.</param>
+        public FormField(string fieldName, string content)
+            : this(fieldName, new MemoryStream(Encoding.UTF8.GetBytes(content)))
+        {
+        }
+
+        /// <summary>
         /// The name of the field.
         /// </summary>

branches/eraser6/BlackBox/Eraser/Strings.NL.resx

@@ -151 +151 @@
     <value>Sluiten</value>
   </data>
+  <data name="Unknown crash report server response." xml:space="preserve">
+    <value>(Untranslated)</value>
+  </data>
   <data name="Session: {0:F}" xml:space="preserve">
     <value>(Untranslated)</value>

branches/eraser6/BlackBox/Eraser/Strings.en.resx

@@ -151 +151 @@
     <value>Close</value>
   </data>
+  <data name="Unknown crash report server response." xml:space="preserve">
+    <value>Unknown crash report server response.</value>
+  </data>
   <data name="Session: {0:F}" xml:space="preserve">
     <value>Session: {0:F}</value>

branches/eraser6/BlackBox/Eraser/Strings.it.resx

@@ -151 +151 @@
     <value>Chiudi</value>
   </data>
+  <data name="Unknown crash report server response." xml:space="preserve">
+    <value>(Untranslated)</value>
+  </data>
   <data name="Session: {0:F}" xml:space="preserve">
     <value>Sessione: {0:F}</value>

branches/eraser6/BlackBox/Eraser/Strings.resx

@@ -151 +151 @@
     <value>Close</value>
   </data>
+  <data name="Unknown crash report server response." xml:space="preserve">
+    <value>Unknown crash report server response.</value>
+  </data>
   <data name="Session: {0:F}" xml:space="preserve">
     <value>Session: {0:F}</value>