destroyed global classes; view hierarchy instead

[chaz/yoink] / src / Moof / Settings.cc

diff --git a/src/Moof/Settings.cc b/src/Moof/Settings.cc
index c5c3734189fc159f63bfd10fb2a702e5fb5a86d5..bc503c52a26f8064b86fe7d4529987b29b2ebe6c 100644 (file)
--- a/src/Moof/Settings.cc
+++ b/src/Moof/Settings.cc
@@ -1,32 +1,14 @@
 
-/*******************************************************************************
-
- Copyright (c) 2009, Charles McGarvey
- All rights reserved.
- 
- Redistribution   and   use  in  source  and  binary  forms,  with  or  without
- modification, are permitted provided that the following conditions are met:
- 
-   * Redistributions  of  source  code  must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   * Redistributions  in binary form must reproduce the above copyright notice,
-     this  list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
- 
- THIS  SOFTWARE  IS  PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND  ANY  EXPRESS  OR  IMPLIED  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN  NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR  ANY  DIRECT,  INDIRECT,  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES  (INCLUDING,  BUT  NOT  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES;  LOSS  OF  USE,  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#include <sstream>
+/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+**]  All rights reserved.
+*
+* vi:ts=4 sw=4 tw=75
+*
+* Distributable under the terms and conditions of the 2-clause BSD license;
+* see the file COPYING for a complete text of the license.
+*
+**************************************************************************/
+
 #include <cstdlib>             // getenv
 
 #include "Settings.hh"
@@ -40,12 +22,6 @@ Settings::~Settings()
        save();
 }
 
-Settings& Settings::getInstance()
-{
-       static Settings settings;
-       return settings;
-}
-
 
 void Settings::parseArgs(int argc, char* argv[])
 {
@@ -56,39 +32,46 @@ void Settings::parseArgs(int argc, char* argv[])
 }
 
 
-void Settings::loadFromFile(const std::string& filePath)
+void Settings::loadFromFiles(const std::string& path)
 {
        std::vector<std::string> paths;
-       boost::split(paths, filePath, boost::is_any_of(":"));
+       boost::split(paths, path, boost::is_any_of(":"));
 
        loadFromFiles(paths);
 }
 
-void Settings::loadFromFiles(const std::vector<std::string>& filePaths)
+void Settings::loadFromFiles(const std::vector<std::string>& path)
 {
-       std::vector<std::string>::const_iterator it;
-
-       char* home = getenv("HOME");
-
-       for (it = filePaths.begin(); it != filePaths.end(); ++it)
+       std::vector<std::string> copy(path);
+       std::vector<std::string>::iterator it;
+
+#if defined(_WIN32)
+       char* homeDrive = getenv("HOMEDRIVE");
+       char* homePath = getenv("HOMEPATH");
+       std::string home(homeDrive ? homeDrive : "");
+       if (homePath) home += homePath;
+#else
+       char *homePath = getenv("HOME");
+       std::string home(homePath ? homePath : "");
+#endif
+
+       for (it = copy.begin(); it != copy.end(); ++it)
        {
-               std::string path = *it;
-
-               if (home)
+               if (!home.empty())
                {
-                       boost::replace_all(path, "$HOME", home);
+                       boost::replace_all(*it, "$HOME", home);
 
                        //Mf::logDebug("Copying global settings...");
-                       //mUserFile = path;
+                       //mUserFile = *it;
                        //mGlobals.pushCopy();
                        //mScript.set("globals", Script::REGISTRY);
                }
 
-               if (mScript.doFile(path) != Script::SUCCESS)
+               if (mScript.doFile(*it) != Script::SUCCESS)
                {
                        std::string str;
                        mScript[-1].get(str);
-                       logInfo(str);
+                       logWarning(str);
                        mScript.clear();
                }
        }
@@ -101,18 +84,17 @@ void Settings::clear()
 }
 
 
-void Settings::saveAs(const std::string& filePath)
+void Settings::saveAs(const std::string& path)
 {
-       mUserFile = filePath;
+       mUserFile = path;
        save();
 }
 
 void Settings::save() const
 {
+       // TODO saving settings not yet implemented
 }
 
 
 } // namepsace Mf
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-