Account settings works properly; auto completion has been implemented and improved, TWBlue loads in a threaded mode

2025-07-17 13:46:07 -04:00 · 2015-01-27 17:09:28 -06:00
parent 51957125c1
commit ff65b73232
21 changed files with 508 additions and 27 deletions
--- a/src/controller/buffersController.py
+++ b/src/controller/buffersController.py
@@ -142,7 +142,7 @@ class emptyPanel(bufferController):
  self.needs_init = True

 class baseBufferController(bufferController):
- def __init__(self, parent, function, name, sessionObject, account, bufferType=None, *args, **kwargs):
+ def __init__(self, parent, function, name, sessionObject, account, sound=None, bufferType=None, *args, **kwargs):
  super(baseBufferController, self).__init__(parent, function, *args, **kwargs)
  log.debug("Initializing buffer %s, account %s" % (name, account,))
  if bufferType != None:
@@ -159,6 +159,7 @@ class baseBufferController(bufferController):
  self.account = account
  self.buffer.account = account
  self.bind_events()
+  self.sound = sound

 def get_formatted_message(self):
  if self.type == "dm" or self.name == "sent_tweets" or self.name == "sent_direct_messages":   return self.compose_function(self.get_right_tweet(), self.session.db, self.session.settings["general"]["relative_times"])[1]
@@ -174,6 +175,9 @@ class baseBufferController(bufferController):
  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)
+  if self.sound == None: return
+  if number_of_items > 0 and self.name != "sent_tweets" and self.name != "sent_direct_messages":
+   self.session.sound.play(self.sound)

 def put_items_on_list(self, number_of_items):
  log.debug("The list contains %d items " % (self.buffer.list.get_count(),))
--- a/src/controller/mainController.py
+++ b/src/controller/mainController.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 from wxUI import (view, dialogs, commonMessageDialogs)
+from sessionmanager import manager
 import buffersController
 import messages
 import settings
@@ -90,6 +91,7 @@ class Controller(object):
  log.debug("Binding other application events...")
  pub.subscribe(self.editing_keystroke, "editing_keystroke")
  pub.subscribe(self.manage_stream_errors, "stream-error")
+  pub.subscribe(self.create_new_buffer, "create-new-buffer")
  widgetUtils.connect_event(self.view, widgetUtils.MENU, self.show_hide, menuitem=self.view.show_hide)
  widgetUtils.connect_event(self.view, widgetUtils.MENU, self.search, menuitem=self.view.menuitem_search)
  widgetUtils.connect_event(self.view, widgetUtils.MENU, self.learn_sounds, menuitem=self.view.sounds_tutorial)
@@ -127,17 +129,19 @@ class Controller(object):
  if config.app["app-settings"]["use_invisible_keyboard_shorcuts"] == True:
   km = self.create_invisible_keyboard_shorcuts()
   self.register_invisible_keyboard_shorcuts(km)
-  self.do_work()

 def do_work(self):
  log.debug("Creating buffers for all sessions...")
  for i in session_.sessions:
   log.debug("Working on session %s" % (i,))
   self.create_buffers(session_.sessions[i])
-   call_threaded(self.start_buffers, session_.sessions[i])
-  session_.sessions[session_.sessions.keys()[0]].sound.play("tweet_timeline.ogg")
  self.checker_function = RepeatingTimer(60, self.check_connection)
  self.checker_function.start()
+ def start(self):
+  for i in session_.sessions:
+   self.start_buffers(session_.sessions[i])
+  session_.sessions[session_.sessions.keys()[0]].sound.play("ready.ogg")
+  output.speak(_(u"Ready"))

 def create_buffers(self, session):
  session.get_user_info()
@@ -149,14 +153,12 @@ class Controller(object):
  home = buffersController.baseBufferController(self.view.nb, "get_home_timeline", "home_timeline", session, session.db["user_name"])
  self.buffers.append(home)
  self.view.insert_buffer(home.buffer, name=_(u"Home"), pos=self.view.search(session.db["user_name"], session.db["user_name"]))
-  mentions = buffersController.baseBufferController(self.view.nb, "get_mentions_timeline", "mentions", session, session.db["user_name"])
+  mentions = buffersController.baseBufferController(self.view.nb, "get_mentions_timeline", "mentions", session, session.db["user_name"], sound="mention_received.ogg")
  self.buffers.append(mentions)
  self.view.insert_buffer(mentions.buffer, name=_(u"Mentions"), pos=self.view.search(session.db["user_name"], session.db["user_name"]))
