Bumped pillarsdk version to 1.6.1

Previously it would always send 'unlink', even when a duplicate strip was
removed.

blender_cloud/__init__.py

@@ -21,7 +21,7 @@
 bl_info = {
     'name': 'Blender Cloud',
     "author": "Sybren A. Stüvel, Francesco Siddi, Inês Almeida, Antony Riakiotakis",
-    'version': (1, 4, 99),
+    'version': (1, 4, 999),
     'blender': (2, 77, 0),
     'location': 'Addon Preferences panel, and Ctrl+Shift+Alt+A anywhere for texture browser',
     'description': 'Texture library browser and Blender Sync. Requires the Blender ID addon '

blender_cloud/attract/__init__.py

@@ -36,17 +36,22 @@
 #     "support": "TESTING"
 # }
 
+import contextlib
 import functools
 import logging
 
 if "bpy" in locals():
     import importlib
 
-    importlib.reload(draw)
+    draw = importlib.reload(draw)
+    pillar = importlib.reload(pillar)
+    async_loop = importlib.reload(async_loop)
 else:
     from . import draw
+    from .. import pillar, async_loop
 
 import bpy
+import pillarsdk
 from pillarsdk.nodes import Node
 from pillarsdk.projects import Project
 from pillarsdk import exceptions as sdk_exceptions
@@ -63,6 +68,40 @@ def active_strip(context):
         return None
 
 
+def selected_shots(context):
+    """Generator, yields selected strips if they are Attract shots."""
+
+    for strip in context.selected_sequences:
+        atc_object_id = getattr(strip, 'atc_object_id')
+        if not atc_object_id:
+            continue
+
+        yield strip
+
+
+def all_shots(context):
+    """Generator, yields all strips if they are Attract shots."""
+
+    for strip in context.scene.sequence_editor.sequences_all:
+        atc_object_id = getattr(strip, 'atc_object_id')
+        if not atc_object_id:
+            continue
+
+        yield strip
+
+
+def shown_strips(context):
+    """Returns the strips from the current meta-strip-stack, or top-level strips.
+
+    What is returned depends on what the user is currently editing.
+    """
+
+    if context.scene.sequence_editor.meta_stack:
+        return context.scene.sequence_editor.meta_stack[-1].sequences
+
+    return context.scene.sequence_editor.sequences
+
+
 def remove_atc_props(strip):
     """Resets the attract custom properties assigned to a VSE strip"""
 
@@ -72,6 +111,34 @@ def remove_atc_props(strip):
     strip.atc_is_synced = False
 
 
+def shot_id_use(strips):
+    """Returns a mapping from shot Object ID to a list of strips that use it."""
+
+    import collections
+
+    # Count the number of uses per Object ID, so that we can highlight double use.
+    ids_in_use = collections.defaultdict(list)
+    for strip in strips:
+        if not getattr(strip, 'atc_is_synced', False):
+            continue
+
+        ids_in_use[strip.atc_object_id].append(strip)
+
+    return ids_in_use
+
+
+def compute_strip_conflicts(context):
+    """Sets the strip property atc_object_id_conflict for each strip."""
+
+    ids_in_use = shot_id_use(context.scene.sequence_editor.sequences_all)
+    for strips in ids_in_use.values():
+        is_conflict = len(strips) > 1
+        for strip in strips:
+            strip.atc_object_id_conflict = is_conflict
+
+    return ids_in_use
+
+
 class ToolsPanel(Panel):
     bl_label = 'Attract'
     bl_space_type = 'SEQUENCE_EDITOR'
@@ -86,7 +153,20 @@ class ToolsPanel(Panel):
         strip = active_strip(context)
         layout = self.layout
         strip_types = {'MOVIE', 'IMAGE'}
-        if strip and strip.atc_object_id and strip.type in strip_types:
+
+        selshots = list(selected_shots(context))
+        if strip and strip.type in strip_types and strip.atc_object_id:
+            if len(selshots) > 1:
+                noun = 'Selected Shots'
+            else:
+                noun = 'This Shot'
+
+            if strip.atc_object_id_conflict:
+                warnbox = layout.box()
+                warnbox.alert = True
+                warnbox.label('Warning: This shot is linked to multiple sequencer strips.',
+                              icon='ERROR')
+
             layout.prop(strip, 'atc_name', text='Name')
             layout.prop(strip, 'atc_status', text='Status')
 
@@ -97,23 +177,34 @@ class ToolsPanel(Panel):
             ro_sub.prop(strip, 'atc_notes', text='Notes')
 
             if strip.atc_is_synced:
-                row = layout.row(align=True)
-                row.operator('attract.shot_submit_update')
+                sub = layout.column(align=True)
+                row = sub.row(align=True)
+                if bpy.ops.attract.submit_selected.poll():
+                    row.operator('attract.submit_selected', text='Submit %s' % noun)
+                else:
+                    row.operator(ATTRACT_OT_submit_all.bl_idname)
                 row.operator(AttractShotFetchUpdate.bl_idname,
                              text='', icon='FILE_REFRESH')
+                row.operator(ATTRACT_OT_shot_open_in_browser.bl_idname,
+                             text='', icon='WORLD')
+                sub.operator(ATTRACT_OT_make_shot_thumbnail.bl_idname,
+                             text='Render Thumbnail for %s' % noun)
 
                 # Group more dangerous operations.
                 dangerous_sub = layout.column(align=True)
-                dangerous_sub.operator('attract.shot_delete')
+                dangerous_sub.operator(AttractShotDelete.bl_idname)
                 dangerous_sub.operator('attract.strip_unlink')
 
-        elif strip and strip.type in strip_types:
-            layout.operator('attract.shot_submit_new')
+        elif context.selected_sequences:
+            if len(context.selected_sequences) > 1:
+                noun = 'selected strips'
+            else:
+                noun = 'this strip'
+            layout.operator(AttractShotSubmitSelected.bl_idname,
+                            text='Submit %s as New Shot' % noun)
             layout.operator('attract.shot_relink')
         else:
-            layout.label(text='Select a Movie or Image strip')
-
-        layout.operator(AttractShotSubmitSelected.bl_idname)
+            layout.operator(ATTRACT_OT_submit_all.bl_idname)
 
 
 class AttractOperatorMixin:
@@ -166,6 +257,7 @@ class AttractOperatorMixin:
                 'description': '',
                 'properties': {'status': 'todo',
                                'notes': '',
+                               'used_in_edit': True,
                                'trim_start_in_frames': strip.frame_offset_start,
                                'duration_in_edit_in_frames': strip.frame_final_duration,
                                'cut_in_timeline_in_frames': strip.frame_final_start},
@@ -190,6 +282,7 @@ class AttractOperatorMixin:
         strip.atc_notes = node['properties']['notes']
         strip.atc_status = node['properties']['status']
 
+        compute_strip_conflicts(bpy.context)
         draw.tag_redraw_all_sequencer_editors()
 
     def submit_update(self, strip):
@@ -204,6 +297,7 @@ class AttractOperatorMixin:
                 'properties.duration_in_edit_in_frames': strip.frame_final_duration,
                 'properties.cut_in_timeline_in_frames': strip.frame_final_start,
                 'properties.status': strip.atc_status,
+                'properties.used_in_edit': True,
             }
         }
 
