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

Faster cancelling of thumbnail downloads.

Browse Source 
I forgot to pass the 'future' object to the download_texture_thumbnail
function, and as such it wasn't notified of cancellations.
This commit is contained in:
Sybren A. Stüvel 2016-03-22 11:30:00 +01:00
parent c679809c18
commit db10201cd3
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
blender_cloud/pillar.py
View File

@ -185,6 +185,9 @@ async def download_to_file(url, filename, *,
except KeyError: except KeyError:
pass pass
if is_cancelled(future):
log.debug('Downloading was cancelled before doing the GET.')
raise asyncio.CancelledError('Downloading was cancelled')
return uncached_session.get(url, headers=headers, stream=True, verify=True) return uncached_session.get(url, headers=headers, stream=True, verify=True)
# Download the file in a different thread. # Download the file in a different thread.
@ -302,7 +305,8 @@ async def fetch_texture_thumbs(parent_node_uuid: str, desired_size: str,
coros = (download_texture_thumbnail(texture_node, desired_size, coros = (download_texture_thumbnail(texture_node, desired_size,
thumbnail_directory, thumbnail_directory,
thumbnail_loading=thumbnail_loading, thumbnail_loading=thumbnail_loading,
thumbnail_loaded=thumbnail_loaded) thumbnail_loaded=thumbnail_loaded,
future=future)
for texture_node in chunk) for texture_node in chunk)
# raises any exception from failed handle_texture_node() calls. # raises any exception from failed handle_texture_node() calls.