darugar · binduwavell · Feb 22, 2011 · Feb 22, 2011 · Feb 22, 2011 · Feb 22, 2011
diff --git a/app.yaml b/app.yaml
@@ -1,5 +1,5 @@
 application: fxc-log-service
-version: 1
+version: 2
 runtime: python
 api_version: 1
 
@@ -8,5 +8,21 @@ handlers:
 - url: /static
   static_dir: static
 
+- url: /list
+  login: required
+  script: upload.py
+
+- url: /show/.*
+  login: required
+  script: upload.py
+
+- url: /delete/*
+  login: required
+  script: upload.py
+
+- url: /bulk-action
+  login: required
+  script: upload.py
+
 - url: /.*
   script: upload.py
diff --git a/config.yaml b/config.yaml
diff --git a/settings.py b/settings.py
@@ -1 +1 @@
-ALLOWED_USERS = ('test@example.com', 'somebodyelse@me.com' )
+ALLOWED_USERS = ('test@example.com', 'somebodyelse@me.com' )
diff --git a/static/test.html b/static/test.html
@@ -5,6 +5,7 @@
 			<tr><td>username:</td><td><input type="text" name="username"></td></tr>
 			<tr><td>uid:</td><td><input type="text" name="uid"></td></tr>
 			<tr><td>filename:</td><td><input type="text" name="filename"></td></tr>
+			<tr><td>version:</td><td><input type="text" name="version"></td></tr>
 			<tr><td>file:</td><td><input type="file" name="file"/></td></tr>
 		</table>
 	    <input type="submit" value="Upload">

diff --git a/templates/denied.html b/templates/denied.html
@@ -0,0 +1,7 @@
+<html>
+  <body>
+  	<p id="header">
+  		{{nickname}} you are not allowed to access this resource. [<a href="{{logout_url}}">Log out</a>]
+  	</p>
+  </body>
+</html>
diff --git a/templates/dump.html b/templates/dump.html
@@ -0,0 +1,11 @@
+<html>
+  <body>
+  	<p id="header">
+  		{{text}}
+  		{% for item in items %}
+  		<li>{{item}}</li>
+  		{% endfor %}
+  	</p>
+  	<p id="footer">Back to <a href="/list">list</a>.</p>
+  </body>
+</html>
diff --git a/templates/list.html b/templates/list.html
@@ -1,14 +1,57 @@
 <html>
+  <head>
+	<SCRIPT LANGUAGE="JavaScript">
+	function SetAllCheckBoxes(FormName, FieldName, CheckValue)
+	{
+		if(!document.forms[FormName])
+			return;
+		var objCheckBoxes = document.forms[FormName].elements[FieldName];
+		if(!objCheckBoxes)
+			return;
+		var countCheckBoxes = objCheckBoxes.length;
+		if(!countCheckBoxes)
+			objCheckBoxes.checked = CheckValue;
+		else
+			// set the check value for all check boxes
+			for(var i = 0; i < countCheckBoxes; i++)
+				objCheckBoxes[i].checked = CheckValue;
+	}
+	function OneOrMoreSelected(FormName, FieldName)
+	{
+		if(!document.forms[FormName])
+			return false;
+		var objCheckBoxes = document.forms[FormName].elements[FieldName];
+		if(!objCheckBoxes)
+			return false;
+		var countCheckBoxes = objCheckBoxes.length;
+		if(!countCheckBoxes)
+			return objCheckBoxes.checked;
+		else
+			for(var i = 0; i < countCheckBoxes; i++)
+				if (objCheckBoxes[i].checked) return true;
+		return false;
+	}
+	</script>
+  </head>
   <body>
+  	<form action="/bulk-action" method="POST" name="bulk-action">
   	<p id="header">
   		Hello {{nickname}} [<a href="{{logout_url}}">Log out</a>]
   	</p>
 	<p id="contents">
   	<ul>
     {% for item in items %}
-        <li>User {{ item.username }} , uid {{ item.uid }} uploaded on {{ item.date }}: <a href="/show/{{item.key}}">{{ item.filename }}</a> [<a href="/delete/{{item.key}}">delete</a>]</li>
+        <li><input type="checkbox" name="bulk-items" value="{{item.key}}" id="checkbox-{{item.key}}"/><label for="checkbox-{{item.key}}">User {{ item.username }} , uid {{ item.uid }} uploaded on {{ item.date }}</label>: <a href="/show/{{item.key}}">{{ item.filename }}</a> [<a href="/delete/{{item.key}}">delete</a>] {{ item.version }}</li>
 	{% endfor %}
 	</ul>
 	</p>
+	<p id="footer">
+		{% if items.count %}
+			<input type="button" name="CheckAll" value="Check All" onClick="SetAllCheckBoxes('bulk-action','bulk-items', true)"> &nbsp; 
+			<input type="button" name="UnCheckAll" value="Uncheck All" onClick="SetAllCheckBoxes('bulk-action','bulk-items', false)"> &nbsp;&nbsp;&nbsp;&nbsp; 
+			<input type="submit" value="Bulk Delete" name="action" onClick="if (!OneOrMoreSelected('bulk-action','bulk-items')) {window.alert('You must select at least one item'); return false}"/>
+		{% endif %}
+	</p>
+	</form>
   </body>
 </html>
diff --git a/upload.py b/upload.py
@@ -13,13 +13,15 @@ class Content(db.Model):
     filename = db.StringProperty()
     contents = db.BlobProperty()
     date = db.DateTimeProperty(auto_now_add=True)
+    version = db.StringProperty()
 
 class UploadPage(webapp.RequestHandler):
     def post(self):
         item = Content(
             username=self.request.get("username"),
             uid     =self.request.get("uid"),
             filename=self.request.get("filename"),
+            version =self.request.get("version"),
             contents=db.Blob(self.request.get("file"))
         )
         item.put()
@@ -32,8 +34,13 @@ def get(self):
             self.redirect(users.create_login_url(self.request.uri))
             return
 
-        if user.email().lower() not in settings.ALLOWED_USERS:
-            self.response.out.write("Permission Denied")
+        if user.email().lower() not in settings.ALLOWED_USERS and not users.is_current_user_admin():
+            template_data = {
+                'nickname' : user.nickname(),
+                'logout_url' : users.create_logout_url("/list"), 
+            }
+            path = os.path.join(os.path.dirname(__file__), 'templates/denied.html')
+            self.response.out.write(template.render(path, template_data ))
             return
 
         template_data = {
@@ -54,16 +61,39 @@ def get(self, key):
 class ShowPage(webapp.RequestHandler):
     def get(self, key):
         item = Content.get(key)
-        self.response.headers['Content-Type'] = 'text/plain'
-        #evaluate the extension, txt and log should be text, otherwise octet-stream
-        #self.response.headers['Content-Type'] = 'application/octet-stream'
+        if item.filename[-4:] in (".log", ".txt"):
+            self.response.headers['Content-Type'] = 'text/plain'
+        else:
+            self.response.headers['Content-Type'] = 'application/octet-stream'
+            self.response.headers['Content-Disposition'] = 'attachment; filename="%s"' % (item.filename)
         self.response.out.write(item.contents)
+
+class BulkAction(webapp.RequestHandler):
+    def post(self):
+        action = self.request.get("action")
+        deleted = []
+        if action == "Bulk Delete":
+            keys = self.request.get("bulk-items", allow_multiple=True)
+            for key in keys:
+                item = Content.get(key)
+                deleted.append("User %s, uid %s uploaded on %s: %s with internal key %s" % (item.username, item.uid, item.date, item.filename, key));
+                Content.delete(item)
+
+            template_data = {
+                'text' : 'Deleted',
+                'items' : deleted
+            }
+            path = os.path.join(os.path.dirname(__file__), 'templates/dump.html')
+            self.response.out.write(template.render(path, template_data ))
+        else:
+            self.redirect('/list', False)
 
 application = webapp.WSGIApplication([
     ('/list', ListPage),
     ('/show/(.*)', ShowPage),
     ('/delete/(.*)', DeletePage),
-    ('/upload', UploadPage)
+    ('/upload', UploadPage),
+    ('/bulk-action.*', BulkAction)
 ], debug=True)
 
 def main():
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ALLOWED_USERS = ('test@example.com', 'somebodyelse@me.com' )
		ALLOWED_USERS = ('test@example.com', 'somebodyelse@me.com' )