@@ -211,72 +305,55 @@ class AttractOperatorMixin:
         result = pillar.sync_call(node.patch, patch)
         log.info('PATCH result: %s', result)
 
-    def relink(self, strip, atc_object_id):
+    def relink(self, strip, atc_object_id, *, refresh=False):
         from .. import pillar
 
         try:
-            node = pillar.sync_call(Node.find, atc_object_id)
+            node = pillar.sync_call(Node.find, atc_object_id, caching=False)
         except (sdk_exceptions.ResourceNotFound, sdk_exceptions.MethodNotAllowed):
-            self.report({'ERROR'}, 'Shot %r not found on the Attract server, unable to relink.'
-                        % atc_object_id)
+            verb = 'refresh' if refresh else 'relink'
+            self.report({'ERROR'}, 'Shot %r not found on the Attract server, unable to %s.'
+                        % (atc_object_id, verb))
+            strip.atc_is_synced = False
             return {'CANCELLED'}
 
+        pillar.sync_call(node.patch, {'op': 'relink'})
         strip.atc_is_synced = True
-        strip.atc_name = node.name
-        strip.atc_object_id = node['_id']
+        if not refresh:
+            strip.atc_name = node.name
+            strip.atc_object_id = node['_id']
 
         # We do NOT set the position/cuts of the shot, that always has to come from Blender.
         strip.atc_status = node.properties.status
         strip.atc_notes = node.properties.notes or ''
         strip.atc_description = node.description or ''
 
+        compute_strip_conflicts(bpy.context)
         draw.tag_redraw_all_sequencer_editors()
 
 
-class AttractShotSubmitNew(AttractOperatorMixin, Operator):
-    bl_idname = "attract.shot_submit_new"
-    bl_label = "Submit to Attract"
-
-    @classmethod
-    def poll(cls, context):
-        strip = active_strip(context)
-        return not strip.atc_object_id
-
-    def execute(self, context):
-        strip = active_strip(context)
-        if strip.atc_object_id:
-            return
-
-        node_type = self.find_node_type('attract_shot')
-        if isinstance(node_type, set):  # in case of error
-            return node_type
-
-        return self.submit_new_strip(strip) or {'FINISHED'}
-
-
 class AttractShotFetchUpdate(AttractOperatorMixin, Operator):
     bl_idname = "attract.shot_fetch_update"
-    bl_label = "Fetch update from Attract"
+    bl_label = "Fetch Update From Attract"
+    bl_description = 'Update status, description & notes from Attract'
 
     @classmethod
     def poll(cls, context):
-        strip = active_strip(context)
-        return strip is not None and getattr(strip, 'atc_object_id', None)
+        return any(selected_shots(context))
 
     def execute(self, context):
-        strip = active_strip(context)
-
-        status = self.relink(strip, strip.atc_object_id)
-        if isinstance(status, set):
-            return status
-
-        self.report({'INFO'}, "Shot {0} refreshed".format(strip.atc_name))
+        for strip in selected_shots(context):
+            status = self.relink(strip, strip.atc_object_id, refresh=True)
+            # We don't abort when one strip fails. All selected shots should be
+            # refreshed, even if one can't be found (for example).
+            if not isinstance(status, set):
+                self.report({'INFO'}, "Shot {0} refreshed".format(strip.atc_name))
         return {'FINISHED'}
 
 
 class AttractShotRelink(AttractShotFetchUpdate):
     bl_idname = "attract.shot_relink"
-    bl_label = "Relink with Attract"
+    bl_label = "Relink With Attract"
 
     strip_atc_object_id = bpy.props.StringProperty()
 
