From 6dcbcdd19c00e1a2a0be92be10d2549060b2df0d Mon Sep 17 00:00:00 2001
From: j <j@mailb.org>
Date: Thu, 16 Jun 2016 14:48:54 +0200
Subject: [PATCH] dont update timeline in update_selected, remove unused async
 get_item case

---
 pandora/archive/tasks.py |  6 +++---
 pandora/item/models.py   | 26 ++++++++++----------------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/pandora/archive/tasks.py b/pandora/archive/tasks.py
index 5c6c1511..28852f51 100644
--- a/pandora/archive/tasks.py
+++ b/pandora/archive/tasks.py
@@ -68,7 +68,7 @@ def update_files(user, volume, files):
     volume, created = models.Volume.objects.get_or_create(user=user, name=volume)
     all_files = [f['oshash'] for f in files]
 
-    #remove deleted files
+    # remove deleted files
     removed = models.Instance.objects.filter(volume=volume).exclude(file__oshash__in=all_files)
     ids = [i['public_id'] for i in Item.objects.filter(
            files__instances__in=removed.filter(file__selected=True)).distinct().values('public_id')]
@@ -105,9 +105,9 @@ def process_stream(fileId):
         file = models.File.objects.get(id=fileId)
         file.encoding = False
         file.save()
-    file.item.update_selected(update_timeline=False)
+    file.item.update_selected()
     if not file.item.rendered \
-        and not file.item.files.exclude(id=fileId).filter(Q(queued=True)|Q(encoding=True)).count():
+            and not file.item.files.exclude(id=fileId).filter(Q(queued=True) | Q(encoding=True)).count():
         file.item.update_timeline()
     if file.item.rendered:
         file.item.save()
diff --git a/pandora/item/models.py b/pandora/item/models.py
index f9fe3502..744399f9 100644
--- a/pandora/item/models.py
+++ b/pandora/item/models.py
@@ -64,7 +64,7 @@ def get_id(info):
             return imdbId
     return None
 
-def get_item(info, user=None, async=False):
+def get_item(info, user=None):
     '''
         info dict with:
             imdbId, title, director, year,
@@ -98,11 +98,8 @@ def get_item(info, user=None, async=False):
                     item.external_data = item_data
                 item.user = user
                 item.oxdbId = item.public_id
-                item.save(sync=not async)
-                if async:
-                    tasks.update_external.delay(item.public_id)
-                else:
-                    item.update_external()
+                item.save(sync=True)
+                item.update_external()
         else:
             public_id = get_id(info)
             if public_id:
@@ -124,9 +121,8 @@ def get_item(info, user=None, async=False):
                     item = existing_item
                 except Item.DoesNotExist:
                     item.oxdbId = item.oxdb_id()
-                    p = item.save(sync=not async)
-                    if not p and async:
-                        tasks.update_poster.delay(item.public_id)
+                    item.save(sync=True)
+                    tasks.update_poster.delay(item.public_id)
     else:
         qs = Item.objects.filter(find__key='title', find__value__iexact=info['title'])
         if 'year' in info:
@@ -137,9 +133,8 @@ def get_item(info, user=None, async=False):
             item = Item()
             item.data = item_data
             item.user = user
-            p = item.save(sync=not async)
-            if not p and async:
-                tasks.update_poster.delay(item.public_id)
+            item.save(sync=True)
+            tasks.update_poster.delay(item.public_id)
     return item
 
 def get_path(f, x):
@@ -361,6 +356,7 @@ class Item(models.Model):
                 self.public_id = str(uuid.uuid1())
             self.add_default_data()
             super(Item, self).save(*args, **kwargs)
+            update_poster = True
             if not settings.USE_IMDB:
                 self.public_id = ox.toAZ(self.id)
 
@@ -462,7 +458,7 @@ class Item(models.Model):
         for a in self.annotations.all().order_by('id'):
             a.item = other
             a.set_public_id()
-            Annotations.objects.filter(id=a.id).update(item=other, public_id=a.public_id)
+            Annotation.objects.filter(id=a.id).update(item=other, public_id=a.public_id)
 
         if hasattr(self, 'files'):
             for f in self.files.all():
@@ -1186,7 +1182,7 @@ class Item(models.Model):
             qs = qs.exclude(id__in=wanted)
         qs.update(wanted=False)
 
-    def update_selected(self, update_timeline=True):
+    def update_selected(self):
         sets = self.sets()
         for s in sets:
             if s.filter(Q(is_video=True) | Q(is_audio=True)).filter(available=False).count() == 0:
@@ -1202,8 +1198,6 @@ class Item(models.Model):
                 if update:
                     self.rendered = False
                     self.save()
-                    if update_timeline:
-                        tasks.update_timeline.delay(self.public_id)
                 break
         if not sets:
             self.rendered = False