scanner: Remove the ImportTask
It is no longer needed now that we have updated from the tagdb Signed-off-by: Anna Schumaker <Anna@NoWheyCreamery.com>
This commit is contained in:
parent
b768d74928
commit
7b89f54e8b
|
@ -29,9 +29,6 @@ def EnableSwitch(library):
|
||||||
def commit():
|
def commit():
|
||||||
Queue.push(task.CommitTask())
|
Queue.push(task.CommitTask())
|
||||||
|
|
||||||
def import_track(lib, track, playcount, lastplayed, playlists):
|
|
||||||
Queue.push(task.ImportTask(lib, track, playcount, lastplayed, playlists))
|
|
||||||
|
|
||||||
def update_library(lib):
|
def update_library(lib):
|
||||||
Queue.push(task.CheckSchedulerTask(lib))
|
Queue.push(task.CheckSchedulerTask(lib))
|
||||||
|
|
||||||
|
|
|
@ -38,32 +38,6 @@ class FileTask(Task):
|
||||||
db.genre.Table.find(genre).add_track(track)
|
db.genre.Table.find(genre).add_track(track)
|
||||||
|
|
||||||
|
|
||||||
class ImportTask(FileTask):
|
|
||||||
def __init__(self, library, filepath, playcount, lastplayed, playlists):
|
|
||||||
FileTask.__init__(self, library, filepath)
|
|
||||||
self.playcount = playcount
|
|
||||||
if isinstance(lastplayed, datetime.datetime):
|
|
||||||
self.lastplayed = lastplayed
|
|
||||||
elif isinstance(lastplayed, datetime.date):
|
|
||||||
self.lastplayed = datetime.datetime.combine(lastplayed,
|
|
||||||
datetime.time())
|
|
||||||
|
|
||||||
exclude = set([ "Collection", "New Tracks", "Previous" ])
|
|
||||||
self.playlists = [ p for p in playlists if p not in exclude ]
|
|
||||||
if "Up Next" in self.playlists:
|
|
||||||
self.playlists[self.playlists.index("Up Next")] = "Queued Tracks"
|
|
||||||
|
|
||||||
def run_task(self):
|
|
||||||
FileTask.run_task(self)
|
|
||||||
if track := db.track.Table.lookup(self.filepath):
|
|
||||||
db.user.Table.find("New Tracks").remove_track(track)
|
|
||||||
for plist in self.playlists:
|
|
||||||
db.user.Table.find(plist).add_track(track)
|
|
||||||
if self.playcount > 0:
|
|
||||||
track.playcount = self.playcount
|
|
||||||
track.lastplayed = self.lastplayed
|
|
||||||
|
|
||||||
|
|
||||||
class DirectoryTask(Task):
|
class DirectoryTask(Task):
|
||||||
def __init__(self, library, dirpath):
|
def __init__(self, library, dirpath):
|
||||||
Task.__init__(self)
|
Task.__init__(self)
|
||||||
|
|
|
@ -15,11 +15,6 @@ class TestScanner(unittest.TestCase):
|
||||||
def test_scanner_init(self):
|
def test_scanner_init(self):
|
||||||
self.assertIsInstance(scanner.Queue, scanner.queue.TaskQueue)
|
self.assertIsInstance(scanner.Queue, scanner.queue.TaskQueue)
|
||||||
|
|
||||||
def test_scanner_import_track(self):
|
|
||||||
lib = db.library.Table.find(test_album)
|
|
||||||
scanner.import_track(lib, test_track, 2, datetime.date.today(), [ ])
|
|
||||||
self.assertIsInstance(scanner.Queue.tasks[0], scanner.task.ImportTask)
|
|
||||||
|
|
||||||
def test_scanner_update_library(self):
|
def test_scanner_update_library(self):
|
||||||
lib = db.library.Table.find(test_album)
|
lib = db.library.Table.find(test_album)
|
||||||
scanner.update_library(lib)
|
scanner.update_library(lib)
|
||||||
|
|
|
@ -65,37 +65,6 @@ class TestScannerFileTask(unittest.TestCase):
|
||||||
self.assertEqual(new.get_track(0), track)
|
self.assertEqual(new.get_track(0), track)
|
||||||
|
|
||||||
|
|
||||||
class TestScannerImportTask(unittest.TestCase):
|
|
||||||
def setUp(self):
|
|
||||||
db.reset()
|
|
||||||
|
|
||||||
def test_scanner_import_task(self):
|
|
||||||
playlists = [ "Collection", "Favorites", "New Tracks",
|
|
||||||
"Previous", "Up Next", "Test Playlist" ]
|
|
||||||
today = datetime.date.today()
|
|
||||||
lib = db.library.Table.find(test_tracks)
|
|
||||||
it = task.ImportTask(lib, test_track01, 4, today, playlists)
|
|
||||||
|
|
||||||
self.assertIsInstance(it, task.FileTask)
|
|
||||||
self.assertEqual(it.library, lib)
|
|
||||||
self.assertEqual(it.filepath, test_track01)
|
|
||||||
self.assertEqual(it.playcount, 4)
|
|
||||||
self.assertEqual(it.lastplayed,
|
|
||||||
datetime.datetime.combine(today, datetime.time()))
|
|
||||||
self.assertEqual(it.playlists, ["Favorites", "Queued Tracks", "Test Playlist" ])
|
|
||||||
|
|
||||||
self.assertIsNone(it.run_task())
|
|
||||||
|
|
||||||
track = db.track.Table.lookup(test_track01)
|
|
||||||
self.assertEqual(track.playcount, 4)
|
|
||||||
self.assertEqual(track.lastplayed,
|
|
||||||
datetime.datetime.combine(today, datetime.time()))
|
|
||||||
self.assertEqual(db.user.Table.lookup("Favorites").get_track(0), track)
|
|
||||||
self.assertEqual(db.user.Table.lookup("Queued Tracks").get_track(0), track)
|
|
||||||
self.assertEqual(db.user.Table.lookup("Test Playlist").get_track(0), track)
|
|
||||||
self.assertEqual(db.user.Table.lookup("New Tracks").get_n_tracks(), 0)
|
|
||||||
|
|
||||||
|
|
||||||
class TestScannerDirectoryTask(unittest.TestCase):
|
class TestScannerDirectoryTask(unittest.TestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
db.reset()
|
db.reset()
|
||||||
|
|
Loading…
Reference in New Issue