Changeset 159

Timestamp:

09/26/2008 11:32:18 AM (4 years ago)

Author:

guyru

Message:

• Import settings and highscores to new configuration class.
• Fix segementation fault caused by trying to close an unopened db in DBwrapper destructor.

Location:

trunk/src

Files:

• DBwrapper.cpp (modified) (6 diffs)
• DBwrapper.h (modified) (1 diff)
• configuration.cpp (modified) (3 diffs)
• configuration.h (modified) (5 diffs)

trunk/src/DBwrapper.cpp

@@ -41 +41 @@
 {
         m_errmsg=0; //set the pointer to null
+        db_loaded = false;
         
         m_errorcode = sqlite3_open(filename.c_str(), &m_db);
@@ -46 +47 @@
         if (m_errorcode!=SQLITE_OK)
                 cerr<<"ERROR: couldn't open database (DBhandler constructor). filename: "<< filename<<endl;
+        
+        db_loaded = true;
 
 }
@@ -55 +58 @@
 */
 DBwrapper::DBwrapper(){
-
+        db_loaded = false;
 }
 
@@ -64 +67 @@
 DBwrapper::~DBwrapper()
 {
-        sqlite3_close(m_db);
+        if (db_loaded) {
+                sqlite3_close(m_db);
+        }
 }
 
@@ -148 +153 @@
 int DBwrapper::Open( std::string filename )
 {
+        db_loaded = false;
         m_errorcode = sqlite3_open(filename.c_str(), &m_db);
         
@@ -153 +159 @@
                 cerr<<"ERROR: couldn't open database (DBhandler constructor). filename: "<< filename<<endl;
         
+        db_loaded = true;
         return m_errorcode;
 }

trunk/src/DBwrapper.h

@@ -56 +56 @@
         char *m_errmsg; ///< holds the sqllite error messages
         int m_errorcode; ///< holds the returned sqllite errorcode
+        bool db_loaded;
 };
 

trunk/src/configuration.cpp

@@ -20 +20 @@
 
 #include <iostream>
+#include <cstdlib> // used in the back-compatibility code
 #include "configuration.h"
 #include "../config.h"
@@ -64 +65 @@
                 }
         }
+
         conf_file.close();
 }
 
-void Configuration::importOldFile()
-{
-
-}
-
 void Configuration::parseSettings(ifstream *file)
 {
+        loadDefaultSettings();
         cerr<<"parsing settings"<<endl;
         string temp_line;
@@ -167 +165 @@
         }
 }
+
+string Configuration::get(string key)
+{
+        map<string,string>::iterator obj;
+
+        obj = m_settings.find(key);
+        if (obj == m_settings.end()) {
+                // key is missing return empty string
+                return "";
+        }
+        return obj->second;
+}
+
+Configuration* Configuration::set(string key, string value)
+{
+        m_settings[key] = value;
+        return this;
+}
+
+void Configuration::loadDefaultSettings()
+{
+        m_settings["dice-animation"] = "True";
+        m_settings["calculate-subtotal"] = "True";
+        m_settings["calculate-subtotal"] = "True";
+        m_settings["horizontal-layout"] = "True";
+        m_settings["score-hints"] = "True";
+        m_settings["highscore-list-size"] = DEFAULT_HIGHSCORE_SIZE;
+}
+
+
+void Configuration::importOldFile()
+{
+        loadDefaultSettings();
+        if (old_db.Open(m_file)!=SQLITE_OK) {
+                return;
+        }
+        importSettings();
+        // importHighscores is called after importSettings() so the
+        // highscore size settings will be known
+        importHighscores();
+}
+
+string Configuration::getKeyFromDb(string key)
+{
+        string tmp_query;
+        std::list<string> tmp_value;
+        
+        tmp_query = "SELECT value FROM settings WHERE key = \"" + key + "\"";
+
+        tmp_value = old_db.Query(tmp_query);
+        if (tmp_value.empty()) { //if there was no result return an empty string
+                tmp_query = ""; //use tmp_query for holding a tmp_string
+                return tmp_query;
+        }
+        return  *(tmp_value.begin());
+}
+
+void Configuration::importSettings()
+{
+        string temp_value;
+
+        temp_value = getKeyFromDb("animate");
+        if (temp_value=="No") {
+                set("dice-animation","False");
+        }
+
+        temp_value = getKeyFromDb("calculatesubtotal");
+        if (temp_value=="No") {
+                set("calculate-subtotal","False");
+        }
+
+        temp_value = getKeyFromDb("horizontalayout");
+        if (temp_value=="No") {
+                set("horizontal-layout","False");
+        }
+
+        temp_value = getKeyFromDb("score_hints");
+        if (temp_value=="No") {
+                set("score-hints","False");
+        }
+
+        temp_value = getKeyFromDb("highscoresize");
+        if (temp_value=="") {
+                set("highscore-list-size",DEFAULT_HIGHSCORE_SIZE);
+        }
+}
+
+void Configuration::importHighscores()
+{
+        string tmp_query = "SELECT name,date,score FROM highscore LIMIT "
+                + m_settings["highscore-list-size"];
+        
+        list<string> res = old_db.Query(tmp_query);
+        HighscoreItem temp_item;
+
+        list<string>::iterator it = res.begin();
+        size_t pos;
+        while(it!=res.end()) {
+                temp_item.name = (*it++);
+
+                // the database saved the the hour before the date,
+                // we need to reverse this
+                pos = it->find(' ');
+                temp_item.date = it->substr(pos+1); // date
+                temp_item.date += " " + it->substr(0,pos-3); // time, without seconds
+                it++;
+
+                temp_item.score = atoi((*it++).c_str());
+
+                m_highscores.push_back(temp_item);
+        }
+}

trunk/src/configuration.h

@@ -22 +22 @@
 #define OPENYAHTZEE_CONFIGURATION_INC
 
+#include "DBwrapper.h" // used in the back-compatibility code
 #include <string>
 #include <fstream>
@@ -33 +34 @@
 typedef std::list<HighscoreItem> HighscoreList;
 
+static const char* DEFAULT_HIGHSCORE_SIZE = "20";
+
 class Configuration {
 public:
@@ -41 +44 @@
         void load(std::string file);
 
+        /**
+         * Saves the configurations (setting and highscores) to the file
+         * specified when the class was constructed
+         */
         void save();
+
+        /**
+         * \return the value associated with the specified key, or empty
+         * string if that key is missing
+         */
+        std::string get(std::string key);
+        /**
+         * Associates the given value with the given key. You must call
+         * save() in order to make the change permanent.
+         * \return pointer to self.
+         */
+        Configuration *set(std::string key, std::string value);
 private:
         /**
@@ -53 +72 @@
         void saveSettings(std::ofstream *file);
         void saveHighscores(std::ofstream *file);
+
+        /**
+         * Loads default settings
+         */
+        void loadDefaultSettings();
         
         std::map<std::string, std::string> m_settings;
@@ -58 +82 @@
 
         std::string m_file;
+
+        /* The following functions and variables are used for legacy SQLite
+         * configuration file, and could be dropped.
+         */
+        DBwrapper old_db;
+        std::string getKeyFromDb(std::string key);
+        void importSettings();
+        void importHighscores();
 };