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

curds: Remove node.insert_child() function

Browse Source 
This function is now unused, since we're using bisection insertion
instead. We switch remaining callers over to using node.append_child()
while we're at it.

Signed-off-by: Anna Schumaker <Anna@NoWheyCreamery.com>
This commit is contained in:
Anna Schumaker 2019-06-10 08:55:12 -04:00
parent fe181b72a4
commit e610a7a078
5 changed files with 4 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
curds/playlist/node.py
View File

@ -73,12 +73,6 @@ class PlaylistNode:
def has_sibling(self):
return (self.next_child != None) or (self.prev_child != None)
def insert_child(self, child):
for i, n in enumerate(self.children):
if child.sort_key() < n.sort_key():
return self.__insert_node__(child, i)
return self.append_child(child)
def lookup(self, name):
for node in self.children:
if node.sort_key() == node.sort_key(name):

2
curds/playlist/test_genre.py
View File

@ -64,7 +64,7 @@ class TestGenrePlaylist(unittest.TestCase):
def test_genre_reset(self):
gnode = genre.GenreNode()
plist = playlist.Playlist("Test Playlist")
gnode.insert_child(plist)
gnode.append_child(plist)
notify.cancel("new-track", gnode.new_track)
gnode.reset()

41
curds/playlist/test_node.py
View File

@ -80,47 +80,6 @@ class TestPlaylistNode(unittest.TestCase):
self.assertEqual(b.node_index(), 1)
self.assertEqual(c.node_index(), 0)
def test_node_insert_child(self):
notify.register("node-inserted", self.on_insert_node)
self.cb_insert = None
root = node.PlaylistNode()
a = node.PlaylistNode("a")
b = node.PlaylistNode("b")
c = node.PlaylistNode("c")
d = node.PlaylistNode("d")
self.assertEqual(root.n_children(), 0)
self.assertEqual(root.insert_child(b), b)
self.assertEqual(root.n_children(), 1)
self.assertEqual(root.children, [ b ])
self.assertEqual(self.cb_insert, (b, 0))
self.assertEqual(root.insert_child(d), d)
self.assertEqual(root.n_children(), 2)
self.assertEqual(root.children, [ b, d ])
self.assertEqual(b.next_child, d)
self.assertEqual(d.prev_child, b)
self.assertEqual(self.cb_insert, (d, 1))
self.assertEqual(root.insert_child(c), c)
self.assertEqual(root.n_children(), 3)
self.assertEqual(root.children, [ b, c, d ])
self.assertEqual(b.next_child, c)
self.assertEqual(c.prev_child, b)
self.assertEqual(c.next_child, d)
self.assertEqual(d.prev_child, c)
self.assertEqual(self.cb_insert, (c, 1))
self.assertEqual(root.insert_child(a), a)
self.assertEqual(root.n_children(), 4)
self.assertEqual(root.children, [ a, b, c, d ])
self.assertEqual(a.next_child, b)
self.assertEqual(b.prev_child, a)
self.assertEqual(self.cb_insert, (a, 0))
notify.cancel("node-inserted", self.on_insert_node)
def test_node_lookup(self):
root = node.PlaylistNode()
a = node.PlaylistNode("a")

4
curds/playlist/user.py
View File

@ -8,10 +8,10 @@ class UserNode(node.PlaylistNode):
sort = [ "artist", "date", "album", "discnumber", "tracknumber" ]
self.starred = playlist.Playlist("Starred", "starred", sort)
self.insert_child(self.starred)
self.append_child(self.starred)
def reset(self):
node.PlaylistNode.reset(self)
self.starred.reset()
self.insert_child(self.starred)
self.append_child(self.starred)
node.nodes[id(self.starred)] = self.starred

2
rind/node/test_view.py
View File

@ -147,7 +147,7 @@ class TestNodeTreeView(unittest.TestCase):
stär = curds.Playlist("Stärred", "semi-starred")
iter = None
user.insert_child(stär)
user.append_child(stär)
self.assertEqual(user.n_children(), 2)
self.assertEqual(view.Filter.iter_n_children(None), root.n_children())