From af087508b02bfaf6d6cd1d6332bcbc9f49cf75a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20Cort=C3=A9z?= <manuel@manuelcortez.net>
Date: Thu, 22 Jan 2015 08:54:41 -0600
Subject: [PATCH] Timelines fix and some minor bugfixes too

---
 doc/application.py                  | 2 +-
 src/application.py                  | 2 +-
 src/controller/buffersController.py | 4 +++-
 src/sessionmanager/session.py       | 8 ++++----
 src/twitter/buffers/indibidual.py   | 4 ++--
 src/wxUI/buffers/base.py            | 6 ++++++
 src/wxUI/buffers/events.py          | 6 ++++++
 7 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/doc/application.py b/doc/application.py
index 8e219007..591bacc5 100644
--- a/doc/application.py
+++ b/doc/application.py
@@ -2,6 +2,6 @@
 name = 'TWBlue'
 snapshot = False
 if snapshot == False:
- version = "0.51"
+ version = "0.80"
 else:
  version = "7"
diff --git a/src/application.py b/src/application.py
index 2735b54c..66eff230 100644
--- a/src/application.py
+++ b/src/application.py
@@ -2,7 +2,7 @@
 name = 'TW Blue'
 snapshot = False
 if snapshot == False:
- version = "0.90"
+ version = "0.80"
  update_url = 'http://twblue.es/updates/tw_blue.json'
 else:
  version = "7"
diff --git a/src/controller/buffersController.py b/src/controller/buffersController.py
index 8dd995c1..f373023f 100644
--- a/src/controller/buffersController.py
+++ b/src/controller/buffersController.py
@@ -61,7 +61,7 @@ class bufferController(object):
     self.session.settings["sound"]["volume"] +=0.05
   if hasattr(sound.URLPlayer, "stream"):
    sound.URLPlayer.stream.volume = self.session.settings["sound"]["volume"]
-   self.session.sound.play("volume_changed.ogg")
+  self.session.sound.play("volume_changed.ogg")
 
  def start_stream(self):
   pass
@@ -178,6 +178,7 @@ class baseBufferController(bufferController):
    for i in self.session.db[self.name]:
     tweet = self.compose_function(i, self.session.db, self.session.settings["general"]["relative_times"])
     self.buffer.list.insert_item(False, *tweet)
+   self.buffer.set_position(self.session.settings["general"]["reverse_timelines"])
 #   self.buffer.set_list_position()
   elif self.buffer.list.get_count() > 0:
    if self.session.settings["general"]["reverse_timelines"] == False:
@@ -374,6 +375,7 @@ class peopleBufferController(baseBufferController):
    for i in self.session.db[self.name]["items"]:
     tweet = self.compose_function(i, self.session.db, self.session.settings["general"]["relative_times"])
     self.buffer.list.insert_item(False, *tweet)
+   self.buffer.set_position(self.session.settings["general"]["reverse_timelines"])
 #   self.buffer.set_list_position()
   elif self.buffer.list.get_count() > 0:
    if self.session.settings["general"]["reverse_timelines"] == False:
diff --git a/src/sessionmanager/session.py b/src/sessionmanager/session.py
index 3e5efe56..5950c48a 100644
--- a/src/sessionmanager/session.py
+++ b/src/sessionmanager/session.py
@@ -157,12 +157,12 @@ class Session(object):
     if report_failure and hasattr(e, 'message'):
      output.speak(_("%s failed.  Reason: %s") % (action, e.message))
     finished = True
-   except:
-    tries = tries + 1
-    time.sleep(5)
+#   except:
+#    tries = tries + 1
+#    time.sleep(5)
   if report_success:
    output.speak(_("%s succeeded.") % action)
-  if _sound != None: sound.player.play(_sound)
+  if _sound != None: self.sound.play(_sound)
 
  @_require_login
  def get_favourites_timeline(self, name, *args, **kwargs):
diff --git a/src/twitter/buffers/indibidual.py b/src/twitter/buffers/indibidual.py
index 1546bc56..55ce6a2f 100644
--- a/src/twitter/buffers/indibidual.py
+++ b/src/twitter/buffers/indibidual.py
@@ -20,8 +20,8 @@ class timelinesStreamer(TwythonStreamer):
  def check_tls(self, data):
   for i in self.session.settings["other_buffers"]["timelines"]:
    if data["user"]["screen_name"] == i:
-    if self.session.settings["general"]["reverse_timelines"] == False: self.session.db[i].append(data)
-    else: self.session.db[i].insert(0, data)
+    if self.session.settings["general"]["reverse_timelines"] == False: self.session.db["%s-timeline" % (i,)].append(data)
+    else: self.session.db["%s-timeline" % (i,)].insert(0, data)
     pub.sendMessage("item-in-timeline", data= data, user= self.session.db["user_name"], who= i)
 
  def on_success(self, data):
diff --git a/src/wxUI/buffers/base.py b/src/wxUI/buffers/base.py
index 7cfdc202..f87319be 100644
--- a/src/wxUI/buffers/base.py
+++ b/src/wxUI/buffers/base.py
@@ -30,3 +30,9 @@ class basePanel(wx.Panel):
   self.sizer.Add(btnSizer, 0, wx.ALL, 5)
   self.sizer.Add(self.list.list, 0, wx.ALL, 5)
   self.SetSizer(self.sizer)
+
+ def set_position(self, reversed=False):
+  if reversed == False:
+   self.list.select_item(self.list.get_count()-1)
+  else:
+   self.list.select_item(0)
\ No newline at end of file
diff --git a/src/wxUI/buffers/events.py b/src/wxUI/buffers/events.py
index 870531e1..cb1e5849 100644
--- a/src/wxUI/buffers/events.py
+++ b/src/wxUI/buffers/events.py
@@ -13,3 +13,9 @@ class eventsPanel(wx.Panel):
   self.list = widgets.list(self, _(u"Date"), _(u"Event"), size=(600,600), style=wx.LC_REPORT|wx.LC_SINGLE_SEL|wx.LC_VRULES)
   self.tweet = wx.Button(self, -1, _(u"Tweet"))
   self.delete_event = wx.Button(self, -1, _(u"Remove event"))
+
+ def set_position(self, reversed=False):
+  if reversed == False:
+   self.list.select_item(self.list.get_count()-1)
+  else:
+   self.list.select_item(0)
\ No newline at end of file