catch exception instead of error code

check for existing database

fix default path collision

catch exceptioninstead of error code

Author: dorin-ga

source/gameanalytics/GAStore.cpp

@@ -207,32 +207,67 @@ namespace gameanalytics
             return sqlDatabase;
         }
 
-        bool GAStore::ensureDatabase(bool dropDatabase, std::string const& key)
+        bool GAStore::fixOldDatabase()
+        {
+            std::filesystem::path oldPath  = dbPath;
+            std::filesystem::path filename = oldPath.filename();
+            
+            oldPath = oldPath.parent_path() / ".." / filename;
+            
+            if(std::filesystem::exists(oldPath) && !std::filesystem::exists(dbPath))
+            {
+                try
+                {
+                    std::filesystem::rename(oldPath, dbPath);
+                }
+                catch(...)
+                {
+                    return false;
+                }
+                
+                return true;
+            }
+
+            return false;
+        }
+    
+        bool GAStore::initDatabaseLocation()
         {
-            // lazy creation of db path
-            if(getInstance().dbPath.empty())
+            constexpr const char* DATABASE_NAME = "ga.sqlite3";
+            
+            std::filesystem::path p = device::GADevice::getWritablePath();
+            
+            p /= state::GAState::getGameKey();
+            
+            dbPath = (p / DATABASE_NAME).string();
+            if(!std::filesystem::exists(p))
             {
-                std::string path = device::GADevice::getWritablePath();
-                path += "/ga.sqlite3";
+                if(!std::filesystem::create_directory(p))
+                    return false;
 
-                getInstance().dbPath = path;
+                fixOldDatabase();
             }
 
-            const std::string dbPath = getInstance().dbPath;
+            return true;
+        }
 
+        bool GAStore::ensureDatabase(bool dropDatabase, std::string const& key)
+        {
+            getInstance().initDatabaseLocation();
+            
             // Open database
-            if (sqlite3_open(dbPath.c_str(), &getInstance().sqlDatabase) != SQLITE_OK)
+            if (sqlite3_open(getInstance().dbPath.c_str(), &getInstance().sqlDatabase) != SQLITE_OK)
             {
                 getInstance().dbReady = false;
-                logging::GALogger::w("Could not open database: %s", dbPath.c_str());
+                logging::GALogger::w("Could not open database: %s", getInstance().dbPath.c_str());
                 return false;
             }
             else
             {
                 getInstance().dbReady = true;
-                logging::GALogger::i("Database opened: %s", dbPath.c_str());
+                logging::GALogger::i("Database opened: %s", getInstance().dbPath.c_str());
             }
-
+            
             if (dropDatabase)
             {
                 logging::GALogger::d("Drop tables");

source/gameanalytics/GAStore.h

@@ -50,7 +50,10 @@ namespace gameanalytics
 
             static GAStore& getInstance();
 
+            bool fixOldDatabase();
             bool trimEventTable();
+            
+            bool initDatabaseLocation();
 
             // set when calling "ensureDatabase"
             // using a "writablePath" that needs to be set into the C++ component before

source/gameanalytics/GameAnalytics.cpp

@@ -356,8 +356,7 @@ namespace gameanalytics
         {
             return;
         }
-
-
+        
         threading::GAThreading::performTaskOnGAThread([gameKey, gameSecret]()
         {
             if (isSdkReady(true, false))

source/gameanalytics/Platform/GADevicePlatform.h

@@ -49,5 +49,3 @@ namespace gameanalytics
         return std::make_unique<GADevicePlatform>();
     }
 }
-
-