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

rind: Switch node iterators from user_data3 to user_data 

These other variables are unused now, so let's just use the first one
for simplicity.

Signed-off-by: Anna Schumaker <Anna@NoWheyCreamery.com>
This commit is contained in:
Anna Schumaker 2019-04-23 10:59:53 -04:00
parent dcc2f7e6d0
commit 8f3178bfc7
2 changed files with 32 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rind/node.py
View File

@ -87,7 +87,7 @@ class NodeTreeModel(GObject.GObject, Gtk.TreeModel):
plist = self.iter_playlist(iter)
if plist == None or plist.next_child == None:
return (False, None)
iter.user_data3 = id(plist.next_child)
iter.user_data = id(plist.next_child)
return (True, iter)
def do_iter_parent(self, child):
@ -104,8 +104,8 @@ class NodeTreeModel(GObject.GObject, Gtk.TreeModel):
return True
def iter_playlist(self, iter):
if iter and iter.user_data3 > 0:
return curds.playlist.Root.lookup_byid(iter.user_data3)
if iter and iter.user_data > 0:
return curds.playlist.Root.lookup_byid(iter.user_data)
return curds.playlist.Root
def on_playlist_changed(self, plist):
@ -139,7 +139,7 @@ class NodeTreeModel(GObject.GObject, Gtk.TreeModel):
if plist == None or plist.parent == None:
return None
iter = Gtk.TreeIter()
iter.user_data3 = id(plist)
iter.user_data = id(plist)
return iter
def set_filter_text(self, entry):

61
rind/test_node.py
View File

