[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 4636e41bdafea903eafecfde9ae3d3d26cf8b768
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 7 07:42:31 2009 +0000

    2009-12-06  Eric Seidel  <eric at webkit.org>
    
            Reviewed by Adam Barth.
    
            Status Server needs a way to handle uploaded results
            https://bugs.webkit.org/show_bug.cgi?id=32209
    
            * QueueStatusServer/queue_status.py: Add a ShowResults (results/*) command
            * QueueStatusServer/update_status.html: Add file upload.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51752 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 7e3299f..e6cae97 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2009-12-06  Eric Seidel  <eric at webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Status Server needs a way to handle uploaded results
+        https://bugs.webkit.org/show_bug.cgi?id=32209
+
+        * QueueStatusServer/queue_status.py: Add a ShowResults (results/*) command
+        * QueueStatusServer/update_status.html: Add file upload.
+
 2009-12-06  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebKitTools/QueueStatusServer/queue_status.py b/WebKitTools/QueueStatusServer/queue_status.py
index def1638..bc0c82a 100644
--- a/WebKitTools/QueueStatusServer/queue_status.py
+++ b/WebKitTools/QueueStatusServer/queue_status.py
@@ -35,9 +35,8 @@ use_library('django', '1.1')
 
 from google.appengine.ext.webapp import template
 from google.appengine.api import users
-from google.appengine.ext import webapp
+from google.appengine.ext import webapp, db
 from google.appengine.ext.webapp.util import run_wsgi_app
-from google.appengine.ext import db
 
 webapp.template.register_template_library('filters.webkit_extras')
 
@@ -49,6 +48,7 @@ class QueueStatus(db.Model):
     active_patch_id = db.IntegerProperty()
     message = db.StringProperty(multiline=True)
     date = db.DateTimeProperty(auto_now_add=True)
+    results_file = db.BlobProperty()
 
 
 class MainPage(webapp.RequestHandler):
@@ -144,15 +144,27 @@ class UpdateStatus(webapp.RequestHandler):
         queue_status.active_bug_id = self._int_from_request('bug_id')
         queue_status.active_patch_id = self._int_from_request('patch_id')
         queue_status.message = self.request.get('status')
+        results_file = self.request.get("results_file")
+        queue_status.results_file = db.Blob(results_file)
         queue_status.put()
         self.redirect('/')
 
 
+class ShowResults(webapp.RequestHandler):
+    def get(self, status_id):
+        status = QueueStatus.get_by_id(int(status_id))
+        if not status:
+            self.error(404)
+            return
+        self.response.out.write(status.results_file)
+
+
 routes = [
     ('/', MainPage),
     ('/update-status', UpdateStatus),
     (r'/patch-status/(.*)/(.*)', PatchStatus),
     (r'/status-bubble/(.*)', StatusBubble),
+    (r'/results/(.*)', ShowResults)
 ]
 
 application = webapp.WSGIApplication(routes, debug=True)
diff --git a/WebKitTools/QueueStatusServer/update_status.html b/WebKitTools/QueueStatusServer/update_status.html
index 31e2615..9343c60 100644
--- a/WebKitTools/QueueStatusServer/update_status.html
+++ b/WebKitTools/QueueStatusServer/update_status.html
@@ -1,4 +1,4 @@
-<form name="update_status" method="post">
+<form name="update_status" enctype="multipart/form-data" method="post">
 Update status for a queue: <input name="queue_name">
  <div>
      Active Bug Id:
@@ -12,5 +12,6 @@ Update status for a queue: <input name="queue_name">
       Status Text:<br>
       <textarea name="status" rows="3" cols="60"></textarea>
   </div>
+  <div>Results file: <input type="file" name="results_file"></div>
   <div><input type="submit" value="Add Status"></div>
 </form>

-- 
WebKit Debian packaging