@@ -298,6 +375,15 @@ class AttractShotRelink(AttractShotFetchUpdate):
         return {'FINISHED'}
 
     def invoke(self, context, event):
+        maybe_id = context.window_manager.clipboard
+        if len(maybe_id) == 24:
+            try:
+                int(maybe_id, 16)
+            except ValueError:
+                pass
+            else:
+                self.strip_atc_object_id = maybe_id
+
         return context.window_manager.invoke_props_dialog(self)
 
     def draw(self, context):
@@ -306,23 +392,30 @@ class AttractShotRelink(AttractShotFetchUpdate):
         col.prop(self, 'strip_atc_object_id', text='Shot ID')
 
 
-class AttractShotSubmitUpdate(AttractOperatorMixin, Operator):
-    bl_idname = 'attract.shot_submit_update'
-    bl_label = 'Submit update'
-    bl_description = 'Sends local changes to Attract'
+class ATTRACT_OT_shot_open_in_browser(AttractOperatorMixin, Operator):
+    bl_idname = 'attract.shot_open_in_browser'
+    bl_label = 'Open in Browser'
+    bl_description = 'Opens a webbrowser to show the shot on Attract'
 
     def execute(self, context):
-        strip = active_strip(context)
-        self.submit_update(strip)
+        from ..blender import PILLAR_WEB_SERVER_URL
+        import webbrowser
+        import urllib.parse
+
+        strip = active_strip(context)
+
+        url = urllib.parse.urljoin(PILLAR_WEB_SERVER_URL,
+                                   'nodes/%s/redir' % strip.atc_object_id)
+        webbrowser.open_new_tab(url)
+        self.report({'INFO'}, 'Opened a browser at %s' % url)
 
-        self.report({'INFO'}, 'Shot was updated on Attract')
         return {'FINISHED'}
 
 
 class AttractShotDelete(AttractOperatorMixin, Operator):
     bl_idname = 'attract.shot_delete'
-    bl_label = 'Delete'
-    bl_description = 'Remove from Attract'
+    bl_label = 'Delete Shot'
+    bl_description = 'Remove this shot from Attract'
 
     confirm = bpy.props.BoolProperty(name='confirm')
 
@@ -349,21 +442,37 @@ class AttractShotDelete(AttractOperatorMixin, Operator):
     def draw(self, context):
         layout = self.layout
         col = layout.column()
-        col.prop(self, 'confirm', text="I hereby confirm I want to delete this shot.")
+        col.prop(self, 'confirm', text="I hereby confirm I want to delete this shot from The Edit.")
 
 
 class AttractStripUnlink(AttractOperatorMixin, Operator):
     bl_idname = 'attract.strip_unlink'
-    bl_label = 'Unlink'
+    bl_label = 'Unlink Shot From This Strip'
     bl_description = 'Remove Attract props from the selected strip(s)'
 
     def execute(self, context):
+        unlinked_ids = set()
+
+        # First remove the Attract properties from the strips.
         for strip in context.selected_sequences:
             atc_object_id = getattr(strip, 'atc_object_id')
             remove_atc_props(strip)
 
             if atc_object_id:
-                self.report({'INFO'}, 'Shot %s has been unlinked from Attract.' % atc_object_id)
+                unlinked_ids.add(atc_object_id)
+
+        # For all Object IDs that are no longer in use in the edit, let Attract know.
+        # This should be done with care, as the shot could have been attached to multiple
+        # strips.
+        id_to_shots = compute_strip_conflicts(context)
+        for oid in unlinked_ids:
+            if len(id_to_shots[oid]):
+                # Still in use
+                continue
+
+            node = Node({'_id': oid})
+            pillar.sync_call(node.patch, {'op': 'unlink'})
+            self.report({'INFO'}, 'Shot %s has been marked as Unused.' % oid)
 
         draw.tag_redraw_all_sequencer_editors()
         return {'FINISHED'}
@@ -371,7 +480,7 @@ class AttractStripUnlink(AttractOperatorMixin, Operator):
 
 class AttractShotSubmitSelected(AttractOperatorMixin, Operator):
     bl_idname = 'attract.submit_selected'
-    bl_label = 'Submit all selected'
+    bl_label = 'Submit All Selected'
     bl_description = 'Submits all selected strips to Attract'
 
     @classmethod
@@ -380,9 +489,9 @@ class AttractShotSubmitSelected(AttractOperatorMixin, Operator):
 
     def execute(self, context):
         # Check that the project is set up for Attract.
-        node_type = self.find_node_type('attract_shot')
-        if isinstance(node_type, set):
-            return node_type
+        maybe_error = self.find_node_type('attract_shot')
+        if isinstance(maybe_error, set):
+            return maybe_error
 
         for strip in context.selected_sequences:
             status = self.submit(strip)
@@ -404,43 +513,333 @@ class AttractShotSubmitSelected(AttractOperatorMixin, Operator):
         return self.submit_update(strip)
 
 
