diff options
author | Vilem Duha <vilem.duha@gmail.com> | 2021-11-05 10:40:56 +0300 |
---|---|---|
committer | Vilem Duha <vilem.duha@gmail.com> | 2021-11-08 13:58:55 +0300 |
commit | 2259a24adb662c35ce0a9a3ee64e7e17c4a39d7c (patch) | |
tree | aa34c5a8abcf3666e399ca82ce22cbfe166e758d /blenderkit/upload.py | |
parent | 64fcec250d2d9450ac64d8314af7092a6922a28b (diff) |
BlenderKit: new asset bar fixes and improvements
Reports are back and split in reports.py
Quality is drawn in tooltip
comments and notification improvements and fixes
Tips were updated
(cherry picked from commit 3222ff126c2193d7f9c8f0279d6459acd955f4c2)
Diffstat (limited to 'blenderkit/upload.py')
-rw-r--r-- | blenderkit/upload.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/blenderkit/upload.py b/blenderkit/upload.py index 7c67d55f..dfca4d94 100644 --- a/blenderkit/upload.py +++ b/blenderkit/upload.py @@ -18,7 +18,7 @@ from blenderkit import asset_inspector, paths, utils, bg_blender, autothumb, version_checker, search, ui_panels, ui, \ - overrides, colors, rerequests, categories, upload_bg, tasks_queue, image_utils, asset_bar_op + overrides, colors, rerequests, categories, upload_bg, tasks_queue, image_utils, asset_bar_op, reports import tempfile, os, subprocess, json, re @@ -715,7 +715,7 @@ class FastMetadata(bpy.types.Operator): thread = threading.Thread(target=patch_individual_metadata, args=(self.asset_id, mdict, user_preferences.api_key)) thread.start() - tasks_queue.add_task((ui.add_report, (f'Uploading metadata for {self.name}. ' + tasks_queue.add_task((reports.add_report, (f'Uploading metadata for {self.name}. ' f'Refresh search results to see that changes applied correctly.', 8,))) return {'FINISHED'} @@ -871,7 +871,7 @@ class Uploader(threading.Thread): message = str(message).replace("'", "") # this adds a UI report but also writes above the upload panel fields. - tasks_queue.add_task((ui.add_report, (message,))) + tasks_queue.add_task((reports.add_report, (message,))) estring = f"{self.export_data['eval_path_state']} = '{message}'" tasks_queue.add_task((exec, (estring,))) @@ -895,14 +895,14 @@ class Uploader(threading.Thread): # self.upload_data['license'] = 'ovejajojo' json_metadata = self.upload_data # json.dumps(self.upload_data, ensure_ascii=False).encode('utf8') - # tasks_queue.add_task((ui.add_report, ('Posting metadata',))) + # tasks_queue.add_task((reports.add_report, ('Posting metadata',))) self.send_message('Posting metadata') if self.export_data['assetBaseId'] == '': try: r = rerequests.post(url, json=json_metadata, headers=headers, verify=True, immediate=True) # files = files, - # tasks_queue.add_task((ui.add_report, ('uploaded metadata',))) + # tasks_queue.add_task((reports.add_report, ('uploaded metadata',))) utils.p(r.text) self.send_message('uploaded metadata') @@ -920,7 +920,7 @@ class Uploader(threading.Thread): immediate=True) # files = files, self.send_message('uploaded metadata') - # tasks_queue.add_task((ui.add_report, ('uploaded metadata',))) + # tasks_queue.add_task((reports.add_report, ('uploaded metadata',))) # parse the request # print('uploaded metadata') print(r.text) @@ -938,10 +938,10 @@ class Uploader(threading.Thread): return {'FINISHED'} try: rj = r.json() - utils.pprint(rj) + # utils.pprint(rj) # if r.status_code not in (200, 201): # if r.status_code == 401: - # ###ui.add_report(r.detail, 5, colors.RED) + # ###reports.add_report(r.detail, 5, colors.RED) # return {'CANCELLED'} # if props.asset_base_id == '': # props.asset_base_id = rj['assetBaseId'] |