-  session.sound.play("mention_received.ogg")
-  dm = buffersController.baseBufferController(self.view.nb, "get_direct_messages", "direct_messages", session, session.db["user_name"], bufferType="dmPanel")
+  dm = buffersController.baseBufferController(self.view.nb, "get_direct_messages", "direct_messages", session, session.db["user_name"], bufferType="dmPanel", sound="dm_received.ogg")
  self.buffers.append(dm)
  self.view.insert_buffer(dm.buffer, name=_(u"Direct messages"), pos=self.view.search(session.db["user_name"], session.db["user_name"]))
-  session.sound.play("dm_received.ogg")
  sent_dm = buffersController.baseBufferController(self.view.nb, "get_sent_messages", "sent_direct_messages", session, session.db["user_name"], bufferType="dmPanel")
  self.buffers.append(sent_dm)
  self.view.insert_buffer(sent_dm.buffer, name=_(u"Sent direct messages"), pos=self.view.search(session.db["user_name"], session.db["user_name"]))
@@ -259,12 +261,14 @@ class Controller(object):

 def accountConfiguration(self, *args, **kwargs):
  buff = self.get_best_buffer()
-  d = settings.accountSettingsController(buff.session.settings, buff.session.db["user_name"])
-#  if d.response == widgetUtils.OK:
-#   d.save_configuration()
-#   if d.needs_restart == True:
-#    commonMessageDialogs.needs_restart()
-#    restart.restart_program()
+  manager.manager.set_current_session(buff.session.session_id)
+  d = settings.accountSettingsController(buff, self)
+  if d.response == widgetUtils.OK:
+   d.save_configuration()
+   if d.needs_restart == True:
+    commonMessageDialogs.needs_restart()
+    buff.session.settings.write()
+    restart.restart_program()

 def update_profile(self):
  pass
@@ -398,7 +402,8 @@ class Controller(object):
   self.view.advance_selection(forward)

 def buffer_changed(self, *args, **kwargs):
-  if self.get_current_buffer().account != self.current_account: self.current_account = self.get_current_buffer().account
+  if self.get_current_buffer().account != self.current_account:
+   self.current_account = self.get_current_buffer().account

 def fix_wrong_buffer(self):
  buffer = self.get_current_buffer()
@@ -671,5 +676,38 @@ class Controller(object):
  for i in session_.sessions:
   session_.sessions[i].check_connection()

+ def create_new_buffer(self, buffer, account, create):
+  buff = self.search_buffer("home_timeline", account)
+  if create == True:
+   if buffer == "favourites":
+    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"Favourites"), pos=self.view.search(buff.session.db["user_name"], buff.session.db["user_name"]))
+    favourites.start_stream()
+   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()
+   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()
+   elif buffer == "blocks":
+    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()
+   elif buffer == "mutes":
+    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()
+   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)
+    self.view.insert_buffer(events.buffer, name=_(u"Events"), pos=self.view.search(buff.session.db["user_name"], buff.session.db["user_name"]))
+
 def __del__(self):
  config.app.write()
--- a/src/controller/messages.py
+++ b/src/controller/messages.py
@@ -5,7 +5,7 @@ import url_shortener
 import sound
 from pubsub import pub
 from wxUI.dialogs import message, urlList
-from extra import translator, SpellChecker
+from extra import translator, SpellChecker, autocompletionUsers
 from extra.AudioUploader import audioUploader
 from twitter import utils

@@ -101,6 +101,7 @@ class tweet(basicTweet):
  super(tweet, self).__init__(session, title, caption, text, messageType)
  self.image = None
  widgetUtils.connect_event(self.message.upload_image, widgetUtils.BUTTON_PRESSED, self.upload_image)
+  widgetUtils.connect_event(self.message.autocompletionButton, widgetUtils.BUTTON_PRESSED, self.autocomplete_users)

 def upload_image(self, *args, **kwargs):
  if self.message.get("upload_image") == _(u"Discard image"):
@@ -112,6 +113,10 @@ class tweet(basicTweet):
   self.image = self.message.get_image()
   self.message.set("upload_image", _(u"Discard image"))

+ def autocomplete_users(self, *args, **kwargs):
+  c = autocompletionUsers.completion.autocompletionUsers(self.message, self.session.session_id)
+  c.show_menu()
+
 class reply(tweet):
 def __init__(self, session, title, caption, text, users=None):
  super(reply, self).__init__(session, title, caption, text, messageType="reply")
--- a/src/controller/settings.py
+++ b/src/controller/settings.py
@@ -1,11 +1,14 @@
 # -*- coding: utf-8 -*-
 import os
