1 files changed, 1 insertions, 93 deletions
diff --git a/src/Cache.cpp b/src/Cache.cpp
index 84bee97..0d5dd05 100644
--- a/src/Cache.cpp
+++ b/src/Cache.cpp
@@ -2,6 +2,7 @@
 #include "../include/env.hpp"
 #include "../include/dchat/FileUtil.hpp"
 #include "../include/dchat/Gif.hpp"
+#include "../include/dchat/Storage.hpp"
 #include <boost/filesystem/convenience.hpp>
 #include <process.hpp>
 #include <odhtdb/Hash.hpp>
@@ -11,7 +12,6 @@
 #include <gd.h>
 
 #if OS_FAMILY == OS_FAMILY_POSIX
-#include <pwd.h>
 #define toNativeString(str) str
 #else
 #include <string>
@@ -32,98 +32,6 @@ using namespace TinyProcessLib;
 namespace dchat
 {
     const i64 CONTENT_NOT_VISIBLE_AGE_MS = 30000; // Delete content from cache after a specified amount of time if the content is not visible on the screen
-    
-    static boost::filesystem::path getHomeDir()
-    {
-    #if OS_FAMILY == OS_FAMILY_POSIX
-        const char *homeDir = getenv("HOME");
-        if(!homeDir)
-        {
-            passwd *pw = getpwuid(getuid());
-            homeDir = pw->pw_dir;
-        }
-        return boost::filesystem::path(homeDir);
-    #elif OS_FAMILY == OS_FAMILY_WINDOWS
-        BOOL ret;
-        HANDLE hToken;
-        std::wstring homeDir;
-        DWORD homeDirLen = MAX_PATH;
-        homeDir.resize(homeDirLen);
-
-        if (!OpenProcessToken(GetCurrentProcess(), TOKEN_READ, &hToken))
-            throw std::runtime_error("Failed to open process token");
-
-        if (!GetUserProfileDirectory(hToken, &homeDir[0], &homeDirLen))
-        {
-            CloseHandle(hToken);
-            throw std::runtime_error("Failed to get home directory");
-        }
-
-        CloseHandle(hToken);
-        homeDir.resize(wcslen(homeDir.c_str()));
-        return boost::filesystem::path(homeDir);
-    #endif
-    }
-    
-    boost::filesystem::path Cache::getDchatDir()
-    {
-        boost::filesystem::path dchatHomeDir = getHomeDir() / ".local" / "share" / "dchat";
-        boost::filesystem::create_directories(dchatHomeDir);
-        return dchatHomeDir;
-    }
-    
-    boost::filesystem::path Cache::getImagesDir()
-    {
-        boost::filesystem::path imagesDir = getDchatDir() / "images";
-        boost::filesystem::create_directories(imagesDir);
-        return imagesDir;
-    }
-    
-    void Cache::loadBindsFromFile(LoadBindsCallbackFunc callbackFunc)
-    {
-        assert(callbackFunc);
-        StringView fileContent;
-        try
-        {
-            fileContent = getFileContent(getDchatDir() / "binds");
-            sibs::SafeDeserializer deserializer((const u8*)fileContent.data, fileContent.size);
-            
-            while(!deserializer.empty())
-            {
-                u8 keySize = deserializer.extract<u8>();
-                string key;
-                key.resize(keySize);
-                deserializer.extract((u8*)&key[0], keySize);
-                
-                u8 valueSize = deserializer.extract<u8>();
-                string value;
-                value.resize(valueSize);
-                deserializer.extract((u8*)&value[0], valueSize);
-                
-                callbackFunc(key, value);
-            }
-        }
-        catch(FileException &e)
-        {
-            fprintf(stderr, "Failed to read binds from file, reason: %s\n", e.what());
-        }
-        
-        delete[] fileContent.data;
-    }
-    
-    void Cache::replaceBindsInFile(const unordered_map<string, string> &binds)
-    {
-        sibs::SafeSerializer serializer;
-        for(auto &it : binds)
-        {
-            serializer.add((u8)it.first.size());
-            serializer.add((const u8*)it.first.data(), it.first.size());
-            
-            serializer.add((u8)it.second.size());
-            serializer.add((const u8*)it.second.data(), it.second.size());
-        }
-        fileReplace(getDchatDir() / "binds", StringView((const char*)serializer.getBuffer().data(), serializer.getBuffer().size()));
-    }
 
     static bool downscaleImage(const boost::filesystem::path &filepath, void *data, const int size, const int newWidth, const int newHeight)
     {