X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FResource.cc;h=b04acd78f0c9d7e00424577602926fbf39151d3c;hp=e21c834e869ce4bc78debe11c0c57d618ab7313e;hb=e0c0a3b5e7337cde55e520801d2e59e03dc97d9c;hpb=493ddb59a8620b49dfa0ff62ce93395ebfd02e86

diff --git a/src/Moof/Resource.cc b/src/Moof/Resource.cc
index e21c834..b04acd7 100644
--- a/src/Moof/Resource.cc
+++ b/src/Moof/Resource.cc
@@ -1,33 +1,19 @@
 
-/*******************************************************************************
-
- 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.
-
-*******************************************************************************/
+/*]  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 <unistd.h>
 
+#include <boost/algorithm/string.hpp>
+
+#include "Log.hh"
 #include "Resource.hh"
 
 
@@ -35,41 +21,63 @@ namespace Mf {
 
 
 // static member
-std::vector<std::string> Resource::searchPaths_;
+std::vector<std::string> Resource::gSearchPaths;
 
 
-Resource::~Resource() {}
+void Resource::addSearchPaths(const std::string& path)
+{
+	std::vector<std::string> paths;
+	boost::split(paths, path, boost::is_any_of(":"));
 
+	addSearchPaths(paths);
+}
 
-void Resource::addSearchPath(const std::string& directory)
+void Resource::addSearchPaths(const std::vector<std::string>& path)
 {
-	// add a slash if there isn't one already
-	if (directory[directory.length() - 1] != '/')
-	{
-		searchPaths_.push_back(directory + '/');
-	}
-	else
+	std::vector<std::string>::const_iterator it;
+
+	for (it = path.begin(); it != path.end(); ++it)
 	{
-		searchPaths_.push_back(directory);
+		std::string onePath(*it);
+
+		ASSERT(!onePath.empty() && "empty search path string");
+
+		// add a slash if there isn't one already
+		if (*onePath.rbegin() != '/')
+		{
+			onePath += '/';
+		}
+
+#if defined(_WIN32)
+		boost::replace_all(onePath, "/", "\\");
+#endif
+
+		gSearchPaths.push_back(onePath);
+		logInfo << "added search path " << onePath << std::endl;
 	}
 }
 
-std::string Resource::getPathToResource(const std::string& name)
+
+std::string Resource::getPath(const std::string& name)
 {
 	std::vector<std::string>::iterator it;
 
-	for (it = searchPaths_.begin(); it != searchPaths_.end(); ++it)
+	std::string path(name);
+
+#if defined(_WIN32)
+	boost::replace_all(path, "/", "\\");
+#endif
+
+	for (it = gSearchPaths.begin(); it != gSearchPaths.end(); ++it)
 	{
 		std::string fullPath(*it);
-		fullPath += name;
+		fullPath += path;
 
-		// TODO this could be more portable
-		if (access(fullPath.c_str(), R_OK) == 0)
-		{
-			return fullPath;
-		}
+		if (access(fullPath.c_str(), R_OK) == 0) return fullPath;
 	}
 
+	logWarning << "cannot find resource " << name << std::endl;
+
 	// empty string
 	return std::string();
 }
@@ -77,5 +85,3 @@ std::string Resource::getPathToResource(const std::string& name)
 
 } // namespace Mf
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-