+import webbrowser
 import sound_lib
 import paths
 import widgetUtils
 import config
 import languageHandler
 from wxUI.dialogs import configuration
+from extra.autocompletionUsers import settings
+from extra.AudioUploader import dropbox_transfer
 from pubsub import pub
 import logging
 log = logging.getLogger("Settings")
@@ -15,6 +18,7 @@ class globalSettingsController(object):
  super(globalSettingsController, self).__init__()
  self.dialog = configuration.configurationDialog()
  self.create_config()
+  self.needs_restart = False

 def create_config(self):
  self.langs = languageHandler.getAvailableLanguages()
@@ -30,7 +34,6 @@ class globalSettingsController(object):
  self.dialog.set_value("general", "disable_sapi5", config.app["app-settings"]["voice_enabled"])
  self.dialog.set_value("general", "hide_gui", config.app["app-settings"]["hide_gui"])  
  self.dialog.realize()
-  self.needs_restart = False
  self.response = self.dialog.get_response()

 def save_configuration(self):
@@ -46,9 +49,11 @@ class globalSettingsController(object):
  config.app.write()

 class accountSettingsController(globalSettingsController):
- def __init__(self, config, user_name):
-  self.config = config
-  self.user = user_name
+ def __init__(self, buffer, window):
+  self.user = buffer.session.db["user_name"]
+  self.buffer = buffer
+  self.window = window
+  self.config = buffer.session.settings
  super(accountSettingsController, self).__init__()

 def create_config(self):
@@ -66,6 +71,8 @@ class accountSettingsController(globalSettingsController):
  self.dialog.set_value("buffers", "mutes", self.config["other_buffers"]["show_muted_users"])
  self.dialog.set_value("buffers", "events", self.config["other_buffers"]["show_events"])
  self.dialog.create_ignored_clients(self.config["twitter"]["ignored_clients"])
+  widgetUtils.connect_event(self.dialog.ignored_clients.add, widgetUtils.BUTTON_PRESSED, self.add_ignored_client)
+  widgetUtils.connect_event(self.dialog.ignored_clients.remove, widgetUtils.BUTTON_PRESSED, self.remove_ignored_client)
  self.input_devices = sound_lib.input.Input.get_device_names()
  self.output_devices = sound_lib.output.Output.get_device_names()
  self.soundpacks = []
@@ -77,9 +84,100 @@ class accountSettingsController(globalSettingsController):
  self.dialog.set_value("sound", "global_mute", self.config["sound"]["global_mute"])
  self.dialog.set_value("sound", "soundpack", self.config["sound"]["current_soundpack"])
  self.dialog.create_audio_services()
+  if self.config["services"]["dropbox_token"] == "":
+   self.dialog.services.set_dropbox(False)
+  else:
+   self.dialog.services.set_dropbox(True)
+  widgetUtils.connect_event(self.dialog.services.dropbox, widgetUtils.BUTTON_PRESSED, self.manage_dropbox)
+  self.dialog.set_value("services", "apiKey", self.config["sound"]["sndup_api_key"])
  self.dialog.realize()
  self.dialog.set_title(_(u"Account settings for %s") % (self.user,))
  self.response = self.dialog.get_response()

