database: Outsource {music, perfdata}_db_path() to namespace djinterop::enginelibrary

6 files changed, 15 insertions, 33 deletions

diff --git a/src/djinterop/database.cpp b/src/djinterop/database.cpp
index 4643293..9c072f1 100644
--- a/src/djinterop/database.cpp
+++ b/src/djinterop/database.cpp
@@ -71,16 +71,6 @@ void database::verify() const
     pimpl_->verify();
 }
 
-std::string database::music_db_path() const
-{
-    return pimpl_->music_db_path();
-}
-
-std::string database::perfdata_db_path() const
-{
-    return pimpl_->perfdata_db_path();
-}
-
 void database::remove_crate(crate cr) const
 {
     pimpl_->remove_crate(cr);
diff --git a/src/djinterop/enginelibrary.cpp b/src/djinterop/enginelibrary.cpp
index 41a6b91..373344d 100644
--- a/src/djinterop/enginelibrary.cpp
+++ b/src/djinterop/enginelibrary.cpp
@@ -19,7 +19,7 @@ database load_database(std::string directory)
 }
 
 database make_database(
-    std::string directory, const semantic_version &default_version)
+    std::string directory, const semantic_version& default_version)
 {
     if (!is_supported(default_version))
     {
@@ -70,6 +70,11 @@ database make_database(
     return load_database(std::move(directory));
 }
 
+std::string music_db_path(const database& db)
+{
+    return db.directory() + "/m.db";
+}
+
 std::vector<beatgrid_marker> normalize_beatgrid(
     std::vector<beatgrid_marker> beatgrid, int64_t sample_count)
 {
@@ -81,7 +86,7 @@ std::vector<beatgrid_marker> normalize_beatgrid(
     {
         auto last_marker_iter = std::find_if(
             beatgrid.begin(), beatgrid.end(),
-            [sample_count](const beatgrid_marker &marker) {
+            [sample_count](const beatgrid_marker& marker) {
                 return marker.sample_offset > sample_count;
             });
         if (last_marker_iter != beatgrid.end())
@@ -93,7 +98,7 @@ std::vector<beatgrid_marker> normalize_beatgrid(
     {
         auto after_first_marker_iter = std::find_if(
             beatgrid.begin(), beatgrid.end(),
-            [](const beatgrid_marker &marker) {
+            [](const beatgrid_marker& marker) {
                 return marker.sample_offset > 0;
             });
         if (after_first_marker_iter != beatgrid.begin())
@@ -130,5 +135,10 @@ std::vector<beatgrid_marker> normalize_beatgrid(
     return beatgrid;  // Named RVO
 }
 
+std::string perfdata_db_path(const database& db)
+{
+    return db.directory() + "/p.db";
+}
+
 }  // namespace enginelibrary
 }  // namespace djinterop
diff --git a/src/djinterop/enginelibrary/el_database_impl.cpp b/src/djinterop/enginelibrary/el_database_impl.cpp
index 50e7690..8dfb6d7 100644
--- a/src/djinterop/enginelibrary/el_database_impl.cpp
+++ b/src/djinterop/enginelibrary/el_database_impl.cpp
@@ -187,16 +187,6 @@ void el_database_impl::verify()
     verify_performance_schema(storage_->perfdata_db);
 }
 
-std::string el_database_impl::music_db_path()
-{
-    return storage_->music_db_path;
-}
-
-std::string el_database_impl::perfdata_db_path()
-{
-    return storage_->perfdata_db_path;
-}
-
 void el_database_impl::remove_crate(crate cr)
 {
     storage_->music_db << "DELETE FROM Crate WHERE id = ?" << cr.id();
diff --git a/src/djinterop/enginelibrary/el_database_impl.hpp b/src/djinterop/enginelibrary/el_database_impl.hpp
index 0ab4f71..fa6ca7a 100644
--- a/src/djinterop/enginelibrary/el_database_impl.hpp
+++ b/src/djinterop/enginelibrary/el_database_impl.hpp
@@ -46,8 +46,6 @@ public:
     std::string directory() override;
     bool is_supported() override;
     void verify() override;
-    std::string music_db_path() override;
-    std::string perfdata_db_path() override;
     void remove_crate(djinterop::crate cr) override;
     void remove_track(djinterop::track tr) override;
     std::vector<djinterop::crate> root_crates() override;
diff --git a/src/djinterop/enginelibrary/el_storage.hpp b/src/djinterop/enginelibrary/el_storage.hpp
index 14667ec..ca828ed 100644
--- a/src/djinterop/enginelibrary/el_storage.hpp
+++ b/src/djinterop/enginelibrary/el_storage.hpp
@@ -13,17 +13,13 @@ class el_storage
 public:
     el_storage(std::string directory)
         : directory{directory},
-          music_db_path{directory + "/m.db"},
-          perfdata_db_path{directory + "/p.db"},
-          music_db{music_db_path},
-          perfdata_db{perfdata_db_path}
+          music_db{directory + "/m.db"},
+          perfdata_db{directory + "/p.db"}
     {
         // TODO (haslersn): Should we check that directory is an absolute path?
     }
 
     std::string directory;
-    std::string music_db_path;
-    std::string perfdata_db_path;
     sqlite::database music_db;
     sqlite::database perfdata_db;
 };
diff --git a/src/djinterop/impl/database_impl.hpp b/src/djinterop/impl/database_impl.hpp
index e7c197c..79faac6 100644
--- a/src/djinterop/impl/database_impl.hpp
+++ b/src/djinterop/impl/database_impl.hpp
@@ -24,8 +24,6 @@ public:
     virtual std::string directory() = 0;
     virtual bool is_supported() = 0;
     virtual void verify() = 0;
-    virtual std::string music_db_path() = 0;
-    virtual std::string perfdata_db_path() = 0;
     virtual void remove_crate(crate cr) = 0;
     virtual void remove_track(track tr) = 0;
     virtual std::vector<crate> root_crates() = 0;