Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender-addons.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVilem Duha <vilem.duha@gmail.com>2019-04-20 08:53:01 +0300
committerVilem Duha <vilem.duha@gmail.com>2019-04-21 22:20:16 +0300
commit39b148fed3097c4bac7b77e8c7e0b6b2c1247468 (patch)
tree497d9095d6c5e066888f811078e5b5b0cd5ccb96 /blenderkit/download.py
parentde3a1c0fc9af681d26a82a86856b0f4254a7e573 (diff)
BlenderKit: open free assets for non-registered users.
Diffstat (limited to 'blenderkit/download.py')
-rw-r--r--blenderkit/download.py18
1 files changed, 7 insertions, 11 deletions
diff --git a/blenderkit/download.py b/blenderkit/download.py
index 3f340981..65dc631b 100644
--- a/blenderkit/download.py
+++ b/blenderkit/download.py
@@ -29,6 +29,7 @@ if "bpy" in locals():
imp.reload(paths)
imp.reload(append_link)
+ imp.reload(utils)
else:
from blenderkit import paths, append_link, utils
@@ -171,7 +172,7 @@ def report_usages():
user_preferences = bpy.context.preferences.addons['blenderkit'].preferences
api_key = user_preferences.api_key
sid = get_scene_id()
- headers = {"accept": "application/json", "Authorization": "Bearer %s" % api_key}
+ headers = utils.get_headers(api_key)
url = paths.get_bkit_url() + paths.BLENDERKIT_REPORT_URL
assets = {}
@@ -526,8 +527,7 @@ def main_thread(asset_data, tcom, scene_id, api_key):
with open(file_name, "wb") as f:
print("Downloading %s" % file_name)
- headers = {"accept": "application/json",
- "Authorization": "Bearer %s" % api_key}
+ headers = utils.get_headers(api_key)
response = requests.get(asset_data['url'], stream=True)
total_length = response.headers.get('Content-Length')
@@ -560,10 +560,7 @@ def download(asset_data, **kwargs):
user_preferences = bpy.context.preferences.addons['blenderkit'].preferences
api_key = user_preferences.api_key
scene_id = get_scene_id()
- if api_key == '':
- props = utils.get_search_props()
- props.report = 'Register online to use the free library.'
- return
+
tcom = ThreadCom()
tcom.passargs = kwargs
@@ -680,10 +677,9 @@ def fprint(text):
def get_download_url(asset_data, scene_id, api_key, tcom=None):
''''retrieves the download url. The server checks if user can download the item.'''
mt = time.time()
- headers = {
- "accept": "application/json",
- "Authorization": "Bearer %s" % api_key,
- }
+
+ headers = utils.get_headers(api_key)
+
data = {
'scene_uuid': scene_id
}