clips,default annotations without user

pandora/item/models.py

@@ -1007,8 +1007,11 @@ class Item(models.Model):
                            .filter(selected=True).order_by('part'):
             subtitles_added = False
             prefix = os.path.splitext(f.path)[0]
+            if f.instances.all().count() > 0:
                 user = f.instances.all()[0].volume.user
-
+            else:
+                #FIXME: allow annotations from no user instead?
+                user = User.objects.all().order_by('id')[0]
             #if there is a subtitle with the same prefix, import
             q = subtitles.filter(path__startswith=prefix,
                                  language=language)

pandora/item/views.py

@@ -224,11 +224,13 @@ Positions
         def get_clips(qs):
             n = qs.count()
             if n > query['clip_items']:
+                num = query['clip_items']
                 clips = []
-                step = int(n/query['clip_items'])
-                offset = int((n - step * query['clip_items']) / 2)
-                for i in range(offset, n, step):
+                step = int(n / (num + 1))
+                i = step
+                while i <= (n - step) and i < n and len(clips) < num:
                     clips.append(qs[i])
+                    i += step
             else:
                 clips = qs
             return [c.json(query['clip_keys']) for c in clips]