diff --git a/emmental-gtk4.py b/emmental-gtk4.py deleted file mode 100755 index 9dfec62..0000000 --- a/emmental-gtk4.py +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/python -# Copyright 2021 (c) Anna Schumaker. -import gi -gi.require_version('Gtk', '4.0') -gi.require_version('Gst', '1.0') - -import lib -import trackdb -lib.settings.load() -trackdb.load() - -import ui -ui.Application.run() diff --git a/emmental.py b/emmental.py index 2714f57..9dfec62 100755 --- a/emmental.py +++ b/emmental.py @@ -1,8 +1,13 @@ #!/usr/bin/python -# Copyright 2019 (c) Anna Schumaker. -import lib -import curds -import rind -import sys +# Copyright 2021 (c) Anna Schumaker. +import gi +gi.require_version('Gtk', '4.0') +gi.require_version('Gst', '1.0') -rind.Application.run(sys.argv) +import lib +import trackdb +lib.settings.load() +trackdb.load() + +import ui +ui.Application.run() diff --git a/test_emmental.py b/test_emmental.py deleted file mode 100644 index 34db5ea..0000000 --- a/test_emmental.py +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 2019 (c) Anna Schumaker. -import curds -import os -import pathlib -import rind -import trackdb -import unittest - -class TestEmmental(unittest.TestCase): - def test_import_curds(self): - self.assertEqual(curds.DataFile, curds.data.DataFile) - self.assertEqual(curds.ThreadQueue, curds.threadqueue.ThreadQueue) - self.assertEqual(curds.Track, trackdb.track.Track) - - self.assertEqual(curds.Playlist, curds.playlist.playlist.Playlist) - self.assertEqual(curds.playlist.Library, curds.playlist.library.LibraryPlaylist) - self.assertEqual(curds.playlist.Starred, curds.playlist.lookup("Playlists").lookup("Starred")) - - self.assertIsNotNone(curds.notify) - self.assertIsInstance(curds.playlist.Root, curds.playlist.root.PlaylistRoot) - - def test_import_rind(self): - self.assertEqual(rind.Application, rind.gtk.Application) - self.assertEqual(rind.audio.Playbin, rind.audio.playbin.Playbin) - - self.assertEqual(rind.node.Model, rind.node.model.NodeTreeModel) - self.assertEqual(rind.node.View, rind.node.view.TreeView) - - self.assertEqual(rind.playlist.Model, rind.playlist.model.PlaylistModel) - self.assertEqual(rind.playlist.View, rind.playlist.view.TreeView) - - def test_reset_stop_curds(self): - lib = trackdb.add_path(pathlib.Path("trier") / "Test Album") - path = os.path.join("trier", "Test Album", "01 - Test Track.ogg") - track = lib.add_track("01 - Test Track.ogg") - - self.assertIsNotNone(track) - self.assertGreater(len(lib.tracks), 0) - - curds.reset() - self.assertEqual(len(curds.playlist.lookup("Collection")), 0) - self.assertEqual(curds.playlist.lookup("Libraries").n_children(), 0) - - curds.stop()