Allow the user to overwrite a running reload worker

Chronial · May 13, 2019 · 28e9577 · 28e9577
1 parent c512436
commit 28e9577
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/DbAlbumCollection.cpp b/DbAlbumCollection.cpp
@@ -139,8 +139,8 @@ void DBWriter::remove_tracks(metadb_handle_list_cref tracks) {
   }
 }
 
-void DbAlbumCollection::onCollectionReload(DbReloadWorker&& worker) {
-  db = std::move(worker.db);
+void DbAlbumCollection::onCollectionReload(std::unique_ptr<db_structure::DB> newDb) {
+  db = std::move(newDb);
 
   decltype(libraryChangeQueue) changeQueue;
   std::swap(changeQueue, libraryChangeQueue);

diff --git a/DbAlbumCollection.h b/DbAlbumCollection.h
@@ -132,7 +132,7 @@ class DbAlbumCollection {
   // Gets the leftmost album whose title starts with `input`
   std::optional<DBPos> performFayt(const std::string& input);
 
-  void onCollectionReload(DbReloadWorker&& worker);
+  void onCollectionReload(std::unique_ptr<db_structure::DB> newDb);
 
   DBIter begin() const;
   DBIter end() const;

diff --git a/DbReloadWorker.cpp b/DbReloadWorker.cpp
@@ -25,7 +25,8 @@ DbReloadWorker::~DbReloadWorker() {
 
 void DbReloadWorker::threadProc() {
   TRACK_CALL_TEXT("Chronflow DbReloadWorker");
-  console::timer_scope timer("foo_chronflow collection generated in");
+  pfc::hires_timer timer;
+  timer.start();
 
   engineThread.runInMainThread([&] {
     ++engineThread.libraryVersion;
@@ -46,5 +47,8 @@ void DbReloadWorker::threadProc() {
   DBWriter(*db).add_tracks(std::move(library), abort);
   abort.check();
 
+  FB2K_console_formatter() << "foo_chronflow collection generated in: "
+                           << pfc::format_time_ex(timer.query(), 6);
+  completed = true;
   engineThread.send<EM::CollectionReloadedMessage>();
 };
diff --git a/DbReloadWorker.h b/DbReloadWorker.h
@@ -16,6 +16,7 @@ class DbReloadWorker {
   ~DbReloadWorker();
 
   unique_ptr<db_structure::DB> db;
+  std::atomic<bool> completed = false;
 
  private:
   void threadProc();

diff --git a/engine_messages.cpp b/engine_messages.cpp
@@ -98,13 +98,14 @@ std::optional<AlbumInfo> EM::GetTargetAlbum::run(Engine& e) {
 }
 
 void EM::ReloadCollection::run(Engine& e) {
-  if (e.reloadWorker)
-    return;  // already running
+  // This will abort any already running reload worker
   e.reloadWorker = make_unique<DbReloadWorker>(e.thread);
 }
 
 void EM::CollectionReloadedMessage::run(Engine& e) {
-  e.db.onCollectionReload(std::move(*e.reloadWorker));
+  if (!e.reloadWorker || !e.reloadWorker->completed)
+    return;
+  e.db.onCollectionReload(std::move(e.reloadWorker->db));
   e.reloadWorker.reset();
   e.texCache.onCollectionReload();
   e.cacheDirty = true;