Changeset 1027

Timestamp:

Apr 10, 2008, 6:44:38 PM (16 years ago)

Author:

landauf

Message:

console command 'cleanConfig' is now implemented: it drops all not-existing classes and variables and all comments from the config file

Location:

code/branches/core2/src/orxonox/core

Files:

• ConfigFileManager.cc (modified) (8 diffs)
• ConfigFileManager.h (modified) (6 diffs)

code/branches/core2/src/orxonox/core/ConfigFileManager.cc

@@ -38 +38 @@
 {
     ConsoleCommandShortcutExtern(reloadConfig, AccessLevel::None);
-    ConsoleCommandShortcutExtern(saveConfig, AccessLevel::None);
     ConsoleCommandShortcutExtern(cleanConfig, AccessLevel::None);
     ConsoleCommandShortcutExtern(loadSettings, AccessLevel::None);
@@ -48 +47 @@
     }
 
-    void saveConfig()
-    {
-        ConfigFileManager::getSingleton()->save();
-    }
-
     void cleanConfig()
     {
@@ -60 +54 @@
     void loadSettings(const std::string& filename)
     {
-        ConfigFileManager::getSingleton()->setFile(CFT_Settings, filename);
+        ConfigFileManager::getSingleton()->setFile(CFT_Settings, filename, false);
     }
 
@@ -145 +139 @@
     }
 
-    void ConfigFile::load()
-    {
-        // This creates the file if it's not existing
-        std::ofstream createFile;
-        createFile.open(this->filename_.c_str(), std::fstream::app);
-        createFile.close();
+    void ConfigFile::load(bool bCreateIfNotExisting)
+    {
+        if (bCreateIfNotExisting)
+        {
+            // This creates the default config file if it's not existing
+            std::ofstream createFile;
+            createFile.open(this->filename_.c_str(), std::fstream::app);
+            createFile.close();
+        }
 
         // Open the file
@@ -289 +286 @@
     void ConfigFile::clean()
     {
+        for (std::list<ConfigFileSection*>::iterator it1 = this->sections_.begin(); it1 != this->sections_.end(); )
+        {
+            std::map<std::string, Identifier*>::const_iterator it2 = Identifier::getIdentifierMap().find((*it1)->getName());
+            if (it2 != Identifier::getIdentifierMapEnd() && (*it2).second->hasConfigValues())
+            {
+                // The section exists, delete comment
+                (*it1)->setComment("");
+                for (std::list<ConfigFileEntry*>::iterator it3 = (*it1)->entries_.begin(); it3 != (*it1)->entries_.end(); )
+                {
+                    std::map<std::string, ConfigValueContainer*>::const_iterator it4 = (*it2).second->getConfigValueMap().find((*it3)->getName());
+                    if (it4 != (*it2).second->getConfigValueMapEnd())
+                    {
+                        // The config-value exists, delete comment
+                        (*it3)->setComment("");
+                        ++it3;
+                    }
+                    else
+                    {
+                        // The config-value doesn't exist
+                        delete (*it3);
+                        (*it1)->entries_.erase(it3++);
+                    }
+                }
+                ++it1;
+            }
+            else
+            {
+                // The section doesn't exist
+                delete (*it1);
+                this->sections_.erase(it1++);
+            }
+        }
+
+        // Save the file
+        this->save();
     }
 
@@ -343 +375 @@
     }
 
-    void ConfigFileManager::setFile(ConfigFileType type, const std::string& filename)
+    void ConfigFileManager::setFile(ConfigFileType type, const std::string& filename, bool bCreateIfNotExisting)
     {
         std::map<ConfigFileType, ConfigFile*>::const_iterator it = this->configFiles_.find(type);
@@ -351 +383 @@
 
         this->configFiles_[type] = new ConfigFile(this->getFilePath(filename));
-        this->load(type);
-    }
-
-    void ConfigFileManager::load()
+        this->load(type, bCreateIfNotExisting);
+    }
+
+    void ConfigFileManager::load(bool bCreateIfNotExisting)
     {
         for(std::map<ConfigFileType, ConfigFile*>::const_iterator it = this->configFiles_.begin(); it != this->configFiles_.end(); ++it)
-            (*it).second->load();
+            (*it).second->load(bCreateIfNotExisting);
 
         this->updateConfigValues();
@@ -374 +406 @@
     }
 
-    void ConfigFileManager::load(ConfigFileType type)
-    {
-        this->getFile(type)->load();
+    void ConfigFileManager::load(ConfigFileType type, bool bCreateIfNotExisting)
+    {
+        this->getFile(type)->load(bCreateIfNotExisting);
         this->updateConfigValues(type);
     }

code/branches/core2/src/orxonox/core/ConfigFileManager.h

@@ -65 +65 @@
             virtual const std::string& getValue() const = 0;
             virtual const std::string& getName() const = 0;
+            virtual void setComment(const std::string& comment) = 0;
             virtual unsigned int getIndex() const { return 0; }
             virtual std::string getFileEntry() const = 0;
@@ -81 +82 @@
             inline virtual const std::string& getName() const
                 { return this->name_; }
+
+            inline virtual void setComment(const std::string& comment)
+                { this->additionalComment_ = comment; }
 
             inline virtual void setValue(const std::string& value)
@@ -133 +137 @@
                 { return this->comment_; }
 
+            inline virtual void setComment(const std::string& comment)
+                { this->comment_ = comment; }
+
             inline virtual void setValue(const std::string& value)
                 {}
@@ -159 +166 @@
             inline const std::string& getName() const
                 { return this->name_; }
+
+            inline void setComment(const std::string& comment)
+                { this->additionalComment_ = comment; }
 
             inline void setValue(const std::string& name, const std::string& value)
@@ -204 +214 @@
             ~ConfigFile();
 
-            void load();
+            void load(bool bCreateIfNotExisting = true);
             void save() const;
             void clean();
@@ -236 +246 @@
             static ConfigFileManager* getSingleton();
 
-            void setFile(ConfigFileType type, const std::string& filename);
-
-            void load();
+            void setFile(ConfigFileType type, const std::string& filename, bool bCreateIfNotExisting = true);
+
+            void load(bool bCreateIfNotExisting = true);
             void save();
             void clean();
 
-            void load(ConfigFileType type);
+            void load(ConfigFileType type, bool bCreateIfNotExisting = true);
             void save(ConfigFileType type);
             void clean(ConfigFileType type);