Break FatfsStreamFactory's dep on ServiceLocator

2 files changed, 16 insertions, 0 deletions

diff --git a/src/tangara/database/database.cpp b/src/tangara/database/database.cpp
index cf1430b3..85700431 100644
--- a/src/tangara/database/database.cpp
+++ b/src/tangara/database/database.cpp
@@ -684,6 +684,12 @@ auto Database::countRecords(const SearchKey& c) -> size_t {
   return count;
 }
 
+Handle::Handle(std::shared_ptr<Database>& db) : db_(db) {}
+
+auto Handle::lock() -> std::shared_ptr<Database> {
+  return db_;
+}
+
 auto SearchKey::startKey() const -> std::string_view {
   if (key) {
     return *key;
diff --git a/src/tangara/database/database.hpp b/src/tangara/database/database.hpp
index d2de7c72..c2e72568 100644
--- a/src/tangara/database/database.hpp
+++ b/src/tangara/database/database.hpp
@@ -128,6 +128,16 @@ class Database {
   auto countRecords(const SearchKey& c) -> size_t;
 };
 
+class Handle {
+ public:
+  Handle(std::shared_ptr<Database>& db);
+
+  auto lock() -> std::shared_ptr<Database>;
+
+ private:
+  std::shared_ptr<Database>& db_;
+};
+
 /*
  * Container for the data needed to iterate through database records. This is a
  * lower-level type that the higher-level iterators are built from; most users