mcvsoftware/twblue
1
0
Fork 0
mirror of https://github.com/MCV-Software/TWBlue.git synced 2025-07-17 13:46:07 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

A bug exiting TWBlue on GUI mode

Browse Source
This commit is contained in:
Manuel Cortez
2015-02-07 13:55:52 -06:00
parent 2dd0cc8fbb
commit 42aea45a41
3 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/controller/buffersController.py
View File

@@ -414,7 +414,6 @@ class peopleBufferController(baseBufferController):
def onFocus(self, ev):
pass
@_tweets_exist
def get_message(self):
return " ".join(self.compose_function(self.get_tweet(), self.session.db, self.session.settings["general"]["relative_times"]))
@@ -490,7 +489,10 @@ class searchBufferController(baseBufferController):
log.debug("Starting stream for %s buffer, %s account and %s type" % (self.name, self.account, self.type))
log.debug("args: %s, kwargs: %s" % (self.args, self.kwargs))
log.debug("Function: %s" % (self.function,))
val = getattr(self.session.twitter.twitter, self.function)(*self.args, **self.kwargs)
try:
val = getattr(self.session.twitter.twitter, self.function)(*self.args, **self.kwargs)
except:
return None
number_of_items = self.session.order_buffer(self.name, val["statuses"])
log.debug("Number of items retrieved: %d" % (number_of_items,))
self.put_items_on_list(number_of_items)
@@ -509,7 +511,10 @@ class searchPeopleBufferController(searchBufferController):
log.debug("starting stream for %s buffer, %s account and %s type" % (self.name, self.account, self.type))
log.debug("args: %s, kwargs: %s" % (self.args, self.kwargs))
log.debug("Function: %s" % (self.function,))
val = getattr(self.session.twitter.twitter, self.function)(*self.args, **self.kwargs)
try:
val = getattr(self.session.twitter.twitter, self.function)(*self.args, **self.kwargs)
except:
return
number_of_items = self.session.order_buffer(self.name, val)
log.debug("Number of items retrieved: %d" % (number_of_items,))
self.put_items_on_list(number_of_items)
@@ -535,7 +540,10 @@ class trendsBufferController(bufferController):
self.get_formatted_message = self.get_message
def start_stream(self):
data = self.session.twitter.twitter.get_place_trends(id=self.trendsFor)
try:
data = self.session.twitter.twitter.get_place_trends(id=self.trendsFor)
except:
return
if not hasattr(self, "name_"):
self.name_ = data[0]["locations"][0]["name"]
self.trends = data[0]["trends"]
@@ -561,7 +569,6 @@ class trendsBufferController(bufferController):
# widgetUtils.connect_event(self.buffer, widgetUtils.BUTTON_PRESSED, self.direct_message, self.buffer.dm)
# widgetUtils.connect_event(self.buffer, widgetUtils.BUTTON_PRESSED, self.reply, self.buffer.reply)
@_tweets_exist
def get_message(self):
return self.compose_function(self.trends[self.buffer.list.get_selected()])[0]

1
src/controller/mainController.py
View File

@@ -102,6 +102,7 @@ class Controller(object):
widgetUtils.connect_event(self.view, widgetUtils.MENU, self.accountConfiguration, menuitem=self.view.account_settings)
widgetUtils.connect_event(self.view, widgetUtils.MENU, self.configuration, menuitem=self.view.prefs)
widgetUtils.connect_event(self.view, widgetUtils.MENU, self.exit, menuitem=self.view.close)
widgetUtils.connect_event(self.view, widgetUtils.CLOSE_EVENT, self.exit)
if widgetUtils.toolkit == "wx":
log.debug("Binding the exit function...")
widgetUtils.connectExitFunction(self.exit_)