+class ATTRACT_OT_submit_all(AttractOperatorMixin, Operator):
+    bl_idname = 'attract.submit_all'
+    bl_label = 'Submit All Shots to Attract'
+    bl_description = 'Updates Attract with the current state of the edit'
+
+    def execute(self, context):
+        # Check that the project is set up for Attract.
+        maybe_error = self.find_node_type('attract_shot')
+        if isinstance(maybe_error, set):
+            return maybe_error
+
+        for strip in all_shots(context):
+            status = self.submit_update(strip)
+            if isinstance(status, set):
+                return status
+
+        self.report({'INFO'}, 'All strips re-sent to Attract.')
+
+        return {'FINISHED'}
+
+
+class ATTRACT_OT_open_meta_blendfile(AttractOperatorMixin, Operator):
+    bl_idname = 'attract.open_meta_blendfile'
+    bl_label = 'Open Blendfile'
+    bl_description = 'Open Blendfile from movie strip metadata'
+
+    @classmethod
+    def poll(cls, context):
+        return bool(any(cls.filename_from_metadata(s) for s in context.selected_sequences))
+
+    @staticmethod
+    def filename_from_metadata(strip):
+        """Returns the blendfile name from the strip metadata, or None."""
+
+        # Metadata is a dict like:
+        # meta = {'END_FRAME': '88',
+        #         'BLEND_FILE': 'metadata-test.blend',
+        #         'SCENE': 'SüperSčene',
+        #         'FRAME_STEP': '1',
+        #         'START_FRAME': '32'}
+
+        meta = strip.get('metadata', None)
+        if not meta:
+            return None
+
+        return meta.get('BLEND_FILE', None) or None
+
+    def execute(self, context):
+        for strip in context.selected_sequences:
+            meta = strip.get('metadata', None)
+            if not meta:
+                continue
+
+            fname = meta.get('BLEND_FILE', None)
+            if not fname: continue
+
+            scene = meta.get('SCENE', None)
+            self.open_in_new_blender(fname, scene)
+
+        return {'FINISHED'}
+
+    def open_in_new_blender(self, fname, scene):
+        """
+        :type fname: str
+        :type scene: str
+        """
+        import subprocess
+        import sys
+
+        cmd = [
+            bpy.app.binary_path,
+            str(fname),
+        ]
+
+        cmd[1:1] = [v for v in sys.argv if v.startswith('--enable-')]
+
+        if scene:
+            cmd.extend(['--python-expr',
+                        'import bpy; bpy.context.screen.scene = bpy.data.scenes["%s"]' % scene])
+            cmd.extend(['--scene', scene])
+
+        subprocess.Popen(cmd)
+
+
+class ATTRACT_OT_make_shot_thumbnail(AttractOperatorMixin,
+                                     async_loop.AsyncModalOperatorMixin,
+                                     Operator):
+    bl_idname = 'attract.make_shot_thumbnail'
+    bl_label = 'Render Shot Thumbnail'
+    bl_description = 'Renders the current frame, and uploads it as thumbnail for the shot'
+
+    stop_upon_exception = True
+
+    @classmethod
+    def poll(cls, context):
+        return bool(context.selected_sequences)
+
+    @contextlib.contextmanager
+    def thumbnail_render_settings(self, context, thumbnail_width=512):
+        # Remember current settings so we can restore them later.
+        orig_res_x = context.scene.render.resolution_x
+        orig_res_y = context.scene.render.resolution_y
+        orig_percentage = context.scene.render.resolution_percentage
+        orig_file_format = context.scene.render.image_settings.file_format
+        orig_quality = context.scene.render.image_settings.quality
+
+        try:
+            # Update the render size to something thumbnaily.
+            factor = orig_res_y / orig_res_x
+            context.scene.render.resolution_x = thumbnail_width
+            context.scene.render.resolution_y = round(thumbnail_width * factor)
+            context.scene.render.resolution_percentage = 100
+            context.scene.render.image_settings.file_format = 'JPEG'
+            context.scene.render.image_settings.quality = 85
+
+            yield
+        finally:
+            # Return the render settings to normal.
+            context.scene.render.resolution_x = orig_res_x
+            context.scene.render.resolution_y = orig_res_y
+            context.scene.render.resolution_percentage = orig_percentage
+            context.scene.render.image_settings.file_format = orig_file_format
+            context.scene.render.image_settings.quality = orig_quality
+
+    @contextlib.contextmanager
+    def temporary_current_frame(self, context):
+        current_frame = context.scene.frame_current
+        try:
+            yield
+        finally:
+            context.scene.frame_current = current_frame
+
+    async def async_execute(self, context):
+        nr_of_strips = len(context.selected_sequences)
+        do_multishot = nr_of_strips > 1
+
+        with self.temporary_current_frame(context):
+            if do_multishot:
+                context.window_manager.progress_begin(0, nr_of_strips)
+                try:
+                    self.report({'INFO'}, 'Rendering thumbnails for %i selected shots.' %
+                                nr_of_strips)
+
+                    for idx, strip in enumerate(context.selected_sequences):
+                        context.window_manager.progress_update(idx)
+                        # For multi-shot we can't just use the current frame (each thumb would be
+                        # identical), so instead we use the middle frame. The first/last frames
+                        # cannot be reliably used due to transitions with other shots.
+                        self.set_middle_frame(context, strip)
+                        await self.thumbnail_strip(context, strip)
+
+                        if self._state == 'QUIT':
+                            return
+                    context.window_manager.progress_update(nr_of_strips)
+                finally:
+                    context.window_manager.progress_end()
+
+            else:
+                strip = active_strip(context)
+                if not strip.frame_final_start <= context.scene.frame_current <= strip.frame_final_end:
+                    self.report({'WARNING'}, 'Rendering middle frame as thumbnail for active shot.')
+                    self.set_middle_frame(context, strip)
+                else:
+                    self.report({'INFO'}, 'Rendering current frame as thumbnail for active shot.')
+
+                context.window_manager.progress_begin(0, 1)
+                context.window_manager.progress_update(0)
+                try:
+                    await self.thumbnail_strip(context, strip)
+                finally:
+                    context.window_manager.progress_update(1)
+                    context.window_manager.progress_end()
+
+                if self._state == 'QUIT':
+                    return
+
+        self.report({'INFO'}, 'Thumbnail uploaded to Attract')
+        self.quit()
+
+    def set_middle_frame(self, context, strip):
+        """Sets the current frame to the middle frame of the strip."""
+
+        middle = round((strip.frame_final_start + strip.frame_final_end) / 2)
+        context.scene.frame_set(middle)
+
+    async def thumbnail_strip(self, context, strip):
+        atc_object_id = getattr(strip, 'atc_object_id', None)
+        if not atc_object_id:
+            self.report({'ERROR'}, 'Strip %s not set up for Attract' % strip.name)
+            self.quit()
+            return
+
+        with self.thumbnail_render_settings(context):
+            bpy.ops.render.render()
+        file_id = await self.upload_via_tempdir(bpy.data.images['Render Result'],
+                                                'attract_shot_thumbnail.jpg')
+
+        if file_id is None:
+            self.quit()
+            return
+
+        # Update the shot to include this file as the picture.
+        node = pillarsdk.Node({'_id': atc_object_id})
+        await pillar.pillar_call(
+            node.patch,
+            {
+                'op': 'from-blender',
+                '$set': {
+                    'picture': file_id,
+                }
+            })
+
+    async def upload_via_tempdir(self, datablock, filename_on_cloud) -> pillarsdk.Node:
+        """Saves the datablock to file, and uploads it to the cloud.
+
+        Saving is done to a temporary directory, which is removed afterwards.
+
+        Returns the node.
+        """
+        import tempfile
+        import os.path
+
+        with tempfile.TemporaryDirectory() as tmpdir:
+            filepath = os.path.join(tmpdir, filename_on_cloud)
+            self.log.debug('Saving %s to %s', datablock, filepath)
+            datablock.save_render(filepath)
+            return await self.upload_file(filepath)
+
+    async def upload_file(self, filename: str, fileobj=None):
+        """Uploads a file to the cloud, attached to the image sharing node.
+
+        Returns the node.
+        """
+        from .. import blender
+
+        prefs = blender.preferences()
+        project = self.find_project(prefs.attract_project.project)
+
+        self.log.info('Uploading file %s', filename)
+        resp = await pillar.pillar_call(
+            pillarsdk.File.upload_to_project,
+            project['_id'],
+            'image/jpeg',
+            filename,
+            fileobj=fileobj)
+
+        self.log.debug('Returned data: %s', resp)
+        try:
+            file_id = resp['file_id']
+        except KeyError:
+            self.log.error('Upload did not succeed, response: %s', resp)
+            self.report({'ERROR'}, 'Unable to upload thumbnail to Attract: %s' % resp)
+            return None
+
+        self.log.info('Created file %s', file_id)
+        self.report({'INFO'}, 'File succesfully uploaded to the cloud!')
+
+        return file_id
+
+
+def draw_strip_movie_meta(self, context):
+    strip = active_strip(context)
+    if not strip:
+        return
+
+    meta = strip.get('metadata', None)
+    if not meta:
+        return None
+
+    box = self.layout.column(align=True)
+    row = box.row(align=True)
+    fname = meta.get('BLEND_FILE', None) or None
+    if fname:
+        row.label('Original Blendfile: %s' % fname)
+        row.operator(ATTRACT_OT_open_meta_blendfile.bl_idname,
+                     text='', icon='FILE_BLEND')
+    sfra = meta.get('START_FRAME', '?')
+    efra = meta.get('END_FRAME', '?')
+    box.label('Original Frame Range: %s-%s' % (sfra, efra))
+
+
 def register():
