From 43819927185cb7cfede0bd53b72efda124c4b2db Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Wed, 15 Aug 2018 11:19:31 -0500 Subject: [PATCH] Made sound playback during startup as it was before --- src/controller/buffersController.py | 30 ++++++++++++++--------------- src/controller/mainController.py | 21 +++++++++++--------- 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/src/controller/buffersController.py b/src/controller/buffersController.py index fcec39d1..db26d8e5 100644 --- a/src/controller/buffersController.py +++ b/src/controller/buffersController.py @@ -101,7 +101,7 @@ class bufferController(object): self.session.sound.play("volume_changed.ogg") self.session.settings.write() - def start_stream(self, mandatory=False): + def start_stream(self, mandatory=False, play_sound=True): # if mandatory == True: # output.speak(_(u"Unable to update this buffer.")) pass @@ -315,7 +315,7 @@ class baseBufferController(bufferController): tweetsList.append(tweet) return (tweet, tweetsList) - def start_stream(self, mandatory=False): + def start_stream(self, mandatory=False, play_sound=True): # starts stream every 3 minutes. current_time = time.time() if self.execution_time == 0 or current_time-self.execution_time >= 180 or mandatory==True: @@ -335,7 +335,7 @@ class baseBufferController(bufferController): elif "-favorite" in self.name: self.username = self.session.api_call("show_user", **self.kwargs)["screen_name"] self.finished_timeline = True - if number_of_items > 0 and self.name != "sent_tweets" and self.name != "sent_direct_messages" and self.sound != None and self.session.settings["sound"]["session_mute"] == False and self.name not in self.session.settings["other_buffers"]["muted_buffers"]: + if number_of_items > 0 and self.name != "sent_tweets" and self.name != "sent_direct_messages" and self.sound != None and self.session.settings["sound"]["session_mute"] == False and self.name not in self.session.settings["other_buffers"]["muted_buffers"] and play_sound == True: self.session.sound.play(self.sound) return number_of_items @@ -862,9 +862,9 @@ class listBufferController(baseBufferController): self.list_id = list_id self.kwargs["list_id"] = list_id - def start_stream(self, mandatory=False): + def start_stream(self, mandatory=False, play_sound=True): self.get_user_ids() - super(listBufferController, self).start_stream(mandatory) + super(listBufferController, self).start_stream(mandatory, play_sound) def get_user_ids(self): next_cursor = -1 @@ -1017,7 +1017,7 @@ class peopleBufferController(baseBufferController): call_threaded(self.session.api_call, call_name="update_status_with_media", _sound="reply_send.ogg", status=message.message.get_text(), media=message.file) if hasattr(message.message, "destroy"): message.message.destroy() - def start_stream(self, mandatory=False): + def start_stream(self, mandatory=False, play_sound=True): # starts stream every 3 minutes. current_time = time.time() if self.execution_time == 0 or current_time-self.execution_time >= 180 or mandatory==True: @@ -1029,7 +1029,7 @@ class peopleBufferController(baseBufferController): if hasattr(self, "finished_timeline") and self.finished_timeline == False: self.username = self.session.api_call("show_user", **self.kwargs)["screen_name"] self.finished_timeline = True - if val > 0 and self.sound != None and self.session.settings["sound"]["session_mute"] == False and self.name not in self.session.settings["other_buffers"]["muted_buffers"]: + if val > 0 and self.sound != None and self.session.settings["sound"]["session_mute"] == False and self.name not in self.session.settings["other_buffers"]["muted_buffers"] and play_sound == True: self.session.sound.play(self.sound) return val @@ -1118,7 +1118,7 @@ class peopleBufferController(baseBufferController): pub.sendMessage("execute-action", action="user_details") class searchBufferController(baseBufferController): - def start_stream(self, mandatory=False): + def start_stream(self, mandatory=False, play_sound=True): # starts stream every 3 minutes. current_time = time.time() if self.execution_time == 0 or current_time-self.execution_time >= 180 or mandatory==True: @@ -1132,7 +1132,7 @@ class searchBufferController(baseBufferController): # return None num = self.session.order_buffer(self.name, val) self.put_items_on_list(num) - if num > 0 and self.sound != None and self.session.settings["sound"]["session_mute"] == False and self.name not in self.session.settings["other_buffers"]["muted_buffers"]: + if num > 0 and self.sound != None and self.session.settings["sound"]["session_mute"] == False and self.name not in self.session.settings["other_buffers"]["muted_buffers"] and play_sound == True: self.session.sound.play(self.sound) return num @@ -1197,7 +1197,7 @@ class searchPeopleBufferController(peopleBufferController): if self.kwargs.has_key("page") == False: self.kwargs["page"] = 1 - def start_stream(self, mandatory=False): + def start_stream(self, mandatory=False, play_sound=True): # starts stream every 3 minutes. current_time = time.time() if self.execution_time == 0 or current_time-self.execution_time >= 180 or mandatory==True: @@ -1212,7 +1212,7 @@ class searchPeopleBufferController(peopleBufferController): number_of_items = self.session.order_cursored_buffer(self.name, val) log.debug("Number of items retrieved: %d" % (number_of_items,)) self.put_items_on_list(number_of_items) - if number_of_items > 0 and self.sound != None and self.session.settings["sound"]["session_mute"] == False and self.name not in self.session.settings["other_buffers"]["muted_buffers"]: + if number_of_items > 0 and self.sound != None and self.session.settings["sound"]["session_mute"] == False and self.name not in self.session.settings["other_buffers"]["muted_buffers"] and play_sound == True: self.session.sound.play(self.sound) return number_of_items @@ -1278,7 +1278,7 @@ class trendsBufferController(bufferController): self.get_formatted_message = self.get_message self.reply = self.search_topic - def start_stream(self, mandatory=False): + def start_stream(self, mandatory=False, play_sound=True): # starts stream every 3 minutes. current_time = time.time() if self.execution_time == 0 or current_time-self.execution_time >= 180 or mandatory == True: @@ -1291,7 +1291,7 @@ class trendsBufferController(bufferController): self.name_ = data[0]["locations"][0]["name"] self.trends = data[0]["trends"] self.put_items_on_the_list() - if self.sound != None and self.session.settings["sound"]["session_mute"] == False and self.name not in self.session.settings["other_buffers"]["muted_buffers"]: + if self.sound != None and self.session.settings["sound"]["session_mute"] == False and self.name not in self.session.settings["other_buffers"]["muted_buffers"] and play_sound == True: self.session.sound.play(self.sound) def put_items_on_the_list(self): @@ -1383,7 +1383,7 @@ class trendsBufferController(bufferController): class conversationBufferController(searchBufferController): - def start_stream(self, start=False, mandatory=False): + def start_stream(self, start=False, mandatory=False, play_sound=True): # starts stream every 3 minutes. current_time = time.time() if self.execution_time == 0 or current_time-self.execution_time >= 180 or mandatory == True: @@ -1413,7 +1413,7 @@ class conversationBufferController(searchBufferController): number_of_items = self.session.order_buffer(self.name, self.statuses) log.debug("Number of items retrieved: %d" % (number_of_items,)) self.put_items_on_list(number_of_items) - if number_of_items > 0 and self.sound != None and self.session.settings["sound"]["session_mute"] == False and self.name not in self.session.settings["other_buffers"]["muted_buffers"]: + if number_of_items > 0 and self.sound != None and self.session.settings["sound"]["session_mute"] == False and self.name not in self.session.settings["other_buffers"]["muted_buffers"] and play_sound == True: self.session.sound.play(self.sound) return number_of_items diff --git a/src/controller/mainController.py b/src/controller/mainController.py index 94996dc2..f2efa67c 100644 --- a/src/controller/mainController.py +++ b/src/controller/mainController.py @@ -399,7 +399,7 @@ class Controller(object): self.view.insert_buffer(tl.buffer, name=_(u"Search for {}").format(i), pos=self.view.search("searches", session.db["user_name"])) for i in session.settings["other_buffers"]["trending_topic_buffers"]: buffer = buffersController.trendsBufferController(self.view.nb, "%s_tt" % (i,), session, session.db["user_name"], i, sound="trends_updated.ogg") - buffer.start_stream() + buffer.start_stream(play_sound=False) buffer.searchfunction = self.search self.buffers.append(buffer) self.view.insert_buffer(buffer.buffer, name=_(u"Trending topics for %s") % (buffer.name_), pos=self.view.search(session.db["user_name"], session.db["user_name"])) @@ -919,7 +919,7 @@ class Controller(object): return tl = buffersController.peopleBufferController(self.view.nb, "get_friends_list", "%s-friends" % (usr["id_str"],), buff.session, buff.session.db["user_name"], sound="new_event.ogg", user_id=usr["id_str"]) try: - tl.start_stream() + tl.start_stream(play_sound=False) except TwythonAuthError: commonMessageDialogs.unauthorized() return @@ -1390,7 +1390,10 @@ class Controller(object): else: change_title = False try: - i.start_stream() + if "mentions" in i.name or "direct_messages" in i.name: + i.start_stream() + else: + i.start_stream(play_sound=False) except TwythonAuthError: buff = self.view.search(i.name, i.account) i.remove_buffer(force=True) @@ -1444,27 +1447,27 @@ class Controller(object): favourites = buffersController.baseBufferController(self.view.nb, "get_favorites", "favourites", buff.session, buff.session.db["user_name"]) self.buffers.append(favourites) self.view.insert_buffer(favourites.buffer, name=_(u"Likes"), pos=self.view.search(buff.session.db["user_name"], buff.session.db["user_name"])) - favourites.start_stream() + favourites.start_stream(play_sound=False) if buffer == "followers": followers = buffersController.peopleBufferController(self.view.nb, "get_followers_list", "followers", buff.session, buff.session.db["user_name"], screen_name=buff.session.db["user_name"]) self.buffers.append(followers) self.view.insert_buffer(followers.buffer, name=_(u"Followers"), pos=self.view.search(buff.session.db["user_name"], buff.session.db["user_name"])) - followers.start_stream() + followers.start_stream(play_sound=False) elif buffer == "friends": friends = buffersController.peopleBufferController(self.view.nb, "get_friends_list", "friends", buff.session, buff.session.db["user_name"], screen_name=buff.session.db["user_name"]) self.buffers.append(friends) self.view.insert_buffer(friends.buffer, name=_(u"Friends"), pos=self.view.search(buff.session.db["user_name"], buff.session.db["user_name"])) - friends.start_stream() + friends.start_stream(play_sound=False) elif buffer == "blocked": blocks = buffersController.peopleBufferController(self.view.nb, "list_blocks", "blocked", buff.session, buff.session.db["user_name"]) self.buffers.append(blocks) self.view.insert_buffer(blocks.buffer, name=_(u"Blocked users"), pos=self.view.search(buff.session.db["user_name"], buff.session.db["user_name"])) - blocks.start_stream() + blocks.start_stream(play_sound=False) elif buffer == "muted": muted = buffersController.peopleBufferController(self.view.nb, "get_muted_users_list", "muted", buff.session, buff.session.db["user_name"]) self.buffers.append(muted) self.view.insert_buffer(muted.buffer, name=_(u"Muted users"), pos=self.view.search(buff.session.db["user_name"], buff.session.db["user_name"])) - muted.start_stream() + muted.start_stream(play_sound=False) elif buffer == "events": events = buffersController.eventsBufferController(self.view.nb, "events", buff.session, buff.session.db["user_name"], bufferType="dmPanel", screen_name=buff.session.db["user_name"]) self.buffers.append(events) @@ -1480,7 +1483,7 @@ class Controller(object): pos=self.view.search("lists", buff.session.db["user_name"]) self.insert_buffer(tl, pos) self.view.insert_buffer(tl.buffer, name=_(u"List for {}").format(create), pos=self.view.search("lists", buff.session.db["user_name"])) - tl.start_stream() + tl.start_stream(play_sound=False) buff.session.settings["other_buffers"]["lists"].append(create) buff.session.settings.write() pub.sendMessage("restart-streams", streams=["timelinesStream"], session=buff.session)