Merge all changes from the fork

Makefile

@@ -0,0 +1,17 @@
+install: bin/python
+
+bin/python:
+	virtualenv benchmarkenv
+	. ./benchmarkenv/bin/activate
+	benchmarkenv/bin/pip install -r requirements.txt
+
+serve: bin/python
+	benchmarkenv/bin/python manage.py syncdb
+	benchmarkenv/bin/python manage.py runserver 8888
+
+deploy: benchmarkenv/bin/python
+	benchmarkenv/bin/python manage.py collectstatic --clear --noinput
+	touch wsgi.py # trigger reload
+
+clean:
+	rm -rf bin/ lib/ build/ dist/ *.egg-info/ include/ local/

README.md

@@ -4,19 +4,15 @@ benchmark
 Visualization and Database framework for BRL-CAD's benchmarks, a GSoC '14 project. 
 Originally forked from [here](http://bitbucket.org/suryajith/benchmark/)
 
-Requirements
-============
 
-* Django
-* Pillow
-* mysql-python
 
 Installation
 ============
 
-* Clone the repository ````git clone https://github.com/ankeshanand/benchmark.git````
-* ````cd benchmark````
-* ````pip install -r requirements.txt```` (will install django, pillow and mysql-python)
-* ````python manage.py syncdb````
-* ````python manage.py runserver````
-* go to ````localhost:8000/```` and upload some files
+* Clone the repository ````git clone https://github.com/BRL-CAD/benchmark.git````
+* Change to the project directory ````cd benchmark````
+* Swith to the development branch: ````git checkout development````
+* If required, make changes to ````settings.py```` to ensure database credentials are matching with that on your system.
+* Initailize a few things: ````bash ./setup.sh````
+* Install and Serve the application ````make clean && make serve````
+* go to ````localhost:8888/```` and upload some files

TODO.md

@@ -1,5 +1,7 @@
 * Fix the issue in archiving files.
 * URL links in the navbar should be same for both the apps. Fix this.
 * Complete all the charts in the plots app.
-* Characterize the charts properly.
 * Build a home page for the web app.
+* Fix links for social media icons.
+* Add BRL-CAD logo.
+

fileupload/api/__init__.py

@@ -0,0 +1 @@
+__author__ = 'ankesh'

fileupload/api/resources.py

@@ -0,0 +1,32 @@
+from tastypie import fields, utils
+from tastypie.authentication import Authentication
+from tastypie.authorization import Authorization
+
+__author__ = 'ankesh'
+
+from tastypie.resources import ModelResource
+from fileupload.models import Picture
+from django.db import models
+
+
+class MultipartResource(object):
+    def deserialize(self, request, data, format=None):
+        if not format:
+            format = request.META.get('CONTENT_TYPE', 'application/json')
+        if format == 'application/x-www-form-urlencoded':
+            return request.POST
+        if format.startswith('multipart'):
+            data = request.POST.copy()
+            data.update(request.FILES)
+            return data
+        return super(MultipartResource, self).deserialize(request, data, format)
+
+
+class PictureResource(MultipartResource, ModelResource):
+    file = fields.FileField(attribute="file", null=True, blank=True)
+
+    class Meta:
+        queryset = Picture.objects.all()
+        allowed_methods = ['post']
+        authentication = Authentication()
+        authorization = Authorization()

fileupload/models.py

@@ -1,15 +1,22 @@
 # encoding: utf-8
 from django.db import models
+import uuid
+import os
 
 
+def unique_file_name(instance, filename):
+    path = 'benchmarkLogs/'
+    name = str(uuid.uuid4().hex) + '.log'
+    return os.path.join(path, name)
+
 class Picture(models.Model):
     """This is a small demo using just two fields. The slug field is really not
     necessary, but makes the code simpler. ImageField depends on PIL or
     pillow (where Pillow is easily installable in a virtualenv. If you have
     problems installing pillow, use a more generic FileField instead.
 
     """
-    file = models.FileField(upload_to="pictures")
+    file = models.FileField(upload_to=unique_file_name)
     slug = models.SlugField(max_length=50, blank=True)
 
     def __unicode__(self):