-    bpy.types.Sequence.atc_is_synced = bpy.props.BoolProperty(name="Is synced")
+    bpy.types.Sequence.atc_is_synced = bpy.props.BoolProperty(name="Is Synced")
     bpy.types.Sequence.atc_object_id = bpy.props.StringProperty(name="Attract Object ID")
+    bpy.types.Sequence.atc_object_id_conflict = bpy.props.BoolProperty(
+        name='Object ID Conflict',
+        description='Attract Object ID used multiple times',
+        default=False)
     bpy.types.Sequence.atc_name = bpy.props.StringProperty(name="Shot Name")
-    bpy.types.Sequence.atc_description = bpy.props.StringProperty(name="Shot description")
-    bpy.types.Sequence.atc_notes = bpy.props.StringProperty(name="Shot notes")
+    bpy.types.Sequence.atc_description = bpy.props.StringProperty(name="Shot Description")
+    bpy.types.Sequence.atc_notes = bpy.props.StringProperty(name="Shot Notes")
 
     # TODO: get this from the project's node type definition.
     bpy.types.Sequence.atc_status = bpy.props.EnumProperty(
         items=[
-            ('on_hold', 'On hold', 'The shot is on hold'),
+            ('on_hold', 'On Hold', 'The shot is on hold'),
             ('todo', 'Todo', 'Waiting'),
-            ('in_progress', 'In progress', 'The show has been assigned'),
+            ('in_progress', 'In Progress', 'The show has been assigned'),
             ('review', 'Review', ''),
             ('final', 'Final', ''),
         ],
         name="Status")
     bpy.types.Sequence.atc_order = bpy.props.IntProperty(name="Order")
 
