anna/emmental
anna
/
emmental
1
0
Fork 0
Code Issues 11 Pull Requests Projects 1 Releases 12 Wiki Activity

rind: Remove playlist_valid_iter() 

I'm about to change how iterators work, so remove this function to
simplify the code.

Signed-off-by: Anna Schumaker <Anna@NoWheyCreamery.com>
This commit is contained in:
Anna Schumaker 2019-04-22 14:26:24 -04:00
parent b49e81f580
commit cf8b88b833
2 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rind/node.py
View File

@ -82,7 +82,8 @@ class NodeTreeModel(GObject.GObject, Gtk.TreeModel):
plist = self.iter_playlist(iter)
if plist:
child = plist.nth_child(n)
return self.playlist_valid_iter(child)
iter = self.playlist_iter(child)
return self.iter_valid(iter)
return (False, None)
def do_iter_next(self, iter):
@ -94,7 +95,8 @@ class NodeTreeModel(GObject.GObject, Gtk.TreeModel):
def do_iter_parent(self, child):
plist = self.iter_playlist(child)
return self.playlist_valid_iter(plist.parent)
iter = self.playlist_iter(plist.parent)
return self.iter_valid(iter)
def is_visible(self, model, iter, data):
plist = self.iter_playlist(iter)
@ -146,10 +148,6 @@ class NodeTreeModel(GObject.GObject, Gtk.TreeModel):
return None
return self.get_iter(plist.get_path())
def playlist_valid_iter(self, plist):
iter = self.playlist_iter(plist)
return self.iter_valid(iter)
def set_filter_text(self, entry):
try:
self.filter_re = re.compile(entry.get_text(), re.I)

14
rind/test_node.py
View File

@ -238,20 +238,6 @@ class TestNodeTreeModel(unittest.TestCase):
child = self.model.playlist_iter(node)
self.assertTreeIterEqual(child, (iter.user_data, i + 1, 0))
def test_model_playlist_valid_iter(self):
self.assertEqual(self.model.playlist_valid_iter(None), (False, None))
for i, node in enumerate(plist_root.children):
(valid, iter) = self.model.playlist_valid_iter(node)
self.assertTrue(valid)
self.assertTreeIterEqual(iter, (i + 1, 0, 0))
iter = self.model.playlist_iter(self.genre)
for i, node in enumerate(self.genre.children):
(valid, child) = self.model.playlist_valid_iter(node)
self.assertTrue(valid)
self.assertTreeIterEqual(child, (iter.user_data, i + 1, 0))
def test_node_selection(self):
selection = node.Treeview.get_selection()
self.assertIsInstance(selection, Gtk.TreeSelection)