Skip to content
This repository has been archived by the owner on Mar 13, 2021. It is now read-only.

Commit

Permalink
Merge remote branch 'ace/fs-fix'
Browse files Browse the repository at this point in the history
  • Loading branch information
@zinnschlag
zinnschlag committed Mar 31, 2012
2 parents a4576f0 + 3b0dc40 commit 509650d
Show file tree
Hide file tree
Showing 5 changed files with 90 additions and 96 deletions.
9 changes: 7 additions & 2 deletions apps/openmw/engine.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,13 +204,18 @@ OMW::Engine::~Engine()
void OMW::Engine::loadBSA()
{
const Files::MultiDirCollection& bsa = mFileCollections.getCollection (".bsa");
std::string dataDirectory;

for (Files::MultiDirCollection::TIter iter(bsa.begin()); iter!=bsa.end(); ++iter)
{
std::cout << "Adding " << iter->second.string() << std::endl;
Bsa::addBSA(iter->second.string());
}

dataDirectory = iter->second.parent_path().string();
const Files::PathContainer& dataDirs = mFileCollections.getPaths();
std::string dataDirectory;
for (Files::PathContainer::const_iterator iter = dataDirs.begin(); iter != dataDirs.end(); ++iter)
{
dataDirectory = iter->string();
std::cout << "Data dir " << dataDirectory << std::endl;
Bsa::addDir(dataDirectory, mFSStrict);
}
Expand Down
168 changes: 75 additions & 93 deletions components/bsa/bsa_archive.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,20 @@ struct ciLessBoost : std::binary_function<std::string, std::string, bool>
}
};

struct pathComparer
{
private:
int m_start, m_size;

public:
pathComparer(int start, int size) : m_start(start), m_size(size) { }

bool operator() (const std::string& first, const std::string& other)
{
return lexicographical_compare(first.substr(m_start,m_size), other.substr(m_start,m_size), boost::algorithm::is_iless());
}
};

static bool fsstrict = false;

/// An OGRE Archive wrapping a BSAFile archive
Expand All @@ -55,16 +69,59 @@ class DirArchive: public Ogre::FileSystemArchive
std::map<std::string, std::vector<std::string>, ciLessBoost> m;
unsigned int cutoff;

bool comparePortion(std::string file1, std::string file2, int start, int size) const
bool findFile(const String& filename, std::string& copy) const
{
for(int i = start; i < start+size; i++)
{
char one = file1.at(i);
char two = file2.at(i);
if(tolower(one) != tolower(two) )
String passed = filename;
if(filename.at(filename.length() - 1) == '*' || filename.at(filename.length() - 1) == '?' || filename.at(filename.length() - 1) == '<'
|| filename.at(filename.length() - 1) == '"' || filename.at(filename.length() - 1) == '>' || filename.at(filename.length() - 1) == ':'
|| filename.at(filename.length() - 1) == '|')
{
passed = filename.substr(0, filename.length() - 2);
}
if(filename.at(filename.length() - 2) == '>')
passed = filename.substr(0, filename.length() - 6);
copy = passed;
}

std::replace(copy.begin(), copy.end(), '\\', '/');

if(copy.at(0) == '/')
copy.erase(0, 1);

if(fsstrict == true)
return true;

std::string folder;
int delimiter = 0;
size_t lastSlash = copy.rfind('/');
if (lastSlash != std::string::npos)
{
folder = copy.substr(0, lastSlash);
delimiter = lastSlash+1;
}

std::vector<std::string> current;
{
std::map<std::string,std::vector<std::string>,ciLessBoost>::const_iterator found = m.find(folder);

if (found == m.end())
{
return false;
}
else
current = found->second;
}
return true;

pathComparer comp(delimiter, copy.size() - delimiter-1);
std::vector<std::string>::iterator find = std::lower_bound(current.begin(), current.end(), copy, comp);
if (find != current.end() && !comp(copy, current.front()))
{
copy = *find;
return true;
}

return false;
}

