mirror of
https://github.com/MCV-Software/TWBlue.git
synced 2025-02-21 17:13:09 -05:00
Bugfixes for lists buffers and autocomplete
This commit is contained in:
parent
e12f440cf2
commit
eb2c315abb
@ -1,8 +1,8 @@
|
|||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
name = 'TW Blue'
|
name = 'TW Blue'
|
||||||
snapshot = True
|
snapshot = False
|
||||||
if snapshot == False:
|
if snapshot == False:
|
||||||
version = "0.48"
|
version = "0.50"
|
||||||
update_url = 'http://twblue.com.mx/updates/tw_blue.json'
|
update_url = 'http://twblue.com.mx/updates/tw_blue.json'
|
||||||
else:
|
else:
|
||||||
version = "6"
|
version = "6"
|
||||||
|
@ -44,13 +44,13 @@ class autocompletionSettings(object):
|
|||||||
|
|
||||||
def execute_at_startup(window):
|
def execute_at_startup(window):
|
||||||
database = storage.storage()
|
database = storage.storage()
|
||||||
if config.main["mysc"]["save_followers_in_autocompletion_db"] == True:
|
if config.main["mysc"]["save_followers_in_autocompletion_db"] == True and config.main["other_buffers"]["show_followers"] == True:
|
||||||
buffer = window.search_buffer("people", "followers")
|
buffer = window.search_buffer("people", "followers")
|
||||||
for i in buffer.db.settings[buffer.name_buffer]:
|
for i in buffer.db.settings[buffer.name_buffer]:
|
||||||
database.set_user(i["screen_name"], i["name"], 1)
|
database.set_user(i["screen_name"], i["name"], 1)
|
||||||
else:
|
else:
|
||||||
database.remove_by_buffer(1)
|
database.remove_by_buffer(1)
|
||||||
if config.main["mysc"]["save_friends_in_autocompletion_db"] == True:
|
if config.main["mysc"]["save_friends_in_autocompletion_db"] == True and config.main["other_buffers"]["show_friends"] == True:
|
||||||
buffer = window.search_buffer("people", "friends")
|
buffer = window.search_buffer("people", "friends")
|
||||||
for i in buffer.db.settings[buffer.name_buffer]:
|
for i in buffer.db.settings[buffer.name_buffer]:
|
||||||
database.set_user(i["screen_name"], i["name"], 2)
|
database.set_user(i["screen_name"], i["name"], 2)
|
||||||
|
@ -127,7 +127,7 @@ class listViewer(wx.Dialog):
|
|||||||
output.speak(_(u"This list is arready opened."))
|
output.speak(_(u"This list is arready opened."))
|
||||||
return
|
return
|
||||||
listUI = gui.buffers.lists.listPanel(self.nb, self.parent, list_updated["slug"]+"-list", argumento=utils.find_list(list_updated["slug"], self.db.settings["lists"]))
|
listUI = gui.buffers.lists.listPanel(self.nb, self.parent, list_updated["slug"]+"-list", argumento=utils.find_list(list_updated["slug"], self.db.settings["lists"]))
|
||||||
self.nb.AddPage(listUI, _(u"List for %s") % (list_updated["slug"],))
|
self.nb.InsertSubPage(self.db.settings["buffers"].index("lists"), listUI, _(u"List for %s") % (list_updated["slug"],))
|
||||||
self.db.settings["buffers"].append(list_updated["slug"]+"-list")
|
self.db.settings["buffers"].append(list_updated["slug"]+"-list")
|
||||||
num = listUI.start_streams()
|
num = listUI.start_streams()
|
||||||
listUI.put_items(num)
|
listUI.put_items(num)
|
||||||
|
@ -339,6 +339,7 @@ class mainFrame(wx.Frame):
|
|||||||
self.Bind(event.MyEVT_STARTED, self.onInit)
|
self.Bind(event.MyEVT_STARTED, self.onInit)
|
||||||
self.Bind(event.EVT_RESULT, self.onMemberAdded)
|
self.Bind(event.EVT_RESULT, self.onMemberAdded)
|
||||||
pub.subscribe(self.listen_streamerror, "streamError")
|
pub.subscribe(self.listen_streamerror, "streamError")
|
||||||
|
pub.subscribe(self.listen_for_friends, "friendsReceived")
|
||||||
call_threaded(self.init, run_streams=True)
|
call_threaded(self.init, run_streams=True)
|
||||||
|
|
||||||
def init(self, run_streams=False):
|
def init(self, run_streams=False):
|
||||||
@ -1072,12 +1073,15 @@ class mainFrame(wx.Frame):
|
|||||||
|
|
||||||
def listen_streamerror(self):
|
def listen_streamerror(self):
|
||||||
log.error("There is a connection error")
|
log.error("There is a connection error")
|
||||||
print "Connection error"
|
if hasattr(self, "stream"):
|
||||||
self.stream.disconnect()
|
self.stream.disconnect()
|
||||||
|
del self.stream
|
||||||
if hasattr(self, "stream2"):
|
if hasattr(self, "stream2"):
|
||||||
self.stream2.disconnect()
|
self.stream2.disconnect()
|
||||||
del self.stream2
|
del self.stream2
|
||||||
del self.stream
|
|
||||||
|
def listen_for_friends(self):
|
||||||
|
self.stream2.set_friends(self.stream.friends)
|
||||||
|
|
||||||
### Close App
|
### Close App
|
||||||
def Destroy(self):
|
def Destroy(self):
|
||||||
|
@ -42,11 +42,12 @@ class streamer(TwythonStreamer):
|
|||||||
except ValueError:
|
except ValueError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
def set_friends(self, friends):
|
||||||
|
self.friends = friends
|
||||||
|
|
||||||
def on_success(self, data):
|
def on_success(self, data):
|
||||||
try:
|
try:
|
||||||
if data.has_key("text") and utils.is_allowed(data):
|
if data.has_key("text") and utils.is_allowed(data):
|
||||||
self.check_tls(data)
|
self.check_tls(data)
|
||||||
elif "friends" in data:
|
|
||||||
self.friends = data["friends"]
|
|
||||||
except:
|
except:
|
||||||
pass
|
pass
|
@ -8,6 +8,7 @@ import config
|
|||||||
import logging as original_logger
|
import logging as original_logger
|
||||||
log = original_logger.getLogger("MainStream")
|
log = original_logger.getLogger("MainStream")
|
||||||
import output
|
import output
|
||||||
|
from wx.lib.pubsub import pub
|
||||||
|
|
||||||
class streamer(TwythonStreamer):
|
class streamer(TwythonStreamer):
|
||||||
def __init__(self, app_key, app_secret, oauth_token, oauth_token_secret, timeout=300, retry_count=None, retry_in=10, client_args=None, handlers=None, chunk_size=1, parent=None):
|
def __init__(self, app_key, app_secret, oauth_token, oauth_token_secret, timeout=300, retry_count=None, retry_in=10, client_args=None, handlers=None, chunk_size=1, parent=None):
|
||||||
@ -105,6 +106,7 @@ class streamer(TwythonStreamer):
|
|||||||
self.process_dm(data)
|
self.process_dm(data)
|
||||||
elif "friends" in data:
|
elif "friends" in data:
|
||||||
self.friends = data["friends"]
|
self.friends = data["friends"]
|
||||||
|
pub.sendMessage("friendsReceived")
|
||||||
elif "text" in data and utils.is_allowed(data) == True:
|
elif "text" in data and utils.is_allowed(data) == True:
|
||||||
if data["user"]["id"] in self.muted_users: return
|
if data["user"]["id"] in self.muted_users: return
|
||||||
self.check_mentions(data)
|
self.check_mentions(data)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user