+    bpy.types.SEQUENCER_PT_edit.append(draw_strip_movie_meta)
+
     bpy.utils.register_class(ToolsPanel)
-    bpy.utils.register_class(AttractShotSubmitNew)
     bpy.utils.register_class(AttractShotRelink)
-    bpy.utils.register_class(AttractShotSubmitUpdate)
     bpy.utils.register_class(AttractShotDelete)
     bpy.utils.register_class(AttractStripUnlink)
     bpy.utils.register_class(AttractShotFetchUpdate)
     bpy.utils.register_class(AttractShotSubmitSelected)
+    bpy.utils.register_class(ATTRACT_OT_submit_all)
+    bpy.utils.register_class(ATTRACT_OT_open_meta_blendfile)
+    bpy.utils.register_class(ATTRACT_OT_shot_open_in_browser)
+    bpy.utils.register_class(ATTRACT_OT_make_shot_thumbnail)
     draw.callback_enable()
 
 
 def unregister():
     draw.callback_disable()
+    bpy.utils.unregister_module(__name__)
     del bpy.types.Sequence.atc_is_synced
     del bpy.types.Sequence.atc_object_id
+    del bpy.types.Sequence.atc_object_id_conflict
     del bpy.types.Sequence.atc_name
     del bpy.types.Sequence.atc_description
     del bpy.types.Sequence.atc_notes
     del bpy.types.Sequence.atc_status
     del bpy.types.Sequence.atc_order
-    bpy.utils.unregister_module(__name__)

blender_cloud/attract/draw.py

@@ -34,19 +34,22 @@ strip_status_colour = {
     'todo': (1.0, 0.5019607843137255, 0.5019607843137255)
 }
 
+CONFLICT_COLOUR = (0.576, 0.118, 0.035)  # RGB tuple
 
-def get_strip_rectf(strip, pixel_size_y):
+
+def get_strip_rectf(strip):
     # Get x and y in terms of the grid's frames and channels
     x1 = strip.frame_final_start
     x2 = strip.frame_final_end
-    y1 = strip.channel + 0.2 - pixel_size_y
-    y2 = y1 + 2 * pixel_size_y
+    y1 = strip.channel + 0.2
+    y2 = strip.channel - 0.2 + 1
 
-    return (x1, y1, x2, y2)
+    return x1, y1, x2, y2
 
 
-def draw_underline_in_strip(strip_coords, pixel_size, color):
+def draw_underline_in_strip(strip_coords, pixel_size_x, color):
     from bgl import glColor4f, glRectf, glEnable, glDisable, GL_BLEND
+    import bgl
 
     context = bpy.context
 
@@ -56,18 +59,52 @@ def draw_underline_in_strip(strip_coords, pixel_size, color):
     # be careful not to draw over the current frame line
     cf_x = context.scene.frame_current_final
 
+    bgl.glPushAttrib(bgl.GL_COLOR_BUFFER_BIT | bgl.GL_LINE_BIT)
+
     glColor4f(*color)
     glEnable(GL_BLEND)
+    bgl.glLineWidth(2)
+    bgl.glBegin(bgl.GL_LINES)
 
+    bgl.glVertex2f(s_x1, s_y1)
     if s_x1 < cf_x < s_x2:
         # Bad luck, the line passes our strip
-        glRectf(s_x1, s_y1, cf_x - pixel_size, s_y2)
-        glRectf(cf_x + pixel_size, s_y1, s_x2, s_y2)
-    else:
-        # Normal, full rectangle draw
-        glRectf(s_x1, s_y1, s_x2, s_y2)
+        bgl.glVertex2f(cf_x - pixel_size_x, s_y1)
+        bgl.glVertex2f(cf_x + pixel_size_x, s_y1)
+    bgl.glVertex2f(s_x2, s_y1)
 
-    glDisable(GL_BLEND)
+    bgl.glEnd()
+    bgl.glPopAttrib()
+
+
+def draw_strip_conflict(strip_coords, pixel_size_x):
+    """Draws conflicting states between strips."""
+
+    import bgl
+
+    s_x1, s_y1, s_x2, s_y2 = strip_coords
+    bgl.glPushAttrib(bgl.GL_COLOR_BUFFER_BIT | bgl.GL_LINE_BIT)
+
+    # Always draw the full rectangle, the conflict should be resolved and thus stand out.
+    bgl.glColor3f(*CONFLICT_COLOUR)
+    bgl.glLineWidth(3)
+    bgl.glPointSize(10)
+
+    bgl.glBegin(bgl.GL_LINE_LOOP)
+    bgl.glVertex2f(s_x1, s_y1)
+    bgl.glVertex2f(s_x2, s_y1)
+    bgl.glVertex2f(s_x2, s_y2)
+    bgl.glVertex2f(s_x1, s_y2)
+    bgl.glEnd()
+
+    bgl.glBegin(bgl.GL_POINTS)
+    bgl.glVertex2f(s_x1, s_y1)
+    bgl.glVertex2f(s_x2, s_y1)
+    bgl.glVertex2f(s_x2, s_y2)
+    bgl.glVertex2f(s_x1, s_y2)
+    bgl.glEnd()
+
+    bgl.glPopAttrib()
 
 
 def draw_callback_px():