@ -28,11 +28,6 @@ class TestNodeTreeModel(unittest.TestCase):
def tearDownClass():
curds.stop()
def assertTreeIterEqual(self, iter, ud):
self.assertEqual(iter.user_data, ud[0])
self.assertEqual(iter.user_data2, ud[1])
self.assertEqual(iter.user_data3, ud[2])
def test_init(self):
self.assertIsInstance(gtk.Builder.get_object("node_treeview"), Gtk.TreeView)
self.assertIsInstance(node.LibraryAdd, Gtk.Button)
@ -63,23 +58,23 @@ class TestNodeTreeModel(unittest.TestCase):
for node in plist_root.children:
path = Gtk.TreePath(node.get_path())
iter = self.model.get_iter(path)
self.assertTreeIterEqual(iter, (0, 0, id(node)))
self.assertEqual(iter.user_data, id(node))
for node in self.genre.children:
path = Gtk.TreePath(node.get_path())
iter = self.model.get_iter(path)
self.assertTreeIterEqual(iter, (0, 0, id(node)))
self.assertEqual(iter.user_data, id(node))
def test_model_get_path(self):
iter = Gtk.TreeIter()
for node in plist_root.children:
iter.user_data3 = id(node)
iter.user_data = id(node)
path = self.model.get_path(iter)
self.assertEqual(path.get_indices(), node.get_path())
for node in self.genre.children:
iter.user_data3 = id(node)
iter.user_data = id(node)
path = self.model.get_path(iter)
self.assertEqual(path.get_indices(), node.get_path())
@ -90,7 +85,7 @@ class TestNodeTreeModel(unittest.TestCase):
for i, child in enumerate(plist_root.children):
text = str(child) if i != 0 else f"<b>{str(child)}</b>"
iter.user_data3 = id(child)
iter.user_data = id(child)
self.assertEqual(self.model.get_value(iter, 0), child.icon)
self.assertEqual(self.model.get_value(iter, 1), text)
if isinstance(child, curds.Playlist):
@ -100,36 +95,36 @@ class TestNodeTreeModel(unittest.TestCase):
def test_model_iter_children(self):
iter = self.model.iter_children(None)
self.assertTreeIterEqual(iter, (0, 0, id(plist_root.nth_child(0))))
self.assertEqual(iter.user_data, id(plist_root.nth_child(0)))
for node in plist_root.children:
iter.user_data3 = id(node)
iter.user_data = id(node)
child = self.model.iter_children(iter)
if node not in [ self.artist, self.decade, self.genre ]:
self.assertIsNone(child)
iter.user_data3 = 42
iter.user_data = 42
self.assertIsNone(self.model.iter_children(iter))
iter = self.model.playlist_iter(self.genre)
child = self.model.iter_children(iter)
self.assertTreeIterEqual(child, (0, 0, id(self.genre.nth_child(0))))
self.assertEqual(child.user_data, id(self.genre.nth_child(0)))
for node in self.genre.children:
child.user_data3 = id(node)
child.user_data = id(node)
self.assertIsNone(self.model.iter_children(child))
def test_model_iter_has_child(self):
iter = Gtk.TreeIter()
for node in plist_root.children:
iter.user_data3 = id(node)
iter.user_data = id(node)
expected = node in [ self.artist, self.decade, self.genre ]
self.assertEqual(self.model.iter_has_child(iter), expected)
iter.user_data3 = 42
iter.user_data = 42
self.assertFalse(self.model.iter_has_child(iter))
for node in self.genre.children:
iter.user_data3 = id(node)
iter.user_data = id(node)
self.assertFalse(self.model.iter_has_child(iter))
def test_model_iter_n_children(self):
@ -137,19 +132,19 @@ class TestNodeTreeModel(unittest.TestCase):
self.assertEqual(self.model.iter_n_children(None), plist_root.n_children())
for node in plist_root.children:
iter.user_data3 = id(node)
iter.user_data = id(node)
self.assertEqual(self.model.iter_n_children(iter), node.n_children())
iter.user_data3 = 42
iter.user_data = 42
self.assertEqual(self.model.iter_n_children(iter), 0)
for node in self.genre.children:
iter.user_data3 = id(node)
iter.user_data = id(node)
self.assertEqual(self.model.iter_n_children(iter), 0)
def test_model_iter_nth_child(self):
for i, node in enumerate(plist_root.children):
iter = self.model.iter_nth_child(None, i)
self.assertTreeIterEqual(iter, (0, 0, id(node)))
self.assertEqual(iter.user_data, id(node))
if node not in [self.artist, self.decade, self.genre]:
self.assertIsNone(self.model.iter_nth_child(iter, 0))
self.assertIsNone(self.model.iter_nth_child(None, plist_root.n_children()))
@ -157,33 +152,33 @@ class TestNodeTreeModel(unittest.TestCase):
iter = self.model.playlist_iter(self.genre)
for i, node in enumerate(self.genre.children):
child = self.model.iter_nth_child(iter, i)
self.assertTreeIterEqual(child, (0, 0, id(node)))
self.assertEqual(child.user_data, id(node))
self.assertIsNone(self.model.iter_nth_child(iter, i + 1))
def test_model_iter_next(self):
iter = self.model.iter_children(None)
for node in plist_root.children:
self.assertTreeIterEqual(iter, (0, 0, id(node)))
self.assertEqual(iter.user_data, id(node))
iter = self.model.iter_next(iter)
self.assertIsNone(iter)
iter = self.model.playlist_iter(self.genre)
child = self.model.iter_children(iter)
for node in self.genre.children:
self.assertTreeIterEqual(child, (0, 0, id(node)))
self.assertEqual(child.user_data, id(node))
child = self.model.iter_next(child)
self.assertIsNone(child)
def test_model_iter_parent(self):
iter = Gtk.TreeIter()
for node in enumerate(plist_root.children):
iter.user_data3 = id(node)
iter.user_data = id(node)
self.assertIsNone(self.model.iter_parent(iter))
for node in self.genre.children:
iter.user_data3 = id(node)
iter.user_data = id(node)
parent = self.model.iter_parent(iter)
self.assertTreeIterEqual(parent, (0, 0, id(self.genre)))
self.assertEqual(parent.user_data, id(self.genre))
def test_model_iter_playlist(self):
iter = Gtk.TreeIter()
@ -191,15 +186,15 @@ class TestNodeTreeModel(unittest.TestCase):
self.assertEqual(self.model.iter_playlist(None), plist_root)
self.assertEqual(self.model.iter_playlist(iter), plist_root)
iter.user_data3 = 42
iter.user_data = 42
self.assertIsNone(self.model.iter_playlist(iter))
for node in plist_root.children:
iter.user_data3 = id(node)
iter.user_data = id(node)
self.assertEqual(self.model.iter_playlist(iter), node)
for node in self.genre.children:
iter.user_data3 = id(node)
iter.user_data = id(node)
self.assertEqual(self.model.iter_playlist(iter), node)
def test_model_playlist_iter(self):
@ -207,12 +202,12 @@ class TestNodeTreeModel(unittest.TestCase):
for node in plist_root.children:
iter = self.model.playlist_iter(node)
self.assertTreeIterEqual(iter, (0, 0, id(node)))
self.assertEqual(iter.user_data, id(node))
iter = self.model.playlist_iter(self.genre)
for node in self.genre.children:
child = self.model.playlist_iter(node)
self.assertTreeIterEqual(child, (0, 0, id(node)))
self.assertEqual(child.user_data, id(node))
def test_node_selection(self):
selection = node.Treeview.get_selection()