Move cache files to subdirectory 'datacache', fix report loading.gif

.gitignore

@@ -4,6 +4,7 @@
 
 widget_data*
 *.db
+*.data
 log.txt
 
 build

apps/datasource/datasource/profiler.py

@@ -16,7 +16,7 @@
 
 from apps.datasource.models import TableColumn
 from apps.datasource.devicemanager import DeviceManager
-
+from project import settings
 
 logger = logging.getLogger('datasource')
 lock = threading.Lock()
@@ -35,7 +35,7 @@ def __init__(self, table, job):
         self.job = job
 
     def run(self):
-        cachefile = "table-%s.cache" % self.table.id
+        cachefile = os.path.join(settings.DATA_CACHE, "table-%s.cache" % self.table.id)
         if os.path.exists(cachefile):
             # XXXCJ This cachefile hack is temporary and is only good for testing to avoid actually
             # having to run the report every single time.

apps/datasource/datasource/shark.py

@@ -20,7 +20,7 @@
 
 from apps.datasource.models import TableColumn
 from apps.datasource.devicemanager import DeviceManager
-
+from project import settings
 
 logger = logging.getLogger('datasource')
 lock = threading.Lock()
@@ -38,7 +38,7 @@ def __init__(self, table, job):
         self.job = job
 
     def run(self):
-        cachefile = "table-%s.cache" % self.table.id
+        cachefile = os.path.join(settings.DATA_CACHE, "table-%s.cache" % self.table.id)
         if os.path.exists(cachefile):
             # XXXCJ This cachefile hack is temporary and is only good for testing to avoid actually
             # having to run the report every single time.

apps/datasource/models.py

@@ -6,6 +6,7 @@
 # This software is distributed "AS IS" as set forth in the License.
 
 
+import os
 import sys
 import pickle
 import logging
@@ -15,6 +16,8 @@
 from django.db import models
 from django.core.exceptions import ObjectDoesNotExist
 
+from project import settings
+
 from jsonfield import JSONField
 
 logger = logging.getLogger('datasource')
@@ -154,7 +157,7 @@ def done(self):
         return self.status == Job.COMPLETE or self.status == Job.ERROR
 
     def datafile(self):
-        return self.handle + ".data"
+        return os.path.join(settings.DATA_CACHE, self.handle + ".data")
 
     def data(self):
         f = open(self.datafile(), "r")

apps/report/templates/report.html

@@ -42,6 +42,16 @@
           });
       }
     </script>
+    <style>
+        .loading-indicator
+        {
+            height: 80px;
+            width: 80px;
+            background: url( '{{ STATIC_URL }}showLoading/images/loading.gif' );
+            background-repeat: no-repeat;
+            background-position: center center;
+        }
+    </style>
 {% endblock %}
 
 {% block content %}

datacache/.gitignore

@@ -0,0 +1,4 @@
+# ignore everything in this directory for git
+*
+# except this file
+!.gitignore

project/settings.py

@@ -14,6 +14,7 @@
 
 PORTAL_ROOT = os.path.abspath(os.path.dirname(__file__))
 PROJECT_ROOT = os.path.dirname(PORTAL_ROOT)
+DATA_CACHE = os.path.join(PROJECT_ROOT, 'datacache')
 
 
 ADMINS = (

templates/base.html

@@ -71,7 +71,6 @@
       </div>
     </div>
     {% block content %}{% endblock %}
-  {{ django_version }}
   </body>
 </html>