mcvsoftware/socializer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restructured group info storage for a wider usage

Browse Source
This commit is contained in:
Manuel Cortez 2019-05-06 15:50:45 -05:00
parent 75267294f9
commit 72cc04342f
3 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/controller/buffers.py
View File

@ -475,9 +475,9 @@ class feedBuffer(baseBuffer):
class communityBuffer(feedBuffer): class communityBuffer(feedBuffer):
def __init__(self, group_info, *args, **kwargs): def __init__(self, *args, **kwargs):
super(communityBuffer, self).__init__(*args, **kwargs) super(communityBuffer, self).__init__(*args, **kwargs)
self.group_data = group_info self.group_id = self.kwargs["owner_id"]
def create_tab(self, parent): def create_tab(self, parent):
self.tab = home.communityTab(parent) self.tab = home.communityTab(parent)
@ -499,10 +499,10 @@ class communityBuffer(feedBuffer):
""" This method retrieves community information, useful to show different parts of the community itself.""" """ This method retrieves community information, useful to show different parts of the community itself."""
if self.can_get_items: if self.can_get_items:
# Strangely, groups.get does not return counters so we need those to show options for loading specific posts for communities. # Strangely, groups.get does not return counters so we need those to show options for loading specific posts for communities.
self.group_info = self.session.vk.client.groups.getById(group_ids=-1*self.kwargs["owner_id"], fields="counters")[0] group_info = self.session.vk.client.groups.getById(group_ids=-1*self.kwargs["owner_id"], fields="counters")[0]
self.group_info.update(self.group_data) self.session.db["group_info"][self.group_info].update(group_info)
print(self.group_info) print(self.session.db["group_info"][self.group_info])
if "can_post" in self.group_info and self.group_info["can_post"] == True: if "can_post" in self.session.db["group_info"][self.group_id] and self.session.db["group_info"][self.group_id]["can_post"] == True:
self.tab.post.Enable(True) self.tab.post.Enable(True)
super(communityBuffer, self).get_items(*args, **kwargs) super(communityBuffer, self).get_items(*args, **kwargs)

37
src/controller/mainController.py
View File