public:
Expand All @@ -83,16 +140,14 @@ class DirArchive: public Ogre::FileSystemArchive
//need to cut off first
boost::filesystem::directory_iterator dir_iter(d), dir_end;
std::vector<std::string> filesind;
boost::filesystem::path f;
for(;dir_iter != dir_end; dir_iter++)
{
if(boost::filesystem::is_directory(*dir_iter))
populateMap(*dir_iter);
else
{

f = *dir_iter;
std::string s = f.string();
std::string s = dir_iter->path().string();
std::replace(s.begin(), s.end(), '\\', '/');

std::string small;
if(cutoff < s.size())
Expand All @@ -103,14 +158,17 @@ class DirArchive: public Ogre::FileSystemArchive
filesind.push_back(small);
}
}
std::sort(filesind.begin(), filesind.end(), ciLessBoost());

std::string small;
std::string original = d.string();
std::replace(original.begin(), original.end(), '\\', '/');
if(cutoff < original.size())
small = original.substr(cutoff, original.size() - cutoff);
else
small = original.substr(cutoff - 1, original.size() - cutoff);
m[small] = filesind;

m[small] = filesind;
}

bool isCaseSensitive() const { return fsstrict; }
Expand All @@ -120,97 +178,21 @@ class DirArchive: public Ogre::FileSystemArchive
void unload() {}

bool exists(const String& filename) {
std::string copy = filename;



for (unsigned int i = 0; i < filename.size(); i++)
{
if(copy.at(i) == '\\' ){
copy.replace(i, 1, "/");
}
}


if(copy.at(0) == '\\' || copy.at(0) == '/')
{
copy.erase(0, 1);
}
if(fsstrict == true)
{
//std::cout << "fsstrict " << copy << "\n";
std::string copy;

if (findFile(filename, copy))
return FileSystemArchive::exists(copy);
}


int last = copy.size() - 1;
int i = last;

for (;last >= 0; i--)
{
if(copy.at(i) == '/' || copy.at(i) == '\\')
break;
}

std::string folder = copy.substr(0, i); //folder with no slash

std::vector<std::string>& current = m[folder];

for(std::vector<std::string>::iterator iter = current.begin(); iter != current.end(); iter++)
{
if(comparePortion(*iter, copy, i + 1, copy.size() - i -1) == true){
return FileSystemArchive::exists(*iter);
}
}


return false;
}

DataStreamPtr open(const String& filename, bool readonly = true) const
{
std::map<std::string, std::vector<std::string>, ciLessBoost> mlocal = m;
std::string copy = filename;

std::string copy;


for (unsigned int i = 0; i < filename.size(); i++)
{
if(copy.at(i) == '\\' ){
copy.replace(i, 1, "/");
}
}


if(copy.at(0) == '\\' || copy.at(0) == '/')
{
copy.erase(0, 1);
}

if(fsstrict == true)
{
if (findFile(filename, copy))
return FileSystemArchive::open(copy, readonly);
}


int last = copy.size() - 1;
int i = last;

for (;last >= 0; i--)
{
if(copy.at(i) == '/' || copy.at(i) == '\\')
break;
}

std::string folder = copy.substr(0, i); //folder with no slash
std::vector<std::string> current = mlocal[folder];

for(std::vector<std::string>::iterator iter = current.begin(); iter != current.end(); iter++)
{
if(comparePortion(*iter, copy, i + 1, copy.size() - i -1) == true){
return FileSystemArchive::open(*iter, readonly);
}
}

DataStreamPtr p;
return p;
}
Expand Down
5 changes: 5 additions & 0 deletions components/files/collections.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,9 @@ namespace Files

return iter->second;
}

const Files::PathContainer& Collections::getPaths() const
{
return mDirectories;
}
}
2 changes: 2 additions & 0 deletions components/files/collections.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ namespace Files
/// leading dot and must be all lower-case.
const MultiDirCollection& getCollection(const std::string& extension) const;

const Files::PathContainer& getPaths() const;

private:
typedef std::map<std::string, MultiDirCollection> MultiDirCollectionContainer;
Files::PathContainer mDirectories;
Expand Down
2 changes: 1 addition & 1 deletion components/nifogre/ogre_nif_loader.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1368,7 +1368,7 @@ void NIFLoader::loadResource(Resource *resource)

if (!vfs->isFile(resourceName))
{
warn("File not found.");
warn("File "+resourceName+" not found.");
return;
}

Expand Down

0 comments on commit 509650d

Please sign in to comment.