Changeset 158 for trunk/src

Timestamp:

09/25/2008 08:44:25 PM (4 years ago)

Author:

guyru

Message:

• Put all of configuration.h into namespace.
• save method for Configuration

Location:

trunk/src

Files:

• MainFrame.cpp (modified) (1 diff)
• configuration.cpp (modified) (7 diffs)
• configuration.h (modified) (4 diffs)

trunk/src/MainFrame.cpp

@@ -79 +79 @@
                 wxRenameFile(home_path+wxT("/.OpenYahtzee"),home_path+wxT("/.openyahtzee"),false);
         }
-        Configuration config("/home/guy/.openyahtzee.new");
+        configuration::Configuration config("/home/guy/.openyahtzee.new");
+        config.save();
         m_settingsdb = new SettingsDB(); //Get the settings database connection
         m_highscoredb = new HighScoreTableDB();

trunk/src/configuration.cpp

@@ -19 +19 @@
  ***************************************************************************/
 
+#include <iostream>
 #include "configuration.h"
-#include <iostream>
+#include "../config.h"
 
 using namespace std;
+using namespace configuration;
 
 Configuration::Configuration(string file)
@@ -31 +33 @@
 void Configuration::load(string file)
 {
+        m_file = file;
+
         cerr<<"loading file: "<<file<<endl;
         ifstream conf_file (file.c_str());
@@ -36 +40 @@
                 // file couldn't be opened, this is due to missing file or
                 // permission error.
+                cerr<<"Error openning configuration file for reading: "<<m_file<<endl;
         }
         
@@ -59 +64 @@
                 }
         }
+        conf_file.close();
 }
 
@@ -99 +105 @@
         string date,hour,name;
         HighscoreItem temp_item;
-        while(!file->eof()) {
+        while(file->good()) {
                 temp_chr = file->get();
                 file->unget();
@@ -109 +115 @@
                 (*file)>>date;
                 (*file)>>hour;
+                (*file).get(); // discard space before name
                 getline(*file,name);
                 temp_item.score = score;
@@ -115 +122 @@
                 m_highscores.push_back(temp_item);
                 cerr<<score<<" "<<name<<" "<<temp_item.date<<endl;
+
+                // The following two lines read one character forword and
+                // return it. This is done in order to raise the eofbit if
+                // we reached the eof (it is raised only after reading
+                // operation failed).
+                temp_chr = file->get();
+                file->unget();
         }
 }
+
+void Configuration::save()
+{
+        ofstream conf_file (m_file.c_str());
+        if (!conf_file.is_open()) {
+                // file couldn't be opened, this is due to missing file or
+                // permission error.
+                cerr<<"Error openning configuration file for writing: "<<m_file<<endl;
+        }
+        conf_file<<"openyahtzee="<<VERSION<<endl;
+
+        conf_file<<"[settings]\n";
+        saveSettings(&conf_file);
+        conf_file<<"[highscores]\n";
+        saveHighscores(&conf_file);
+
+        conf_file.close();
+}
+
+void Configuration::saveSettings(ofstream *file)
+{
+        map<string,string>::iterator it;
+        for (it = m_settings.begin(); it!=m_settings.end(); it++) {
+                (*file)<<(*it).first<<"="<<(*it).second<<"\n";
+        }
+}
+
+void Configuration::saveHighscores(ofstream *file)
+{
+        HighscoreList::iterator it;
+        for (it = m_highscores.begin(); it!=m_highscores.end(); it++) {
+                (*file)<<(*it).score<<" ";
+                (*file)<<(*it).date<<" ";
+                (*file)<<(*it).name<<"\n";
+        }
+}

trunk/src/configuration.h

@@ -27 +27 @@
 #include <list>
 
+namespace configuration {
+
 struct HighscoreItem;
 
@@ -38 +40 @@
          */
         void load(std::string file);
+
+        void save();
 private:
         /**
@@ -46 +50 @@
         void parseSettings(std::ifstream *file);
         void parseHighscores(std::ifstream *file);
+
+        void saveSettings(std::ofstream *file);
+        void saveHighscores(std::ofstream *file);
         
         std::map<std::string, std::string> m_settings;
         HighscoreList m_highscores;
+
+        std::string m_file;
 };
 
@@ -56 +65 @@
         std::string date;
 };
+
+}