@ -200,14 +200,15 @@ class Controller(object):
if self.session.settings["load_at_startup"]["communities"] == False and force_action == False: if self.session.settings["load_at_startup"]["communities"] == False and force_action == False:
return return
log.debug("Create community buffers...") log.debug("Create community buffers...")
groups= self.session.vk.client.groups.get(user_id=user_id, extended=1, count=1000, fields="can_post") groups= self.session.vk.client.groups.get(user_id=user_id, extended=1, count=1000, fields="can_post, can_create_topic")
self.session.groups=groups["items"] self.session.groups=groups["items"]
# Let's feed the local database cache with new groups coming from here. # Let's feed the local database cache with new groups coming from here.
data= dict(profiles=[], groups=self.session.groups) data= dict(profiles=[], groups=self.session.groups)
self.session.process_usernames(data) self.session.process_usernames(data)
if create_buffers: if create_buffers:
for i in self.session.groups: for i in self.session.groups:
wx.CallAfter(pub.sendMessage, "create_buffer", buffer_type="communityBuffer", buffer_title=i["name"], parent_tab="communities", loadable=True, get_items=True, kwargs=dict(parent=self.window.tb, name="{0}_community".format(i["id"],), composefunc="render_status", session=self.session, group_info=i, endpoint="get", parent_endpoint="wall", extended=1, count=self.session.settings["buffers"]["count_for_wall_buffers"], owner_id=-1*i["id"])) self.session.db["group_info"][i["id"]*-1] = i
wx.CallAfter(pub.sendMessage, "create_buffer", buffer_type="communityBuffer", buffer_title=i["name"], parent_tab="communities", loadable=True, get_items=True, kwargs=dict(parent=self.window.tb, name="{0}_community".format(i["id"],), composefunc="render_status", session=self.session, endpoint="get", parent_endpoint="wall", extended=1, count=self.session.settings["buffers"]["count_for_wall_buffers"], owner_id=-1*i["id"]))
time.sleep(0.15) time.sleep(0.15)
def login(self): def login(self):
@ -821,19 +822,19 @@ class Controller(object):
# 2. If the group_info does not have counters for such items, which would indicate there are no items posted yet. # 2. If the group_info does not have counters for such items, which would indicate there are no items posted yet.
if self.search(current_buffer.name+"_audios") != False: if self.search(current_buffer.name+"_audios") != False:
menu.load_audios.Enable(False) menu.load_audios.Enable(False)
elif hasattr(current_buffer, "group_info") and "audios" not in current_buffer.group_info["counters"]: elif "counters" in self.session.db["group_info"][current_buffer.group_id] and "audios" not in self.session.db["group_info"][current_buffer.group_id]["counters"]:
menu.load_audios.Enable(False) menu.load_audios.Enable(False)
if self.search(current_buffer.name+"_videos") != False: if self.search(current_buffer.name+"_videos") != False:
menu.load_videos.Enable(False) menu.load_videos.Enable(False)
elif hasattr(current_buffer, "group_info") and "videos" not in current_buffer.group_info["counters"]: elif "counters" in self.session.db["group_info"][current_buffer.group_id] and "videos" not in self.session.db["group_info"][current_buffer.group_id]["counters"]:
menu.load_videos.Enable(False) menu.load_videos.Enable(False)
if self.search(current_buffer.name+"_topics") != False: if self.search(current_buffer.name+"_topics") != False:
menu.load_topics.Enable(False) menu.load_topics.Enable(False)
elif hasattr(current_buffer, "group_info") and "topics" not in current_buffer.group_info["counters"]: elif "counters" in self.session.db["group_info"][current_buffer.group_id] and "topics" not in self.session.db["group_info"][current_buffer.group_id]["counters"]:
menu.load_topics.Enable(False) menu.load_topics.Enable(False)
if self.search(current_buffer.name+"_documents") != False: if self.search(current_buffer.name+"_documents") != False:
menu.load_documents.Enable(False) menu.load_documents.Enable(False)
elif hasattr(current_buffer, "group_info") and "docs" not in current_buffer.group_info["counters"]: elif "counters" in self.session.db["group_info"][current_buffer.group_id] and "docs" not in self.session.db["group_info"][current_buffer.group_id]["counters"]:
menu.load_documents.Enable(False) menu.load_documents.Enable(False)
# Connect the rest of the functions. # Connect the rest of the functions.
widgetUtils.connect_event(menu, widgetUtils.MENU, self.load_community_posts, menuitem=menu.load_posts) widgetUtils.connect_event(menu, widgetUtils.MENU, self.load_community_posts, menuitem=menu.load_posts)
@ -888,10 +889,10 @@ class Controller(object):
""" Load community audios if they are not loaded already.""" """ Load community audios if they are not loaded already."""
current_buffer = self.get_current_buffer() current_buffer = self.get_current_buffer()
# Get group_info if the community buffer does not have it already, so future menus will be able to use it. # Get group_info if the community buffer does not have it already, so future menus will be able to use it.
if not hasattr(current_buffer, "group_info"): if current_buffer.group_id not in self.session.db["group_info"] or "counters" not in self.session.db["group_info"][current_buffer.group_id]:
group_info = self.session.vk.client.groups.getById(group_ids=-1*current_buffer.kwargs["owner_id"], fields="counters")[0] group_info = self.session.vk.client.groups.getById(group_ids=-1*current_buffer.kwargs["owner_id"], fields="counters")[0]
current_buffer.group_info = group_info self.session.db["group_info"][current_buffer.kwargs["owner_id"]] = group_info
if "audios" not in current_buffer.group_info["counters"]: if "audios" not in self.session.db["group_info"][current_buffer.group_id]["counters"]:
commonMessages.community_no_items() commonMessages.community_no_items()
return return
new_name = current_buffer.name+"_audios" new_name = current_buffer.name+"_audios"
@ -901,10 +902,10 @@ class Controller(object):
""" Load community videos if they are not loaded already.""" """ Load community videos if they are not loaded already."""
current_buffer = self.get_current_buffer() current_buffer = self.get_current_buffer()
# Get group_info if the community buffer does not have it already, so future menus will be able to use it. # Get group_info if the community buffer does not have it already, so future menus will be able to use it.
if not hasattr(current_buffer, "group_info"): if current_buffer.group_id not in self.session.db["group_info"] or "counters" not in self.session.db["group_info"][current_buffer.group_id]:
group_info = self.session.vk.client.groups.getById(group_ids=-1*current_buffer.kwargs["owner_id"], fields="counters")[0] group_info = self.session.vk.client.groups.getById(group_ids=-1*current_buffer.kwargs["owner_id"], fields="counters")[0]
current_buffer.group_info = group_info self.session.db["group_info"][current_buffer.kwargs["owner_id"]] = group_info
if "videos" not in current_buffer.group_info["counters"]: if "videos" not in self.session.db["group_info"][current_buffer.group_id]["counters"]:
commonMessages.community_no_items() commonMessages.community_no_items()
return return
new_name = current_buffer.name+"_videos" new_name = current_buffer.name+"_videos"
@ -914,10 +915,10 @@ class Controller(object):
""" Load community topics.""" """ Load community topics."""
current_buffer = self.get_current_buffer() current_buffer = self.get_current_buffer()
# Get group_info if the community buffer does not have it already, so future menus will be able to use it. # Get group_info if the community buffer does not have it already, so future menus will be able to use it.
if not hasattr(current_buffer, "group_info"): if current_buffer.group_id not in self.session.db["group_info"] or "counters" not in self.session.db["group_info"][current_buffer.group_id]:
group_info = self.session.vk.client.groups.getById(group_ids=-1*current_buffer.kwargs["owner_id"], fields="counters")[0] group_info = self.session.vk.client.groups.getById(group_ids=-1*current_buffer.kwargs["owner_id"], fields="counters")[0]
current_buffer.group_info = group_info self.session.db["group_info"][current_buffer.kwargs["owner_id"]] = group_info
if "topics" not in current_buffer.group_info["counters"]: if "topics" not in self.session.db["group_info"][current_buffer.group_id]["counters"]:
commonMessages.community_no_items() commonMessages.community_no_items()
return return
new_name = current_buffer.name+"_topics" new_name = current_buffer.name+"_topics"
@ -926,10 +927,10 @@ class Controller(object):
def load_community_documents(self, *args, **kwargs): def load_community_documents(self, *args, **kwargs):
current_buffer = self.get_current_buffer() current_buffer = self.get_current_buffer()
# Get group_info if the community buffer does not have it already, so future menus will be able to use it. # Get group_info if the community buffer does not have it already, so future menus will be able to use it.
if not hasattr(current_buffer, "group_info"): if current_buffer.group_id not in self.session.db["group_info"] or "counters" not in self.session.db["group_info"][current_buffer.group_id]:
group_info = self.session.vk.client.groups.getById(group_ids=-1*current_buffer.kwargs["owner_id"], fields="counters")[0] group_info = self.session.vk.client.groups.getById(group_ids=-1*current_buffer.kwargs["owner_id"], fields="counters")[0]
current_buffer.group_info = group_info self.session.db["group_info"][current_buffer.kwargs["owner_id"]] = group_info
if "docs" not in current_buffer.group_info["counters"]: if "docs" not in self.session.db["group_info"][current_buffer.group_id]["counters"]:
commonMessages.community_no_items() commonMessages.community_no_items()
return return
new_name = current_buffer.name+"_documents" new_name = current_buffer.name+"_documents"

1
src/sessionmanager/session.py
View File

@ -101,6 +101,7 @@ class vkSession(object):
self.db = {} self.db = {}
self.db["users"] = {} self.db["users"] = {}
self.db["groups"] = {} self.db["groups"] = {}
self.db["group_info"] = {}
@property @property
def is_logged(self): def is_logged(self):