Continually update the selected row in the radio program, switching to a new day...

[watersofshiloah] / src / windows / radio.py

diff --git a/src/windows/radio.py b/src/windows/radio.py
index d75db1a..c3a5d3f 100644 (file)
--- a/src/windows/radio.py
+++ b/src/windows/radio.py
@@ -7,6 +7,7 @@ import gtk
 import hildonize
 import util.misc as misc_utils
 import util.time_utils as time_utils
+import util.go_utils as go_utils
 import banners
 import presenter
 
@@ -62,11 +63,11 @@ class RadioWindow(windows._base.BasicWindow):
                self._treeView.append_column(titleColumn)
                self._treeView.get_selection().connect("changed", self._on_row_changed)
 
-               viewport = gtk.Viewport()
-               viewport.add(self._treeView)
+               self._viewport = gtk.Viewport()
+               self._viewport.add(self._treeView)
 
                self._treeScroller = gtk.ScrolledWindow()
-               self._treeScroller.add(viewport)
+               self._treeScroller.add(self._viewport)
                self._treeScroller.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
                self._treeScroller = hildonize.hildonize_scrollwindow(self._treeScroller)
 
@@ -85,8 +86,12 @@ class RadioWindow(windows._base.BasicWindow):
                self._layout.pack_start(self._radioLayout, True, True)
 
                self._dateShown = datetime.datetime.now(tz=time_utils.Mountain)
+               self._currentTime = self._dateShown
                self._update_title()
 
+               self._continualUpdate = go_utils.Timeout(self._on_continual_update, once = False)
+               self._continualUpdate.start(seconds=60)
+
        def show(self):
                windows._base.BasicWindow.show(self)
 
@@ -98,6 +103,15 @@ class RadioWindow(windows._base.BasicWindow):
        def jump_to(self, node):
                _moduleLogger.info("Only 1 channel, nothing to jump to")
 
+       def _update_time(self, newTime):
+               oldTime = self._dateShown
+               self._dateShown = newTime
+               if newTime.date() == oldTime.date():
+                       self._select_row()
+               else:
+                       self._update_title()
+                       self._refresh()
+
        def _update_title(self):
                self._window.set_title("%s - %s" % (self._node.title, self._dateShown.strftime("%m/%d")))
 
@@ -149,6 +163,20 @@ class RadioWindow(windows._base.BasicWindow):
                        return i
 
        @misc_utils.log_exception(_moduleLogger)
+       def _on_continual_update(self, *args):
+               if self._isDestroyed:
+                       return False
+               newTime = datetime.datetime.now(tz=time_utils.Mountain)
+               oldTime = self._currentTime
+               shownTime = self._dateShown
+
+               self._currentTime = newTime
+               if shownTime.date() == oldTime.date():
+                       _moduleLogger.info("Today selected, updating selection")
+                       self._update_time(newTime)
+               return True
+
+       @misc_utils.log_exception(_moduleLogger)
        def _on_player_state_change(self, player, newState):
                if self._headerNavigation.is_active() or self._presenterNavigation.is_active():
                        return
@@ -209,13 +237,9 @@ class RadioWindow(windows._base.BasicWindow):
                elif navState == "up":
                        pass
                elif navState == "left":
-                       self._dateShown += datetime.timedelta(days=1)
-                       self._update_title()
-                       self._refresh()
+                       self._update_time(self._dateShown + datetime.timedelta(days=1))
                elif navState == "right":
-                       self._dateShown -= datetime.timedelta(days=1)
-                       self._update_title()
-                       self._refresh()
+                       self._update_time(self._dateShown - datetime.timedelta(days=1))
 
        @misc_utils.log_exception(_moduleLogger)
        def _on_channels(self, channels):
@@ -244,14 +268,17 @@ class RadioWindow(windows._base.BasicWindow):
                        row = program["time"], program["title"]
                        self._programmingModel.append(row)
 
-               currentDate = datetime.datetime.now()
+               currentDate = self._currentTime
                if currentDate.date() != self._dateShown.date():
                        self._treeView.get_selection().set_mode(gtk.SELECTION_NONE)
                else:
                        self._treeView.get_selection().set_mode(gtk.SELECTION_SINGLE)
-                       path = (self._get_current_row(), )
-                       self._treeView.scroll_to_cell(path)
-                       self._treeView.get_selection().select_path(path)
+                       self._select_row()
+                       go_utils.Async(self._on_delay_scroll).start()
+
+       @misc_utils.log_exception(_moduleLogger)
+       def _on_delay_scroll(self, *args):
+               self._scroll_to_row()
 
        @misc_utils.log_exception(_moduleLogger)
        def _on_load_error(self, exception):
@@ -263,11 +290,40 @@ class RadioWindow(windows._base.BasicWindow):
                if len(self._programmingModel) == 0:
                        return
 
+               # Undo the user's changing of the selection
+               self._select_row()
+
+       def _select_row(self):
                rowIndex = self._get_current_row()
+               if rowIndex < 0:
+                       return
                path = (rowIndex, )
-               if not selection.path_is_selected(path):
-                       # Undo the user's changing of the selection
-                       selection.select_path(path)
+               if not self._treeView.get_selection().path_is_selected(path):
+                       self._treeView.get_selection().select_path(path)
+
+       def _scroll_to_row(self):
+               if self._isDestroyed:
+                       return
+               rowIndex = self._get_current_row()
+               if rowIndex < 0:
+                       return
+
+               path = (rowIndex, )
+               self._treeView.scroll_to_cell(path)
+
+               treeViewHeight = self._treeView.get_allocation().height
+               viewportHeight = self._viewport.get_allocation().height
+
+               viewsPerPort = treeViewHeight / float(viewportHeight)
+               maxRows = len(self._programmingModel)
+               percentThrough = rowIndex / float(maxRows)
+               dxByIndex = int(viewsPerPort * percentThrough * viewportHeight)
+
+               dxMax = max(treeViewHeight - viewportHeight, 0)
+
+               dx = min(dxByIndex, dxMax)
+               adjustment = self._treeScroller.get_vadjustment()
+               adjustment.value = dx
 
 
 gobject.type_register(RadioWindow)