From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 4 Apr 2014 08:23:32 +0000 (+0200)
Subject: update task status handling in run
X-Git-Tag: 0.5.5~1^2~59
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0a2096893861f0d1a3980a4a992122d1209ced37;p=timeside.git

update task status handling in run
---

diff --git a/timeside/models.py b/timeside/models.py
index 1e35160..7008fbb 100644
--- a/timeside/models.py
+++ b/timeside/models.py
@@ -175,6 +175,8 @@ class Task(models.Model):
         self.save()
 
     def run(self):
+        self.status_setter(2)
+
         for item in self.items:
             pipe = timeside.decoder.FileDecoder(item.file)
             proc_dict = {}
@@ -193,13 +195,9 @@ class Task(models.Model):
                 item.save()
             
             try:
-                self.status_setter(2)
                 pipe.run()
                 pipe.results.to_hdf5(item.hdf5)
-            except:
-                self.status_setter(0)
-        
-            if sef.status == 2:    
+                
                 for processor in proc_dict.keys():
                     proc = proc_dict[processor]
                     results = Result.objects.filter(processor=processor, uuid=proc.UUID)
@@ -210,7 +208,11 @@ class Task(models.Model):
                     result.hdf5 = path + item.uuid + '_' + proc.UUID + '.hdf5'
                     proc.results.to_hdf5(result.hdf5)
                     result.save()
+            except:
+                self.status_setter(0)
+                break
         
+        self.status_setter(3)
         del proc
         del pipe
-        self.status_setter(3)
+