X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FResource.cc;h=d1dc5fac425d1f3f808eb66357b44706a5d4f3a0;hp=ec940257045ea6650bf479f197eed0df9f91b60c;hb=2f239b9ba2a556a5ca810cfffc60552a56a4fe86;hpb=987971a961454d97082c6448fdc0bbeb540281bb diff --git a/src/Moof/Resource.cc b/src/Moof/Resource.cc index ec94025..d1dc5fa 100644 --- a/src/Moof/Resource.cc +++ b/src/Moof/Resource.cc @@ -1,32 +1,13 @@ -/******************************************************************************* - - 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 +/*] 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 @@ -41,66 +22,116 @@ namespace Mf { std::vector Resource::gSearchPaths; -void Resource::addSearchPaths(const std::string& path) +void Resource::addSearchPaths(const std::string& paths) { - std::vector paths; - boost::split(paths, path, boost::is_any_of(":")); + std::vector pathList; + boost::split(pathList, paths, boost::is_any_of(":")); - addSearchPaths(paths); + addSearchPaths(pathList); } -void Resource::addSearchPaths(const std::vector& path) +void Resource::addSearchPaths(const std::vector& pathList) { std::vector::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) || defined(__WIN32__) - boost::replace_all(onePath, "/", "\\"); +#if defined(_WIN32) + 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::iterator it; + std::string realPath(path); + if (getPath(realPath, prefix, extension)) return realPath; + + return std::string(); +} + +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; + } - std::string path(name); + return false; +} -#if defined(_WIN32) || defined(__WIN32__) +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 preList; + boost::split(preList, prefix, boost::is_any_of(":")); + std::vector postList; + boost::split(postList, extension, boost::is_any_of(":")); + + std::vector::iterator it; for (it = gSearchPaths.begin(); it != gSearchPaths.end(); ++it) { - std::string fullPath(*it); - fullPath += path; + std::vector::iterator jt; + for (jt = preList.begin(); jt != preList.end(); ++jt) + { + std::vector::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()); } } // namespace Mf -/** vim: set ts=4 sw=4 tw=80: *************************************************/ -