From d7ad6c5894d741a40cb55d8bcf1da726668bf18b Mon Sep 17 00:00:00 2001 From: Anna Schumaker Date: Mon, 16 Dec 2019 13:43:40 -0500 Subject: [PATCH] curds: Remove the PlaylistNode class It is now unused Signed-off-by: Anna Schumaker --- curds/playlist/__init__.py | 1 - curds/playlist/artist.py | 6 +++--- curds/playlist/decade.py | 6 +++--- curds/playlist/genre.py | 6 +++--- curds/playlist/library.py | 6 +++--- curds/playlist/new.py | 1 - curds/playlist/node.py | 10 ---------- curds/playlist/playlist.py | 12 ++++++------ curds/playlist/prev.py | 1 - curds/playlist/root.py | 6 +++--- curds/playlist/test_artist.py | 4 ++-- curds/playlist/test_decade.py | 4 ++-- curds/playlist/test_genre.py | 4 ++-- curds/playlist/test_library.py | 4 ++-- curds/playlist/test_node.py | 17 ----------------- curds/playlist/test_playlist.py | 4 ++-- curds/playlist/test_root.py | 4 ++-- curds/playlist/test_user.py | 4 ++-- curds/playlist/user.py | 10 +++++----- test_emmental.py | 1 - 20 files changed, 40 insertions(+), 71 deletions(-) delete mode 100644 curds/playlist/node.py delete mode 100644 curds/playlist/test_node.py diff --git a/curds/playlist/__init__.py b/curds/playlist/__init__.py index 9a0109c..80a69ba 100644 --- a/curds/playlist/__init__.py +++ b/curds/playlist/__init__.py @@ -11,7 +11,6 @@ import threading Current = [ ] Library = library.LibraryPlaylist Lock = threading.Lock() -Node = node.PlaylistNode Root = None Track = None diff --git a/curds/playlist/artist.py b/curds/playlist/artist.py index 1ad6009..2ecf439 100644 --- a/curds/playlist/artist.py +++ b/curds/playlist/artist.py @@ -1,7 +1,7 @@ # Copyright 2019 (c) Anna Schumaker. -from . import node from . import playlist from .. import notify +from .. import tree ALBUM_ICON = "media-optical-cd-audio" ARTIST_ICON = "avatar-default-symbolic" @@ -16,9 +16,9 @@ class ArtistPlaylist(playlist.Playlist): self.find_child(track["album"], ALBUM_ICON).add(track) -class ArtistNode(node.PlaylistNode): +class ArtistNode(tree.ETree): def __init__(self): - node.PlaylistNode.__init__(self, "Artists", ARTIST_ICON) + tree.ETree.__init__(self, "Artists", ARTIST_ICON) def alloc_child(self, name, icon): return ArtistPlaylist(name, icon, [ "album", "discnumber", "tracknumber" ]) diff --git a/curds/playlist/decade.py b/curds/playlist/decade.py index c0a4b82..d26cab5 100644 --- a/curds/playlist/decade.py +++ b/curds/playlist/decade.py @@ -1,7 +1,7 @@ # Copyright 2019 (c) Anna Schumaker. -from . import node from . import playlist from .. import notify +from .. import tree DECADE_ICON = "x-office-calendar" @@ -16,9 +16,9 @@ class DecadePlaylist(playlist.Playlist): self.find_child(str(track["date"]), DECADE_ICON).add(track) -class DecadeNode(node.PlaylistNode): +class DecadeNode(tree.ETree): def __init__(self): - node.PlaylistNode.__init__(self, "Decades", "x-office-calendar") + tree.ETree.__init__(self, "Decades", "x-office-calendar") def alloc_child(self, name, icon): return DecadePlaylist(name, icon, diff --git a/curds/playlist/genre.py b/curds/playlist/genre.py index ac75119..e9dad0c 100644 --- a/curds/playlist/genre.py +++ b/curds/playlist/genre.py @@ -1,13 +1,13 @@ # Copyright 2019 (c) Anna Schumaker. -from . import node from . import playlist from .. import notify +from .. import tree GENRE_ICON = "emblem-generic" -class GenreNode(node.PlaylistNode): +class GenreNode(tree.ETree): def __init__(self): - node.PlaylistNode.__init__(self, "Genres", GENRE_ICON) + tree.ETree.__init__(self, "Genres", GENRE_ICON) def alloc_child(self, name, icon): return playlist.Playlist(name, icon, diff --git a/curds/playlist/library.py b/curds/playlist/library.py index 5da0cc9..98d704f 100644 --- a/curds/playlist/library.py +++ b/curds/playlist/library.py @@ -1,9 +1,9 @@ # Copyright 2019 (c) Anna Schumaker. -from . import node from . import playlist from .. import notify from .. import threadqueue from .. import trak +from .. import tree import os LIBRARY_ICON = "folder-music" @@ -26,9 +26,9 @@ class LibraryPlaylist(playlist.Playlist): library_thread.push(self.thread_save) -class LibraryNode(node.PlaylistNode): +class LibraryNode(tree.ETree): def __init__(self): - node.PlaylistNode.__init__(self, "Libraries", "folder-music") + tree.ETree.__init__(self, "Libraries", "folder-music") def alloc_child(self, path, icon): return LibraryPlaylist(path, icon, diff --git a/curds/playlist/new.py b/curds/playlist/new.py index c6dace3..80ca1e0 100644 --- a/curds/playlist/new.py +++ b/curds/playlist/new.py @@ -1,5 +1,4 @@ # Copyright 2019 (c) Anna Schumaker. -from . import node from . import playlist from .. import notify diff --git a/curds/playlist/node.py b/curds/playlist/node.py deleted file mode 100644 index 5160c3f..0000000 --- a/curds/playlist/node.py +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright 2019 (c) Anna Schumaker. -from .. import notify -from .. import sort -from .. import tree -import threading -import unicodedata - -class PlaylistNode(tree.ETree): - def __init__(self, name="", icon=""): - tree.ETree.__init__(self, name, icon) diff --git a/curds/playlist/playlist.py b/curds/playlist/playlist.py index 6241c6a..52c7153 100644 --- a/curds/playlist/playlist.py +++ b/curds/playlist/playlist.py @@ -1,13 +1,13 @@ # Copyright 2019 (c) Anna Schumaker. -from . import node from .. import notify from .. import sort from .. import trak +from .. import tree import random import threading from gi.repository import GLib -class Playlist(node.PlaylistNode): +class Playlist(tree.ETree): def __init__(self, name, icon="", sort=[], can_loop=True, can_random=True): self.list = [ ] self.sort_order = sort @@ -18,7 +18,7 @@ class Playlist(node.PlaylistNode): self.random = False self.visible = False self.plist_lock = threading.Lock() - node.PlaylistNode.__init__(self, name, icon) + tree.ETree.__init__(self, name, icon) def __find_track__(self, track): if track == None: @@ -38,7 +38,7 @@ class Playlist(node.PlaylistNode): def __getstate__(self): with self.plist_lock: - state = node.PlaylistNode.__getstate__(self) + state = tree.ETree.__getstate__(self) state["list"] = [ t.path for t in self.list ] del state["plist_lock"] return state @@ -61,7 +61,7 @@ class Playlist(node.PlaylistNode): return None def __setstate__(self, state): - node.PlaylistNode.__setstate__(self, state) + tree.ETree.__setstate__(self, state) self.list = [ trak.lookup(path) for path in state["list"] ] self.sort_order = state["sort_order"] self.current = state["current"] @@ -151,7 +151,7 @@ class Playlist(node.PlaylistNode): self.current = -1 self.loop = False self.random = False - node.PlaylistNode.reset(self) + tree.ETree.reset(self) def runtime(self): with self.plist_lock: diff --git a/curds/playlist/prev.py b/curds/playlist/prev.py index 38e6a61..1bd604a 100644 --- a/curds/playlist/prev.py +++ b/curds/playlist/prev.py @@ -1,5 +1,4 @@ # Copyright 2019 (c) Anna Schumaker. -from . import node from . import playlist from .. import notify diff --git a/curds/playlist/root.py b/curds/playlist/root.py index e75136b..8f4a862 100644 --- a/curds/playlist/root.py +++ b/curds/playlist/root.py @@ -4,16 +4,16 @@ from . import collection from . import decade from . import genre from . import library -from . import node from . import prev from . import up_next from . import user from .. import sort +from .. import tree -class PlaylistRoot(node.PlaylistNode): +class PlaylistRoot(tree.ETree): def __init__(self): - node.PlaylistNode.__init__(self, "root") + tree.ETree.__init__(self, "root") with self.tree_lock: self.__insert__(0, collection.CollectionPlaylist()) diff --git a/curds/playlist/test_artist.py b/curds/playlist/test_artist.py index 32b78bf..12e8ce7 100644 --- a/curds/playlist/test_artist.py +++ b/curds/playlist/test_artist.py @@ -1,9 +1,9 @@ # Copyright 2019 (c) Anna Schumaker from . import artist -from . import node from . import playlist from .. import notify from .. import trak +from .. import tree import os import unittest @@ -16,7 +16,7 @@ class TestArtistPlaylist(unittest.TestCase): def test_artist_node(self): anode = artist.ArtistNode() - self.assertIsInstance(anode, node.PlaylistNode) + self.assertIsInstance(anode, tree.ETree) self.assertEqual(anode.name, "Artists") self.assertEqual(anode.icon, "avatar-default-symbolic") diff --git a/curds/playlist/test_decade.py b/curds/playlist/test_decade.py index 3b8bcfa..c7390c0 100644 --- a/curds/playlist/test_decade.py +++ b/curds/playlist/test_decade.py @@ -1,9 +1,9 @@ # Copyright 2019 (c) Anna Schumaker. from . import decade -from . import node from . import playlist from .. import notify from .. import trak +from .. import tree import os import unittest @@ -19,7 +19,7 @@ class TestDecadePlaylist(unittest.TestCase): def test_decade_node(self): dnode = decade.DecadeNode() - self.assertIsInstance(dnode, node.PlaylistNode) + self.assertIsInstance(dnode, tree.ETree) self.assertEqual(dnode.name, "Decades") self.assertEqual(dnode.icon, "x-office-calendar") diff --git a/curds/playlist/test_genre.py b/curds/playlist/test_genre.py index 48c8208..b7e501b 100644 --- a/curds/playlist/test_genre.py +++ b/curds/playlist/test_genre.py @@ -1,9 +1,9 @@ # Copyright 2019 (c) Anna Schumaker. from . import genre -from . import node from . import playlist from .. import notify from .. import trak +from .. import tree import os import unittest @@ -16,7 +16,7 @@ class TestGenrePlaylist(unittest.TestCase): def test_genre_node(self): gnode = genre.GenreNode() - self.assertIsInstance(gnode, node.PlaylistNode) + self.assertIsInstance(gnode, tree.ETree) self.assertEqual(gnode.name, "Genres") self.assertEqual(gnode.icon, "emblem-generic") diff --git a/curds/playlist/test_library.py b/curds/playlist/test_library.py index 1c3031a..c0e6a3a 100644 --- a/curds/playlist/test_library.py +++ b/curds/playlist/test_library.py @@ -1,10 +1,10 @@ # Copyright 2019 (c) Anna Schumaker. from . import library -from . import node from . import playlist from .. import notify from .. import threadqueue from .. import trak +from .. import tree import os import time import unittest @@ -23,7 +23,7 @@ class TestLibraryPlaylist(unittest.TestCase): def test_library_node(self): lnode = library.LibraryNode() - self.assertIsInstance(lnode, node.PlaylistNode) + self.assertIsInstance(lnode, tree.ETree) self.assertEqual(lnode.name, "Libraries") self.assertEqual(lnode.icon, "folder-music") diff --git a/curds/playlist/test_node.py b/curds/playlist/test_node.py deleted file mode 100644 index f4a2d76..0000000 --- a/curds/playlist/test_node.py +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 2019 (c) Anna Schumaker. -from . import node -from .. import notify -import threading -import unittest - -class TestPlaylistNode(unittest.TestCase): - def test_node_init(self): - n = node.PlaylistNode() - self.assertEqual( n.children, [ ]) - self.assertEqual( n.icon, "") - self.assertEqual( n.name, "") - self.assertIsNone(n.sibling) - - n = node.PlaylistNode("Test Node", "test-icon") - self.assertEqual(n.icon, "test-icon") - self.assertEqual(n.name, "Test Node") diff --git a/curds/playlist/test_playlist.py b/curds/playlist/test_playlist.py index 426cac0..6fa90d2 100644 --- a/curds/playlist/test_playlist.py +++ b/curds/playlist/test_playlist.py @@ -1,8 +1,8 @@ # Copyright 2019 (c) Anna Schumaker. -from . import node from . import playlist from .. import notify from .. import trak +from .. import tree import os import random import unittest @@ -43,7 +43,7 @@ class TestPlaylist(unittest.TestCase): self.cb_changed = plist def test_playlist__init__(self): - self.assertIsInstance(self.plist, node.PlaylistNode) + self.assertIsInstance(self.plist, tree.ETree) self.assertEqual(self.plist.name, "Test Playlist") self.assertEqual(self.plist.icon, "") self.assertEqual(self.plist.list, [ ]) diff --git a/curds/playlist/test_root.py b/curds/playlist/test_root.py index 6bf966d..b4436af 100644 --- a/curds/playlist/test_root.py +++ b/curds/playlist/test_root.py @@ -4,7 +4,6 @@ from . import collection from . import decade from . import genre from . import library -from . import node from . import playlist from . import prev from . import root @@ -13,6 +12,7 @@ from . import user from .. import notify from .. import threadqueue from .. import trak +from .. import tree import os import random import unittest @@ -52,7 +52,7 @@ class TestPlaylistRoot(unittest.TestCase): def test_root_init(self): self.assertIsInstance(self.playman, root.PlaylistRoot) - self.assertIsInstance(self.playman, node.PlaylistNode) + self.assertIsInstance(self.playman, tree.ETree) self.assertIsInstance(self.playman.lookup("Collection"), collection.CollectionPlaylist) self.assertIsInstance(self.playman.lookup("Up Next"), up_next.UpNextPlaylist) diff --git a/curds/playlist/test_user.py b/curds/playlist/test_user.py index bbd89ff..7e63a07 100644 --- a/curds/playlist/test_user.py +++ b/curds/playlist/test_user.py @@ -1,16 +1,16 @@ # Copyright 2019 (c) Anna Schumaker. from . import new -from . import node from . import user from .. import notify from .. import trak +from .. import tree import unittest class TestUserPlaylists(unittest.TestCase): def test_user_node(self): unode = user.UserNode() - self.assertIsInstance(unode, node.PlaylistNode) + self.assertIsInstance(unode, tree.ETree) self.assertEqual(unode.name, "Playlists") self.assertEqual(unode.icon, "audio-x-generic") diff --git a/curds/playlist/user.py b/curds/playlist/user.py index 3d2ded9..2709d0d 100644 --- a/curds/playlist/user.py +++ b/curds/playlist/user.py @@ -1,24 +1,24 @@ # Copyright 2019 (c) Anna Schumaker. from . import new -from . import node from . import playlist +from .. import tree -class UserNode(node.PlaylistNode): +class UserNode(tree.ETree): def __init__(self): sort = [ "artist", "date", "album", "discnumber", "tracknumber" ] self.starred = playlist.Playlist("Starred", "starred", sort) self.new = new.NewPlaylist() - node.PlaylistNode.__init__(self, "Playlists", "audio-x-generic") + tree.ETree.__init__(self, "Playlists", "audio-x-generic") self.insert_child(self.new) self.insert_child(self.starred) def __setstate__(self, state): self.new = state["new"] self.starred = state["starred"] - node.PlaylistNode.__setstate__(self, state) + tree.ETree.__setstate__(self, state) def reset(self): - node.PlaylistNode.reset(self) + tree.ETree.reset(self) self.new.reset() self.starred.reset() self.insert_child(self.new) diff --git a/test_emmental.py b/test_emmental.py index 8039a76..3866c30 100644 --- a/test_emmental.py +++ b/test_emmental.py @@ -12,7 +12,6 @@ class TestEmmental(unittest.TestCase): self.assertEqual(curds.Playlist, curds.playlist.playlist.Playlist) self.assertEqual(curds.playlist.Library, curds.playlist.library.LibraryPlaylist) - self.assertEqual(curds.playlist.Node, curds.playlist.node.PlaylistNode) self.assertEqual(curds.playlist.Starred, curds.playlist.lookup("Playlists").lookup("Starred")) self.assertIsNotNone(curds.notify)