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

Keep loading other buffers if a section cannot be loaded

Browse Source
This commit is contained in:
Manuel Cortez 2016-09-15 15:27:38 -05:00
parent 65815113d5
commit 444d506359
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/controller/buffers.py
View File

@ -155,6 +155,7 @@ class baseBuffer(object):
widgetUtils.connect_event(m, widgetUtils.MENU, self.do_like, menuitem=m.like) widgetUtils.connect_event(m, widgetUtils.MENU, self.do_like, menuitem=m.like)
widgetUtils.connect_event(m, widgetUtils.MENU, self.do_dislike, menuitem=m.dislike) widgetUtils.connect_event(m, widgetUtils.MENU, self.do_dislike, menuitem=m.dislike)
widgetUtils.connect_event(m, widgetUtils.MENU, self.do_comment, menuitem=m.comment) widgetUtils.connect_event(m, widgetUtils.MENU, self.do_comment, menuitem=m.comment)
widgetUtils.connect_event(m, widgetUtils.MENU, self.open_person_profile, menuitem=m.view_profile)
return m return m
def do_like(self, *args, **kwargs): def do_like(self, *args, **kwargs):
@ -228,6 +229,15 @@ class baseBuffer(object):
pub.sendMessage("play-audio", audio_object=post["audio"]["items"][0]) pub.sendMessage("play-audio", audio_object=post["audio"]["items"][0])
return True return True
def open_person_profile(self, *args, **kwargs):
selected = self.get_post()
print selected.keys()
keys = ["from_id", "source_id"]
for i in keys:
if selected.has_key(i):
pub.sendMessage("user-profile", person=selected[i])
print selected[i]
def open_post(self, *args, **kwargs): def open_post(self, *args, **kwargs):
post = self.session.db[self.name]["items"][self.tab.list.get_selected()] post = self.session.db[self.name]["items"][self.tab.list.get_selected()]
if post.has_key("type") and post["type"] == "audio": if post.has_key("type") and post["type"] == "audio":

7
src/controller/mainController.py
View File

@ -139,6 +139,7 @@ class Controller(object):
pub.subscribe(self.update_status_bar, "update-status-bar") pub.subscribe(self.update_status_bar, "update-status-bar")
pub.subscribe(self.chat_from_id, "new-chat") pub.subscribe(self.chat_from_id, "new-chat")
pub.subscribe(self.authorisation_failed, "authorisation-failed") pub.subscribe(self.authorisation_failed, "authorisation-failed")
pub.subscribe(self.user_profile, "user-profile")
widgetUtils.connect_event(self.window, widgetUtils.CLOSE_EVENT, self.exit) widgetUtils.connect_event(self.window, widgetUtils.CLOSE_EVENT, self.exit)
widgetUtils.connect_event(self.window, widgetUtils.MENU, self.update_buffer, menuitem=self.window.update_buffer) widgetUtils.connect_event(self.window, widgetUtils.MENU, self.update_buffer, menuitem=self.window.update_buffer)
widgetUtils.connect_event(self.window, widgetUtils.MENU, self.check_for_updates, menuitem=self.window.check_for_updates) widgetUtils.connect_event(self.window, widgetUtils.MENU, self.check_for_updates, menuitem=self.window.check_for_updates)
@ -433,6 +434,8 @@ class Controller(object):
log.exception("Something went wrong when getting albums. Waiting a second to retry") log.exception("Something went wrong when getting albums. Waiting a second to retry")
time.sleep(2) time.sleep(2)
return self.get_audio_albums(user_id=user_id) return self.get_audio_albums(user_id=user_id)
elif ex.code == 10:
return
self.session.audio_albums = albums["items"] self.session.audio_albums = albums["items"]
for i in albums["items"]: for i in albums["items"]:
buffer = buffers.audioAlbum(parent=self.window.tb, name="{0}_audio_album".format(i["id"],), composefunc="compose_audio", session=self.session, endpoint="get", parent_endpoint="audio", full_list=True, count=self.session.settings["buffers"]["count_for_audio_buffers"], user_id=user_id, album_id=i["id"]) buffer = buffers.audioAlbum(parent=self.window.tb, name="{0}_audio_album".format(i["id"],), composefunc="compose_audio", session=self.session, endpoint="get", parent_endpoint="audio", full_list=True, count=self.session.settings["buffers"]["count_for_audio_buffers"], user_id=user_id, album_id=i["id"])
@ -534,7 +537,7 @@ class Controller(object):
if player.player.check_is_playing() != False: if player.player.check_is_playing() != False:
return player.player.pause() return player.player.pause()
b = self.get_current_buffer() b = self.get_current_buffer()
if hasattr(b, "play_audio"): if hasattr(b, "play_next"):
b.play_audio() b.play_audio()
else: else:
b = self.search("me_audio") b = self.search("me_audio")
@ -573,3 +576,5 @@ class Controller(object):
def menu_mute(self, *args, **kwargs): def menu_mute(self, *args, **kwargs):
player.player.volume = 0 player.player.volume = 0
def user_profile(self, person):
p = posts.userProfile(self.session, person)