- def save_config(self): pass
- def manage_autocomplete(self, *args, **kwargs): pass
+ def save_configuration(self):
+  if self.config["general"]["relative_times"] != self.dialog.get_value("general", "relative_time"):
+   self.needs_restart = True
+   self.config["general"]["relative_times"] = self.dialog.get_value("general", "relative_time")
+  self.config["general"]["max_api_calls"] = self.dialog.get_value("general", "apiCalls")
+  self.config["general"]["max_tweets_per_call"] = self.dialog.get_value("general", "itemsPerApiCall")
+  if self.config["general"]["reverse_timelines"] != self.dialog.get_value("general", "reverse_timelines"):
+   self.needs_restart = True
+   self.config["general"]["reverse_timelines"] = self.dialog.get_value("general", "reverse_timelines")
+  if self.config["other_buffers"]["show_followers"] != self.dialog.get_value("buffers", "followers"):
+   self.config["other_buffers"]["show_followers"] = self.dialog.get_value("buffers", "followers")
+   pub.sendMessage("create-new-buffer", buffer="followers", account=self.user, create=self.config["other_buffers"]["show_followers"])
+  if self.config["other_buffers"]["show_friends"] != self.dialog.get_value("buffers", "friends"):
+   self.config["other_buffers"]["show_friends"] = self.dialog.get_value("buffers", "friends")
+   pub.sendMessage("create-new-buffer", buffer="friends", account=self.user, create=self.config["other_buffers"]["show_friends"])
+  if self.config["other_buffers"]["show_favourites"] != self.dialog.get_value("buffers", "favs"):
+   self.config["other_buffers"]["show_favourites"] = self.dialog.get_value("buffers", "favs")
+   pub.sendMessage("create-new-buffer", buffer="favourites", account=self.user, create=self.config["other_buffers"]["show_favourites"])
+  if self.config["other_buffers"]["show_blocks"] != self.dialog.get_value("buffers", "blocks"):
+   self.config["other_buffers"]["show_blocks"] = self.dialog.get_value("buffers", "blocks")
+   pub.sendMessage("create-new-buffer", buffer="blocks", account=self.user, create=self.config["other_buffers"]["show_blocks"])
+  if self.config["other_buffers"]["show_muted_users"] != self.dialog.get_value("buffers", "mutes"):
+   self.config["other_buffers"]["show_muted_users"] = self.dialog.get_value("buffers", "mutes")
+   pub.sendMessage("create-new-buffer", buffer="mutes", account=self.user, create=self.config["other_buffers"]["show_muted_users"])
+  if self.config["other_buffers"]["show_events"] != self.dialog.get_value("buffers", "events"):
+   self.config["other_buffers"]["show_events"] = self.dialog.get_value("buffers", "events")
+   pub.sendMessage("create-new-buffer", buffer="events", account=self.user, create=self.config["other_buffers"]["show_events"])
+  if self.config["sound"]["input_device"] != self.dialog.sound.get("input"):
+   self.config["sound"]["input_device"] = self.dialog.sound.get("input")
+   try:
+    self.buffer.session.sound.input.set_device(self.buffer.session.sound.input.find_device_by_name(self.config["sound"]["input_device"]))
+   except:
+    self.config["sound"]["input_device"] = "default"
+  if self.config["sound"]["output_device"] != self.dialog.sound.get("output"):
+   self.config["sound"]["output_device"] = self.dialog.sound.get("output")
+   try:
+    self.buffer.session.sound.output.set_device(self.buffer.session.sound.output.find_device_by_name(self.config["sound"]["output_device"]))
+   except:
+    self.config["sound"]["output_device"] = "default"
+  self.config["sound"]["volume"] = self.dialog.get_value("sound", "volumeCtrl")/100.0
+  self.config["sound"]["global_mute"] = self.dialog.get_value("sound", "global_mute")
+  self.config["sound"]["soundpack"] = self.dialog.sound.get("soundpack")
+  self.buffer.session.sound.check_soundpack()
+  self.config["sound"]["sndup_api_key"] = self.dialog.get_value("services", "apiKey")
+
+
+ def manage_autocomplete(self, *args, **kwargs):
+  configuration = settings.autocompletionSettings(self.buffer.session.settings, self.buffer, self.window)
+
+ def add_ignored_client(self, *args, **kwargs):
+  client = commonMessageDialogs.get_ignored_client()
+  if client == None: return
+  if client not in self.config["twitter"]["ignored_clients"]:
+   self.config["twitter"]["ignored_clients"].append(client)
+   self.dialog.ignored_clients.append(client)
+
+ def remove_ignored_client(self, *args, **kwargs):
+  if self.dialog.ignored_clients.get_clients() == 0: return
+  id = self.dialog.ignored_clients.get_client_id()
+  self.config["twitter"]["ignored_clients"].pop(id)
+  self.dialog.ignored_clients.remove(id)
+
+ def manage_dropbox(self, *args, **kwargs):
+  if self.dialog.services.get_dropbox() == _(u"Link your Dropbox account"):
+   self.connect_dropbox()
+  else:
+   self.disconnect_dropbox()
+
+ def connect_dropbox(self):
+  auth = dropbox_transfer.dropboxLogin(self.config)
+  url = auth.get_url()
+  self.dialog.services.show_dialog()
+  webbrowser.open(url)
+  resp = self.dialog.services.get_response()
+  if resp == "":
+   self.dialog.services.set_dropbox(False)
+  else:
+   try:
+    auth.authorise(resp)
+    self.dialog.services.set_dropbox()
+   except:
+    self.dialog.services.show_error()
+    self.dialog.services.set_dropbox(False)
+
+ def disconnect_dropbox(self):
+  self.config["services"]["dropbox_token"] = ""
+  self.dialog.services.set_dropbox(False)