[Bf-extensions-cvs] [55d03ce5] master: BlenderKit: notifications - mark all read and go to target
Vilem Duha
noreply at git.blender.org
Mon Oct 25 11:21:53 CEST 2021
Commit: 55d03ce52af61877be20db4d12547d9518ac886a
Author: Vilem Duha
Date: Mon Oct 25 11:01:17 2021 +0200
Branches: master
https://developer.blender.org/rBA55d03ce52af61877be20db4d12547d9518ac886a
BlenderKit: notifications - mark all read and go to target
===================================================================
M blenderkit/comments_utils.py
M blenderkit/search.py
M blenderkit/ui_panels.py
===================================================================
diff --git a/blenderkit/comments_utils.py b/blenderkit/comments_utils.py
index 23a17405..adca81ed 100644
--- a/blenderkit/comments_utils.py
+++ b/blenderkit/comments_utils.py
@@ -174,6 +174,10 @@ def check_notifications_read():
bpy.context.window_manager['bkit notifications'] = None
return True
+def get_notifications_thread(api_key, all_count = 1000):
+ thread = threading.Thread(target=get_notifications, args=([api_key, all_count]), daemon=True)
+ thread.start()
+
def get_notifications(api_key, all_count = 1000):
'''
Retrieve notifications from BlenderKit server. Can be run from a thread.
@@ -209,6 +213,9 @@ def get_notifications(api_key, all_count = 1000):
# store notifications - send them to task queue
tasks_queue.add_task((store_notifications_local, ([rj])))
+def mark_notification_read_thread(api_key, notification_id):
+ thread = threading.Thread(target=mark_notification_read, args=([api_key, notification_id]), daemon=True)
+ thread.start()
def mark_notification_read(api_key, notification_id):
'''
@@ -221,6 +228,7 @@ def mark_notification_read(api_key, notification_id):
r = rerequests.get(url, params=params, verify=True, headers=headers)
if r is None:
return
+ # print(r.text)
# if r.status_code == 200:
# rj = r.json()
# # store notifications - send them to task queue
diff --git a/blenderkit/search.py b/blenderkit/search.py
index fc716fdc..9c19b25b 100644
--- a/blenderkit/search.py
+++ b/blenderkit/search.py
@@ -109,7 +109,7 @@ def refresh_notifications_timer():
preferences = bpy.context.preferences.addons['blenderkit'].preferences
fetch_server_data()
all_notifications_count = comments_utils.count_all_notifications()
- comments_utils.get_notifications(preferences.api_key, all_count = all_notifications_count)
+ comments_utils.get_notifications_thread(preferences.api_key, all_count = all_notifications_count)
return 300
diff --git a/blenderkit/ui_panels.py b/blenderkit/ui_panels.py
index d94d483d..7222e1ab 100644
--- a/blenderkit/ui_panels.py
+++ b/blenderkit/ui_panels.py
@@ -334,7 +334,7 @@ def draw_assetbar_show_hide(layout, props):
ttip = 'Click to Show Asset Bar'
preferences = bpy.context.preferences.addons['blenderkit'].preferences
- if 1:#preferences.experimental_features:
+ if 1: # preferences.experimental_features:
op = layout.operator('view3d.blenderkit_asset_bar_widget', text='', icon=icon)
else:
op = layout.operator('view3d.blenderkit_asset_bar', text='', icon=icon)
@@ -615,8 +615,54 @@ class MarkNotificationRead(bpy.types.Operator):
comments_utils.check_notifications_read()
user_preferences = bpy.context.preferences.addons['blenderkit'].preferences
api_key = user_preferences.api_key
- comments_utils.mark_notification_read(api_key,self.notification_id)
-
+ comments_utils.mark_notification_read_thread(api_key, self.notification_id)
+
+ return {'FINISHED'}
+
+class MarkAllNotificationsRead(bpy.types.Operator):
+ """Mark notification as read here and also on BlenderKit server"""
+ bl_idname = "wm.blenderkit_mark_notifications_read_all"
+ bl_label = "Mark all notifications as read"
+ bl_options = {'REGISTER', 'UNDO', 'INTERNAL'}
+
+
+ @classmethod
+ def poll(cls, context):
+ return True
+
+ def execute(self, context):
+ user_preferences = bpy.context.preferences.addons['blenderkit'].preferences
+ api_key = user_preferences.api_key
+ notifications = bpy.context.window_manager['bkit notifications']
+ for n in notifications:
+ if n['unread'] == 1:
+ n['unread'] = 0
+ comments_utils.mark_notification_read_thread(api_key, n['id'])
+
+ comments_utils.check_notifications_read()
+ return {'FINISHED'}
+
+class NotificationOpenTarget(bpy.types.Operator):
+ """"""
+ bl_idname = "wm.blenderkit_open_notification_target"
+ bl_label = ""
+ bl_description = "Open notification target and mark notification as read"
+ bl_options = {'REGISTER', 'UNDO', 'INTERNAL'}
+
+ tooltip: bpy.props.StringProperty(default='Open a web page')
+ url: bpy.props.StringProperty(default='Runs search and displays the asset bar at the same time')
+ notification_id: bpy.props.IntProperty(
+ name="Id",
+ description="notification id",
+ default=-1)
+
+ @classmethod
+ def description(cls, context, properties):
+ return properties.tooltip
+
+ def execute(self, context):
+ bpy.ops.wm.blenderkit_mark_notification_read(notification_id=self.notification_id)
+ bpy.ops.wm.url_open(url=self.url)
return {'FINISHED'}
@@ -647,51 +693,58 @@ class LikeComment(bpy.types.Operator):
return True
def execute(self, context):
-
user_preferences = bpy.context.preferences.addons['blenderkit'].preferences
api_key = user_preferences.api_key
- comments_utils.send_comment_flag_to_thread(asset_id = self.asset_id, comment_id=self.comment_id, flag=self.flag, api_key = api_key)
+ comments_utils.send_comment_flag_to_thread(asset_id=self.asset_id, comment_id=self.comment_id, flag=self.flag,
+ api_key=api_key)
return {'FINISHED'}
-def draw_notification(self, notification, width = 600):
+def draw_notification(self, notification, width=600):
layout = self.layout
box = layout.box()
print(notification.to_dict())
firstline = f"{notification['actor']['string']} {notification['verb']} {notification['target']['string']}"
box1 = box.box()
row = box1.row()
- utils.label_multiline(row, text=firstline, width = width)
-
-
+ utils.label_multiline(row, text=firstline, width=width)
op = row.operator("wm.blenderkit_mark_notification_read", text="", icon='CANCEL')
op.notification_id = notification['id']
if notification['description']:
- rows = utils.label_multiline(box, text=notification['description'], width = width)
- split = rows[-1].split(factor = 0.8)
+ rows = utils.label_multiline(box, text=notification['description'], width=width)
+ split = rows[-1].split(factor=0.8)
else:
row = layout.row()
- split = row.split(factor = 0.8)
- split.label(text = '')
+ split = row.split(factor=0.8)
+ split.label(text='')
split = split.split()
if notification['target']:
# row = layout.row()
# split = row.split(factor=.8)
# split.label(text='')
# split = split.split()
- op = split.operator('wm.blenderkit_url', text='Open page', icon='GREASEPENCIL')
+ op = split.operator('wm.blenderkit_open_notification_target', text='Open page', icon='GREASEPENCIL')
op.tooltip = 'Open the browser on the asset page to comment'
op.url = paths.get_bkit_url() + notification['target']['url']
+ op.notification_id = notification['id']
+
-def draw_notifications(self, context, width = 600):
+def draw_notifications(self, context, width=600):
layout = self.layout
notifications = bpy.context.window_manager.get('bkit notifications')
if notifications is not None:
+ row = layout.row()
+ # row.alert = True
+ split = row.split(factor = 0.7)
+ split.label(text='')
+ split = split.split()
+ split.operator('wm.blenderkit_mark_notifications_read_all', text = 'Mark All Read', icon = 'CANCEL')
for notification in notifications:
if notification['unread'] == 1:
- draw_notification(self,notification, width = width)
+ draw_notification(self, notification, width=width)
+
class ShowNotifications(bpy.types.Operator):
"""Show notifications"""
@@ -707,13 +760,15 @@ class ShowNotifications(bpy.types.Operator):
@classmethod
def poll(cls, context):
return True
+
def draw(self, context):
- draw_notifications(self,context, width = 600)
+ draw_notifications(self, context, width=600)
def execute(self, context):
wm = bpy.context.window_manager
return wm.invoke_popup(self, width=600)
+
class VIEW3D_PT_blenderkit_notifications(Panel):
bl_category = "BlenderKit"
bl_idname = "VIEW3D_PT_blenderkit_notifications"
@@ -727,10 +782,9 @@ class VIEW3D_PT_blenderkit_notifications(Panel):
if notifications is not None and len(notifications) > 0:
return True
return False
- def draw(self,context):
- draw_notifications(self,context)
-
+ def draw(self, context):
+ draw_notifications(self, context)
class VIEW3D_PT_blenderkit_login(Panel):
@@ -1488,7 +1542,7 @@ def draw_asset_context_menu(layout, context, asset_data, from_panel=False):
row = layout.row()
row.operator_context = 'INVOKE_DEFAULT'
- op = layout.operator('wm.blenderkit_fast_metadata', text='Edit Metadata',icon='GREASEPENCIL')
+ op = layout.operator('wm.blenderkit_fast_metadata', text='Edit Metadata', icon='GREASEPENCIL')
op.asset_id = asset_data['id']
op.asset_type = asset_data['assetType']
@@ -2021,7 +2075,7 @@ class AssetPopupCard(bpy.types.Operator, ratings_utils.RatingsProperties):
if self.asset_data.get('canDownload', True):
row.prop(ui_props, 'drag_init_button', icon='MOUSE_LMB_DRAG', text='Click / Drag from here', emboss=True)
else:
- op = layout.operator('wm.blenderkit_url', text='Unlock this asset', icon = 'UNLOCKED')
+ op = layout.operator('wm.blenderkit_url', text='Unlock this asset', icon='UNLOCKED')
op.url = paths.get_bkit_url() + '/get-blenderkit/' + self.asset_data['id'] + '/?from_addon=True'
def draw_menu_desc_author(self, context, layout, width=330):
@@ -2091,14 +2145,14 @@ class AssetPopupCard(bpy.types.Operator, ratings_utils.RatingsProperties):
def draw_comment(self, context, layout, comment, width=330):
row = layout.row()
# print(comment)
- if comment['level']>0:
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list