@@ -76,24 +113,22 @@ def draw_callback_px():
     if not context.scene.sequence_editor:
         return
 
+    from . import shown_strips
+
     region = context.region
     xwin1, ywin1 = region.view2d.region_to_view(0, 0)
     xwin2, ywin2 = region.view2d.region_to_view(region.width, region.height)
     one_pixel_further_x, one_pixel_further_y = region.view2d.region_to_view(1, 1)
     pixel_size_x = one_pixel_further_x - xwin1
-    pixel_size_y = one_pixel_further_y - ywin1
 
-    if context.scene.sequence_editor.meta_stack:
-        strips = context.scene.sequence_editor.meta_stack[-1].sequences
-    else:
-        strips = context.scene.sequence_editor.sequences
+    strips = shown_strips(context)
 
     for strip in strips:
         if not strip.atc_object_id:
             continue
 
         # Get corners (x1, y1), (x2, y2) of the strip rectangle in px region coords
-        strip_coords = get_strip_rectf(strip, pixel_size_y)
+        strip_coords = get_strip_rectf(strip)
 
         # check if any of the coordinates are out of bounds
         if strip_coords[0] > xwin2 or strip_coords[2] < xwin1 or strip_coords[1] > ywin2 or \
@@ -109,7 +144,9 @@ def draw_callback_px():
 
         alpha = 1.0 if strip.atc_is_synced else 0.5
 
-        draw_underline_in_strip(strip_coords, pixel_size_x, color + (alpha, ))
+        draw_underline_in_strip(strip_coords, pixel_size_x, color + (alpha,))
+        if strip.atc_is_synced and strip.atc_object_id_conflict:
+            draw_strip_conflict(strip_coords, pixel_size_x)
 
 
 def tag_redraw_all_sequencer_editors():

blender_cloud/blender.py

@@ -31,8 +31,9 @@ import rna_prop_ui
 
 from . import pillar, async_loop
 
-PILLAR_SERVER_URL = 'https://cloud.blender.org/api/'
-# PILLAR_SERVER_URL = 'http://pillar:5001/api/'
+PILLAR_WEB_SERVER_URL = 'https://cloud.blender.org/'
+# PILLAR_WEB_SERVER_URL = 'http://pillar-web:5001/'
+PILLAR_SERVER_URL = '%sapi/' % PILLAR_WEB_SERVER_URL
 
 ADDON_NAME = 'blender_cloud'
 log = logging.getLogger(__name__)
@@ -44,6 +45,36 @@ def redraw(self, context):
     context.area.tag_redraw()
 
 
+def pyside_cache(propname):
+
+    if callable(propname):
+        raise TypeError('Usage: pyside_cache("property_name")')
+
+    def decorator(wrapped):
+        """Stores the result of the callable in Python-managed memory.
+
+        This is to work around the warning at
+        https://www.blender.org/api/blender_python_api_master/bpy.props.html#bpy.props.EnumProperty
+        """
+
+        import functools
+
+        @functools.wraps(wrapped)
+        # We can't use (*args, **kwargs), because EnumProperty explicitly checks
+        # for the number of fixed positional arguments.
+        def wrapper(self, context):
+            result = None
+            try:
+                result = wrapped(self, context)
+                return result
+            finally:
+                rna_type, rna_info = getattr(self.bl_rna, propname)
+                rna_info['_cached_result'] = result
+        return wrapper
+    return decorator
+
+
+@pyside_cache('version')
 def blender_syncable_versions(self, context):
     """Returns the list of items used by SyncStatusProperties.version EnumProperty."""
 
@@ -106,6 +137,7 @@ class SyncStatusProperties(PropertyGroup):
         self['available_blender_versions'] = new_versions
 
 
+@pyside_cache('project')
 def bcloud_available_projects(self, context):
     """Returns the list of items used by BlenderCloudProjectGroup.project EnumProperty."""
 
@@ -165,7 +197,15 @@ class BlenderCloudPreferences(AddonPreferences):
         default=True
     )
 
+    # TODO: store local path with the Attract project, so that people
+    # can switch projects and the local path switches with it.
     attract_project = PointerProperty(type=BlenderCloudProjectGroup)
+    attract_project_local_path = StringProperty(
+        name='Local project path',
+        description='Local path of your Attract project, used to search for blend files; '
+                    'usually best to set to an absolute path',
+        subtype='DIR_PATH',
+        default='//../')
 
     def draw(self, context):
         import textwrap
@@ -251,9 +291,7 @@ class BlenderCloudPreferences(AddonPreferences):
         # Attract stuff
         attract_box = layout.box()
         attract_box.enabled = msg_icon != 'ERROR'
-        attract_row = attract_box.row(align=True)
-        attract_row.label('Attract', icon_value=icon('CLOUD'))
-        self.draw_attract_buttons(attract_row, self.attract_project)
+        self.draw_attract_buttons(attract_box, self.attract_project)
 
     def draw_subscribe_button(self, layout):
         layout.operator('pillar.subscribe', icon='WORLD')
@@ -289,9 +327,12 @@ class BlenderCloudPreferences(AddonPreferences):
         else:
             row_pull.label('Cloud Sync is running.')
 
