Non-active presenter browsing implemented

[watersofshiloah] / src / windows.py

diff --git a/src/windows.py b/src/windows.py
index d62c0ed..4027a41 100644 (file)
--- a/src/windows.py
+++ b/src/windows.py
@@ -350,8 +350,8 @@ class RadioWindow(BasicWindow):
                self._layout.pack_start(self._loadingBanner.toplevel, False, False)
                self._layout.pack_start(self._radioLayout, True, True)
 
-               self._window.set_title(self._node.title)
                self._dateShown = datetime.datetime.now()
+               self._update_title()
 
        def show(self):
                BasicWindow.show(self)
@@ -364,6 +364,9 @@ class RadioWindow(BasicWindow):
        def jump_to(self, node):
                _moduleLogger.info("Only 1 channel, nothing to jump to")
 
+       def _update_title(self):
+               self._window.set_title("%s - %s" % (self._node.title, self._dateShown.strftime("%m/%d")))
+
        @property
        def _active(self):
                return self._player.node is self._childNode
@@ -441,12 +444,11 @@ class RadioWindow(BasicWindow):
                                _moduleLogger.info("Unhandled player state %s" % self._player.state)
                elif navState == "down":
                        imageName = "home"
-               elif navState == "up":
-                       imageName = "play"
-               elif navState == "left":
-                       imageName = "play"
-               elif navState == "right":
-                       imageName = "play"
+               else:
+                       if self._player.state == self._player.STATE_PLAY:
+                               imageName = "pause"
+                       else:
+                               imageName = "play"
 
                self._presenter.set_state(self._store.STORE_LOOKUP[imageName])
 
@@ -474,9 +476,11 @@ class RadioWindow(BasicWindow):
                        pass
                elif navState == "left":
                        self._dateShown += datetime.timedelta(days=1)
+                       self._update_title()
                        self._refresh()
                elif navState == "right":
                        self._dateShown -= datetime.timedelta(days=1)
+                       self._update_title()
                        self._refresh()
 
        @misc_utils.log_exception(_moduleLogger)
@@ -541,6 +545,8 @@ class ListWindow(BasicWindow):
                BasicWindow.__init__(self, player, store)
                self._node = node
 
+               self.connect_auto(self._player, "title-change", self._on_player_title_change)
+
                self._loadingBanner = banners.GenericBanner()
 
                modelTypes, columns = zip(*self._get_columns())
@@ -617,6 +623,10 @@ class ListWindow(BasicWindow):
                raise NotImplementedError("")
 
        @misc_utils.log_exception(_moduleLogger)
+       def _on_player_title_change(self, player, node):
+               self._select_row()
+
+       @misc_utils.log_exception(_moduleLogger)
        def _on_jump(self, source, node):
                ancestors, current, descendants = stream_index.common_paths(node, self._node)
                if current is None:
@@ -690,9 +700,7 @@ class ConferencesWindow(ListWindow):
                        row = programNode, program["title"], program["full_title"]
                        self._model.append(row)
 
-               path = (self._get_current_row(), )
-               self._treeView.scroll_to_cell(path)
-               self._treeView.get_selection().select_path(path)
+               self._select_row()
 
        @misc_utils.log_exception(_moduleLogger)
        def _on_error(self, exception):
@@ -755,9 +763,7 @@ class ConferenceSessionsWindow(ListWindow):
                        row = programNode, program["title"]
                        self._model.append(row)
 
-               path = (self._get_current_row(), )
-               self._treeView.scroll_to_cell(path)
-               self._treeView.get_selection().select_path(path)
+               self._select_row()
 
        @misc_utils.log_exception(_moduleLogger)
        def _on_error(self, exception):
@@ -820,9 +826,7 @@ class ConferenceTalksWindow(ListWindow):
                        row = programNode, "%s\n%s" % (program["title"], program["speaker"])
                        self._model.append(row)
 
-               path = (self._get_current_row(), )
-               self._treeView.scroll_to_cell(path)
-               self._treeView.get_selection().select_path(path)
+               self._select_row()
 
        @misc_utils.log_exception(_moduleLogger)
        def _on_error(self, exception):
@@ -856,6 +860,7 @@ class ConferenceTalkWindow(BasicWindow):
                BasicWindow.__init__(self, player, store)
                self._node = node
                self._playerNode = self._player.node
+               self._nextSearch = None
 
                self.connect_auto(self._player, "state-change", self._on_player_state_change)
                self.connect_auto(self._player, "title-change", self._on_player_title_change)
@@ -924,8 +929,11 @@ class ConferenceTalkWindow(BasicWindow):
        @misc_utils.log_exception(_moduleLogger)
        def _on_player_title_change(self, player, node):
                if not self._active or node in [None, self._node]:
+                       self._playerNode = player.node
                        return
+               self._playerNode = player.node
                self.emit("jump-to", node)
+               self._window.destroy()
 
        @misc_utils.log_exception(_moduleLogger)
        def _on_player_error(self, player, err, debug):
@@ -948,7 +956,17 @@ class ConferenceTalkWindow(BasicWindow):
                elif navState == "down":
                        imageName = "home"
                elif navState == "up":
-                       imageName = "play"
+                       if self._player.state == self._player.STATE_PLAY:
+                               if self._active:
+                                       imageName = "pause"
+                               else:
+                                       imageName = "play"
+                       elif self._player.state == self._player.STATE_PAUSE:
+                               imageName = "play"
+                       elif self._player.state == self._player.STATE_STOP:
+                               imageName = "play"
+                       else:
+                               _moduleLogger.info("Unhandled player state %s" % self._player.state)
                elif navState == "left":
                        imageName = "next"
                elif navState == "right":
@@ -983,12 +1001,27 @@ class ConferenceTalkWindow(BasicWindow):
                        if self._active:
                                self._player.next()
                        else:
-                               pass # @todo Not Implemented
+                               assert self._nextSearch is None
+                               self._nextSearch = stream_index.AsyncWalker(stream_index.get_next)
+                               self._nextSearch.start(self._node, self._on_next_node, self._on_node_search_error)
                elif navState == "right":
                        if self._active:
                                self._player.back()
                        else:
-                               pass # @todo Not Implemented
+                               assert self._nextSearch is None
+                               self._nextSearch = stream_index.AsyncWalker(stream_index.get_previous)
+                               self._nextSearch.start(self._node, self._on_next_node, self._on_node_search_error)
+
+       @misc_utils.log_exception(_moduleLogger)
+       def _on_next_node(self, node):
+               self._nextSearch = None
+               self.emit("jump-to", node)
+               self._window.destroy()
+
+       @misc_utils.log_exception(_moduleLogger)
+       def _on_node_search_error(self, e):
+               self._nextSearch = None
+               self._errorBanner.push_message(str(e))
 
 
 gobject.type_register(ConferenceTalkWindow)