1 files changed, 25 insertions, 11 deletions

diff --git a/common/storage_lmdb.cpp b/common/storage_lmdb.cpp
index 18a5aa6..283205f 100644
--- a/common/storage_lmdb.cpp
+++ b/common/storage_lmdb.cpp
@@ -14,10 +14,12 @@
 class Storage::Private
 {
 public:
-    Private(const QString &p);
+    Private(const QString &s, const QString &name);
     ~Private();
 
-    QString path;
+    QString storageRoot;
+    QString name;
+
     MDB_dbi dbi;
     MDB_env *env;
     MDB_txn *transaction;
@@ -25,20 +27,21 @@ public:
     bool firstOpen;
 };
 
-Storage::Private::Private(const QString &p)
-    : path(p),
-      transaction(0),
+Storage::Private::Private(const QString &s, const QString &n)
+    : transaction(0),
       readTransaction(false),
-      firstOpen(true)
+      firstOpen(true),
+      storageRoot(s),
+      name(n)
 {
     QDir dir;
-    dir.mkdir(path);
+    dir.mkdir(storageRoot);
 
     //create file
     if (mdb_env_create(&env)) {
         // TODO: handle error
     } else {
-        int rc = mdb_env_open(env, path.toStdString().data(), 0, 0664);
+        int rc = mdb_env_open(env, storageRoot.toStdString().data(), 0, 0664);
 
         if (rc) {
             std::cerr << "mdb_env_open: " << rc << " " << mdb_strerror(rc) << std::endl;
@@ -63,7 +66,7 @@ Storage::Private::~Private()
 }
 
 Storage::Storage(const QString &storageRoot, const QString &name)
-    : d(new Private(storageRoot + '/' + name))
+    : d(new Private(storageRoot, name))
 {
 }
 
@@ -143,6 +146,11 @@ void Storage::abortTransaction()
     d->transaction = 0;
 }
 
+bool Storage::write(const char *key, size_t keySize, const char *value, size_t valueSize)
+{
+    write(std::string(key, keySize), std::string(value, valueSize));
+}
+
 bool Storage::write(const std::string &sKey, const std::string &sValue)
 {
     if (!d->env) {
@@ -241,7 +249,7 @@ bool Storage::read(const std::string &sKey, const std::function<void(void *ptr,
 
     if (rc) {
         std::cerr << "mdb_cursor_get: " << rc << " " << mdb_strerror(rc) << std::endl;
-        return false
+        return false;
     }
 
     /**
@@ -255,7 +263,7 @@ bool Storage::read(const std::string &sKey, const std::function<void(void *ptr,
 
 qint64 Storage::diskUsage() const
 {
-    QFileInfo info(d->path, "data.mdb");
+    QFileInfo info(d->storageRoot + "/data.mdb");
     return info.size();
 }
 
@@ -266,3 +274,9 @@ void Storage::removeFromDisk() const
     dir.remove("lock.mdb");
 }
 
+void Storage::removeFromDisk() const
+{
+    QDir dir(d->storageRoot);
+    dir.remove("data.mdb");
+    dir.remove("lock.mdb");
+}