-    def draw_attract_buttons(self, layout, bcp: BlenderCloudProjectGroup):
-        layout.enabled = bcp.status in {'NONE', 'IDLE'}
-        row_buttons = layout.row(align=True)
+    def draw_attract_buttons(self, attract_box, bcp: BlenderCloudProjectGroup):
+        attract_row = attract_box.row(align=True)
+        attract_row.label('Attract', icon_value=icon('CLOUD'))
+
+        attract_row.enabled = bcp.status in {'NONE', 'IDLE'}
+        row_buttons = attract_row.row(align=True)
 
         projects = bcp.available_projects
         project = bcp.project
@@ -308,6 +349,8 @@ class BlenderCloudPreferences(AddonPreferences):
         else:
             row_buttons.label('Fetching available projects.')
 
+        attract_box.prop(self, 'attract_project_local_path')
+
 
 class PillarCredentialsUpdate(pillar.PillarOperatorMixin,
                               Operator):
@@ -361,6 +404,7 @@ class PILLAR_OT_subscribe(Operator):
     """Opens a browser to subscribe the user to the Cloud."""
     bl_idname = 'pillar.subscribe'
     bl_label = 'Subscribe to the Cloud'
+    bl_description = "Opens a page in a web browser to subscribe to the Blender Cloud"
 
     def execute(self, context):
         import webbrowser
@@ -374,7 +418,7 @@ class PILLAR_OT_subscribe(Operator):
 class PILLAR_OT_projects(async_loop.AsyncModalOperatorMixin,
                          pillar.PillarOperatorMixin,
                          Operator):
-    """Fetches the projects available to the user, and ."""
+    """Fetches the projects available to the user"""
     bl_idname = 'pillar.projects'
     bl_label = 'Fetch available projects'
 

blender_cloud/pillar.py

@@ -218,10 +218,10 @@ async def pillar_call(pillar_func, *args, caching=True, **kwargs):
         return await loop.run_in_executor(None, partial)
 
 
-def sync_call(pillar_func, *args, **kwargs):
+def sync_call(pillar_func, *args, caching=True, **kwargs):
     """Synchronous call to Pillar, ensures the correct Api object is used."""
 
-    return pillar_func(*args, api=pillar_api(), **kwargs)
+    return pillar_func(*args, api=pillar_api(caching=caching), **kwargs)
 
 
 async def check_pillar_credentials(required_roles: set):

blender_cloud/utils.py

@@ -16,6 +16,8 @@
 #
 # ##### END GPL LICENSE BLOCK #####
 
+import pathlib
+
 
 def sizeof_fmt(num: int, suffix='B') -> str:
     """Returns a human-readable size.
@@ -29,3 +31,34 @@ def sizeof_fmt(num: int, suffix='B') -> str:
         num /= 1024
 
     return '%.1f Yi%s' % (num, suffix)
+
+
+def find_in_path(path: pathlib.Path, filename: str) -> pathlib.Path:
+    """Performs a breadth-first search for the filename.
+
+    Returns the path that contains the file, or None if not found.
+    """
+
+    import collections
+
+    # Be lenient on our input type.
+    if isinstance(path, str):
+        path = pathlib.Path(path)
+
+    if not path.exists():
+        return None
+    assert path.is_dir()
+
+    to_visit = collections.deque([path])
+    while to_visit:
+        this_path = to_visit.popleft()
+
+        for subpath in this_path.iterdir():
+            if subpath.is_dir():
+                to_visit.append(subpath)
+                continue
+
+            if subpath.name == filename:
+                return subpath
+
+    return None

requirements-dev.txt

@@ -0,0 +1,8 @@
+-r requirements.txt
+
+# Primary requirements
+pytest==3.0.3
+
+# Secondary requirements
+py==1.4.31
+

requirements.txt

@@ -1,7 +1,7 @@
 # Primary requirements:
 -e git+https://github.com/sybrenstuvel/cachecontrol.git@sybren-filecache-delete-crash-fix#egg=CacheControl
 lockfile==0.12.2
-pillarsdk==1.6.0
+pillarsdk==1.6.1
 wheel==0.29.0
 
 # Secondary requirements:

setup.py

@@ -196,7 +196,7 @@ setup(
               'wheels': BuildWheels},
     name='blender_cloud',
     description='The Blender Cloud addon allows browsing the Blender Cloud from Blender.',
-    version='1.4.99',
+    version='1.4.999',
     author='Sybren A. Stüvel',
     author_email='sybren@stuvel.eu',
     packages=find_packages('.'),

tests/test_utils.py

@@ -0,0 +1,25 @@
+"""Unittests for blender_cloud.utils."""
+
+import pathlib
+import unittest
+
+from blender_cloud import utils
+
+
+class FindInPathTest(unittest.TestCase):
+    def test_nonexistant_path(self):
+        path = pathlib.Path('/doesnotexistreally')
+        self.assertFalse(path.exists())
+        self.assertIsNone(utils.find_in_path(path, 'jemoeder.blend'))
+
+    def test_really_breadth_first(self):
+        """A depth-first test might find dir_a1/dir_a2/dir_a3/find_me.txt first."""
+
+        path = pathlib.Path(__file__).parent / 'test_really_breadth_first'
+        found = utils.find_in_path(path, 'find_me.txt')
+        self.assertEqual(path / 'dir_b1' / 'dir_b2' / 'find_me.txt', found)
+
+    def test_nonexistant_file(self):
+        path = pathlib.Path(__file__).parent / 'test_really_breadth_first'
+        found = utils.find_in_path(path, 'do_not_find_me.txt')
+        self.assertEqual(None, found)