rename Item.itemId to Item.public_id

pandora/sequence/managers.py

@@ -46,9 +46,9 @@ def parseCondition(condition, user):
         return Q()
 
     if k == 'id':
-        itemId, points = v.split('/')
+        public_id, points = v.split('/')
         points = [float('%0.03f'%float(p)) for p in points.split('-')]
-        q = Q(sort__item__itemId=itemId, start=points[0], end=points[1])
+        q = Q(sort__item__public_id=public_id, start=points[0], end=points[1])
         return exclude and ~q or q
     if k == 'hash':
         v =  models.parse_hash(v)

pandora/sequence/models.py

@@ -38,7 +38,7 @@ class Sequence(models.Model):
 
     @property
     def public_id(self):
-        return u"%s/%0.03f-%0.03f" % (self.sort.item.itemId, float(self.start), float(self.end))
+        return u"%s/%0.03f-%0.03f" % (self.sort.item.public_id, float(self.start), float(self.end))
 
     def __unicode__(self):
         return self.public_id

pandora/sequence/tasks.py

@@ -8,8 +8,8 @@ import item.models
 import extract
 
 @task(ignore_results=True, queue='encoding')
-def get_sequences(itemId):
-    i = item.models.Item.objects.get(itemId=itemId)
+def get_sequences(public_id):
+    i = item.models.Item.objects.get(public_id=public_id)
     models.Sequence.objects.filter(sort=i.sort).delete()
     position = 0
     for stream in i.streams():

pandora/sequence/views.py

@@ -81,7 +81,7 @@ def findSequences(request):
         query = parse_query(data, request.user)
         qs = order_query(query['qs'], query['sort'])
         if qs.count() > 0:
-            response['data']['position'] = utils.get_positions(ids, [qs[0].itemId])[0]
+            response['data']['position'] = utils.get_positions(ids, [qs[0].public_id])[0]
     elif 'positions' in data:
         qs = order_query(qs, query['sort'])
         ids = [i['public_id'] for i in qs.values('public_id')]
@@ -109,7 +109,7 @@ def getSequence(request):
     data = json.loads(request.POST['data'])
     response = json_response()
     position = float('%0.03f' % data['position'])
-    i = Item.objects.get(itemId=data['id'])
+    i = Item.objects.get(public_id=data['id'])
     qs = models.Sequence.objects.filter(
         sort_id=i.sort.pk,
         mode=models.Sequence.MODE[data['mode']],