minor menu logic fixes

xgi · Mar 18, 2019 · be3fc08 · be3fc08
1 parent 245df56
commit be3fc08
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/castero/menus/episodemenu.py b/castero/menus/episodemenu.py
@@ -36,11 +36,7 @@ def metadata(self):
         if len(self._episodes) == 0:
             return ""
 
-        episode = self._episodes[self._selected]
-        if episode is None:
-            return ""
-
-        return episode.metadata
+        return self._episodes[self._selected].metadata
 
     def update_items(self, feed: Feed):
         assert isinstance(feed, Feed) or feed is None

diff --git a/castero/menus/feedmenu.py b/castero/menus/feedmenu.py
@@ -52,10 +52,8 @@ def update_items(self, obj):
     def update_child(self):
         if len(self._feeds) == 0:
             self.update_items(None)
-        elif len(self._feeds) > 0:
-            self._child.update_items(self._feeds[self._selected])
         else:
-            self._child.update_items(None)
+            self._child.update_items(self._feeds[self._selected])
 
     def invert(self):
         super().invert()

diff --git a/tests/test_menu_episode.py b/tests/test_menu_episode.py
@@ -43,6 +43,11 @@ def test_menu_episode_items(mock_A_NORMAL, mock_color_pair):
     } in items
 
 
+def test_menu_episode_item_none():
+    mymenu = EpisodeMenu(window, source)
+    assert mymenu.item() is None
+
+
 @mock.patch('curses.color_pair')
 @mock.patch('curses.A_NORMAL')
 def test_menu_episode_item(mock_A_NORMAL, mock_color_pair):
@@ -70,9 +75,20 @@ def test_menu_episode_metadata(mock_A_NORMAL, mock_color_pair):
     assert mymenu.metadata() == episode1.metadata
 
 
+@mock.patch('curses.color_pair')
+@mock.patch('curses.A_NORMAL')
+def test_menu_episode_update_child(mock_A_NORMAL, mock_color_pair):
+    mymenu = EpisodeMenu(window, source)
+    mymenu.update_items(feed)
+    items = mymenu._items()
+    mymenu.update_child()
+    assert mymenu._items() == items
+
+
 @mock.patch('curses.color_pair')
 @mock.patch('curses.A_NORMAL')
 def test_menu_episode_invert(mock_A_NORMAL, mock_color_pair):
     mymenu = EpisodeMenu(window, source)
     mymenu.invert()
-    assert mymenu._inverted
+    assert mymenu._inverted
+    mymenu.update_items(feed)