extract sequences from all parts

pandora/sequence/extract.py

@@ -50,13 +50,12 @@ def get_hash(image, mode, debug=False):
     if h.endswith('L'): h = h[:-1]
     return '0' * (16-len(h)) + h
 
-def get_sequences(path):
+def get_sequences(path, position=0):
     modes = ['color', 'shape']
     sequences = {}
     for mode in modes:
         sequences[mode] = []
     fps = 25
-    position = 0
     file_names = filter(lambda x: 'timelinedata8p' in x, os.listdir(path))
     file_names = sorted(file_names, key=lambda x: int(x[14:-4]))
     file_names = map(lambda x: path + x, file_names)
@@ -75,5 +74,5 @@ def get_sequences(path):
     for mode in modes:
         if sequences[mode]:
             sequences[mode][-1]['out'] = position
-    return sequences
+    return sequences, position
 

pandora/sequence/tasks.py

@@ -14,11 +14,13 @@ from celery.task import task, periodic_task
 import models
 import extract
 
-@task(ignore_results=True, queue='default')
+@task(ignore_results=True, queue='encoding')
 def get_sequences(itemId):
     i = models.Item.objects.get(itemId=itemId)
     models.Sequence.objects.filter(item=i).delete()
-    data = extract.get_sequences(i.timeline_prefix)
+    position = 0
+    for stream in i.streams():
+        data, position = extract.get_sequences(stream.timeline_prefix, position)
         with transaction.commit_on_success():
             for mode in data:
                 for seq in data[mode]:
@@ -29,3 +31,8 @@ def get_sequences(itemId):
                     s.end = seq['out']
                     s.hash = seq['hash']
                     s.save()
+
+@task(ignore_results=True, queue='encoding')
+def update_sequence_ids(itemId):
+    for s in models.Sequence.objects.filter(item__itemId=itemId):
+        s.save()