X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FResource.cc;h=d1dc5fac425d1f3f808eb66357b44706a5d4f3a0;hp=b04acd78f0c9d7e00424577602926fbf39151d3c;hb=90b2c7fb10b244b781b84965a0d36f1f323ee94d;hpb=8148b51f1bec8f662672d3ca36eea1784991e5cc

diff --git a/src/Moof/Resource.cc b/src/Moof/Resource.cc
index b04acd7..d1dc5fa 100644
--- a/src/Moof/Resource.cc
+++ b/src/Moof/Resource.cc
@@ -9,8 +9,6 @@
 *
 **************************************************************************/
 
-#include <unistd.h>
-
 #include <boost/algorithm/string.hpp>
 
 #include "Log.hh"
@@ -24,62 +22,114 @@ namespace Mf {
 std::vector<std::string> Resource::gSearchPaths;
 
 
-void Resource::addSearchPaths(const std::string& path)
+void Resource::addSearchPaths(const std::string& paths)
 {
-	std::vector<std::string> paths;
-	boost::split(paths, path, boost::is_any_of(":"));
+	std::vector<std::string> pathList;
+	boost::split(pathList, paths, boost::is_any_of(":"));
 
-	addSearchPaths(paths);
+	addSearchPaths(pathList);
 }
 
-void Resource::addSearchPaths(const std::vector<std::string>& path)
+void Resource::addSearchPaths(const std::vector<std::string>& pathList)
 {
 	std::vector<std::string>::const_iterator it;
-
-	for (it = path.begin(); it != path.end(); ++it)
+	for (it = pathList.begin(); it != pathList.end(); ++it)
 	{
-		std::string onePath(*it);
+		std::string path(*it);
 
-		ASSERT(!onePath.empty() && "empty search path string");
+		ASSERT(!path.empty() && "empty search path string");
 
 		// add a slash if there isn't one already
-		if (*onePath.rbegin() != '/')
-		{
-			onePath += '/';
-		}
+		if (*path.rbegin() != '/') path += '/';
 
 #if defined(_WIN32)
-		boost::replace_all(onePath, "/", "\\");
+		boost::replace_all(path, "/", "\\");
 #endif
 
-		gSearchPaths.push_back(onePath);
-		logInfo << "added search path " << onePath << std::endl;
+		gSearchPaths.push_back(path);
+		logInfo << "added search path " << path << std::endl;
 	}
 }
 
 
-std::string Resource::getPath(const std::string& name)
+std::string Resource::getPath(const std::string& path,
+							  const std::string& prefix,
+							  const std::string& extension)
 {
-	std::vector<std::string>::iterator it;
+	std::string realPath(path);
+	if (getPath(realPath, prefix, extension)) return realPath;
+
+	return std::string();
+}
 
-	std::string path(name);
+bool Resource::getPath(std::string& path,
+					   const std::string& prefix,
+					   const std::string& extension)
+{
+	FILE* file = openFile(path, prefix, extension);
+	if (file)
+	{
+		fclose(file);
+		return true;
+	}
 
+	return false;
+}
+
+FILE* Resource::openFile(std::string& path,
+						 std::string prefix,
+						 const std::string& extension,
+						 const std::string& mode)
+{
 #if defined(_WIN32)
+	// Windows always has to be the odd one.
 	boost::replace_all(path, "/", "\\");
+	boost::replace_all(prefix, "/", "\\");
 #endif
 
+	std::vector<std::string> preList;
+	boost::split(preList, prefix, boost::is_any_of(":"));
+	std::vector<std::string> postList;
+	boost::split(postList, extension, boost::is_any_of(":"));
+
+	std::vector<std::string>::iterator it;
 	for (it = gSearchPaths.begin(); it != gSearchPaths.end(); ++it)
 	{
-		std::string fullPath(*it);
-		fullPath += path;
+		std::vector<std::string>::iterator jt;
+		for (jt = preList.begin(); jt != preList.end(); ++jt)
+		{
+			std::vector<std::string>::iterator kt;
+			for (kt = postList.begin(); kt != postList.end(); ++kt)
+			{
+				std::string realPath(*it);
+				realPath += *jt;
+				realPath += path;
+				realPath += ".";
+				realPath += *kt;
+
+				FILE* file = fopen(realPath.c_str(), mode.c_str());
+				if (file)
+				{
+					path = realPath;
+					return file;
+				}
+			}
+		}
 
-		if (access(fullPath.c_str(), R_OK) == 0) return fullPath;
-	}
+		// check path relative to search path
+		std::string realPath(*it);
+		realPath += path;
 
-	logWarning << "cannot find resource " << name << std::endl;
+		FILE* file = fopen(realPath.c_str(), mode.c_str());
+		if (file)
+		{
+			path = realPath;
+			return file;
+		}
+	}
 
-	// empty string
-	return std::string();
+	// last ditch effort; maybe it's already a path to a valid resource
+	return fopen(path.c_str(), mode.c_str());
 }