archive/blender-cloud-addon
Archived
1
3
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Let check_credentials return the user ID

Browse Source
This commit is contained in:
Sybren A. Stüvel 2016-06-17 16:20:49 +02:00
parent 36d62082f3
commit 884d68ebe8
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
blender_cloud/settings_sync.py
View File

@ -59,7 +59,7 @@ class PILLAR_OT_sync(async_loop.AsyncModalOperatorMixin, bpy.types.Operator):
async_loop.AsyncModalOperatorMixin.invoke(self, context, event) async_loop.AsyncModalOperatorMixin.invoke(self, context, event)
log.info('Starting synchronisation') log.info('Starting synchronisation')
self._new_async_task(self.check_credentials(context)) self._new_async_task(self.async_execute(context))
return {'RUNNING_MODAL'} return {'RUNNING_MODAL'}
def modal(self, context, event): def modal(self, context, event):
@ -70,36 +70,36 @@ class PILLAR_OT_sync(async_loop.AsyncModalOperatorMixin, bpy.types.Operator):
return {'PASS_THROUGH'} return {'PASS_THROUGH'}
async def check_credentials(self, context): async def check_credentials(self, context) -> bool:
"""Checks credentials with Pillar, and if ok async-executes the operator.""" """Checks credentials with Pillar, and if ok async-executes the operator."""
self.report({'INFO'}, 'Checking Blender Cloud credentials') self.report({'INFO'}, 'Checking Blender Cloud credentials')
try: try:
await pillar.check_pillar_credentials() user_id = await pillar.check_pillar_credentials()
except pillar.NotSubscribedToCloudError: except pillar.NotSubscribedToCloudError:
self.log.warning('Please subscribe to the blender cloud at https://cloud.blender.org/join') 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') self.report({'INFO'}, 'Please subscribe to the blender cloud at https://cloud.blender.org/join')
return return None
except pillar.CredentialsNotSyncedError: except pillar.CredentialsNotSyncedError:
self.log.info('Credentials not synced, re-syncing automatically.') self.log.info('Credentials not synced, re-syncing automatically.')
else: else:
self.log.info('Credentials okay.') self.log.info('Credentials okay.')
await self.async_execute(context) return user_id
return
try: try:
await pillar.refresh_pillar_credentials() user_id = await pillar.refresh_pillar_credentials()
except pillar.NotSubscribedToCloudError: except pillar.NotSubscribedToCloudError:
self.log.warning('Please subscribe to the blender cloud at https://cloud.blender.org/join') 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') self.report({'INFO'}, 'Please subscribe to the blender cloud at https://cloud.blender.org/join')
return return None
except pillar.UserNotLoggedInError: except pillar.UserNotLoggedInError:
self.log.error('User not logged in on Blender ID.') self.log.error('User not logged in on Blender ID.')
else: else:
self.log.info('Credentials refreshed and ok.') self.log.info('Credentials refreshed and ok.')
await self.async_execute(context) return user_id
return
return None
async def async_execute(self, context): async def async_execute(self, context):
"""Entry point of the asynchronous operator.""" """Entry point of the asynchronous operator."""
@ -107,7 +107,7 @@ class PILLAR_OT_sync(async_loop.AsyncModalOperatorMixin, bpy.types.Operator):
self.report({'INFO'}, 'Synchronizing settings %s with Blender Cloud' % self.action) self.report({'INFO'}, 'Synchronizing settings %s with Blender Cloud' % self.action)
try: try:
self.user_id = await pillar.refresh_pillar_credentials() self.user_id = await self.check_credentials(context)
try: try:
self.home_project_id = await get_home_project_id() self.home_project_id = await get_home_project_id()
except sdk_exceptions.ForbiddenAccess: except sdk_exceptions.ForbiddenAccess: