update then task run (not all fixed)

diff --git a/tests/server/settings.py b/tests/server/settings.py
index 4f1221db9c291f2f6fcbd70a67fb3b2b2377613c..057b4039d2629a571fcde5a7f7a17971b49ebd60 100644 (file)
--- a/tests/server/settings.py
+++ b/tests/server/settings.py
@@ -3,7 +3,7 @@
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 
-import sys
+import os, sys
 sys.dont_write_bytecode = True
 
 ADMINS = (
@@ -50,9 +50,12 @@ USE_L10N = True
 # If you set this to False, Django will not use timezone-aware datetimes.
 USE_TZ = True
 
+# Full filesystem path to the project.
+PROJECT_ROOT = os.path.dirname(os.path.abspath(__file__))
+
 # Absolute filesystem path to the directory that will hold user-uploaded files.
 # Example: "/home/media/media.lawrence.com/media/"
-MEDIA_ROOT = 'media/'
+MEDIA_ROOT = PROJECT_ROOT + '/media/'
 
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash.

diff --git a/timeside/models.py b/timeside/models.py
index 2934f10808d703fab632a83fb9258c0cc72dc3d5..09bb7d6fc8b784dba66ef3e4ac8d91f4a0989934 100644 (file)
--- a/timeside/models.py
+++ b/timeside/models.py
@@ -79,7 +79,7 @@ class Item(DocBaseResource):
     url = models.URLField(_('URL'), blank=True, max_length=1024)
     sha1 = models.CharField(_('sha1'), blank=True, max_length=512)
     mime_type = models.CharField(_('mime type'), blank=True, max_length=256)
-    hdf5 = models.FileField(_('HDF5 result file'), upload_to='items/%Y/%m/%d', blank=True, max_length=1024)
+    hdf5 = models.FileField(_('HDF5 result file'), upload_to='results/%Y/%m/%d', blank=True, max_length=1024)
     lock = models.BooleanField(default=False)
     author = models.ForeignKey(User, related_name="items", verbose_name=_('author'), blank=True, null=True, on_delete=models.SET_NULL)
 
@@ -176,7 +176,7 @@ class Parameters(models.Model):
         verbose_name_plural = _('Parameters')
 
     def __unicode__(self):
-        pass
+        return '_'.join([unicode(self.processor), str(self.id)])
 
     
 class Task(models.Model):
@@ -199,14 +199,16 @@ class Task(models.Model):
         self.save()
 
     def run(self):
-        results_root = settings.MEDIA_ROOT + 'results'
-        if not os.path.exists(results_root):
-            os.makedirs(results_root)
+        results_root = 'results'
+        if not os.path.exists(settings.MEDIA_ROOT + results_root):
+            os.makedirs(settings.MEDIA_ROOT + results_root)
 
         self.status_setter(2)
 
         for item in self.selection.items.all():
             path = results_root + os.sep + item.uuid + os.sep
+            if not os.path.exists(settings.MEDIA_ROOT + os.sep + path):
+                os.makedirs(settings.MEDIA_ROOT + os.sep + path)
             pipe = timeside.decoder.FileDecoder(item.file.path)
             proc_dict = {}
 
@@ -216,25 +218,26 @@ class Task(models.Model):
                 proc_dict[processor] = proc
                 pipe = pipe | proc
 
-            while item.lock:
-                time.sleep(30)
+            # while item.lock:
+            #     time.sleep(30)
             
             if not item.hdf5:
                 item.hdf5 =  path + item.uuid + '.hdf5'
                 item.save()
-            
-        
+
             item.lock_setter(True)
             pipe.run()
-            pipe.results.to_hdf5(item.hdf5)
+            pipe.results.to_hdf5(item.hdf5.path)
             item.lock_setter(False)
             
             for processor in proc_dict.keys():
                 proc = proc_dict[processor]
                 if proc.type == 'analyzer':
-                    result = Result.objects.get_or_create(processor=processor, uuid=proc.UUID, item=item)
+                    parameters = '{}'
+                    parameters = Parameters.objects.get_or_create(processor=processor, parameters=unicode(parameters))
+                    result = Result.objects.get_or_create(parameters=parameters, item=item)
                     result.hdf5 = path + item.uuid + '_' + proc.UUID + '.hdf5'
-                    proc.results.to_hdf5(result.hdf5)
+                    proc.results.to_hdf5(result.hdf5.path)
                     result.save()
         
             # except: