WIP: asset engine support

This allows us to have a structured, well-defined way to point at a node
in Pillar (and store its parent nodes).

README.md

@@ -19,28 +19,6 @@ This addon is a *proof of concept* demonstrating the following features:
 
 {F299745}
 
-Installing the addon
---------------------
-
-* If you don't have one already, sign up for an account at
-  the [Blender ID site](https://www.blender.org/id/).
-* If you had a previous version of the addon installed, deactivate it
-  and restart Blender.
-* Install and log in with the
-  [Blender ID addon](https://developer.blender.org/diffusion/BIA/).
-* Install the Blender Cloud addon in Blender (User Preferences →
-  Addons → Install from file...) by pointing it to
-  `blender_cloud*.addon.zip`.
-* Enable the addon in User Preferences → Addons → System.
-
-Running the addon
------------------
-
-After installing the Blender Cloud addon, press Ctrl+Alt+Shift+A to
-activate it (yes, this needs work). Downloaded textures are loaded into
-image datablocks. The download location can be configured in the addon
-preferences.
-
 
 Building an installable ZIP file
 --------------------------------
@@ -62,6 +40,38 @@ can find them, or be bundled as wheel files in `blender_cloud/wheels`.
 The `python setup.py bdist` command gathers the dependencies and bundles
 them as wheel files.
 
+Installing the addon
+--------------------
+
+* To build the addon, run `python setup.py bdist` as described above.
+* If you don't have one already, sign up for an account at
+  the [Blender ID site](https://www.blender.org/id/).
+* As a final step, install and log in with the
+  [Blender ID addon](https://developer.blender.org/diffusion/BIA/).
+* Install the Blender Cloud addon in Blender (User Preferences →
+  Addons → Install from file...) by pointing it to
+  `dist/blender_cloud*.addon.zip`.
+* Enable the addon in User Preferences → Addons → System.
+
+NOTE: The addon requires HTTPS connections, and thus is dependent on
+[D1845](https://developer.blender.org/D1845). You can do either of
+these:
+
+* Build Blender yourself
+* Get a recent copy from the buildbot
+* Copy certificate authority certificate PEM file to
+  `blender/2.77/python/lib/python3.5/site-packages/requests/cacert.pem`.
+  You can use the same file from your local requests installation, or
+  use `/etc/ssl/certs/ca-certificates.crt`.
+
+Running the addon
+-----------------
+
+After installing the Blender Cloud addon, press Ctrl+Alt+Shift+A to
+activate it (yes, this needs work). Downloaded textures are loaded into
+image datablocks. The download location can be configured in the addon
+preferences.
+
 
 Design
 ------

blender_cloud/__init__.py

@@ -19,21 +19,26 @@
 # <pep8 compliant>
 
 bl_info = {
-    'name': 'Blender Cloud',
-    'author': 'Sybren A. Stüvel and Francesco Siddi',
-    'version': (1, 3, 1),
-    '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 '
-                   'and Blender 2.77a or newer.',
-    'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.6/Py/'
-                'Scripts/System/BlenderCloud',
-    'category': 'System',
-    'support': 'OFFICIAL'
+    "name": "Blender Cloud Texture Browser",
+    "author": "Sybren A. Stüvel and Francesco Siddi",
+    "version": (0, 2, 0),
+    "blender": (2, 77, 0),
+    "location": "TO BE DETERMINED",
+    "description": "Allows downloading of textures from the Blender Cloud. Requires "
+                   "the Blender ID addon.",
+    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.6/Py/"
+                "Scripts/System/BlenderCloud",
+    "category": "System",
+    "support": "TESTING"
 }
 
 import logging
 
+logging.basicConfig(level=logging.INFO,
+                    format='%(asctime)-15s %(levelname)8s %(name)s %(message)s')
+logging.getLogger('cachecontrol').setLevel(logging.DEBUG)
+logging.getLogger(__name__).setLevel(logging.DEBUG)
+
 # Support reloading
 if 'pillar' in locals():
     import importlib
@@ -45,21 +50,16 @@ if 'pillar' in locals():
     cache = importlib.reload(cache)
 else:
     from . import wheels
-
     wheels.load_wheels()
 
     from . import pillar, cache
 
-log = logging.getLogger(__name__)
-
 
 def register():
     """Late-loads and registers the Blender-dependent submodules."""
 
     import sys
 
-    _monkey_patch_requests()
-
     # Support reloading
     if '%s.blender' % __name__ in sys.modules:
         import importlib
@@ -70,49 +70,25 @@ def register():
             sys.modules[modname] = module
             return module
 
-        reload_mod('blendfile')
-        reload_mod('home_project')
-
         blender = reload_mod('blender')
         gui = reload_mod('gui')
         async_loop = reload_mod('async_loop')
-        settings_sync = reload_mod('settings_sync')
-        image_sharing = reload_mod('image_sharing')
+        asset_engine = reload_mod('asset_engine')
     else:
-        from . import (blender, gui, async_loop, settings_sync, blendfile, home_project,
-                       image_sharing)
+        from . import blender, gui, async_loop, asset_engine
 
     async_loop.setup_asyncio_executor()
     async_loop.register()
 
-    gui.register()
     blender.register()
-    settings_sync.register()
-    image_sharing.register()
-
-
-def _monkey_patch_requests():
-    """Monkey-patch old versions of Requests.
-
-    This is required for the Mac version of Blender 2.77a.
-    """
-
-    import requests
-
-    if requests.__build__ >= 0x020601:
-        return
-
-    log.info('Monkey-patching requests version %s', requests.__version__)
-    from requests.packages.urllib3.response import HTTPResponse
-    HTTPResponse.chunked = False
-    HTTPResponse.chunk_left = None
+    gui.register()
+    asset_engine.register()
 
 
 def unregister():
-    from . import blender, gui, async_loop, settings_sync, image_sharing
+    from . import blender, gui, async_loop
 
-    image_sharing.unregister()
-    settings_sync.unregister()
-    blender.unregister()
     gui.unregister()
+    blender.unregister()
     async_loop.unregister()
+

blender_cloud/asset_engine.py

@@ -0,0 +1,468 @@
+# ##### BEGIN GPL LICENSE BLOCK #####
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version 2
+#  of the License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software Foundation,
+#  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ##### END GPL LICENSE BLOCK #####
+
+# <pep8 compliant>
+
+"""Blender Cloud interface for the Asset Engine."""
+import asyncio
+import logging
+
+import bpy
+import time
+from bpy.types import (AssetEngine, AssetList, FileSelectParams,
+                       AssetUUIDList, AssetUUID,
+                       Panel, PropertyGroup, UIList)
+from bpy.props import (StringProperty,
+                       BoolProperty,
+                       IntProperty,
+                       FloatProperty,
+                       EnumProperty,
+                       CollectionProperty)
+
+from . import async_loop, pillar, cache
+
+ASSET_ENGINE_ID = 0xc0ffee
+
+
+def object_id_to_ea_uuid(pillar_object_id: str) -> tuple:
+    """Turns a ObjectId string from Pillar to a tuple of 4 ints.
+
+    >>> object_id_to_ea_uuid('55f2d0dc2beb33006e43dd7e')
+    (12648430, 1441976540, 736834304, 1849941374)
+    >>> object_id_to_ea_uuid('55f2d0dc2beb33006e43dd7e') == \
+        (ASSET_ENGINE_ID, 0x55f2d0dc, 0x2beb3300, 0x6e43dd7e)
+    True
+
+    The first int is hard-coded to indicate this asset engine.
+    The other three ints are 32 bit each, and are taken from the 12-byte
+    ObjectId (see https://docs.mongodb.org/manual/reference/method/ObjectId/)
+    """
+
+    # Make sure it's a 12-byte number in hex.
+    pillar_object_id = pillar_object_id.rjust(24, '0')
+
+    return (ASSET_ENGINE_ID,
+            int(pillar_object_id[0:8], 16),
+            int(pillar_object_id[8:16], 16),
+            int(pillar_object_id[16:24], 16))
+
+
+class BCloudAssetEngineDirListJob:
+    def __init__(self, job_id: int, path: pillar.CloudPath, future: asyncio.Future = None):
+        self.log = logging.getLogger('%s.%s' % (__name__, BCloudAssetEngineDirListJob.__qualname__))
+        self.log.debug('Starting new dirlist job (id=%i) for path %r', job_id, path)
+
+        self.job_id = job_id
+        self.status = {'INVALID'}
+        self.progress = 0.0
+        self.path = path
+
+        # Start a new asynchronous task.
+        self.signalling_future = future or asyncio.Future()
+        # self.async_task = asyncio.ensure_future(self.async_download_previews())
+        # self.log.debug('Created new task %r', self.async_task)
+        # self.status = {'VALID', 'RUNNING'}
+
+        self.async_task = None
+        self.status = {'VALID'}
+
+    def __repr__(self):
+        return '%s(job_id=%i, path=%s, future=%s)' % (type(self), self.job_id, self.path,
+                                                      self.signalling_future)
+
+    def stop(self):
+        self.log.debug('Stopping async task')
+        if self.async_task is None:
+            self.log.debug('No async task, trivially stopped')
+            return
+
+        # Signal that we want to stop.
+        if not self.signalling_future.done():
+            self.log.info("Signalling that we want to cancel anything that's running.")
+            self.signalling_future.cancel()
+
+        # Wait until the asynchronous task is done.
+        if not self.async_task.done():
+            # TODO: Should we really block? Or let it disappear into the background?
+            self.log.info("blocking until async task is done.")
+            loop = asyncio.get_event_loop()
+            try:
+                loop.run_until_complete(self.async_task)
+            except asyncio.CancelledError:
+                self.log.info('Asynchronous task was cancelled')
+                return
+
+        # noinspection PyBroadException
+        try:
+            self.async_task.result()  # This re-raises any exception of the task.
+        except asyncio.CancelledError:
+            self.log.info('Asynchronous task was cancelled')
+        except Exception:
+            self.log.exception("Exception from asynchronous task")
+
+    async def async_download_previews(self):
+        self.log.info('Asynchronously downloading previews')
+
+        def thumbnail_loading(texture_node):
+            self.log.debug('Thumbnail for node %r loading', texture_node)
+            # self.add_menu_item(node, None, 'SPINNER', texture_node['name'])
+
+        def thumbnail_loaded(texture_node, file_desc, thumb_path):
+            self.log.debug('Thumbnail for node %r loaded, thumb at %r', texture_node, thumb_path)
+            # self.update_menu_item(node, file_desc, thumb_path, file_desc['filename'])
+
+        node_uuid = self.path.node_uuid
+        project_uuid = self.path.project_uuid
+
+        # Download either by group_texture node or project UUID (showing all top-level nodes)
+        if node_uuid:
+            self.log.debug('Getting subnodes for parent node %r', node_uuid)
+            children = await pillar.get_nodes(parent_node_uuid=node_uuid,
+                                              node_type='group_textures')
+        elif project_uuid:
+            self.log.debug('Getting subnodes for project node %r', project_uuid)
+            children = await pillar.get_nodes(project_uuid, '')
+
+        else:
+            # TODO: add "nothing here" icon and trigger re-draw
+            self.log.warning("Not node UUID and no project UUID, I can't do anything!")
+            return
+
+        # Download all child nodes
+        self.log.debug('Iterating over child nodes of %r', node_uuid)
+        for child in children:
+            self.log.debug('  - %(_id)s = %(name)s' % child)
+            # self.add_menu_item(child, None, 'FOLDER', child['name'])
+
+        # There are only sub-nodes at the project level, no texture nodes,
+        # so we won't have to bother looking for textures.
+        if not node_uuid:
+            return
+
+        directory = cache.cache_directory('thumbnails', project_uuid, node_uuid)
+
+        self.log.debug('Fetching texture thumbnails for node %r to %r', node_uuid, directory)
+        await pillar.fetch_texture_thumbs(node_uuid, 's', directory,
+                                          thumbnail_loading=thumbnail_loading,
+                                          thumbnail_loaded=thumbnail_loaded,
+                                          future=self.signalling_future)
+
+    def update(self):
+        self.log.debug('update()')
+        async_loop.kick_async_loop()
+
+        if not self.async_task:
+            return
+
+        if self.async_task.done():
+            self.status = {'VALID'}
+
+        self.status = {'VALID', 'RUNNING'}
+
+
+class BCloudAssetEngine(AssetEngine):
+    bl_label = "Blender Cloud"
+    bl_version = 1
+
+    def __init__(self):
+        self.log = logging.getLogger('%s.%s' % (__name__, BCloudAssetEngine.__qualname__))
+        self.log.debug('Starting %s asset engine', self.bl_label)
+
+        self.jobs = {}
+        self._next_job_id = 1
+        self.path = pillar.CloudPath('/5672beecc0261b2005ed1a33')
+        self.dirs = []
+        self.sortedfiltered = []
+
+    def reset(self):
+        pass
+
+    def _start_dirlist_job(self, path: pillar.CloudPath, job_id: int = None) -> int:
+        if not job_id:
+            job_id = self._next_job_id
+            self._next_job_id += 1
+
+        self.jobs[job_id] = BCloudAssetEngineDirListJob(job_id, path)
+        self.path = path
+
+        return job_id
+
+    ########## PY-API only ##########
+    # UI header
+    def draw_header(self, layout, context):
+        params = context.space_data.params
+        assert isinstance(params, FileSelectParams)
+        # self.log.debug('draw_header: params=%r', params)
+
+        # can be None when save/reload with a file selector open
+        if params is None:
+            return
+
+        is_lib_browser = params.use_library_browsing
+
+        layout.prop(params, "display_type", expand=True, text="")
+        layout.prop(params, "sort_method", expand=True, text="")
+
+        layout.prop(params, "show_hidden", text="", icon='FILE_HIDDEN')
+        layout.prop(params, "use_filter", text="", icon='FILTER')
+
+        row = layout.row(align=True)
+        row.active = params.use_filter
+
+        if params.filter_glob:
+            # if st.active_operator and hasattr(st.active_operator, "filter_glob"):
+            #    row.prop(params, "filter_glob", text="")
+            row.label(params.filter_glob)
+        else:
+            row.prop(params, "use_filter_blender", text="")
+            row.prop(params, "use_filter_backup", text="")
+            row.prop(params, "use_filter_image", text="")
+            row.prop(params, "use_filter_movie", text="")
+            row.prop(params, "use_filter_script", text="")
+            row.prop(params, "use_filter_font", text="")
+            row.prop(params, "use_filter_sound", text="")
+            row.prop(params, "use_filter_text", text="")
+
+        if is_lib_browser:
+            row.prop(params, "use_filter_blendid", text="")
+            if params.use_filter_blendid:
+                row.separator()
+                row.prop(params, "filter_id_category", text="")
+
+        row.separator()
+        row.prop(params, "filter_search", text="", icon='VIEWZOOM')
+
+    ########## C (RNA) API ##########
+    def status(self, job_id: int) -> set:
+        """Returns either {'VALID'}, {'RUNNING'} or empty set."""
+
+        if job_id:
+            job = self.jobs.get(job_id, None)
+            return job.status if job is not None else set()
+        return {'VALID'}
+
+    def progress(self, job_id: int) -> float:
+        if job_id:
+            job = self.jobs.get(job_id, None)
+            return job.progress if job is not None else 0.0
+        progress = 0.0
+        nbr_jobs = 0
+        for job in self.jobs.values():
+            if 'RUNNING' in job.status:
+                nbr_jobs += 1
+                progress += job.progress
+        return progress / nbr_jobs if nbr_jobs else 0.0
+
+    def kill(self, job_id: int):
+        self.log.debug('kill(%i)', job_id)
+        if not job_id:
+            for job_id in self.jobs:
+                self.kill(job_id)
+            return
+
+        job = self.jobs.get(job_id, None)
+        if job is not None:
+            job.stop()
+
+    def list_dir(self, job_id: int, asset_list: AssetList) -> int:
+        """Extends the 'asset_list' object with asset_list for the current dir.
+
+        :param job_id: Job ID of a currently running job (to investigate
+            progress), or zero (0) to start a new job.
+        :param asset_list: AssetList to store directory asset_list in.
+
+        :returns: the job ID, which is the given job ID or a new job ID if a
+            new job was started.
+        """
+
+        self.log.debug('list_dir(%i), %i entries already loaded', job_id, len(asset_list.entries))
+
+        # TODO: set asset_list.nbr_entries to the total number of entries.
+
+        # job = self.jobs.get(job_id, None)
+        #
+        # asset_list_path = pillar.CloudPath(asset_list.root_path)
+        # if job is not None:
+        #     if not isinstance(job, BCloudAssetEngineDirListJob) or job.path != asset_list_path:
+        #         # We moved to another directory, abort what's going on now and start a new job.
+        #         self.reset()
+        #         if not isinstance(job, BCloudAssetEngineDirListJob):
+        #             self.log.warn('Job %r is not a BCloudAssetEngineDirListJob', job)
+        #         else:
+        #             self.log.warn('Job %r is investigating path %r while we want %r', job,
+        #                           job.path, asset_list_path)
+        #         return self._start_dirlist_job(pillar.CloudPath(asset_list_path))
+        #
+        #     # Just asking for an update
+        #     job.update()
+        #     return job_id
+        #
+        # # Moved to another directory, but we haven't started any job yet.
+        # if self.path != asset_list_path:
+        #     self.reset()
+        #     self.log.info('No job yet, and path changed from %r to %r',
+        #                   self.path, asset_list_path)
+        #     return self._start_dirlist_job(asset_list_path)
+        #
+        # self.log.warn('No job (id=%i), no change in path (%r == %r), nothing to do.', job_id,
+        #               self.path, asset_list_path)
+
+        # Just add a fake entry for shits and giggles.
+        if asset_list.nbr_entries == 0:
+            asset_list.nbr_entries = 1
+
+        # import time
+        # time.sleep(1)
+        # The job has been finished; the asset_list is complete.
+        # return job_id
+        return -1
+
+    def load_pre(self, uuids, asset_list: AssetList) -> bool:
+        self.log.debug("load_pre(%r, %r)", uuids, asset_list)
+        return False
+
+    def sort_filter(self, use_sort: bool, use_filter: bool, params: FileSelectParams,
+                    asset_list: AssetList) -> bool:
+        self.log.debug("sort_filter(%s, %s, %r, %i in %r)", use_sort, use_filter, params,
+                       len(asset_list.entries), asset_list)
+        asset_list.nbr_entries_filtered = asset_list.nbr_entries
+        return False
+
+    def entries_block_get(self, start_index: int, end_index: int, asset_list: AssetList):
+        self.log.debug("entries_block_get(%i, %i, %r)", start_index, end_index, asset_list)
+
+        entry = asset_list.entries.add()
+        entry.name = 'je moeder'
+        entry.description = 'hahaha'
+        entry.type = {'DIR'}
+        entry.relpath = 'relative'
+        entry.uuid = (1, 2, 3, 4)
+
+        variant = entry.variants.add()
+        variant.uuid = (2, 3, 4, 5)
+        variant.name = 'Variant van je moeder'
+        variant.description = 'Variant van je omschrijving'
+        entry.variants.active = variant
+
+        revision = variant.revisions.add()
+        revision.uuid = (3, 4, 5, 6)
+        revision.size = 1024
+        revision.timestamp = time.time()
+        variant.revisions.active = revision
+
+        return True
+
+    def entries_uuid_get(self, uuids: AssetUUIDList, asset_list: AssetList):
+        self.log.debug("entries_uuid_get(%r, %r)", uuids, asset_list)
+
+        for uuid in uuids.uuids:
+            self.entry_from_uuid(asset_list, uuid)
+        return True
+
+    def entry_from_uuid(self, asset_list: AssetList, uuid: AssetUUID):
+        """Adds the ID'd entry to the asset list.
+
+        Alternatively, it sets the UUID's 'is_unknown_engine' or
+        'is_asset_missing' properties.
+        """
+
+        uuid_asset = tuple(uuid.uuid_asset)
+        uuid_variant = tuple(uuid.uuid_variant)
+        uuid_revision = tuple(uuid.uuid_revision)
+
+        entry = asset_list.entries.add()
+        entry.name = 'je moeder'
+        entry.description = 'hahaha'
+        entry.type = {'DIR'}
+        entry.relpath = 'relative'
+        entry.uuid = uuid_asset
+
+        variant = entry.variants.add()
+        variant.uuid = uuid_variant
+        variant.name = 'Variant van je moeder'
+        variant.description = 'Variant van je omschrijving'
+        entry.variants.active = variant
+
+        revision = variant.revisions.add()
+        revision.uuid = uuid_revision
+        revision.size = 1024
+        revision.timestamp = time.time()
+        variant.revisions.active = revision
+
+
+class BCloudPanel:
+    @classmethod
+    def poll(cls, context):
+        space = context.space_data
+        if space and space.type == 'FILE_BROWSER':
+            ae = space.asset_engine
+            if ae and space.asset_engine_type == "AssetEngineAmber":
+                return True
+        return False
+
+
+class BCloud_PT_options(Panel, BCloudPanel):
+    bl_space_type = 'FILE_BROWSER'
+    bl_region_type = 'TOOLS'
+    bl_category = "Asset Engine"
+    bl_label = "Blender Cloud Options"
+
+    def draw(self, context):
+        layout = self.layout
+        space = context.space_data
+        ae = space.asset_engine
+
+        row = layout.row()
+
+
+class BCloud_PT_tags(Panel, BCloudPanel):
+    bl_space_type = 'FILE_BROWSER'
+    bl_region_type = 'TOOLS'
+    bl_category = "Filter"
+    bl_label = "Tags"
+
+    def draw(self, context):
+        ae = context.space_data.asset_engine
+
+        # Note: This is *ultra-primitive*!
+        #       A good UI will most likely need new widget option anyway (template).
+        #       Or maybe just some UIList...
+        # ~ self.layout.props_enum(ae, "tags")
+        # self.layout.template_list("AMBER_UL_tags_filter", "", ae, "tags", ae, "active_tag_index")
+
+
+def register():
+    import sys
+    import doctest
+    (failures, tests) = doctest.testmod(sys.modules[__name__])
+
+    log = logging.getLogger(__name__)
+    if failures:
+        log.warning('There were test failures: %i of %i tests failed.', failures, tests)
+    else:
+        log.debug('All %i tests were successful.', tests)
+
+    bpy.utils.register_class(BCloudAssetEngine)
+    bpy.utils.register_class(BCloud_PT_options)
+    bpy.utils.register_class(BCloud_PT_tags)
+
+
+def unregister():
+    bpy.utils.register_class(BCloud_PT_tags)
+    bpy.utils.register_class(BCloud_PT_options)
+    bpy.utils.register_class(BCloudAssetEngine)

blender_cloud/async_loop.py

@@ -4,7 +4,6 @@ import asyncio
 import traceback
 import concurrent.futures
 import logging
-import gc
 
 import bpy
 
@@ -54,9 +53,6 @@ def kick_async_loop(*args) -> bool:
                   len(all_tasks))
         stop_after_this_kick = True
 
-        # Clean up circular references between tasks.
-        gc.collect()
-
         for task_idx, task in enumerate(all_tasks):
             if not task.done():
                 continue
@@ -72,9 +68,6 @@ def kick_async_loop(*args) -> bool:
                 print('{}: resulted in exception'.format(task))
                 traceback.print_exc()
 
-            # for ref in gc.get_referrers(task):
-            #     log.debug('      - referred by %s', ref)
-
     loop.stop()
     loop.run_forever()
 
@@ -87,15 +80,6 @@ def ensure_async_loop():
     log.debug('Result of starting modal operator is %r', result)
 
 
-def erase_async_loop():
-    global _loop_kicking_operator_running
-
-    log.debug('Erasing async loop')
-
-    loop = asyncio.get_event_loop()
-    loop.stop()
-
-
 class AsyncLoopModalOperator(bpy.types.Operator):
     bl_idname = 'asyncio.loop'
     bl_label = 'Runs the asyncio main loop'
@@ -103,14 +87,6 @@ class AsyncLoopModalOperator(bpy.types.Operator):
     timer = None
     log = logging.getLogger(__name__ + '.AsyncLoopModalOperator')
 
-    def __del__(self):
-        global _loop_kicking_operator_running
-
-        # This can be required when the operator is running while Blender
-        # (re)loads a file. The operator then doesn't get the chance to
-        # finish the async tasks, hence stop_after_this_kick is never True.
-        _loop_kicking_operator_running = False
-
     def execute(self, context):
         return self.invoke(context, None)
 
@@ -132,12 +108,6 @@ class AsyncLoopModalOperator(bpy.types.Operator):
     def modal(self, context, event):
         global _loop_kicking_operator_running
 
-        # If _loop_kicking_operator_running is set to False, someone called
-        # erase_async_loop(). This is a signal that we really should stop
-        # running.
-        if not _loop_kicking_operator_running:
-            return {'FINISHED'}
-
         if event.type != 'TIMER':
             return {'PASS_THROUGH'}
 
@@ -153,84 +123,6 @@ class AsyncLoopModalOperator(bpy.types.Operator):
         return {'RUNNING_MODAL'}
 
 
-# noinspection PyAttributeOutsideInit
-class AsyncModalOperatorMixin:
-    async_task = None  # asyncio task for fetching thumbnails
-    signalling_future = None  # asyncio future for signalling that we want to cancel everything.
-    log = logging.getLogger('%s.AsyncModalOperatorMixin' % __name__)
-
-    _state = 'INITIALIZING'
-
-    def invoke(self, context, event):
-        context.window_manager.modal_handler_add(self)
-        self.timer = context.window_manager.event_timer_add(1 / 15, context.window)
-        return {'RUNNING_MODAL'}
-
-    def modal(self, context, event):
-        task = self.async_task
-
-        if self._state != 'EXCEPTION' and task and task.done() and not task.cancelled():
-            ex = task.exception()
-            if ex is not None:
-                self._state = 'EXCEPTION'
-                self.log.error('Exception while running task: %s', ex)
-                return {'RUNNING_MODAL'}
-
-        if self._state == 'QUIT':
-            self._finish(context)
-            return {'FINISHED'}
-
-        return {'PASS_THROUGH'}
-
-    def _finish(self, context):
-        self._stop_async_task()
-        context.window_manager.event_timer_remove(self.timer)
-
-    def _new_async_task(self, async_task: asyncio.coroutine, future: asyncio.Future = None):
-        """Stops the currently running async task, and starts another one."""
-
-        self.log.debug('Setting up a new task %r, so any existing task must be stopped', async_task)
-        self._stop_async_task()
-
-        # Download the previews asynchronously.
-        self.signalling_future = future or asyncio.Future()
-        self.async_task = asyncio.ensure_future(async_task)
-        self.log.debug('Created new task %r', self.async_task)
-
-        # Start the async manager so everything happens.
-        ensure_async_loop()
-
-    def _stop_async_task(self):
-        self.log.debug('Stopping async task')
-        if self.async_task is None:
-            self.log.debug('No async task, trivially stopped')
-            return
-
-        # Signal that we want to stop.
-        self.async_task.cancel()
-        if not self.signalling_future.done():
-            self.log.info("Signalling that we want to cancel anything that's running.")
-            self.signalling_future.cancel()
-
-        # Wait until the asynchronous task is done.
-        if not self.async_task.done():
-            self.log.info("blocking until async task is done.")
-            loop = asyncio.get_event_loop()
-            try:
-                loop.run_until_complete(self.async_task)
-            except asyncio.CancelledError:
-                self.log.info('Asynchronous task was cancelled')
-                return
-
-        # noinspection PyBroadException
-        try:
-            self.async_task.result()  # This re-raises any exception of the task.
-        except asyncio.CancelledError:
-            self.log.info('Asynchronous task was cancelled')
-        except Exception:
-            self.log.exception("Exception from asynchronous task")
-
-
 def register():
     bpy.utils.register_class(AsyncLoopModalOperator)
 

blender_cloud/blender.py

@@ -3,98 +3,24 @@
 Separated from __init__.py so that we can import & run from non-Blender environments.
 """
 
-import logging
 import os.path
 
 import bpy
-from bpy.types import AddonPreferences, Operator, WindowManager, Scene, PropertyGroup
-from bpy.props import StringProperty, EnumProperty, PointerProperty, BoolProperty
+from bpy.types import AddonPreferences, Operator, WindowManager, Scene
+from bpy.props import StringProperty
 
 from . import pillar, gui
 
-PILLAR_SERVER_URL = 'https://cloudapi.blender.org/'
-# PILLAR_SERVER_URL = 'http://localhost:5000/'
-
 ADDON_NAME = 'blender_cloud'
-log = logging.getLogger(__name__)
-
-icons = None
-
-
-def redraw(self, context):
-    context.area.tag_redraw()
-
-
-def blender_syncable_versions(self, context):
-    bss = context.window_manager.blender_sync_status
-    versions = bss.available_blender_versions
-    if not versions:
-        return [('', 'No settings stored in your Blender Cloud', '')]
-    return [(v, v, '') for v in versions]
-
-
-class SyncStatusProperties(PropertyGroup):
-    status = EnumProperty(
-        items=[
-            ('NONE', 'NONE', 'We have done nothing at all yet.'),
-            ('IDLE', 'IDLE', 'User requested something, which is done, and we are now idle.'),
-            ('SYNCING', 'SYNCING', 'Synchronising with Blender Cloud.'),
-        ],
-        name='status',
-        description='Current status of Blender Sync.',
-        update=redraw)
-
-    version = EnumProperty(
-        items=blender_syncable_versions,
-        name='Version of Blender from which to pull',
-        description='Version of Blender from which to pull')
-
-    message = StringProperty(name='message', update=redraw)
-    level = EnumProperty(
-        items=[
-            ('INFO', 'INFO', ''),
-            ('WARNING', 'WARNING', ''),
-            ('ERROR', 'ERROR', ''),
-            ('SUBSCRIBE', 'SUBSCRIBE', ''),
-        ],
-        name='level',
-        update=redraw)
-
-    def report(self, level: set, message: str):
-        assert len(level) == 1, 'level should be a set of one string, not %r' % level
-        self.level = level.pop()
-        self.message = message
-
-        # Message can also be empty, just to erase it from the GUI.
-        # No need to actually log those.
-        if message:
-            try:
-                loglevel = logging._nameToLevel[self.level]
-            except KeyError:
-                loglevel = logging.WARNING
-            log.log(loglevel, message)
-
-    # List of syncable versions is stored in 'available_blender_versions' ID property,
-    # because I don't know how to store a variable list of strings in a proper RNA property.
-    @property
-    def available_blender_versions(self) -> list:
-        return self.get('available_blender_versions', [])
-
-    @available_blender_versions.setter
-    def available_blender_versions(self, new_versions):
-        self['available_blender_versions'] = new_versions
 
 
 class BlenderCloudPreferences(AddonPreferences):
     bl_idname = ADDON_NAME
 
-    # The following two properties are read-only to limit the scope of the
-    # addon and allow for proper testing within this scope.
-    pillar_server = StringProperty(
+    pillar_server = bpy.props.StringProperty(
         name='Blender Cloud Server',
         description='URL of the Blender Cloud backend server',
-        default=PILLAR_SERVER_URL,
-        get=lambda self: PILLAR_SERVER_URL
+        default='https://pillar.blender.org:5000/'
     )
 
     local_texture_dir = StringProperty(
@@ -102,135 +28,52 @@ class BlenderCloudPreferences(AddonPreferences):
         subtype='DIR_PATH',
         default='//textures')
 
-    open_browser_after_share = BoolProperty(
-        name='Open browser after sharing file',
-        description='When enabled, Blender will open a webbrowser',
-        default=True
-    )
-
     def draw(self, context):
-        import textwrap
-
         layout = self.layout
 
         # Carefully try and import the Blender ID addon
         try:
-            import blender_id
+            import blender_id.profiles as blender_id_profiles
         except ImportError:
-            blender_id = None
+            blender_id_profiles = None
             blender_id_profile = None
         else:
-            blender_id_profile = blender_id.get_active_profile()
+            blender_id_profile = blender_id_profiles.get_active_profile()
 
-        if blender_id is None:
-            msg_icon = 'ERROR'
-            text = 'This add-on requires Blender ID'
-            help_text = 'Make sure that the Blender ID add-on is installed and activated'
+        if blender_id_profiles is None:
+            blender_id_icon = 'ERROR'
+            blender_id_text = "This add-on requires Blender ID"
+            blender_id_help = "Make sure that the Blender ID add-on is installed and activated"
         elif not blender_id_profile:
-            msg_icon = 'ERROR'
-            text = 'You are logged out.'
-            help_text = 'To login, go to the Blender ID add-on preferences.'
-        elif bpy.app.debug and pillar.SUBCLIENT_ID not in blender_id_profile.subclients:
-            msg_icon = 'QUESTION'
-            text = 'No Blender Cloud credentials.'
-            help_text = ('You are logged in on Blender ID, but your credentials have not '
-                         'been synchronized with Blender Cloud yet. Press the Update '
-                         'Credentials button.')
+            blender_id_icon = 'ERROR'
+            blender_id_text = "You are logged out."
+            blender_id_help = "To login, go to the Blender ID add-on preferences."
         else:
-            msg_icon = 'WORLD_DATA'
-            text = 'You are logged in as %s.' % blender_id_profile.username
-            help_text = ('To logout or change profile, '
-                         'go to the Blender ID add-on preferences.')
+            blender_id_icon = 'WORLD_DATA'
+            blender_id_text = "You are logged in as %s." % blender_id_profile['username']
+            blender_id_help = "To logout or change profile, " \
+                              "go to the Blender ID add-on preferences."
 
-        # Authentication stuff
-        auth_box = layout.box()
-        auth_box.label(text=text, icon=msg_icon)
+        sub = layout.column()
+        sub.label(text=blender_id_text, icon=blender_id_icon)
+        sub.label(text="* " + blender_id_help)
 
-        help_lines = textwrap.wrap(help_text, 80)
-        for line in help_lines:
-            auth_box.label(text=line)
-        if bpy.app.debug:
-            auth_box.operator("pillar.credentials_update")
-
-        # Texture browser stuff
-        texture_box = layout.box()
-        texture_box.enabled = msg_icon != 'ERROR'
-        sub = texture_box.column()
-        sub.label(text='Local directory for downloaded textures', icon_value=icon('CLOUD'))
+        sub = layout.column()
+        sub.label(text='Local directory for downloaded textures')
         sub.prop(self, "local_texture_dir", text='Default')
         sub.prop(context.scene, "local_texture_dir", text='Current scene')
 
-        # Blender Sync stuff
-        bss = context.window_manager.blender_sync_status
-        bsync_box = layout.box()
-        bsync_box.enabled = msg_icon != 'ERROR'
-        row = bsync_box.row().split(percentage=0.33)
-        row.label('Blender Sync with Blender Cloud', icon_value=icon('CLOUD'))
-
-        icon_for_level = {
-            'INFO': 'NONE',
-            'WARNING': 'INFO',
-            'ERROR': 'ERROR',
-            'SUBSCRIBE': 'ERROR',
-        }
-        msg_icon = icon_for_level[bss.level] if bss.message else 'NONE'
-        message_container = row.row()
-        message_container.label(bss.message, icon=msg_icon)
-
-        sub = bsync_box.column()
-
-        if bss.level == 'SUBSCRIBE':
-            self.draw_subscribe_button(sub)
-        self.draw_sync_buttons(sub, bss)
-
-        # Image Share stuff
-        share_box = layout.box()
-        share_box.label('Image Sharing on Blender Cloud', icon_value=icon('CLOUD'))
-        texture_box.enabled = msg_icon != 'ERROR'
-        share_box.prop(self, 'open_browser_after_share')
-
-    def draw_subscribe_button(self, layout):
-        layout.operator('pillar.subscribe', icon='WORLD')
-
-    def draw_sync_buttons(self, layout, bss):
-        layout.enabled = bss.status in {'NONE', 'IDLE'}
-
-        buttons = layout.column()
-        row_buttons = buttons.row().split(percentage=0.5)
-        row_push = row_buttons.row()
-        row_pull = row_buttons.row(align=True)
-
-        row_push.operator('pillar.sync',
-                          text='Save %i.%i settings' % bpy.app.version[:2],
-                          icon='TRIA_UP').action = 'PUSH'
-
-        versions = bss.available_blender_versions
-        version = bss.version
-        if bss.status in {'NONE', 'IDLE'}:
-            if not versions or not version:
-                row_pull.operator('pillar.sync',
-                                  text='Find version to load',
-                                  icon='TRIA_DOWN').action = 'REFRESH'
-            else:
-                props = row_pull.operator('pillar.sync',
-                                          text='Load %s settings' % version,
-                                          icon='TRIA_DOWN')
-                props.action = 'PULL'
-                props.blender_version = version
-                row_pull.operator('pillar.sync',
-                                  text='',
-                                  icon='DOTSDOWN').action = 'SELECT'
-        else:
-            row_pull.label('Cloud Sync is running.')
+        # options for Pillar
+        sub = layout.column()
+        sub.enabled = blender_id_icon != 'ERROR'
+        sub.prop(self, "pillar_server")
+        sub.operator("pillar.credentials_update")
 
 
-class PillarCredentialsUpdate(pillar.PillarOperatorMixin,
-                              Operator):
+class PillarCredentialsUpdate(Operator):
     """Updates the Pillar URL and tests the new URL."""
-    bl_idname = 'pillar.credentials_update'
-    bl_label = 'Update credentials'
-
-    log = logging.getLogger('bpy.ops.%s' % bl_idname)
+    bl_idname = "pillar.credentials_update"
+    bl_label = "Update credentials"
 
     @classmethod
     def poll(cls, context):
@@ -239,49 +82,26 @@ class PillarCredentialsUpdate(pillar.PillarOperatorMixin,
 
     @classmethod
     def is_logged_in(cls, context):
-        try:
-            import blender_id
-        except ImportError:
-            return False
-
-        return blender_id.is_logged_in()
+        active_user_id = getattr(context.window_manager, 'blender_id_active_profile', None)
+        return bool(active_user_id)
 
     def execute(self, context):
-        import blender_id
-        import asyncio
-
         # Only allow activation when the user is actually logged in.
         if not self.is_logged_in(context):
-            self.report({'ERROR'}, 'No active profile found')
+            self.report({'ERROR'}, "No active profile found")
             return {'CANCELLED'}
 
+        # Test the new URL
+        endpoint = bpy.context.user_preferences.addons[ADDON_NAME].preferences.pillar_server
+        pillar._pillar_api = None
         try:
-            loop = asyncio.get_event_loop()
-            loop.run_until_complete(self.check_credentials(context, set()))
-        except blender_id.BlenderIdCommError as ex:
-            log.exception('Error sending subclient-specific token to Blender ID')
-            self.report({'ERROR'}, 'Failed to sync Blender ID to Blender Cloud')
-            return {'CANCELLED'}
-        except Exception as ex:
-            log.exception('Error in test call to Pillar')
-            self.report({'ERROR'}, 'Failed test connection to Blender Cloud')
-            return {'CANCELLED'}
-
-        self.report({'INFO'}, 'Blender Cloud credentials & endpoint URL updated.')
-        return {'FINISHED'}
-
-
-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'
-
-    def execute(self, context):
-        import webbrowser
-
-        webbrowser.open_new_tab('https://cloud.blender.org/join')
-        self.report({'INFO'}, 'We just started a browser for you.')
+            pillar.get_project_uuid('textures')  # Just any query will do.
+        except Exception as e:
+            print(e)
+            self.report({'ERROR'}, 'Failed connection to %s' % endpoint)
+            return {'FINISHED'}
 
+        self.report({'INFO'}, 'Updated cloud server address to %s' % endpoint)
         return {'FINISHED'}
 
 
@@ -289,51 +109,20 @@ def preferences() -> BlenderCloudPreferences:
     return bpy.context.user_preferences.addons[ADDON_NAME].preferences
 
 
-def load_custom_icons():
-    global icons
-
-    if icons is not None:
-        # Already loaded
-        return
-
-    import bpy.utils.previews
-    icons = bpy.utils.previews.new()
-    my_icons_dir = os.path.join(os.path.dirname(__file__), 'icons')
-    icons.load('CLOUD', os.path.join(my_icons_dir, 'icon-cloud.png'), 'IMAGE')
-
-
-def unload_custom_icons():
-    global icons
-
-    if icons is None:
-        # Already unloaded
-        return
-
-    bpy.utils.previews.remove(icons)
-    icons = None
-
-
-def icon(icon_name: str) -> int:
-    """Returns the icon ID for the named icon.
-
-    Use with layout.operator('pillar.image_share', icon_value=icon('CLOUD'))
-    """
-
-    return icons[icon_name].icon_id
-
-
 def register():
     bpy.utils.register_class(BlenderCloudPreferences)
     bpy.utils.register_class(PillarCredentialsUpdate)
-    bpy.utils.register_class(SyncStatusProperties)
-    bpy.utils.register_class(PILLAR_OT_subscribe)
+
+    WindowManager.blender_cloud_project = StringProperty(
+        name="Blender Cloud project UUID",
+        default='5672beecc0261b2005ed1a33')  # TODO: don't hard-code this
+
+    WindowManager.blender_cloud_node = StringProperty(
+        name="Blender Cloud node UUID",
+        default='')  # empty == top-level of project
 
     addon_prefs = preferences()
 
-    WindowManager.last_blender_cloud_location = StringProperty(
-        name="Last Blender Cloud browser location",
-        default="/")
-
     def default_if_empty(scene, context):
         """The scene's local_texture_dir, if empty, reverts to the addon prefs."""
 
@@ -346,20 +135,13 @@ def register():
         default=addon_prefs.local_texture_dir,
         update=default_if_empty)
 
-    WindowManager.blender_sync_status = PointerProperty(type=SyncStatusProperties)
-
-    load_custom_icons()
-
 
 def unregister():
-    unload_custom_icons()
-
     gui.unregister()
 
     bpy.utils.unregister_class(PillarCredentialsUpdate)
     bpy.utils.unregister_class(BlenderCloudPreferences)
-    bpy.utils.unregister_class(SyncStatusProperties)
-    bpy.utils.unregister_class(PILLAR_OT_subscribe)
 
-    del WindowManager.last_blender_cloud_location
-    del WindowManager.blender_sync_status
+    del WindowManager.blender_cloud_project
+    del WindowManager.blender_cloud_node
+    del WindowManager.blender_cloud_thumbnails

blender_cloud/blendfile.py

@@ -1,929 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ***** END GPL LICENCE BLOCK *****
-#
-# (c) 2009, At Mind B.V. - Jeroen Bakker
-# (c) 2014, Blender Foundation - Campbell Barton
-
-import gzip
-import logging
-import os
-import struct
-import tempfile
-
-log = logging.getLogger("blendfile")
-
-FILE_BUFFER_SIZE = 1024 * 1024
-
-
-# -----------------------------------------------------------------------------
-# module global routines
-#
-# read routines
-# open a filename
-# determine if the file is compressed
-# and returns a handle
-def open_blend(filename, access="rb"):
-    """Opens a blend file for reading or writing pending on the access
-    supports 2 kind of blend files. Uncompressed and compressed.
-    Known issue: does not support packaged blend files
-    """
-    handle = open(filename, access)
-    magic_test = b"BLENDER"
-    magic = handle.read(len(magic_test))
-    if magic == magic_test:
-        log.debug("normal blendfile detected")
-        handle.seek(0, os.SEEK_SET)
-        bfile = BlendFile(handle)
-        bfile.is_compressed = False
-        bfile.filepath_orig = filename
-        return bfile
-    elif magic[:2] == b'\x1f\x8b':
-        log.debug("gzip blendfile detected")
-        handle.close()
-        log.debug("decompressing started")
-        fs = gzip.open(filename, "rb")
-        data = fs.read(FILE_BUFFER_SIZE)
-        magic = data[:len(magic_test)]
-        if magic == magic_test:
-            handle = tempfile.TemporaryFile()
-            while data:
-                handle.write(data)
-                data = fs.read(FILE_BUFFER_SIZE)
-            log.debug("decompressing finished")
-            fs.close()
-            log.debug("resetting decompressed file")
-            handle.seek(os.SEEK_SET, 0)
-            bfile = BlendFile(handle)
-            bfile.is_compressed = True
-            bfile.filepath_orig = filename
-            return bfile
-        else:
-            raise Exception("filetype inside gzip not a blend")
-    else:
-        raise Exception("filetype not a blend or a gzip blend")
-
-
-def pad_up_4(offset):
-    return (offset + 3) & ~3
-
-
-# -----------------------------------------------------------------------------
-# module classes
-
-
-class BlendFile:
-    """
-    Blend file.
-    """
-    __slots__ = (
-        # file (result of open())
-        "handle",
-        # str (original name of the file path)
-        "filepath_orig",
-        # BlendFileHeader
-        "header",
-        # struct.Struct
-        "block_header_struct",
-        # BlendFileBlock
-        "blocks",
-        # [DNAStruct, ...]
-        "structs",
-        # dict {b'StructName': sdna_index}
-        # (where the index is an index into 'structs')
-        "sdna_index_from_id",
-        # dict {addr_old: block}
-        "block_from_offset",
-        # int
-        "code_index",
-        # bool (did we make a change)
-        "is_modified",
-        # bool (is file gzipped)
-        "is_compressed",
-        )
-
-    def __init__(self, handle):
-        log.debug("initializing reading blend-file")
-        self.handle = handle
-        self.header = BlendFileHeader(handle)
-        self.block_header_struct = self.header.create_block_header_struct()
-        self.blocks = []
-        self.code_index = {}
-
-        block = BlendFileBlock(handle, self)
-        while block.code != b'ENDB':
-            if block.code == b'DNA1':
-                (self.structs,
-                 self.sdna_index_from_id,
-                 ) = BlendFile.decode_structs(self.header, block, handle)
-            else:
-                handle.seek(block.size, os.SEEK_CUR)
-
-            self.blocks.append(block)
-            self.code_index.setdefault(block.code, []).append(block)
-
-            block = BlendFileBlock(handle, self)
-        self.is_modified = False
-        self.blocks.append(block)
-
-        # cache (could lazy init, incase we never use?)
-        self.block_from_offset = {block.addr_old: block for block in self.blocks if block.code != b'ENDB'}
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, type, value, traceback):
-        self.close()
-
-    def find_blocks_from_code(self, code):
-        assert(type(code) == bytes)
-        if code not in self.code_index:
-            return []
-        return self.code_index[code]
-
-    def find_block_from_offset(self, offset):
-        # same as looking looping over all blocks,
-        # then checking ``block.addr_old == offset``
-        assert(type(offset) is int)
-        return self.block_from_offset.get(offset)
-
-    def close(self):
-        """
-        Close the blend file
-        writes the blend file to disk if changes has happened
-        """
-        handle = self.handle
-
-        if self.is_modified:
-            if self.is_compressed:
-                log.debug("close compressed blend file")
-                handle.seek(os.SEEK_SET, 0)
-                log.debug("compressing started")
-                fs = gzip.open(self.filepath_orig, "wb")
-                data = handle.read(FILE_BUFFER_SIZE)
-                while data:
-                    fs.write(data)
-                    data = handle.read(FILE_BUFFER_SIZE)
-                fs.close()
-                log.debug("compressing finished")
-
-        handle.close()
-
-    def ensure_subtype_smaller(self, sdna_index_curr, sdna_index_next):
-        # never refine to a smaller type
-        if (self.structs[sdna_index_curr].size >
-            self.structs[sdna_index_next].size):
-
-            raise RuntimeError("cant refine to smaller type (%s -> %s)" %
-                               (self.structs[sdna_index_curr].dna_type_id.decode('ascii'),
-                                self.structs[sdna_index_next].dna_type_id.decode('ascii')))
-
-    @staticmethod
-    def decode_structs(header, block, handle):
-        """
-        DNACatalog is a catalog of all information in the DNA1 file-block
-        """
-        log.debug("building DNA catalog")
-        shortstruct = DNA_IO.USHORT[header.endian_index]
-        shortstruct2 = struct.Struct(header.endian_str + b'HH')
-        intstruct = DNA_IO.UINT[header.endian_index]
-
-        data = handle.read(block.size)
-        types = []
-        names = []
-
-        structs = []
-        sdna_index_from_id = {}
-
-        offset = 8
-        names_len = intstruct.unpack_from(data, offset)[0]
-        offset += 4
-
-        log.debug("building #%d names" % names_len)
-        for i in range(names_len):
-            tName = DNA_IO.read_data0_offset(data, offset)
-            offset = offset + len(tName) + 1
-            names.append(DNAName(tName))
-        del names_len
-
-        offset = pad_up_4(offset)
-        offset += 4
-        types_len = intstruct.unpack_from(data, offset)[0]
-        offset += 4
-        log.debug("building #%d types" % types_len)
-        for i in range(types_len):
-            dna_type_id = DNA_IO.read_data0_offset(data, offset)
-            # None will be replaced by the DNAStruct, below
-            types.append(DNAStruct(dna_type_id))
-            offset += len(dna_type_id) + 1
-
-        offset = pad_up_4(offset)
-        offset += 4
-        log.debug("building #%d type-lengths" % types_len)
-        for i in range(types_len):
-            tLen = shortstruct.unpack_from(data, offset)[0]
-            offset = offset + 2
-            types[i].size = tLen
-        del types_len
-
-        offset = pad_up_4(offset)
-        offset += 4
-
-        structs_len = intstruct.unpack_from(data, offset)[0]
-        offset += 4
-        log.debug("building #%d structures" % structs_len)
-        for sdna_index in range(structs_len):
-            d = shortstruct2.unpack_from(data, offset)
-            struct_type_index = d[0]
-            offset += 4
-            dna_struct = types[struct_type_index]
-            sdna_index_from_id[dna_struct.dna_type_id] = sdna_index
-            structs.append(dna_struct)
-
-            fields_len = d[1]
-            dna_offset = 0
-
-            for field_index in range(fields_len):
-                d2 = shortstruct2.unpack_from(data, offset)
-                field_type_index = d2[0]
-                field_name_index = d2[1]
-                offset += 4
-                dna_type = types[field_type_index]
-                dna_name = names[field_name_index]
-                if dna_name.is_pointer or dna_name.is_method_pointer:
-                    dna_size = header.pointer_size * dna_name.array_size
-                else:
-                    dna_size = dna_type.size * dna_name.array_size
-
-                field = DNAField(dna_type, dna_name, dna_size, dna_offset)
-                dna_struct.fields.append(field)
-                dna_struct.field_from_name[dna_name.name_only] = field
-                dna_offset += dna_size
-
-        return structs, sdna_index_from_id
-
-
-class BlendFileBlock:
-    """
-    Instance of a struct.
-    """
-    __slots__ = (
-        # BlendFile
-        "file",
-        "code",
-        "size",
-        "addr_old",
-        "sdna_index",
-        "count",
-        "file_offset",
-        "user_data",
-        )
-
-    def __str__(self):
-        return ("<%s.%s (%s), size=%d at %s>" %
-                # fields=[%s]
-                (self.__class__.__name__,
-                 self.dna_type.dna_type_id.decode('ascii'),
-                 self.code.decode(),
-                 self.size,
-                 # b", ".join(f.dna_name.name_only for f in self.dna_type.fields).decode('ascii'),
-                 hex(self.addr_old),
-                 ))
-
-    def __init__(self, handle, bfile):
-        OLDBLOCK = struct.Struct(b'4sI')
-
-        self.file = bfile
-        self.user_data = None
-
-        data = handle.read(bfile.block_header_struct.size)
-        # header size can be 8, 20, or 24 bytes long
-        # 8: old blend files ENDB block (exception)
-        # 20: normal headers 32 bit platform
-        # 24: normal headers 64 bit platform
-        if len(data) > 15:
-
-            blockheader = bfile.block_header_struct.unpack(data)
-            self.code = blockheader[0].partition(b'\0')[0]
-            if self.code != b'ENDB':
-                self.size = blockheader[1]
-                self.addr_old = blockheader[2]
-                self.sdna_index = blockheader[3]
-                self.count = blockheader[4]
-                self.file_offset = handle.tell()
-            else:
-                self.size = 0
-                self.addr_old = 0
-                self.sdna_index = 0
-                self.count = 0
-                self.file_offset = 0
-        else:
-            blockheader = OLDBLOCK.unpack(data)
-            self.code = blockheader[0].partition(b'\0')[0]
-            self.code = DNA_IO.read_data0(blockheader[0])
-            self.size = 0
-            self.addr_old = 0
-            self.sdna_index = 0
-            self.count = 0
-            self.file_offset = 0
-
-    @property
-    def dna_type(self):
-        return self.file.structs[self.sdna_index]
-
-    def refine_type_from_index(self, sdna_index_next):
-        assert(type(sdna_index_next) is int)
-        sdna_index_curr = self.sdna_index
-        self.file.ensure_subtype_smaller(sdna_index_curr, sdna_index_next)
-        self.sdna_index = sdna_index_next
-
-    def refine_type(self, dna_type_id):
-        assert(type(dna_type_id) is bytes)
-        self.refine_type_from_index(self.file.sdna_index_from_id[dna_type_id])
-
-    def get_file_offset(self, path,
-            default=...,
-            sdna_index_refine=None,
-            base_index=0,
-            ):
-        """
-        Return (offset, length)
-        """
-        assert(type(path) is bytes)
-
-        ofs = self.file_offset
-        if base_index != 0:
-            assert(base_index < self.count)
-            ofs += (self.size // self.count) * base_index
-        self.file.handle.seek(ofs, os.SEEK_SET)
-
-        if sdna_index_refine is None:
-            sdna_index_refine = self.sdna_index
-        else:
-            self.file.ensure_subtype_smaller(self.sdna_index, sdna_index_refine)
-
-        dna_struct = self.file.structs[sdna_index_refine]
-        field = dna_struct.field_from_path(
-                self.file.header, self.file.handle, path)
-
-        return (self.file.handle.tell(), field.dna_name.array_size)
-
-    def get(self, path,
-            default=...,
-            sdna_index_refine=None,
-            use_nil=True, use_str=True,
-            base_index=0,
-            ):
-
-        ofs = self.file_offset
-        if base_index != 0:
-            assert(base_index < self.count)
-            ofs += (self.size // self.count) * base_index
-        self.file.handle.seek(ofs, os.SEEK_SET)
-
-        if sdna_index_refine is None:
-            sdna_index_refine = self.sdna_index
-        else:
-            self.file.ensure_subtype_smaller(self.sdna_index, sdna_index_refine)
-
-        dna_struct = self.file.structs[sdna_index_refine]
-        return dna_struct.field_get(
-                self.file.header, self.file.handle, path,
-                default=default,
-                use_nil=use_nil, use_str=use_str,
-                )
-
-    def get_recursive_iter(self, path, path_root=b"",
-                           default=...,
-                           sdna_index_refine=None,
-                           use_nil=True, use_str=True,
-                           base_index=0,
-                           ):
-        if path_root:
-            path_full = (
-                    (path_root if type(path_root) is tuple else (path_root, )) +
-                    (path if type(path) is tuple else (path, )))
-        else:
-            path_full = path
-
-        try:
-            yield (path_full, self.get(path_full, default, sdna_index_refine, use_nil, use_str, base_index))
-        except NotImplementedError as ex:
-            msg, dna_name, dna_type = ex.args
-            struct_index = self.file.sdna_index_from_id.get(dna_type.dna_type_id, None)
-            if struct_index is None:
-                yield (path_full, "<%s>" % dna_type.dna_type_id.decode('ascii'))
-            else:
-                struct = self.file.structs[struct_index]
-                for f in struct.fields:
-                    yield from self.get_recursive_iter(
-                            f.dna_name.name_only, path_full, default, None, use_nil, use_str, 0)
-
-    def items_recursive_iter(self):
-        for k in self.keys():
-            yield from self.get_recursive_iter(k, use_str=False)
-
-    def get_data_hash(self):
-        """
-        Generates a 'hash' that can be used instead of addr_old as block id, and that should be 'stable' across .blend
-        file load & save (i.e. it does not changes due to pointer addresses variations).
-        """
-        # TODO This implementation is most likely far from optimal... and CRC32 is not renown as the best hashing
-        #      algo either. But for now does the job!
-        import zlib
-        def _is_pointer(self, k):
-            return self.file.structs[self.sdna_index].field_from_path(
-                    self.file.header, self.file.handle, k).dna_name.is_pointer
-
-        hsh = 1
-        for k, v in self.items_recursive_iter():
-            if not _is_pointer(self, k):
-                hsh = zlib.adler32(str(v).encode(), hsh)
-        return hsh
-
-    def set(self, path, value,
-            sdna_index_refine=None,
-            ):
-
-        if sdna_index_refine is None:
-            sdna_index_refine = self.sdna_index
-        else:
-            self.file.ensure_subtype_smaller(self.sdna_index, sdna_index_refine)
-
-        dna_struct = self.file.structs[sdna_index_refine]
-        self.file.handle.seek(self.file_offset, os.SEEK_SET)
-        self.file.is_modified = True
-        return dna_struct.field_set(
-                self.file.header, self.file.handle, path, value)
-
-    # ---------------
-    # Utility get/set
-    #
-    #   avoid inline pointer casting
-    def get_pointer(
-            self, path,
-            default=...,
-            sdna_index_refine=None,
-            base_index=0,
-            ):
-        if sdna_index_refine is None:
-            sdna_index_refine = self.sdna_index
-        result = self.get(path, default, sdna_index_refine=sdna_index_refine, base_index=base_index)
-
-        # default
-        if type(result) is not int:
-            return result
-
-        assert(self.file.structs[sdna_index_refine].field_from_path(
-                self.file.header, self.file.handle, path).dna_name.is_pointer)
-        if result != 0:
-            # possible (but unlikely)
-            # that this fails and returns None
-            # maybe we want to raise some exception in this case
-            return self.file.find_block_from_offset(result)
-        else:
-            return None
-
-    # ----------------------
-    # Python convenience API
-
-    # dict like access
-    def __getitem__(self, item):
-        return self.get(item, use_str=False)
-
-    def __setitem__(self, item, value):
-        self.set(item, value)
-
-    def keys(self):
-        return (f.dna_name.name_only for f in self.dna_type.fields)
-
-    def values(self):
-        for k in self.keys():
-            try:
-                yield self[k]
-            except NotImplementedError as ex:
-                msg, dna_name, dna_type = ex.args
-                yield "<%s>" % dna_type.dna_type_id.decode('ascii')
-
-    def items(self):
-        for k in self.keys():
-            try:
-                yield (k, self[k])
-            except NotImplementedError as ex:
-                msg, dna_name, dna_type = ex.args
-                yield (k, "<%s>" % dna_type.dna_type_id.decode('ascii'))
-
-
-# -----------------------------------------------------------------------------
-# Read Magic
-#
-# magic = str
-# pointer_size = int
-# is_little_endian = bool
-# version = int
-
-
-class BlendFileHeader:
-    """
-    BlendFileHeader allocates the first 12 bytes of a blend file
-    it contains information about the hardware architecture
-    """
-    __slots__ = (
-        # str
-        "magic",
-        # int 4/8
-        "pointer_size",
-        # bool
-        "is_little_endian",
-        # int
-        "version",
-        # str, used to pass to 'struct'
-        "endian_str",
-        # int, used to index common types
-        "endian_index",
-        )
-
-    def __init__(self, handle):
-        FILEHEADER = struct.Struct(b'7s1s1s3s')
-
-        log.debug("reading blend-file-header")
-        values = FILEHEADER.unpack(handle.read(FILEHEADER.size))
-        self.magic = values[0]
-        pointer_size_id = values[1]
-        if pointer_size_id == b'-':
-            self.pointer_size = 8
-        elif pointer_size_id == b'_':
-            self.pointer_size = 4
-        else:
-            assert(0)
-        endian_id = values[2]
-        if endian_id == b'v':
-            self.is_little_endian = True
-            self.endian_str = b'<'
-            self.endian_index = 0
-        elif endian_id == b'V':
-            self.is_little_endian = False
-            self.endian_index = 1
-            self.endian_str = b'>'
-        else:
-            assert(0)
-
-        version_id = values[3]
-        self.version = int(version_id)
-
-    def create_block_header_struct(self):
-        return struct.Struct(b''.join((
-                self.endian_str,
-                b'4sI',
-                b'I' if self.pointer_size == 4 else b'Q',
-                b'II',
-                )))
-
-
-class DNAName:
-    """
-    DNAName is a C-type name stored in the DNA
-    """
-    __slots__ = (
-        "name_full",
-        "name_only",
-        "is_pointer",
-        "is_method_pointer",
-        "array_size",
-        )
-
-    def __init__(self, name_full):
-        self.name_full = name_full
-        self.name_only = self.calc_name_only()
-        self.is_pointer = self.calc_is_pointer()
-        self.is_method_pointer = self.calc_is_method_pointer()
-        self.array_size = self.calc_array_size()
-
-    def __repr__(self):
-        return '%s(%r)' % (type(self).__qualname__, self.name_full)
-
-    def as_reference(self, parent):
-        if parent is None:
-            result = b''
-        else:
-            result = parent + b'.'
-
-        result = result + self.name_only
-        return result
-
-    def calc_name_only(self):
-        result = self.name_full.strip(b'*()')
-        index = result.find(b'[')
-        if index != -1:
-            result = result[:index]
-        return result
-
-    def calc_is_pointer(self):
-        return (b'*' in self.name_full)
-
-    def calc_is_method_pointer(self):
-        return (b'(*' in self.name_full)
-
-    def calc_array_size(self):
-        result = 1
-        temp = self.name_full
-        index = temp.find(b'[')
-
-        while index != -1:
-            index_2 = temp.find(b']')
-            result *= int(temp[index + 1:index_2])
-            temp = temp[index_2 + 1:]
-            index = temp.find(b'[')
-
-        return result
-
-
-class DNAField:
-    """
-    DNAField is a coupled DNAStruct and DNAName
-    and cache offset for reuse
-    """
-    __slots__ = (
-        # DNAName
-        "dna_name",
-        # tuple of 3 items
-        # [bytes (struct name), int (struct size), DNAStruct]
-        "dna_type",
-        # size on-disk
-        "dna_size",
-        # cached info (avoid looping over fields each time)
-        "dna_offset",
-        )
-
-    def __init__(self, dna_type, dna_name, dna_size, dna_offset):
-        self.dna_type = dna_type
-        self.dna_name = dna_name
-        self.dna_size = dna_size
-        self.dna_offset = dna_offset
-
-
-class DNAStruct:
-    """
-    DNAStruct is a C-type structure stored in the DNA
-    """
-    __slots__ = (
-        "dna_type_id",
-        "size",
-        "fields",
-        "field_from_name",
-        "user_data",
-        )
-
-    def __init__(self, dna_type_id):
-        self.dna_type_id = dna_type_id
-        self.fields = []
-        self.field_from_name = {}
-        self.user_data = None
-
-    def __repr__(self):
-        return '%s(%r)' % (type(self).__qualname__, self.dna_type_id)
-
-    def field_from_path(self, header, handle, path):
-        """
-        Support lookups as bytes or a tuple of bytes and optional index.
-
-        C style 'id.name'   -->  (b'id', b'name')
-        C style 'array[4]'  -->  ('array', 4)
-        """
-        if type(path) is tuple:
-            name = path[0]
-            if len(path) >= 2 and type(path[1]) is not bytes:
-                name_tail = path[2:]
-                index = path[1]
-                assert(type(index) is int)
-            else:
-                name_tail = path[1:]
-                index = 0
-        else:
-            name = path
-            name_tail = None
-            index = 0
-
-        assert(type(name) is bytes)
-
-        field = self.field_from_name.get(name)
-
-        if field is not None:
-            handle.seek(field.dna_offset, os.SEEK_CUR)
-            if index != 0:
-                if field.dna_name.is_pointer:
-                    index_offset = header.pointer_size * index
-                else:
-                    index_offset = field.dna_type.size * index
-                assert(index_offset < field.dna_size)
-                handle.seek(index_offset, os.SEEK_CUR)
-            if not name_tail:  # None or ()
-                return field
-            else:
-                return field.dna_type.field_from_path(header, handle, name_tail)
-
-    def field_get(self, header, handle, path,
-                  default=...,
-                  use_nil=True, use_str=True,
-                  ):
-        field = self.field_from_path(header, handle, path)
-        if field is None:
-            if default is not ...:
-                return default
-            else:
-                raise KeyError("%r not found in %r (%r)" %
-                        (path, [f.dna_name.name_only for f in self.fields], self.dna_type_id))
-
-        dna_type = field.dna_type
-        dna_name = field.dna_name
-
-        if dna_name.is_pointer:
-            return DNA_IO.read_pointer(handle, header)
-        elif dna_type.dna_type_id == b'int':
-            if dna_name.array_size > 1:
-                return [DNA_IO.read_int(handle, header) for i in range(dna_name.array_size)]
-            return DNA_IO.read_int(handle, header)
-        elif dna_type.dna_type_id == b'short':
-            if dna_name.array_size > 1:
-                return [DNA_IO.read_short(handle, header) for i in range(dna_name.array_size)]
-            return DNA_IO.read_short(handle, header)
-        elif dna_type.dna_type_id == b'uint64_t':
-            if dna_name.array_size > 1:
-                return [DNA_IO.read_ulong(handle, header) for i in range(dna_name.array_size)]
-            return DNA_IO.read_ulong(handle, header)
-        elif dna_type.dna_type_id == b'float':
-            if dna_name.array_size > 1:
-                return [DNA_IO.read_float(handle, header) for i in range(dna_name.array_size)]
-            return DNA_IO.read_float(handle, header)
-        elif dna_type.dna_type_id == b'char':
-            if use_str:
-                if use_nil:
-                    return DNA_IO.read_string0(handle, dna_name.array_size)
-                else:
-                    return DNA_IO.read_string(handle, dna_name.array_size)
-            else:
-                if use_nil:
-                    return DNA_IO.read_bytes0(handle, dna_name.array_size)
-                else:
-                    return DNA_IO.read_bytes(handle, dna_name.array_size)
-        else:
-            raise NotImplementedError("%r exists but isn't pointer, can't resolve field %r" %
-                    (path, dna_name.name_only), dna_name, dna_type)
-
-    def field_set(self, header, handle, path, value):
-        assert(type(path) == bytes)
-
-        field = self.field_from_path(header, handle, path)
-        if field is None:
-            raise KeyError("%r not found in %r" %
-                    (path, [f.dna_name.name_only for f in self.fields]))
-
-        dna_type = field.dna_type
-        dna_name = field.dna_name
-
-        if dna_type.dna_type_id == b'char':
-            if type(value) is str:
-                return DNA_IO.write_string(handle, value, dna_name.array_size)
-            else:
-                return DNA_IO.write_bytes(handle, value, dna_name.array_size)
-        elif dna_type.dna_type_id == b'int':
-            DNA_IO.write_int(handle, header, value)
-        else:
-            raise NotImplementedError("Setting %r is not yet supported for %r" %
-                                      (dna_type, dna_name), dna_name, dna_type)
-
-
-class DNA_IO:
-    """
-    Module like class, for read-write utility functions.
-
-    Only stores static methods & constants.
-    """
-
-    __slots__ = ()
-
-    def __new__(cls, *args, **kwargs):
-        raise RuntimeError("%s should not be instantiated" % cls)
-
-    @staticmethod
-    def write_string(handle, astring, fieldlen):
-        assert(isinstance(astring, str))
-        if len(astring) >= fieldlen:
-            stringw = astring[0:fieldlen]
-        else:
-            stringw = astring + '\0'
-        handle.write(stringw.encode('utf-8'))
-
-    @staticmethod
-    def write_bytes(handle, astring, fieldlen):
-        assert(isinstance(astring, (bytes, bytearray)))
-        if len(astring) >= fieldlen:
-            stringw = astring[0:fieldlen]
-        else:
-            stringw = astring + b'\0'
-
-        handle.write(stringw)
-
-    @staticmethod
-    def read_bytes(handle, length):
-        data = handle.read(length)
-        return data
-
-    @staticmethod
-    def read_bytes0(handle, length):
-        data = handle.read(length)
-        return DNA_IO.read_data0(data)
-
-    @staticmethod
-    def read_string(handle, length):
-        return DNA_IO.read_bytes(handle, length).decode('utf-8')
-
-    @staticmethod
-    def read_string0(handle, length):
-        return DNA_IO.read_bytes0(handle, length).decode('utf-8')
-
-    @staticmethod
-    def read_data0_offset(data, offset):
-        add = data.find(b'\0', offset) - offset
-        return data[offset:offset + add]
-
-    @staticmethod
-    def read_data0(data):
-        add = data.find(b'\0')
-        return data[:add]
-
-    USHORT = struct.Struct(b'<H'), struct.Struct(b'>H')
-
-    @staticmethod
-    def read_ushort(handle, fileheader):
-        st = DNA_IO.USHORT[fileheader.endian_index]
-        return st.unpack(handle.read(st.size))[0]
-
-    SSHORT = struct.Struct(b'<h'), struct.Struct(b'>h')
-
-    @staticmethod
-    def read_short(handle, fileheader):
-        st = DNA_IO.SSHORT[fileheader.endian_index]
-        return st.unpack(handle.read(st.size))[0]
-
-    UINT = struct.Struct(b'<I'), struct.Struct(b'>I')
-
-    @staticmethod
-    def read_uint(handle, fileheader):
-        st = DNA_IO.UINT[fileheader.endian_index]
-        return st.unpack(handle.read(st.size))[0]
-
-    SINT = struct.Struct(b'<i'), struct.Struct(b'>i')
-
-    @staticmethod
-    def read_int(handle, fileheader):
-        st = DNA_IO.SINT[fileheader.endian_index]
-        return st.unpack(handle.read(st.size))[0]
-
-    @staticmethod
-    def write_int(handle, fileheader, value):
-        assert isinstance(value, int), 'value must be int, but is %r: %r' % (type(value), value)
-        st = DNA_IO.SINT[fileheader.endian_index]
-        to_write = st.pack(value)
-        handle.write(to_write)
-
-    FLOAT = struct.Struct(b'<f'), struct.Struct(b'>f')
-
-    @staticmethod
-    def read_float(handle, fileheader):
-        st = DNA_IO.FLOAT[fileheader.endian_index]
-        return st.unpack(handle.read(st.size))[0]
-
-    ULONG = struct.Struct(b'<Q'), struct.Struct(b'>Q')
-
-    @staticmethod
-    def read_ulong(handle, fileheader):
-        st = DNA_IO.ULONG[fileheader.endian_index]
-        return st.unpack(handle.read(st.size))[0]
-
-    @staticmethod
-    def read_pointer(handle, header):
-        """
-        reads an pointer from a file handle
-        the pointer size is given by the header (BlendFileHeader)
-        """
-        if header.pointer_size == 4:
-            st = DNA_IO.UINT[header.endian_index]
-            return st.unpack(handle.read(st.size))[0]
-        if header.pointer_size == 8:
-            st = DNA_IO.ULONG[header.endian_index]
-            return st.unpack(handle.read(st.size))[0]

blender_cloud/cache.py

@@ -34,16 +34,12 @@ def cache_directory(*subdirs) -> str:
 
     from . import pillar
 
-    profile = pillar.blender_id_profile()
-    if profile:
-        username = profile.username
-    else:
-        username = 'anonymous'
+    profile = pillar.blender_id_profile() or {'username': 'anonymous'}
 
     # TODO: use bpy.utils.user_resource('CACHE', ...)
     # once https://developer.blender.org/T47684 is finished.
     user_cache_dir = appdirs.user_cache_dir(appname='Blender', appauthor=False)
-    cache_dir = os.path.join(user_cache_dir, 'blender_cloud', username, *subdirs)
+    cache_dir = os.path.join(user_cache_dir, 'blender_cloud', profile['username'], *subdirs)
 
     os.makedirs(cache_dir, mode=0o700, exist_ok=True)
 

blender_cloud/gui.py

@@ -27,11 +27,14 @@ import bgl
 import blf
 import os
 
+from bpy.types import AddonPreferences
+from bpy.props import (BoolProperty, EnumProperty,
+                       FloatProperty, FloatVectorProperty,
+                       IntProperty, StringProperty)
+
 import pillarsdk
 from . import async_loop, pillar, cache
 
-REQUIRED_ROLES_FOR_TEXTURE_BROWSER = {'subscriber', 'demo'}
-
 icon_width = 128
 icon_height = 128
 target_item_width = 400
@@ -41,27 +44,13 @@ library_path = '/tmp'
 library_icons_path = os.path.join(os.path.dirname(__file__), "icons")
 
 
-class SpecialFolderNode(pillarsdk.Node):
-    pass
-
-
-class UpNode(SpecialFolderNode):
+class UpNode(pillarsdk.Node):
     def __init__(self):
         super().__init__()
         self['_id'] = 'UP'
         self['node_type'] = 'UP'
 
 
-class ProjectNode(SpecialFolderNode):
-    def __init__(self, project):
-        super().__init__()
-
-        assert isinstance(project, pillarsdk.Project), 'wrong type for project: %r' % type(project)
-
-        self.merge(project.to_dict())
-        self['node_type'] = 'PROJECT'
-
-
 class MenuItem:
     """GUI menu item for the 3D View GUI."""
 
@@ -77,30 +66,19 @@ class MenuItem:
         'SPINNER': os.path.join(library_icons_path, 'spinner.png'),
     }
 
-    SUPPORTED_NODE_TYPES = {'UP', 'PROJECT', 'group_texture', 'texture'}
+    SUPPORTED_NODE_TYPES = {'UP', 'group_texture', 'texture'}
 
     def __init__(self, node, file_desc, thumb_path: str, label_text):
-        self.log = logging.getLogger('%s.MenuItem' % __name__)
         if node['node_type'] not in self.SUPPORTED_NODE_TYPES:
-            self.log.info('Invalid node type in node: %s', node)
             raise TypeError('Node of type %r not supported; supported are %r.' % (
-                node['node_type'], self.SUPPORTED_NODE_TYPES))
+                node.group_texture, self.SUPPORTED_NODE_TYPES))
 
-        assert isinstance(node, pillarsdk.Node), 'wrong type for node: %r' % type(node)
-        assert isinstance(node['_id'], str), 'wrong type for node["_id"]: %r' % type(node['_id'])
         self.node = node  # pillarsdk.Node, contains 'node_type' key to indicate type
         self.file_desc = file_desc  # pillarsdk.File object, or None if a 'folder' node.
         self.label_text = label_text
         self._thumb_path = ''
         self.icon = None
-        self._is_folder = (node['node_type'] == 'group_texture' or
-                           isinstance(node, SpecialFolderNode))
-
-        # Determine sorting order.
-        # by default, sort all the way at the end and folders first.
-        self._order = 0 if self._is_folder else 10000
-        if node and node.properties and node.properties.order is not None:
-            self._order = node.properties.order
+        self._is_folder = node['node_type'] == 'group_texture' or isinstance(node, UpNode)
 
         self.thumb_path = thumb_path
 
@@ -110,10 +88,6 @@ class MenuItem:
         self.width = 0
         self.height = 0
 
-    def sort_key(self):
-        """Key for sorting lists of MenuItems."""
-        return self._order, self.label_text
-
     @property
     def thumb_path(self) -> str:
         return self._thumb_path
@@ -202,24 +176,29 @@ class MenuItem:
         return self.x < mouse_x < self.x + self.width and self.y < mouse_y < self.y + self.height
 
 
-class BlenderCloudBrowser(pillar.PillarOperatorMixin,
-                          async_loop.AsyncModalOperatorMixin,
-                          bpy.types.Operator):
+class BlenderCloudBrowser(bpy.types.Operator):
     bl_idname = 'pillar.browser'
     bl_label = 'Blender Cloud Texture Browser'
 
     _draw_handle = None
 
-    current_path = pillar.CloudPath('/')
-    project_name = ''
+    _state = 'BROWSING'
+
+    project_uuid = '5672beecc0261b2005ed1a33'  # Blender Cloud project UUID
+    node = None  # The Node object we're currently showing, or None if we're at the project top.
+    node_uuid = ''  # Blender Cloud node UUID we're currently showing, i.e. None-safe self.node['_id']
 
     # This contains a stack of Node objects that lead up to the currently browsed node.
+    # This allows us to display the "up" item.
     path_stack = []
 
+    async_task = None  # asyncio task for fetching thumbnails
+    signalling_future = None  # asyncio future for signalling that we want to cancel everything.
     timer = None
     log = logging.getLogger('%s.BlenderCloudBrowser' % __name__)
 
     _menu_item_lock = threading.Lock()
+    current_path = ''
     current_display_content = []
     loaded_images = set()
     thumbnails_cache = ''
@@ -229,16 +208,10 @@ class BlenderCloudBrowser(pillar.PillarOperatorMixin,
     mouse_y = 0
 
     def invoke(self, context, event):
-        # Refuse to start if the file hasn't been saved.
-        if context.blend_data.is_dirty:
-            self.report({'ERROR'}, 'Please save your Blend file before using '
-                                   'the Blender Cloud addon.')
-            return {'CANCELLED'}
-
         wm = context.window_manager
-
-        self.current_path = pillar.CloudPath(wm.last_blender_cloud_location)
-        self.path_stack = []  # list of nodes that make up the current path.
+        self.project_uuid = wm.blender_cloud_project
+        self.node_uuid = wm.blender_cloud_node
+        self.path_stack = []
 
         self.thumbnails_cache = cache.cache_directory('thumbnails')
         self.mouse_x = event.mouse_x
@@ -256,17 +229,25 @@ class BlenderCloudBrowser(pillar.PillarOperatorMixin,
 
         self.current_display_content = []
         self.loaded_images = set()
+        self.browse_assets()
 
-        context.window.cursor_modal_set('DEFAULT')
-        async_loop.AsyncModalOperatorMixin.invoke(self, context, event)
-        self._new_async_task(self.async_execute(context))
+        context.window_manager.modal_handler_add(self)
+        self.timer = context.window_manager.event_timer_add(1 / 30, context.window)
 
         return {'RUNNING_MODAL'}
 
     def modal(self, context, event):
-        result = async_loop.AsyncModalOperatorMixin.modal(self, context, event)
-        if not {'PASS_THROUGH', 'RUNNING_MODAL'}.intersection(result):
-            return result
+        task = self.async_task
+        if self._state != 'EXCEPTION' and task.done() and not task.cancelled():
+            ex = task.exception()
+            if ex is not None:
+                self._state = 'EXCEPTION'
+                self.log.error('Exception while running task: %s', ex)
+                return {'RUNNING_MODAL'}
+
+        if self._state == 'QUIT':
+            self._finish(context)
+            return {'FINISHED'}
 
         if event.type == 'TAB' and event.value == 'RELEASE':
             self.log.info('Ensuring async loop is running')
@@ -281,104 +262,86 @@ class BlenderCloudBrowser(pillar.PillarOperatorMixin,
             self.mouse_x = event.mouse_x
             self.mouse_y = event.mouse_y
 
-        left_mouse_release = event.type == 'LEFTMOUSE' and event.value == 'RELEASE'
-        if self._state == 'PLEASE_SUBSCRIBE' and left_mouse_release:
-            self.open_browser_subscribe()
-            self._finish(context)
-            return {'FINISHED'}
-
-        if self._state == 'BROWSING':
+        if self._state == 'BROWSING' and event.type == 'LEFTMOUSE' and event.value == 'RELEASE':
             selected = self.get_clicked()
 
-            if selected:
-                context.window.cursor_set('HAND')
+            if selected is None:
+                # No item clicked, ignore it.
+                return {'RUNNING_MODAL'}
+
+            if selected.is_folder:
+                self.descend_node(selected.node)
             else:
-                context.window.cursor_set('DEFAULT')
-
-            if left_mouse_release:
-                if selected is None:
-                    # No item clicked, ignore it.
+                if selected.file_desc is None:
+                    # This can happen when the thumbnail information isn't loaded yet.
+                    # Just ignore the click for now.
+                    # TODO: think of a way to handle this properly.
                     return {'RUNNING_MODAL'}
+                self.handle_item_selection(context, selected)
 
-                if selected.is_folder:
-                    self.descend_node(selected.node)
-                else:
-                    if selected.file_desc is None:
-                        # This can happen when the thumbnail information isn't loaded yet.
-                        # Just ignore the click for now.
-                        # TODO: think of a way to handle this properly.
-                        self.log.debug('Selected item %r has no file_desc', selected)
-                        return {'RUNNING_MODAL'}
-                    self.handle_item_selection(context, selected)
-
-        if event.type in {'RIGHTMOUSE', 'ESC'}:
+        elif event.type in {'RIGHTMOUSE', 'ESC'}:
             self._finish(context)
             return {'CANCELLED'}
 
         return {'RUNNING_MODAL'}
 
-    async def async_execute(self, context):
-        self._state = 'CHECKING_CREDENTIALS'
-        self.log.debug('Checking credentials')
-
-        try:
-            user_id = await self.check_credentials(context, REQUIRED_ROLES_FOR_TEXTURE_BROWSER)
-        except pillar.NotSubscribedToCloudError:
-            self.log.info('User not subscribed to Blender Cloud.')
-            self._show_subscribe_screen()
-            return None
-
-        if user_id is None:
-            raise pillar.UserNotLoggedInError()
-
-        await self.async_download_previews()
-
-    def _show_subscribe_screen(self):
-        """Shows the "You need to subscribe" screen."""
-
-        self._state = 'PLEASE_SUBSCRIBE'
-        bpy.context.window.cursor_set('HAND')
-
     def descend_node(self, node):
         """Descends the node hierarchy by visiting this node.
 
         Also keeps track of the current node, so that we know where the "up" button should go.
         """
 
-        assert isinstance(node, pillarsdk.Node), 'Wrong type %s' % node
+        # Going up or down?
+        if self.path_stack and isinstance(node, UpNode):
+            self.log.debug('Going up, pop the stack; pre-pop stack is %r', self.path_stack)
+            node = self.path_stack.pop()
 
-        if isinstance(node, UpNode):
-            # Going up.
-            self.log.debug('Going up to %r', self.current_path)
-            self.current_path = self.current_path.parent
-            if self.path_stack:
-                self.path_stack.pop()
-            if not self.path_stack:
-                self.project_name = ''
         else:
-            # Going down, keep track of where we were
-            if isinstance(node, ProjectNode):
-                self.project_name = node['name']
-
-            self.current_path /= node['_id']
-            self.log.debug('Going down to %r', self.current_path)
-            self.path_stack.append(node)
+            # Going down, keep track of where we were (project top-level is None)
+            self.path_stack.append(self.node)
+            self.log.debug('Going up, push the stack; post-push stack is %r', self.path_stack)
 
+        # Set 'current' to the given node
+        self.node_uuid = node['_id'] if node else None
+        self.node = node
         self.browse_assets()
 
-    @property
-    def node(self):
-        if not self.path_stack:
-            return None
-        return self.path_stack[-1]
+    def _stop_async_task(self):
+        self.log.debug('Stopping async task')
+        if self.async_task is None:
+            self.log.debug('No async task, trivially stopped')
+            return
+
+        # Signal that we want to stop.
+        if not self.signalling_future.done():
+            self.log.info("Signalling that we want to cancel anything that's running.")
+            self.signalling_future.cancel()
+
+        # Wait until the asynchronous task is done.
+        if not self.async_task.done():
+            self.log.info("blocking until async task is done.")
+            loop = asyncio.get_event_loop()
+            try:
+                loop.run_until_complete(self.async_task)
+            except asyncio.CancelledError:
+                self.log.info('Asynchronous task was cancelled')
+                return
+
+        # noinspection PyBroadException
+        try:
+            self.async_task.result()  # This re-raises any exception of the task.
+        except asyncio.CancelledError:
+            self.log.info('Asynchronous task was cancelled')
+        except Exception:
+            self.log.exception("Exception from asynchronous task")
 
     def _finish(self, context):
         self.log.debug('Finishing the modal operator')
-        async_loop.AsyncModalOperatorMixin._finish(self, context)
+        self._stop_async_task()
         self.clear_images()
 
         context.space_data.draw_handler_remove(self._draw_handle, 'WINDOW')
-        context.window.cursor_modal_restore()
+        context.window_manager.event_timer_remove(self.timer)
 
         if self.maximized_area:
             bpy.ops.screen.screen_full_area(use_hide_panels=True)
@@ -407,8 +370,6 @@ class BlenderCloudBrowser(pillar.PillarOperatorMixin,
             self.current_display_content.append(menu_item)
             self.loaded_images.add(menu_item.icon.filepath_raw)
 
-        self.sort_menu()
-
         return menu_item
 
     def update_menu_item(self, node, *args) -> MenuItem:
@@ -424,23 +385,8 @@ class BlenderCloudBrowser(pillar.PillarOperatorMixin,
             else:
                 raise ValueError('Unable to find MenuItem(node_uuid=%r)' % node_uuid)
 
-        self.sort_menu()
-
-    def sort_menu(self):
-        """Sorts the self.current_display_content list."""
-
-        if not self.current_display_content:
-            return
-
-        with self._menu_item_lock:
-            self.current_display_content.sort(key=MenuItem.sort_key)
-
-    async def async_download_previews(self):
-        self._state = 'BROWSING'
-
-        thumbnails_directory = self.thumbnails_cache
+    async def async_download_previews(self, thumbnails_directory):
         self.log.info('Asynchronously downloading previews to %r', thumbnails_directory)
-        self.log.info('Current BCloud path is %r', self.current_path)
         self.clear_images()
 
         def thumbnail_loading(node, texture_node):
@@ -449,67 +395,70 @@ class BlenderCloudBrowser(pillar.PillarOperatorMixin,
         def thumbnail_loaded(node, file_desc, thumb_path):
             self.update_menu_item(node, file_desc, thumb_path, file_desc['filename'])
 
-        project_uuid = self.current_path.project_uuid
-        node_uuid = self.current_path.node_uuid
+        # Download either by group_texture node UUID or by project UUID (which shows all top-level nodes)
+        if self.node_uuid:
+            self.log.debug('Getting subnodes for parent node %r', self.node_uuid)
+            children = await pillar.get_nodes(parent_node_uuid=self.node_uuid,
+                                              node_type='group_textures')
+
+            # Make sure we can go up again.
+            if self.path_stack:
+                self.add_menu_item(UpNode(), None, 'FOLDER', '.. up ..')
+        elif self.project_uuid:
+            self.log.debug('Getting subnodes for project node %r', self.project_uuid)
+            children = await pillar.get_nodes(self.project_uuid, '')
 
-        if node_uuid:
-            # Query for sub-nodes of this node.
-            self.log.debug('Getting subnodes for parent node %r', node_uuid)
-            children = await pillar.get_nodes(parent_node_uuid=node_uuid,
-                                              node_type='group_texture')
-        elif project_uuid:
-            # Query for top-level nodes.
-            self.log.debug('Getting subnodes for project node %r', project_uuid)
-            children = await pillar.get_nodes(project_uuid=project_uuid,
-                                              parent_node_uuid='',
-                                              node_type='group_texture')
         else:
-            # Query for projects
-            self.log.debug('No node UUID and no project UUID, listing available projects')
-            children = await pillar.get_texture_projects()
-            for proj_dict in children:
-                self.add_menu_item(ProjectNode(proj_dict), None, 'FOLDER', proj_dict['name'])
+            # TODO: add "nothing here" icon and trigger re-draw
+            self.log.warning("Not node UUID and no project UUID, I can't do anything!")
             return
 
-        # Make sure we can go up again.
-        self.add_menu_item(UpNode(), None, 'FOLDER', '.. up ..')
-
         # Download all child nodes
-        self.log.debug('Iterating over child nodes of %r', self.current_path)
+        self.log.debug('Iterating over child nodes of %r', self.node_uuid)
         for child in children:
             # print('  - %(_id)s = %(name)s' % child)
-            if child['node_type'] not in MenuItem.SUPPORTED_NODE_TYPES:
-                self.log.debug('Skipping node of type %r', child['node_type'])
-                continue
             self.add_menu_item(child, None, 'FOLDER', child['name'])
 
         # There are only sub-nodes at the project level, no texture nodes,
         # so we won't have to bother looking for textures.
-        if not node_uuid:
+        if not self.node_uuid:
             return
 
-        directory = os.path.join(thumbnails_directory, project_uuid, node_uuid)
+        directory = os.path.join(thumbnails_directory, self.project_uuid, self.node_uuid)
         os.makedirs(directory, exist_ok=True)
 
-        self.log.debug('Fetching texture thumbnails for node %r', node_uuid)
-        await pillar.fetch_texture_thumbs(node_uuid, 's', directory,
+        self.log.debug('Fetching texture thumbnails for node %r', self.node_uuid)
+        await pillar.fetch_texture_thumbs(self.node_uuid, 's', directory,
                                           thumbnail_loading=thumbnail_loading,
                                           thumbnail_loaded=thumbnail_loaded,
                                           future=self.signalling_future)
 
     def browse_assets(self):
-        self.log.debug('Browsing assets at %r', self.current_path)
-        self._new_async_task(self.async_download_previews())
+        self._state = 'BROWSING'
+        self.log.debug('Browsing assets at project %r node %r', self.project_uuid, self.node_uuid)
+        self._new_async_task(self.async_download_previews(self.thumbnails_cache))
+
+    def _new_async_task(self, async_task: asyncio.coroutine, future: asyncio.Future=None):
+        """Stops the currently running async task, and starts another one."""
+
+        self.log.debug('Setting up a new task %r, so any existing task must be stopped', async_task)
+        self._stop_async_task()
+
+        # Download the previews asynchronously.
+        self.signalling_future = future or asyncio.Future()
+        self.async_task = asyncio.ensure_future(async_task)
+        self.log.debug('Created new task %r', self.async_task)
+
+        # Start the async manager so everything happens.
+        async_loop.ensure_async_loop()
 
     def draw_menu(self, context):
         """Draws the GUI with OpenGL."""
 
         drawers = {
-            'CHECKING_CREDENTIALS': self._draw_checking_credentials,
             'BROWSING': self._draw_browser,
             'DOWNLOADING_TEXTURE': self._draw_downloading,
             'EXCEPTION': self._draw_exception,
-            'PLEASE_SUBSCRIBE': self._draw_subscribe,
         }
 
         if self._state in drawers:
@@ -521,7 +470,7 @@ class BlenderCloudBrowser(pillar.PillarOperatorMixin,
         bgl.glColor4f(1.0, 1.0, 1.0, 1.0)
         blf.size(font_id, 20, 72)
         blf.position(font_id, 5, 5, 0)
-        blf.draw(font_id, '%s %s' % (self._state, self.project_name))
+        blf.draw(font_id, self._state)
         bgl.glDisable(bgl.GL_BLEND)
 
     @staticmethod
@@ -581,24 +530,14 @@ class BlenderCloudBrowser(pillar.PillarOperatorMixin,
     def _draw_downloading(self, context):
         """OpenGL drawing code for the DOWNLOADING_TEXTURE state."""
 
-        self._draw_text_on_colour(context,
-                                  'Downloading texture from Blender Cloud',
-                                  (0.0, 0.0, 0.2, 0.6))
-
-    def _draw_checking_credentials(self, context):
-        """OpenGL drawing code for the CHECKING_CREDENTIALS state."""
-
-        self._draw_text_on_colour(context,
-                                  'Checking login credentials',
-                                  (0.0, 0.0, 0.2, 0.6))
-
-    def _draw_text_on_colour(self, context, text, bgcolour):
         content_height, content_width = self._window_size(context)
+
         bgl.glEnable(bgl.GL_BLEND)
-        bgl.glColor4f(*bgcolour)
+        bgl.glColor4f(0.0, 0.0, 0.2, 0.6)
         bgl.glRectf(0, 0, content_width, content_height)
 
         font_id = 0
+        text = "Downloading texture from Blender Cloud"
         bgl.glColor4f(1.0, 1.0, 1.0, 1.0)
         blf.size(font_id, 20, 72)
         text_width, text_height = blf.dimensions(font_id, text)
@@ -627,15 +566,7 @@ class BlenderCloudBrowser(pillar.PillarOperatorMixin,
         bgl.glRectf(0, 0, content_width, content_height)
 
         font_id = 0
-        ex = self.async_task.exception()
-        if isinstance(ex, pillar.UserNotLoggedInError):
-            ex_msg = 'You are not logged in on Blender ID. Please log in at User Preferences, ' \
-                     'System, Blender ID.'
-        else:
-            ex_msg = str(ex)
-            if not ex_msg:
-                ex_msg = str(type(ex))
-        text = "An error occurred:\n%s" % ex_msg
+        text = "An error occurred:\n%s" % self.async_task.exception()
         lines = textwrap.wrap(text)
 
         bgl.glColor4f(1.0, 1.0, 1.0, 1.0)
@@ -652,11 +583,6 @@ class BlenderCloudBrowser(pillar.PillarOperatorMixin,
             blf.draw(font_id, line)
         bgl.glDisable(bgl.GL_BLEND)
 
-    def _draw_subscribe(self, context):
-        self._draw_text_on_colour(context,
-                                  'Click to subscribe to the Blender Cloud',
-                                  (0.0, 0.0, 0.2, 0.6))
-
     def get_clicked(self) -> MenuItem:
 
         for item in self.current_display_content:
@@ -668,13 +594,11 @@ class BlenderCloudBrowser(pillar.PillarOperatorMixin,
     def handle_item_selection(self, context, item: MenuItem):
         """Called when the user clicks on a menu item that doesn't represent a folder."""
 
-        from pillarsdk.utils import sanitize_filename
-
         self.clear_images()
         self._state = 'DOWNLOADING_TEXTURE'
 
-        node_path_components = (node['name'] for node in self.path_stack if node is not None)
-        local_path_components = [sanitize_filename(comp) for comp in node_path_components]
+        node_path_components = [node['name'] for node in self.path_stack if node is not None]
+        local_path_components = [self.project_uuid] + node_path_components + [self.node['name']]
 
         top_texture_directory = bpy.path.abspath(context.scene.local_texture_dir)
         local_path = os.path.join(top_texture_directory, *local_path_components)
@@ -707,13 +631,6 @@ class BlenderCloudBrowser(pillar.PillarOperatorMixin,
                                                      future=signalling_future))
         self.async_task.add_done_callback(texture_download_completed)
 
-    def open_browser_subscribe(self):
-        import webbrowser
-
-        webbrowser.open_new_tab('https://cloud.blender.org/join')
-
-        self.report({'INFO'}, 'We just started a browser for you.')
-
 
 # store keymaps here to access after registration
 addon_keymaps = []
@@ -727,7 +644,7 @@ def menu_draw(self, context):
 
 def register():
     bpy.utils.register_class(BlenderCloudBrowser)
-    # bpy.types.INFO_MT_mesh_add.append(menu_draw)
+    bpy.types.INFO_MT_mesh_add.append(menu_draw)
 
     # handle the keymap
     wm = bpy.context.window_manager
@@ -742,10 +659,13 @@ def register():
 
 
 def unregister():
+    bpy.utils.unregister_class(BlenderCloudBrowser)
+
     # handle the keymap
     for km, kmi in addon_keymaps:
         km.keymap_items.remove(kmi)
     addon_keymaps.clear()
 
-    if 'bl_rna' in BlenderCloudBrowser.__dict__:   # <-- check if we already removed!
-        bpy.utils.unregister_class(BlenderCloudBrowser)
+
+if __name__ == "__main__":
+    register()

blender_cloud/home_project.py

@@ -1,32 +0,0 @@
-import logging
-
-import pillarsdk
-from pillarsdk import exceptions as sdk_exceptions
-from .pillar import pillar_call
-
-log = logging.getLogger(__name__)
-HOME_PROJECT_ENDPOINT = '/bcloud/home-project'
-
-
-async def get_home_project(params=None) -> pillarsdk.Project:
-    """Returns the home project."""
-
-    log.debug('Getting home project')
-    try:
-        return await pillar_call(pillarsdk.Project.find_from_endpoint,
-                                 HOME_PROJECT_ENDPOINT, params=params)
-    except sdk_exceptions.ForbiddenAccess:
-        log.warning('Access to the home project was denied. '
-                    'Double-check that you are logged in with valid BlenderID credentials.')
-        raise
-    except sdk_exceptions.ResourceNotFound:
-        log.warning('No home project available.')
-        raise
-
-
-async def get_home_project_id() -> str:
-    """Returns just the ID of the home project."""
-
-    home_proj = await get_home_project({'projection': {'_id': 1}})
-    home_proj_id = home_proj['_id']
-    return home_proj_id

blender_cloud/image_sharing.py

@@ -1,323 +0,0 @@
-import logging
-import os.path
-import tempfile
-import datetime
-
-import bpy
-import pillarsdk
-from pillarsdk import exceptions as sdk_exceptions
-from .pillar import pillar_call
-from . import async_loop, pillar, home_project, blender
-
-REQUIRES_ROLES_FOR_IMAGE_SHARING = {'subscriber', 'demo'}
-IMAGE_SHARING_GROUP_NODE_NAME = 'Image sharing'
-log = logging.getLogger(__name__)
-
-
-async def find_image_sharing_group_id(home_project_id, user_id):
-    # Find the top-level image sharing group node.
-    try:
-        share_group, created = await pillar.find_or_create_node(
-            where={'project': home_project_id,
-                   'node_type': 'group',
-                   'parent': None,
-                   'name': IMAGE_SHARING_GROUP_NODE_NAME},
-            additional_create_props={
-                'user': user_id,
-                'properties': {},
-            },
-            projection={'_id': 1},
-            may_create=True)
-    except pillar.PillarError:
-        log.exception('Pillar error caught')
-        raise pillar.PillarError('Unable to find image sharing folder on the Cloud')
-
-    return share_group['_id']
-
-
-class PILLAR_OT_image_share(pillar.PillarOperatorMixin,
-                            async_loop.AsyncModalOperatorMixin,
-                            bpy.types.Operator):
-    bl_idname = 'pillar.image_share'
-    bl_label = 'Share an image/screenshot via Blender Cloud'
-    bl_description = 'Uploads an image for sharing via Blender Cloud'
-
-    log = logging.getLogger('bpy.ops.%s' % bl_idname)
-
-    home_project_id = None
-    home_project_url = 'home'
-    share_group_id = None  # top-level share group node ID
-    user_id = None
-
-    target = bpy.props.EnumProperty(
-        items=[
-            ('FILE', 'File', 'Share an image file'),
-            ('DATABLOCK', 'Datablock', 'Share an image datablock'),
-            ('SCREENSHOT', 'Screenshot', 'Share a screenshot'),
-        ],
-        name='target',
-        default='SCREENSHOT')
-
-    name = bpy.props.StringProperty(name='name',
-                                    description='File or datablock name to sync')
-
-    screenshot_show_multiview = bpy.props.BoolProperty(
-        name='screenshot_show_multiview',
-        description='Enable Multi-View',
-        default=False)
-
-    screenshot_use_multiview = bpy.props.BoolProperty(
-        name='screenshot_use_multiview',
-        description='Use Multi-View',
-        default=False)
-
-    screenshot_full = bpy.props.BoolProperty(
-        name='screenshot_full',
-        description='Full Screen, Capture the whole window (otherwise only capture the active area)',
-        default=False)
-
-    def invoke(self, context, event):
-        # Do a quick test on datablock dirtyness. If it's not packed and dirty,
-        # the user should save it first.
-        if self.target == 'DATABLOCK':
-            if not self.name:
-                self.report({'ERROR'}, 'No name given of the datablock to share.')
-                return {'CANCELLED'}
-
-            datablock = bpy.data.images[self.name]
-            if datablock.type == 'IMAGE' and datablock.is_dirty and not datablock.packed_file:
-                self.report({'ERROR'}, 'Datablock is dirty, save it first.')
-                return {'CANCELLED'}
-
-        async_loop.AsyncModalOperatorMixin.invoke(self, context, event)
-
-        self.log.info('Starting sharing')
-        self._new_async_task(self.async_execute(context))
-        return {'RUNNING_MODAL'}
-
-    def execute(self, context):
-        return self.invoke(context, None)
-
-    async def async_execute(self, context):
-        """Entry point of the asynchronous operator."""
-
-        self.report({'INFO'}, 'Communicating with Blender Cloud')
-
-        try:
-            # Refresh credentials
-            try:
-                self.user_id = await self.check_credentials(context,
-                                                            REQUIRES_ROLES_FOR_IMAGE_SHARING)
-                self.log.debug('Found user ID: %s', self.user_id)
-            except pillar.NotSubscribedToCloudError:
-                self.log.exception('User not subscribed to cloud.')
-                self.report({'ERROR'}, 'Please subscribe to the Blender Cloud.')
-                self._state = 'QUIT'
-                return
-            except pillar.CredentialsNotSyncedError:
-                self.log.exception('Error checking/refreshing credentials.')
-                self.report({'ERROR'}, 'Please log in on Blender ID first.')
-                self._state = 'QUIT'
-                return
-
-            # Find the home project.
-            try:
-                home_proj = await home_project.get_home_project({
-                    'projection': {'_id': 1, 'url': 1}
-                })
-            except sdk_exceptions.ForbiddenAccess:
-                self.log.exception('Forbidden access to home project.')
-                self.report({'ERROR'}, 'Did not get access to home project.')
-                self._state = 'QUIT'
-                return
-            except sdk_exceptions.ResourceNotFound:
-                self.report({'ERROR'}, 'Home project not found.')
-                self._state = 'QUIT'
-                return
-
-            self.home_project_id = home_proj['_id']
-            self.home_project_url = home_proj['url']
-
-            try:
-                gid = await find_image_sharing_group_id(self.home_project_id,
-                                                        self.user_id)
-                self.share_group_id = gid
-                self.log.debug('Found group node ID: %s', self.share_group_id)
-            except sdk_exceptions.ForbiddenAccess:
-                self.log.exception('Unable to find Group ID')
-                self.report({'ERROR'}, 'Unable to find sync folder.')
-                self._state = 'QUIT'
-                return
-
-            await self.share_image(context)
-        except Exception as ex:
-            self.log.exception('Unexpected exception caught.')
-            self.report({'ERROR'}, 'Unexpected error %s: %s' % (type(ex), ex))
-
-        self._state = 'QUIT'
-
-    async def share_image(self, context):
-        """Sends files to the Pillar server."""
-
-        if self.target == 'FILE':
-            self.report({'INFO'}, "Uploading %s '%s'" % (self.target.lower(), self.name))
-            node = await self.upload_file(self.name)
-        elif self.target == 'SCREENSHOT':
-            node = await self.upload_screenshot(context)
-        else:
-            self.report({'INFO'}, "Uploading %s '%s'" % (self.target.lower(), self.name))
-            node = await self.upload_datablock(context)
-
-        self.report({'INFO'}, 'Upload complete, creating link to share.')
-        share_info = await pillar_call(node.share)
-        url = share_info.get('short_link')
-        context.window_manager.clipboard = url
-        self.report({'INFO'}, 'The link has been copied to your clipboard: %s' % url)
-
-        await self.maybe_open_browser(url)
-
-    async def upload_file(self, filename: str, fileobj=None) -> pillarsdk.Node:
-        """Uploads a file to the cloud, attached to the image sharing node.
-
-        Returns the node.
-        """
-
-        self.log.info('Uploading file %s', filename)
-        node = await pillar_call(pillarsdk.Node.create_asset_from_file,
-                                 self.home_project_id,
-                                 self.share_group_id,
-                                 'image',
-                                 filename,
-                                 extra_where={'user': self.user_id},
-                                 always_create_new_node=True,
-                                 fileobj=fileobj,
-                                 caching=False)
-        node_id = node['_id']
-        self.log.info('Created node %s', node_id)
-        self.report({'INFO'}, 'File succesfully uploaded to the cloud!')
-
-        return node
-
-    async def maybe_open_browser(self, url):
-        prefs = blender.preferences()
-        if not prefs.open_browser_after_share:
-            return
-
-        import webbrowser
-
-        self.log.info('Opening browser at %s', url)
-        webbrowser.open_new_tab(url)
-
-    async def upload_datablock(self, context) -> pillarsdk.Node:
-        """Saves a datablock to file if necessary, then upload.
-
-        Returns the node.
-        """
-
-        self.log.info("Uploading datablock '%s'" % self.name)
-        datablock = bpy.data.images[self.name]
-
-        if datablock.type == 'RENDER_RESULT':
-            # Construct a sensible name for this render.
-            filename = '%s-%s-render%s' % (
-                os.path.splitext(os.path.basename(context.blend_data.filepath))[0],
-                context.scene.name,
-                context.scene.render.file_extension)
-            return await self.upload_via_tempdir(datablock, filename)
-
-        if datablock.packed_file is not None:
-            return await self.upload_packed_file(datablock)
-
-        if datablock.is_dirty:
-            # We can handle dirty datablocks like this if we want.
-            # However, I (Sybren) do NOT think it's a good idea to:
-            # - Share unsaved data to the cloud; users can assume it's saved
-            #   to disk and close blender, losing their file.
-            # - Save unsaved data first; this can overwrite a file a user
-            #   didn't want to overwrite.
-            filename = bpy.path.basename(datablock.filepath)
-            return await self.upload_via_tempdir(datablock, filename)
-
-        filepath = bpy.path.abspath(datablock.filepath)
-        return await self.upload_file(filepath)
-
-    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.
-        """
-
-        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_packed_file(self, datablock) -> pillarsdk.Node:
-        """Uploads a packed file directly from memory.
-
-        Returns the node.
-        """
-
-        import io
-
-        filename = '%s.%s' % (datablock.name, datablock.file_format.lower())
-        fileobj = io.BytesIO(datablock.packed_file.data)
-        fileobj.seek(0)  # ensure PillarSDK reads the file from the beginning.
-        self.log.info('Uploading packed file directly from memory to %r.', filename)
-        return await self.upload_file(filename, fileobj=fileobj)
-
-    async def upload_screenshot(self, context) -> pillarsdk.Node:
-        """Takes a screenshot, saves it to a temp file, and uploads it."""
-
-        self.name = datetime.datetime.now().strftime('Screenshot-%Y-%m-%d-%H:%M:%S.png')
-        self.report({'INFO'}, "Uploading %s '%s'" % (self.target.lower(), self.name))
-
-        with tempfile.TemporaryDirectory() as tmpdir:
-            filepath = os.path.join(tmpdir, self.name)
-            self.log.debug('Saving screenshot to %s', filepath)
-            bpy.ops.screen.screenshot(filepath=filepath,
-                                      show_multiview=self.screenshot_show_multiview,
-                                      use_multiview=self.screenshot_use_multiview,
-                                      full=self.screenshot_full)
-            return await self.upload_file(filepath)
-
-
-def image_editor_menu(self, context):
-    image = context.space_data.image
-
-    box = self.layout.row()
-    if image and image.has_data:
-        text = 'Share on Blender Cloud'
-        if image.type == 'IMAGE' and image.is_dirty and not image.packed_file:
-            box.enabled = False
-            text = 'Save image before sharing on Blender Cloud'
-
-        props = box.operator(PILLAR_OT_image_share.bl_idname, text=text,
-                             icon_value=blender.icon('CLOUD'))
-        props.target = 'DATABLOCK'
-        props.name = image.name
-
-
-def window_menu(self, context):
-    props = self.layout.operator(PILLAR_OT_image_share.bl_idname,
-                                 text='Share screenshot via Blender Cloud',
-                                 icon_value=blender.icon('CLOUD'))
-    props.target = 'SCREENSHOT'
-    props.screenshot_full = True
-
-
-def register():
-    bpy.utils.register_class(PILLAR_OT_image_share)
-
-    bpy.types.IMAGE_HT_header.append(image_editor_menu)
-    bpy.types.INFO_MT_window.append(window_menu)
-
-
-def unregister():
-    bpy.utils.unregister_class(PILLAR_OT_image_share)
-
-    bpy.types.IMAGE_HT_header.remove(image_editor_menu)
-    bpy.types.INFO_MT_window.remove(window_menu)

blender_cloud/pillar.py

@@ -4,7 +4,6 @@ import os
 import functools
 import logging
 from contextlib import closing, contextmanager
-import urllib.parse
 import pathlib
 
 import requests
@@ -16,9 +15,7 @@ from pillarsdk.utils import sanitize_filename
 
 from . import cache
 
-SUBCLIENT_ID = 'PILLAR'
-
-_pillar_api = {}  # will become a mapping from bool (cached/non-cached) to pillarsdk.Api objects.
+_pillar_api = None  # will become a pillarsdk.Api object.
 log = logging.getLogger(__name__)
 uncached_session = requests.session()
 _testing_blender_id_profile = None  # Just for testing, overrides what is returned by blender_id_profile.
@@ -31,17 +28,6 @@ class UserNotLoggedInError(RuntimeError):
     This is basically for every interaction with Pillar.
     """
 
-    def __str__(self):
-        return self.__class__.__name__
-
-
-class CredentialsNotSyncedError(UserNotLoggedInError):
-    """Raised when the user may be logged in on Blender ID, but has no Blender Cloud token."""
-
-
-class NotSubscribedToCloudError(UserNotLoggedInError):
-    """Raised when the user may be logged in on Blender ID, but has no Blender Cloud token."""
-
 
 class PillarError(RuntimeError):
     """Raised when there is some issue with the communication with Pillar.
@@ -64,8 +50,6 @@ class CloudPath(pathlib.PurePosixPath):
     @property
     def project_uuid(self) -> str:
         assert self.parts[0] == '/'
-        if len(self.parts) <= 1:
-            return None
         return self.parts[1]
 
     @property
@@ -75,10 +59,11 @@ class CloudPath(pathlib.PurePosixPath):
 
     @property
     def node_uuid(self) -> str:
-        if len(self.parts) <= 2:
-            return None
+        node_uuids = self.node_uuids
 
-        return self.parts[-1]
+        if not node_uuids:
+            return None
+        return node_uuids[-1]
 
 
 @contextmanager
@@ -99,158 +84,66 @@ def save_as_json(pillar_resource, json_filename):
         json.dump(pillar_resource, outfile, sort_keys=True, cls=pillarsdk.utils.PillarJSONEncoder)
 
 
-def blender_id_profile() -> 'blender_id.BlenderIdProfile':
+def blender_id_profile() -> dict:
     """Returns the Blender ID profile of the currently logged in user."""
 
     # Allow overriding before we import the bpy module.
     if _testing_blender_id_profile is not None:
         return _testing_blender_id_profile
 
-    import blender_id
-    return blender_id.get_active_profile()
+    import bpy
+
+    active_user_id = getattr(bpy.context.window_manager, 'blender_id_active_profile', None)
+    if not active_user_id:
+        return None
+
+    import blender_id.profiles
+    return blender_id.profiles.get_active_profile()
 
 
-def blender_id_subclient() -> dict:
-    """Returns the subclient dict, containing the 'subclient_user_id' and 'token' keys."""
-
-    profile = blender_id_profile()
-    if not profile:
-        raise UserNotLoggedInError()
-
-    subclient = profile.subclients.get(SUBCLIENT_ID)
-    if not subclient:
-        raise CredentialsNotSyncedError()
-
-    return subclient
-
-
-def pillar_api(pillar_endpoint: str = None, caching=True) -> pillarsdk.Api:
+def pillar_api(pillar_endpoint: str = None) -> pillarsdk.Api:
     """Returns the Pillar SDK API object for the current user.
 
     The user must be logged in.
 
     :param pillar_endpoint: URL of the Pillar server, for testing purposes. If not specified,
         it will use the addon preferences.
-    :param caching: whether to return a caching or non-caching API
     """
 
     global _pillar_api
 
     # Only return the Pillar API object if the user is still logged in.
-    subclient = blender_id_subclient()
+    profile = blender_id_profile()
+    if not profile:
+        raise UserNotLoggedInError()
 
-    if not _pillar_api:
+    if _pillar_api is None:
         # Allow overriding the endpoint before importing Blender-specific stuff.
         if pillar_endpoint is None:
             from . import blender
             pillar_endpoint = blender.preferences().pillar_server
 
-        _caching_api = pillarsdk.Api(endpoint=pillar_endpoint,
-                                     username=subclient['subclient_user_id'],
-                                     password=SUBCLIENT_ID,
-                                     token=subclient['token'])
-        _caching_api.requests_session = cache.requests_session()
+        pillarsdk.Api.requests_session = cache.requests_session()
 
-        _noncaching_api = pillarsdk.Api(endpoint=pillar_endpoint,
-                                        username=subclient['subclient_user_id'],
-                                        password=SUBCLIENT_ID,
-                                        token=subclient['token'])
-        _noncaching_api.requests_session = uncached_session
+        _pillar_api = pillarsdk.Api(endpoint=pillar_endpoint,
+                                    username=profile['username'],
+                                    password=None,
+                                    token=profile['token'])
 
-        _pillar_api = {
-            True: _caching_api,
-            False: _noncaching_api,
-        }
-
-    return _pillar_api[caching]
-
-
-# No more than this many Pillar calls should be made simultaneously
-pillar_semaphore = asyncio.Semaphore(3)
-
-
-async def pillar_call(pillar_func, *args, caching=True, **kwargs):
-    partial = functools.partial(pillar_func, *args, api=pillar_api(caching=caching), **kwargs)
-    loop = asyncio.get_event_loop()
-
-    async with pillar_semaphore:
-        return await loop.run_in_executor(None, partial)
-
-
-async def check_pillar_credentials(required_roles: set):
-    """Tries to obtain the user at Pillar using the user's credentials.
-
-    :param required_roles: set of roles to require -- having one of those is enough.
-    :raises UserNotLoggedInError: when the user is not logged in on Blender ID.
-    :raises CredentialsNotSyncedError: when the user is logged in on Blender ID but
-        doesn't have a valid subclient token for Pillar.
-    :returns: the Pillar User ID of the current user.
-    """
-
-    profile = blender_id_profile()
-    if not profile:
-        raise UserNotLoggedInError()
-
-    subclient = profile.subclients.get(SUBCLIENT_ID)
-    if not subclient:
-        raise CredentialsNotSyncedError()
-
-    pillar_user_id = subclient['subclient_user_id']
-    if not pillar_user_id:
-        raise CredentialsNotSyncedError()
-
-    try:
-        db_user = await pillar_call(pillarsdk.User.me)
-    except (pillarsdk.UnauthorizedAccess, pillarsdk.ResourceNotFound, pillarsdk.ForbiddenAccess):
-        raise CredentialsNotSyncedError()
-
-    roles = db_user.roles or set()
-    log.debug('User has roles %r', roles)
-    if required_roles and not required_roles.intersection(set(roles)):
-        # Delete the subclient info. This forces a re-check later, which can
-        # then pick up on the user's new status.
-        del profile.subclients[SUBCLIENT_ID]
-        profile.save_json()
-        raise NotSubscribedToCloudError()
-
-    return pillar_user_id
-
-
-async def refresh_pillar_credentials(required_roles: set):
-    """Refreshes the authentication token on Pillar.
-
-    :raises blender_id.BlenderIdCommError: when Blender ID refuses to send a token to Pillar.
-    :raises Exception: when the Pillar credential check fails.
-    """
-
-    global _pillar_api
-
-    import blender_id
-
-    from . import blender
-    pillar_endpoint = blender.preferences().pillar_server.rstrip('/')
-
-    # Create a subclient token and send it to Pillar.
-    # May raise a blender_id.BlenderIdCommError
-    try:
-        blender_id.create_subclient_token(SUBCLIENT_ID, pillar_endpoint)
-    except blender_id.communication.BlenderIdCommError as ex:
-        log.warning("Unable to create authentication token: %s", ex)
-        raise CredentialsNotSyncedError()
-
-    # Test the new URL
-    _pillar_api = None
-    return await check_pillar_credentials(required_roles)
+    return _pillar_api
 
 
 async def get_project_uuid(project_url: str) -> str:
     """Returns the UUID for the project, given its '/p/<project_url>' string."""
 
+    find_one = functools.partial(pillarsdk.Project.find_one, {
+        'where': {'url': project_url},
+        'projection': {'permissions': 1},
+    }, api=pillar_api())
+
+    loop = asyncio.get_event_loop()
     try:
-        project = await pillar_call(pillarsdk.Project.find_one, {
-            'where': {'url': project_url},
-            'projection': {'permissions': 1},
-        })
+        project = await loop.run_in_executor(None, find_one)
     except pillarsdk.exceptions.ResourceNotFound:
         log.error('Project with URL %r does not exist', project_url)
         return None
@@ -260,7 +153,7 @@ async def get_project_uuid(project_url: str) -> str:
 
 
 async def get_nodes(project_uuid: str = None, parent_node_uuid: str = None,
-                    node_type=None) -> list:
+                    node_type: str = None) -> list:
     """Gets nodes for either a project or given a parent node.
 
     @param project_uuid: the UUID of the project, or None if only querying by parent_node_uuid.
@@ -285,31 +178,19 @@ async def get_nodes(project_uuid: str = None, parent_node_uuid: str = None,
         where['project'] = project_uuid
 
     if node_type:
-        if isinstance(node_type, str):
-            where['node_type'] = node_type
-        else:
-            where['node_type'] = {'$in': node_type}
+        where['node_type'] = node_type
 
-    children = await pillar_call(pillarsdk.Node.all, {
+    node_all = functools.partial(pillarsdk.Node.all, {
         'projection': {'name': 1, 'parent': 1, 'node_type': 1,
                        'properties.order': 1, 'properties.status': 1,
                        'properties.files': 1,
                        'properties.content_type': 1, 'picture': 1},
         'where': where,
-        'embed': ['parent']})
+        'sort': 'properties.order',
+        'embed': ['parent']}, api=pillar_api())
 
-    return children['_items']
-
-
-async def get_texture_projects() -> list:
-    """Returns project dicts that contain textures."""
-
-    try:
-        children = await pillar_call(pillarsdk.Project.all_from_endpoint,
-                                     '/bcloud/texture-libraries')
-    except pillarsdk.ResourceNotFound as ex:
-        log.warning('Unable to find texture projects: %s', ex)
-        raise PillarError('Unable to find texture projects: %s' % ex)
+    loop = asyncio.get_event_loop()
+    children = await loop.run_in_executor(None, node_all)
 
     return children['_items']
 
@@ -425,7 +306,11 @@ async def fetch_thumbnail_info(file: pillarsdk.File, directory: str, desired_siz
         finished.
     """
 
-    thumb_link = await pillar_call(file.thumbnail, desired_size)
+    api = pillar_api()
+
+    loop = asyncio.get_event_loop()
+    thumb_link = await loop.run_in_executor(None, functools.partial(
+        file.thumbnail_file, desired_size, api=api))
 
     if thumb_link is None:
         raise ValueError("File {} has no thumbnail of size {}"
@@ -467,15 +352,24 @@ async def fetch_texture_thumbs(parent_node_uuid: str, desired_size: str,
         log.warning('fetch_texture_thumbs: Texture downloading cancelled')
         return
 
-    coros = (download_texture_thumbnail(texture_node, desired_size,
-                                        thumbnail_directory,
-                                        thumbnail_loading=thumbnail_loading,
-                                        thumbnail_loaded=thumbnail_loaded,
-                                        future=future)
-             for texture_node in texture_nodes)
+    # We don't want to gather too much in parallel, as it will make cancelling take more time.
+    # This is caused by HTTP requests going out in parallel, and once the socket is open and
+    # the GET request is sent, we can't cancel until the server starts streaming the response.
+    chunk_size = 2
+    for i in range(0, len(texture_nodes), chunk_size):
+        chunk = texture_nodes[i:i + chunk_size]
 
-    # raises any exception from failed handle_texture_node() calls.
-    await asyncio.gather(*coros)
+        log.debug('fetch_texture_thumbs: Gathering texture[%i:%i] for parent node %r',
+                  i, i + chunk_size, parent_node_uuid)
+        coros = (download_texture_thumbnail(texture_node, desired_size,
+                                            thumbnail_directory,
+                                            thumbnail_loading=thumbnail_loading,
+                                            thumbnail_loaded=thumbnail_loaded,
+                                            future=future)
+                 for texture_node in chunk)
+
+        # raises any exception from failed handle_texture_node() calls.
+        await asyncio.gather(*coros)
 
     log.info('fetch_texture_thumbs: Done downloading texture thumbnails')
 
@@ -495,28 +389,17 @@ async def download_texture_thumbnail(texture_node, desired_size: str,
                   texture_node['_id'])
         return
 
+    api = pillar_api()
     loop = asyncio.get_event_loop()
 
-    # Find out which file to use for the thumbnail picture.
-    pic_uuid = texture_node.picture
-    if not pic_uuid:
-        # Fall back to the first texture file, if it exists.
-        log.debug('Node %r does not have a picture, falling back to first file.',
-                  texture_node['_id'])
-        files = texture_node.properties and texture_node.properties.files
-        if not files:
-            log.info('Node %r does not have a picture nor files, skipping.', texture_node['_id'])
-            return
-        pic_uuid = files[0].file
-        if not pic_uuid:
-            log.info('Node %r does not have a picture nor files, skipping.', texture_node['_id'])
-            return
-
-    # Load the File that belongs to this texture node's picture.
-    loop.call_soon_threadsafe(thumbnail_loading, texture_node, texture_node)
-    file_desc = await pillar_call(pillarsdk.File.find, pic_uuid, params={
+    file_find = functools.partial(pillarsdk.File.find, params={
         'projection': {'filename': 1, 'variations': 1, 'width': 1, 'height': 1},
-    })
+    }, api=api)
+
+    # Find the File that belongs to this texture node
+    pic_uuid = texture_node['picture']
+    loop.call_soon_threadsafe(thumbnail_loading, texture_node, texture_node)
+    file_desc = await loop.run_in_executor(None, file_find, pic_uuid)
 
     if file_desc is None:
         log.warning('Unable to find file for texture node %s', pic_uuid)
@@ -548,10 +431,9 @@ async def download_file_by_uuid(file_uuid,
                                 target_directory: str,
                                 metadata_directory: str,
                                 *,
-                                map_type: str = None,
-                                file_loading: callable = None,
-                                file_loaded: callable = None,
-                                file_loaded_sync: callable = None,
+                                map_type: str=None,
+                                file_loading: callable,
+                                file_loaded: callable,
                                 future: asyncio.Future):
     if is_cancelled(future):
         log.debug('download_file_by_uuid(%r) cancelled.', file_uuid)
@@ -560,25 +442,21 @@ async def download_file_by_uuid(file_uuid,
     loop = asyncio.get_event_loop()
 
     # Find the File document.
-    file_desc = await pillar_call(pillarsdk.File.find, file_uuid, params={
+    api = pillar_api()
+    file_find = functools.partial(pillarsdk.File.find, params={
         'projection': {'link': 1, 'filename': 1},
-    })
+    }, api=api)
+    file_desc = await loop.run_in_executor(None, file_find, file_uuid)
 
     # Save the file document to disk
     metadata_file = os.path.join(metadata_directory, 'files', '%s.json' % file_uuid)
     save_as_json(file_desc, metadata_file)
 
-    root, ext = os.path.splitext(file_desc['filename'])
-    if map_type is None or root.endswith(map_type):
-        target_filename = '%s%s' % (root, ext)
-    else:
-        target_filename = '%s-%s%s' % (root, map_type, ext)
-
-    file_path = os.path.join(target_directory, sanitize_filename(target_filename))
+    file_path = os.path.join(target_directory,
+                             sanitize_filename('%s-%s' % (map_type, file_desc['filename'])))
     file_url = file_desc['link']
     # log.debug('Texture %r:\n%s', file_uuid, pprint.pformat(file_desc.to_dict()))
-    if file_loading is not None:
-        loop.call_soon_threadsafe(file_loading, file_path, file_desc)
+    loop.call_soon_threadsafe(file_loading, file_path, file_desc)
 
     # Cached headers are stored in the project space
     header_store = os.path.join(metadata_directory, 'files',
@@ -586,10 +464,7 @@ async def download_file_by_uuid(file_uuid,
 
     await download_to_file(file_url, file_path, header_store=header_store, future=future)
 
-    if file_loaded is not None:
-        loop.call_soon_threadsafe(file_loaded, file_path, file_desc)
-    if file_loaded_sync is not None:
-        await file_loaded_sync(file_path, file_desc)
+    loop.call_soon_threadsafe(file_loaded, file_path, file_desc)
 
 
 async def download_texture(texture_node,
@@ -612,146 +487,10 @@ async def download_texture(texture_node,
                                          future=future)
                    for file_info in texture_node['properties']['files'])
 
-    return await asyncio.gather(*downloaders, return_exceptions=True)
-
-
-async def upload_file(project_id: str, file_path: pathlib.Path, *,
-                      future: asyncio.Future) -> str:
-    """Uploads a file to the Blender Cloud, returning a file document ID."""
-
-    from .blender import PILLAR_SERVER_URL
-
-    loop = asyncio.get_event_loop()
-    url = urllib.parse.urljoin(PILLAR_SERVER_URL, '/storage/stream/%s' % project_id)
-
-    # Upload the file in a different thread.
-    def upload():
-        auth_token = blender_id_subclient()['token']
-
-        with file_path.open(mode='rb') as infile:
-            return uncached_session.post(url,
-                                         files={'file': infile},
-                                         auth=(auth_token, SUBCLIENT_ID))
-
-    # Check for cancellation even before we start our POST request
-    if is_cancelled(future):
-        log.debug('Uploading was cancelled before doing the POST')
-        raise asyncio.CancelledError('Uploading was cancelled')
-
-    log.debug('Performing POST %s', url)
-    response = await loop.run_in_executor(None, upload)
-    log.debug('Status %i from POST %s', response.status_code, url)
-    response.raise_for_status()
-
-    resp = response.json()
-    log.debug('Upload response: %s', resp)
-
-    try:
-        file_id = resp['file_id']
-    except KeyError:
-        log.error('No file ID in upload response: %s', resp)
-        raise PillarError('No file ID in upload response: %s' % resp)
-
-    log.info('Uploaded %s to file ID %s', file_path, file_id)
-    return file_id
+    return await asyncio.gather(*downloaders)
 
 
 def is_cancelled(future: asyncio.Future) -> bool:
     # assert future is not None  # for debugging purposes.
     cancelled = future is not None and future.cancelled()
     return cancelled
-
-
-class PillarOperatorMixin:
-    async def check_credentials(self, context, required_roles) -> bool:
-        """Checks credentials with Pillar, and if ok returns the user ID.
-
-        Returns None if the user cannot be found, or if the user is not a Cloud subscriber.
-        """
-
-        # self.report({'INFO'}, 'Checking Blender Cloud credentials')
-
-        try:
-            user_id = await check_pillar_credentials(required_roles)
-        except NotSubscribedToCloudError:
-            self._log_subscription_needed()
-            raise
-        except CredentialsNotSyncedError:
-            self.log.info('Credentials not synced, re-syncing automatically.')
-        else:
-            self.log.info('Credentials okay.')
-            return user_id
-
-        try:
-            user_id = await refresh_pillar_credentials(required_roles)
-        except NotSubscribedToCloudError:
-            self._log_subscription_needed()
-            raise
-        except UserNotLoggedInError:
-            self.log.error('User not logged in on Blender ID.')
-        else:
-            self.log.info('Credentials refreshed and ok.')
-            return user_id
-
-        return None
-
-    def _log_subscription_needed(self):
-        self.log.warning(
-            'Please subscribe to the blender cloud at https://cloud.blender.org/join')
-        self.report({'INFO'},
-                    'Please subscribe to the blender cloud at https://cloud.blender.org/join')
-
-
-async def find_or_create_node(where: dict,
-                              additional_create_props: dict = None,
-                              projection: dict = None,
-                              may_create: bool = True) -> (pillarsdk.Node, bool):
-    """Finds a node by the `filter_props`, creates it using the additional props.
-
-    :returns: tuple (node, created), where 'created' is a bool indicating whether
-              a new node was created, or an exising one is returned.
-    """
-
-    params = {
-        'where': where,
-    }
-    if projection:
-        params['projection'] = projection
-
-    found_node = await pillar_call(pillarsdk.Node.find_first, params, caching=False)
-
-    if found_node is not None:
-        return found_node, False
-
-    if not may_create:
-        return None, False
-
-    # Augment the node properties to form a complete node.
-    node_props = where.copy()
-    if additional_create_props:
-        node_props.update(additional_create_props)
-
-    log.debug('Creating new node %s', node_props)
-    created_node = pillarsdk.Node.new(node_props)
-    created_ok = await pillar_call(created_node.create)
-    if not created_ok:
-        log.error('Blender Cloud addon: unable to create node on the Cloud.')
-        raise PillarError('Unable to create node on the Cloud')
-
-    return created_node, True
-
-
-async def attach_file_to_group(file_path: pathlib.Path,
-                               home_project_id: str,
-                               group_node_id: str,
-                               user_id: str = None) -> pillarsdk.Node:
-    """Creates an Asset node and attaches a file document to it."""
-
-    node = await pillar_call(pillarsdk.Node.create_asset_from_file,
-                             home_project_id,
-                             group_node_id,
-                             'file',
-                             str(file_path),
-                             extra_where=user_id and {'user': user_id})
-
-    return node

blender_cloud/settings_sync.py

@@ -1,508 +0,0 @@
-"""Synchronises settings & startup file with the Cloud.
-Caching is disabled on many PillarSDK calls, as synchronisation can happen
-rapidly between multiple machines. This means that information can be outdated
-in seconds, rather than the minutes the cache system assumes.
-"""
-import functools
-import logging
-import pathlib
-import tempfile
-import shutil
-
-import bpy
-
-import asyncio
-
-import pillarsdk
-from pillarsdk import exceptions as sdk_exceptions
-from .pillar import pillar_call
-from . import async_loop, pillar, cache, blendfile, home_project
-
-SETTINGS_FILES_TO_UPLOAD = ['userpref.blend', 'startup.blend']
-
-# These are RNA keys inside the userpref.blend file, and their
-# Python properties names. These settings will not be synced.
-LOCAL_SETTINGS_RNA = [
-    (b'dpi', 'system.dpi'),
-    (b'virtual_pixel', 'system.virtual_pixel_mode'),
-    (b'compute_device_id', 'system.compute_device'),
-    (b'compute_device_type', 'system.compute_device_type'),
-    (b'fontdir', 'filepaths.font_directory'),
-    (b'textudir', 'filepaths.texture_directory'),
-    (b'renderdir', 'filepaths.render_output_directory'),
-    (b'pythondir', 'filepaths.script_directory'),
-    (b'sounddir', 'filepaths.sound_directory'),
-    (b'tempdir', 'filepaths.temporary_directory'),
-    (b'render_cachedir', 'filepaths.render_cache_directory'),
-    (b'i18ndir', 'filepaths.i18n_branches_directory'),
-    (b'image_editor', 'filepaths.image_editor'),
-    (b'anim_player', 'filepaths.animation_player'),
-]
-
-REQUIRES_ROLES_FOR_SYNC = set()  # no roles needed.
-SYNC_GROUP_NODE_NAME = 'Blender Sync'
-SYNC_GROUP_NODE_DESC = 'The [Blender Cloud Addon](https://cloud.blender.org/services' \
-                       '#blender-addon) will synchronize your Blender settings here.'
-log = logging.getLogger(__name__)
-
-
-def set_blender_sync_status(set_status: str):
-    def decorator(func):
-        @functools.wraps(func)
-        def wrapper(*args, **kwargs):
-            bss = bpy.context.window_manager.blender_sync_status
-            bss.status = set_status
-            try:
-                return func(*args, **kwargs)
-            finally:
-                bss.status = 'IDLE'
-
-        return wrapper
-
-    return decorator
-
-
-def async_set_blender_sync_status(set_status: str):
-    def decorator(func):
-        @functools.wraps(func)
-        async def wrapper(*args, **kwargs):
-            bss = bpy.context.window_manager.blender_sync_status
-            bss.status = set_status
-            try:
-                return await func(*args, **kwargs)
-            finally:
-                bss.status = 'IDLE'
-
-        return wrapper
-
-    return decorator
-
-
-async def find_sync_group_id(home_project_id: str,
-                             user_id: str,
-                             blender_version: str,
-                             *,
-                             may_create=True) -> str:
-    """Finds the group node in which to store sync assets.
-
-    If the group node doesn't exist and may_create=True, it creates it.
-    """
-
-    # Find the top-level sync group node. This should have been
-    # created by Pillar while creating the home project.
-    try:
-        sync_group, created = await pillar.find_or_create_node(
-            where={'project': home_project_id,
-                   'node_type': 'group',
-                   'parent': None,
-                   'name': SYNC_GROUP_NODE_NAME,
-                   'user': user_id},
-            projection={'_id': 1},
-            may_create=False)
-    except pillar.PillarError:
-        raise pillar.PillarError('Unable to find sync folder on the Cloud')
-
-    if not may_create and sync_group is None:
-        log.info("Sync folder doesn't exist, and not creating it either.")
-        return None, None
-
-    # Find/create the sub-group for the requested Blender version
-    try:
-        sub_sync_group, created = await pillar.find_or_create_node(
-            where={'project': home_project_id,
-                   'node_type': 'group',
-                   'parent': sync_group['_id'],
-                   'name': blender_version,
-                   'user': user_id},
-            additional_create_props={
-                'description': 'Sync folder for Blender %s' % blender_version,
-                'properties': {'status': 'published'},
-            },
-            projection={'_id': 1},
-            may_create=may_create)
-    except pillar.PillarError:
-        raise pillar.PillarError('Unable to create sync folder on the Cloud')
-
-    if not may_create and sub_sync_group is None:
-        log.info("Sync folder for Blender version %s doesn't exist, "
-                 "and not creating it either.", blender_version)
-        return sync_group['_id'], None
-
-    return sync_group['_id'], sub_sync_group['_id']
-
-
-@functools.lru_cache()
-async def available_blender_versions(home_project_id: str, user_id: str) -> list:
-    bss = bpy.context.window_manager.blender_sync_status
-
-    # Get the available Blender versions.
-    sync_group = await pillar_call(
-        pillarsdk.Node.find_first,
-        params={
-            'where': {'project': home_project_id,
-                      'node_type': 'group',
-                      'parent': None,
-                      'name': SYNC_GROUP_NODE_NAME,
-                      'user': user_id},
-            'projection': {'_id': 1},
-        },
-        caching=False)
-
-    if sync_group is None:
-        bss.report({'ERROR'}, 'No synced Blender settings in your Blender Cloud')
-        log.debug('-- unable to find sync group for home_project_id=%r and user_id=%r',
-                  home_project_id, user_id)
-        return []
-
-    sync_nodes = await pillar_call(
-        pillarsdk.Node.all,
-        params={
-            'where': {'project': home_project_id,
-                      'node_type': 'group',
-                      'parent': sync_group['_id'],
-                      'user': user_id},
-            'projection': {'_id': 1, 'name': 1},
-            'sort': '-name',
-        },
-        caching=False)
-
-    if not sync_nodes or not sync_nodes._items:
-        bss.report({'ERROR'}, 'No synced Blender settings in your Blender Cloud.')
-        return []
-
-    versions = [node.name for node in sync_nodes._items]
-    log.debug('Versions: %s', versions)
-
-    return versions
-
-
-# noinspection PyAttributeOutsideInit
-class PILLAR_OT_sync(pillar.PillarOperatorMixin,
-                     async_loop.AsyncModalOperatorMixin,
-                     bpy.types.Operator):
-    bl_idname = 'pillar.sync'
-    bl_label = 'Synchronise with Blender Cloud'
-    bl_description = 'Synchronises Blender settings with Blender Cloud'
-
-    log = logging.getLogger('bpy.ops.%s' % bl_idname)
-    home_project_id = None
-    sync_group_id = None  # top-level sync group node ID
-    sync_group_versioned_id = None  # sync group node ID for the given Blender version.
-
-    action = bpy.props.EnumProperty(
-        items=[
-            ('PUSH', 'Push', 'Push settings to the Blender Cloud'),
-            ('PULL', 'Pull', 'Pull settings from the Blender Cloud'),
-            ('REFRESH', 'Refresh', 'Refresh available versions'),
-            ('SELECT', 'Select', 'Select version to sync'),
-        ],
-        name='action')
-
-    CURRENT_BLENDER_VERSION = '%i.%i' % bpy.app.version[:2]
-    blender_version = bpy.props.StringProperty(name='blender_version',
-                                               description='Blender version to sync for',
-                                               default=CURRENT_BLENDER_VERSION)
-
-    def bss_report(self, level, message):
-        bss = bpy.context.window_manager.blender_sync_status
-        bss.report(level, message)
-
-    def invoke(self, context, event):
-        if self.action == 'SELECT':
-            # Synchronous action
-            return self.action_select(context)
-
-        if self.action in {'PUSH', 'PULL'} and not self.blender_version:
-            self.bss_report({'ERROR'}, 'No Blender version to sync for was given.')
-            return {'CANCELLED'}
-
-        async_loop.AsyncModalOperatorMixin.invoke(self, context, event)
-
-        self.log.info('Starting synchronisation')
-        self._new_async_task(self.async_execute(context))
-        return {'RUNNING_MODAL'}
-
-    def action_select(self, context):
-        """Allows selection of the Blender version to use.
-
-        This is a synchronous action, as it requires a dialog box.
-        """
-
-        self.log.info('Performing action SELECT')
-
-        # Do a refresh before we can show the dropdown.
-        fut = asyncio.ensure_future(self.async_execute(context, action_override='REFRESH'))
-        loop = asyncio.get_event_loop()
-        loop.run_until_complete(fut)
-
-        self._state = 'SELECTING'
-        return context.window_manager.invoke_props_dialog(self)
-
-    def draw(self, context):
-        bss = bpy.context.window_manager.blender_sync_status
-        self.layout.prop(bss, 'version', text='Blender version')
-
-    def execute(self, context):
-        if self.action != 'SELECT':
-            log.debug('Ignoring execute() for action %r', self.action)
-            return {'FINISHED'}
-
-        log.debug('Performing execute() for action %r', self.action)
-        # Perform the sync when the user closes the dialog box.
-        bss = bpy.context.window_manager.blender_sync_status
-        bpy.ops.pillar.sync('INVOKE_DEFAULT',
-                            action='PULL',
-                            blender_version=bss.version)
-
-        return {'FINISHED'}
-
-    @async_set_blender_sync_status('SYNCING')
-    async def async_execute(self, context, *, action_override=None):
-        """Entry point of the asynchronous operator."""
-
-        action = action_override or self.action
-        self.bss_report({'INFO'}, 'Communicating with Blender Cloud')
-        self.log.info('Performing action %s', action)
-
-        try:
-            # Refresh credentials
-            try:
-                self.user_id = await self.check_credentials(context, REQUIRES_ROLES_FOR_SYNC)
-                log.debug('Found user ID: %s', self.user_id)
-            except pillar.NotSubscribedToCloudError:
-                self.log.exception('User not subscribed to cloud.')
-                self.bss_report({'SUBSCRIBE'}, 'Please subscribe to the Blender Cloud.')
-                self._state = 'QUIT'
-                return
-            except pillar.CredentialsNotSyncedError:
-                self.log.exception('Error checking/refreshing credentials.')
-                self.bss_report({'ERROR'}, 'Please log in on Blender ID first.')
-                self._state = 'QUIT'
-                return
-
-            # Find the home project.
-            try:
-                self.home_project_id = await home_project.get_home_project_id()
-            except sdk_exceptions.ForbiddenAccess:
-                self.log.exception('Forbidden access to home project.')
-                self.bss_report({'ERROR'}, 'Did not get access to home project.')
-                self._state = 'QUIT'
-                return
-            except sdk_exceptions.ResourceNotFound:
-                self.bss_report({'ERROR'}, 'Home project not found.')
-                self._state = 'QUIT'
-                return
-
-            # Only create the folder structure if we're pushing.
-            may_create = self.action == 'PUSH'
-            try:
-                gid, subgid = await find_sync_group_id(self.home_project_id,
-                                                       self.user_id,
-                                                       self.blender_version,
-                                                       may_create=may_create)
-                self.sync_group_id = gid
-                self.sync_group_versioned_id = subgid
-                self.log.debug('Found top-level group node ID: %s', self.sync_group_id)
-                self.log.debug('Found group node ID for %s: %s',
-                               self.blender_version, self.sync_group_versioned_id)
-            except sdk_exceptions.ForbiddenAccess:
-                self.log.exception('Unable to find Group ID')
-                self.bss_report({'ERROR'}, 'Unable to find sync folder.')
-                self._state = 'QUIT'
-                return
-
-            # Perform the requested action.
-            action_method = {
-                'PUSH': self.action_push,
-                'PULL': self.action_pull,
-                'REFRESH': self.action_refresh,
-            }[action]
-            await action_method(context)
-        except Exception as ex:
-            self.log.exception('Unexpected exception caught.')
-            self.bss_report({'ERROR'}, 'Unexpected error: %s' % ex)
-
-        self._state = 'QUIT'
-
-    async def action_push(self, context):
-        """Sends files to the Pillar server."""
-
-        self.log.info('Saved user preferences to disk before pushing to cloud.')
-        bpy.ops.wm.save_userpref()
-
-        config_dir = pathlib.Path(bpy.utils.user_resource('CONFIG'))
-
-        for fname in SETTINGS_FILES_TO_UPLOAD:
-            path = config_dir / fname
-            if not path.exists():
-                self.log.debug('Skipping non-existing %s', path)
-                continue
-
-            if self.signalling_future.cancelled():
-                self.bss_report({'WARNING'}, 'Upload aborted.')
-                return
-
-            self.bss_report({'INFO'}, 'Uploading %s' % fname)
-            try:
-                await pillar.attach_file_to_group(path,
-                                                  self.home_project_id,
-                                                  self.sync_group_versioned_id,
-                                                  self.user_id)
-            except sdk_exceptions.RequestEntityTooLarge as ex:
-                self.log.error('File too big to upload: %s' % ex)
-                self.log.error('To upload larger files, please subscribe to Blender Cloud.')
-                self.bss_report({'SUBSCRIBE'}, 'File %s too big to upload. '
-                                               'Subscribe for unlimited space.' % fname)
-                self._state = 'QUIT'
-                return
-
-        await self.action_refresh(context)
-
-        # After pushing, change the 'pull' version to the current version of Blender.
-        # Or to the latest version, if by some mistake somewhere the current push
-        # isn't available after all.
-        bss = bpy.context.window_manager.blender_sync_status
-        if self.CURRENT_BLENDER_VERSION in bss.available_blender_versions:
-            bss.version = self.CURRENT_BLENDER_VERSION
-        else:
-            bss.version = max(bss.available_blender_versions)
-
-        self.bss_report({'INFO'}, 'Settings pushed to Blender Cloud.')
-
-    async def action_pull(self, context):
-        """Loads files from the Pillar server."""
-
-        # If the sync group node doesn't exist, offer a list of groups that do.
-        if self.sync_group_id is None:
-            self.bss_report({'ERROR'},
-                            'There are no synced Blender settings in your Blender Cloud.')
-            return
-
-        if self.sync_group_versioned_id is None:
-            self.bss_report({'ERROR'}, 'Therre are no synced Blender settings for version %s' %
-                            self.blender_version)
-            return
-
-        self.bss_report({'INFO'}, 'Pulling settings from Blender Cloud')
-        with tempfile.TemporaryDirectory(prefix='bcloud-sync') as tempdir:
-            for fname in SETTINGS_FILES_TO_UPLOAD:
-                await self.download_settings_file(fname, tempdir)
-
-        self.bss_report({'WARNING'}, 'Settings pulled from Cloud, restart Blender to load them.')
-
-    async def action_refresh(self, context):
-        self.bss_report({'INFO'}, 'Refreshing available Blender versions.')
-
-        # Clear the LRU cache of available_blender_versions so that we can
-        # obtain new versions (if someone synced from somewhere else, for example)
-        available_blender_versions.cache_clear()
-
-        versions = await available_blender_versions(self.home_project_id, self.user_id)
-        bss = bpy.context.window_manager.blender_sync_status
-        bss.available_blender_versions = versions
-
-        if versions:
-            # There are versions to sync, so we can remove the status message.
-            # However, if there aren't any, the status message shows why, and
-            # shouldn't be erased.
-            self.bss_report({'INFO'}, '')
-
-    async def download_settings_file(self, fname: str, temp_dir: str):
-        config_dir = pathlib.Path(bpy.utils.user_resource('CONFIG'))
-        meta_path = cache.cache_directory('home-project', 'blender-sync')
-
-        self.bss_report({'INFO'}, 'Downloading %s from Cloud' % fname)
-
-        # Get the asset node
-        node_props = {'project': self.home_project_id,
-                      'node_type': 'asset',
-                      'parent': self.sync_group_versioned_id,
-                      'name': fname}
-        node = await pillar_call(pillarsdk.Node.find_first, {
-            'where': node_props,
-            'projection': {'_id': 1, 'properties.file': 1}
-        }, caching=False)
-        if node is None:
-            self.bss_report({'INFO'}, 'Unable to find %s on Blender Cloud' % fname)
-            self.log.info('Unable to find node on Blender Cloud for %s', fname)
-            return
-
-        async def file_downloaded(file_path: str, file_desc: pillarsdk.File):
-            # Allow the caller to adjust the file before we move it into place.
-
-            if fname.lower() == 'userpref.blend':
-                await self.update_userpref_blend(file_path)
-
-            # Move the file next to the final location; as it may be on a
-            # different filesystem than the temporary directory, this can
-            # fail, and we don't want to destroy the existing file.
-            local_temp = config_dir / (fname + '~')
-            local_final = config_dir / fname
-
-            # Make a backup copy of the file as it was before pulling.
-            if local_final.exists():
-                local_bak = config_dir / (fname + '-pre-bcloud-pull')
-                self.move_file(local_final, local_bak)
-
-            self.move_file(file_path, local_temp)
-            self.move_file(local_temp, local_final)
-
-        file_id = node.properties.file
-        await pillar.download_file_by_uuid(file_id,
-                                           temp_dir,
-                                           str(meta_path),
-                                           file_loaded_sync=file_downloaded,
-                                           future=self.signalling_future)
-
-    def move_file(self, src, dst):
-        self.log.info('Moving %s to %s', src, dst)
-        shutil.move(str(src), str(dst))
-
-    async def update_userpref_blend(self, file_path: str):
-        self.log.info('Overriding machine-local settings in %s', file_path)
-
-        # Remember some settings that should not be overwritten from the Cloud.
-        up = bpy.context.user_preferences
-        remembered = {}
-        for rna_key, python_key in LOCAL_SETTINGS_RNA:
-            assert '.' in python_key, 'Sorry, this code assumes there is a dot in the Python key'
-
-            try:
-                value = up.path_resolve(python_key)
-            except ValueError:
-                # Setting doesn't exist. This can happen, for example Cycles
-                # settings on a build that doesn't have Cycles enabled.
-                continue
-
-            # Map enums from strings (in Python) to ints (in DNA).
-            dot_index = python_key.rindex('.')
-            parent_key, prop_key = python_key[:dot_index], python_key[dot_index + 1:]
-            parent = up.path_resolve(parent_key)
-            prop = parent.bl_rna.properties[prop_key]
-            if prop.type == 'ENUM':
-                log.debug('Rewriting %s from %r to %r',
-                          python_key, value, prop.enum_items[value].value)
-                value = prop.enum_items[value].value
-            else:
-                log.debug('Keeping value of %s: %r', python_key, value)
-
-            remembered[rna_key] = value
-        log.debug('Overriding values: %s', remembered)
-
-        # Rewrite the userprefs.blend file to override the options.
-        with blendfile.open_blend(file_path, 'rb+') as blend:
-            prefs = next(block for block in blend.blocks
-                         if block.code == b'USER')
-
-            for key, value in remembered.items():
-                self.log.debug('prefs[%r] = %r' % (key, prefs[key]))
-                self.log.debug('  -> setting prefs[%r] = %r' % (key, value))
-                prefs[key] = value
-
-
-def register():
-    bpy.utils.register_class(PILLAR_OT_sync)
-
-
-def unregister():
-    bpy.utils.unregister_class(PILLAR_OT_sync)

blender_cloud/wheels/__init__.py

@@ -18,9 +18,8 @@ def load_wheel(module_name, fname_prefix):
 
     try:
         module = __import__(module_name)
-    except ImportError as ex:
-        log.debug('Unable to import %s directly, will try wheel: %s',
-                  module_name, ex)
+    except ImportError:
+        pass
     else:
         log.debug('Was able to load %s from %s, no need to load wheel %s',
                   module_name, module.__file__, fname_prefix)
@@ -31,9 +30,7 @@ def load_wheel(module_name, fname_prefix):
     if not wheels:
         raise RuntimeError('Unable to find wheel at %r' % path_pattern)
 
-    # If there are multiple wheels that match, load the latest one.
-    wheels.sort()
-    sys.path.append(wheels[-1])
+    sys.path.append(wheels[0])
     module = __import__(module_name)
     log.debug('Loaded %s from %s', module_name, module.__file__)
 
@@ -41,4 +38,4 @@ def load_wheel(module_name, fname_prefix):
 def load_wheels():
     load_wheel('lockfile', 'lockfile')
     load_wheel('cachecontrol', 'CacheControl')
-    load_wheel('pillarsdk', 'pillarsdk')
+    load_wheel('pillarsdk', 'pillar_sdk')

clear_wheels.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-git clean -n -d -X blender_cloud/wheels/
-
-echo "Press [ENTER] to actually delete those files."
-read dummy
-
-git clean -f -d -X blender_cloud/wheels/

requirements.txt

@@ -1,15 +1,2 @@
-# Primary requirements:
--e git+https://github.com/sybrenstuvel/cachecontrol.git@sybren-filecache-delete-crash-fix#egg=CacheControl
+CacheControl==0.11.6
 lockfile==0.12.2
-pillarsdk==1.4.0
-wheel==0.29.0
-
-# Secondary requirements:
-cffi==1.6.0
-cryptography==1.3.1
-idna==2.1
-pyasn1==0.1.9
-pycparser==2.14
-pyOpenSSL==16.0.0
-requests==2.10.0
-six==1.10.0

setup.py

@@ -1,11 +1,10 @@
-#!/usr/bin/env python3
-
-import glob
+#!/usr/bin/env python
 import sys
 import shutil
 import subprocess
 import re
 import pathlib
+from glob import glob
 
 from distutils import log
 from distutils.core import Command
@@ -15,18 +14,8 @@ from distutils.command.install_egg_info import install_egg_info
 from setuptools import setup, find_packages
 
 requirement_re = re.compile('[><=]+')
-sys.dont_write_bytecode = True
 
 
-def set_default_path(var, default):
-    """convert CLI-arguments (string) to Paths"""
-
-    if var is None:
-        return default
-    return pathlib.Path(var)
-
-
-# noinspection PyAttributeOutsideInit
 class BuildWheels(Command):
     """Builds or downloads the dependencies as wheel files."""
 
@@ -34,22 +23,31 @@ class BuildWheels(Command):
     user_options = [
         ('wheels-path=', None, "wheel file installation path"),
         ('deps-path=', None, "path in which dependencies are built"),
+        ('pillar-sdk-path=', None, "subdir of deps-path containing the Pillar Python SDK"),
         ('cachecontrol-path=', None, "subdir of deps-path containing CacheControl"),
     ]
 
     def initialize_options(self):
         self.wheels_path = None  # path that will contain the installed wheels.
         self.deps_path = None  # path in which dependencies are built.
+        self.pillar_sdk_path = None  # subdir of deps_path containing the Pillar Python SDK
         self.cachecontrol_path = None  # subdir of deps_path containing CacheControl
 
     def finalize_options(self):
         self.my_path = pathlib.Path(__file__).resolve().parent
         package_path = self.my_path / self.distribution.get_name()
 
-        self.wheels_path = set_default_path(self.wheels_path, package_path / 'wheels')
-        self.deps_path = set_default_path(self.deps_path, self.my_path / 'build/deps')
-        self.cachecontrol_path = set_default_path(self.cachecontrol_path,
-                                                  self.deps_path / 'cachecontrol')
+        def set_default(var, default):
+            if var is None:
+                return default
+            return pathlib.Path(var)  # convert CLI-arguments (string) to Paths.
+
+        self.wheels_path = set_default(self.wheels_path, package_path / 'wheels')
+        self.deps_path = set_default(self.deps_path, self.my_path / 'build/deps')
+        self.pillar_sdk_path = set_default(self.pillar_sdk_path,
+                                           self.deps_path / 'pillar-python-sdk')
+        self.cachecontrol_path = set_default(self.cachecontrol_path,
+                                             self.deps_path / 'cachecontrol')
 
     def run(self):
         log.info('Storing wheels in %s', self.wheels_path)
@@ -75,23 +73,23 @@ class BuildWheels(Command):
         # Download lockfile, as there is a suitable wheel on pypi.
         if not list(self.wheels_path.glob('lockfile*.whl')):
             log.info('Downloading lockfile wheel')
-            self.download_wheel(requirements['lockfile'])
+            subprocess.check_call([
+                'pip', 'download', '--dest', str(self.wheels_path), requirements['lockfile'][0]
+            ])
 
-        # Download Pillar Python SDK from pypi.
-        if not list(self.wheels_path.glob('pillarsdk*.whl')):
-            log.info('Downloading Pillar Python SDK wheel')
-            self.download_wheel(requirements['pillarsdk'])
+        # Build Pillar Python SDK.
+        if not list(self.wheels_path.glob('pillar-python-sdk*.whl')):
+            log.info('Building Pillar Python SDK in %s', self.pillar_sdk_path)
+            self.git_clone(self.pillar_sdk_path,
+                           'https://github.com/armadillica/pillar-python-sdk.git')
+            self.build_copy_wheel(self.pillar_sdk_path)
 
         # Build CacheControl.
         if not list(self.wheels_path.glob('CacheControl*.whl')):
             log.info('Building CacheControl in %s', self.cachecontrol_path)
-            # self.git_clone(self.cachecontrol_path,
-            #                'https://github.com/ionrock/cachecontrol.git',
-            #                'v%s' % requirements['CacheControl'][1])
-            # FIXME: we need my clone until pull request #125 has been merged & released
             self.git_clone(self.cachecontrol_path,
-                           'https://github.com/sybrenstuvel/cachecontrol.git',
-                           'sybren-filecache-delete-crash-fix')
+                           'https://github.com/ionrock/cachecontrol.git',
+                           'v%s' % requirements['CacheControl'][1])
             self.build_copy_wheel(self.cachecontrol_path)
 
         # Ensure that the wheels are added to the data files.
@@ -99,16 +97,6 @@ class BuildWheels(Command):
             ('blender_cloud/wheels', (str(p) for p in self.wheels_path.glob('*.whl')))
         )
 
-    def download_wheel(self, requirement):
-        """Downloads a wheel from PyPI and saves it in self.wheels_path."""
-
-        subprocess.check_call([
-            'pip', 'download',
-            '--no-deps',
-            '--dest', str(self.wheels_path),
-            requirement[0]
-        ])
-
     def git_clone(self, workdir: pathlib.Path, git_url: str, checkout: str = None):
         if workdir.exists():
             # Directory exists, expect it to be set up correctly.
@@ -136,8 +124,6 @@ class BuildWheels(Command):
         log.info('copying %s to %s', wheel, self.wheels_path)
         shutil.copy(str(wheel), str(self.wheels_path))
 
-
-# noinspection PyAttributeOutsideInit
 class BlenderAddonBdist(bdist):
     """Ensures that 'python setup.py bdist' creates a zip file."""
 
@@ -151,7 +137,6 @@ class BlenderAddonBdist(bdist):
         super().run()
 
 
-# noinspection PyAttributeOutsideInit
 class BlenderAddonInstall(install):
     """Ensures the module is placed at the root of the zip file."""
 
@@ -179,12 +164,11 @@ setup(
               'wheels': BuildWheels},
     name='blender_cloud',
     description='The Blender Cloud addon allows browsing the Blender Cloud from Blender.',
-    version='1.3.1',
+    version='1.0.0',
     author='Sybren A. Stüvel',
     author_email='sybren@stuvel.eu',
     packages=find_packages('.'),
-    data_files=[('blender_cloud', ['README.md']),
-                ('blender_cloud/icons', glob.glob('blender_cloud/icons/*'))],
+    data_files=[('blender_cloud', ['README.md'])],
     scripts=[],
     url='https://developer.blender.org/diffusion/BCA/',
     license='GNU General Public License v2 or later (GPLv2+)',