FileSystem: Fix file lookup if unrelated files with same name exist
Before, even though we did match all possible extensions, we only took the first match and tried opening it. If we were looking for a .png image, but there was an unrelated .txt file with the same name (as it actually happens in RTPs), we would potentially see the .txt first, try opening it, and fail alltogether, even though the image file existed. Now we try opening all matching files until we find one that we can parse. This fixes #101.
This commit is contained in:
Jonas Kulla
parent
533e69275a
commit
54c1107f19
|
|
@ -199,43 +199,73 @@ void ALStream::closeSource()
|
||||||
delete source;
|
delete source;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
struct ALStreamOpenHandler : FileSystem::OpenHandler
|
||||||
|
{
|
||||||
|
SDL_RWops *srcOps;
|
||||||
|
bool looped;
|
||||||
|
ALDataSource *source;
|
||||||
|
std::string errorMsg;
|
||||||
|
|
||||||
|
ALStreamOpenHandler(SDL_RWops &srcOps, bool looped)
|
||||||
|
: srcOps(&srcOps), looped(looped), source(0)
|
||||||
|
{}
|
||||||
|
|
||||||
|
bool tryRead(SDL_RWops &ops, const char *ext)
|
||||||
|
{
|
||||||
|
/* Copy this because we need to keep it around,
|
||||||
|
* as we will continue reading data from it later */
|
||||||
|
*srcOps = ops;
|
||||||
|
|
||||||
|
/* Try to read ogg file signature */
|
||||||
|
char sig[5] = { 0 };
|
||||||
|
SDL_RWread(srcOps, sig, 1, 4);
|
||||||
|
SDL_RWseek(srcOps, 0, RW_SEEK_SET);
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (!strcmp(sig, "OggS"))
|
||||||
|
{
|
||||||
|
source = createVorbisSource(*srcOps, looped);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!strcmp(sig, "MThd"))
|
||||||
|
{
|
||||||
|
shState->midiState().initIfNeeded(shState->config());
|
||||||
|
|
||||||
|
if (HAVE_FLUID)
|
||||||
|
{
|
||||||
|
source = createMidiSource(*srcOps, looped);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
source = createSDLSource(*srcOps, ext, STREAM_BUF_SIZE, looped);
|
||||||
|
}
|
||||||
|
catch (const Exception &e)
|
||||||
|
{
|
||||||
|
/* All source constructors will close the passed ops
|
||||||
|
* before throwing errors */
|
||||||
|
errorMsg = e.msg;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
void ALStream::openSource(const std::string &filename)
|
void ALStream::openSource(const std::string &filename)
|
||||||
{
|
{
|
||||||
char ext[8];
|
ALStreamOpenHandler handler(srcOps, looped);
|
||||||
shState->fileSystem().openRead(srcOps, filename.c_str(), false, ext, sizeof(ext));
|
shState->fileSystem().openRead(handler, filename.c_str());
|
||||||
|
source = handler.source;
|
||||||
needsRewind.clear();
|
needsRewind.clear();
|
||||||
|
|
||||||
/* Try to read ogg file signature */
|
if (!source)
|
||||||
char sig[5] = { 0 };
|
|
||||||
SDL_RWread(&srcOps, sig, 1, 4);
|
|
||||||
SDL_RWseek(&srcOps, 0, RW_SEEK_SET);
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
if (!strcmp(sig, "OggS"))
|
|
||||||
{
|
|
||||||
source = createVorbisSource(srcOps, looped);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!strcmp(sig, "MThd"))
|
|
||||||
{
|
|
||||||
shState->midiState().initIfNeeded(shState->config());
|
|
||||||
|
|
||||||
if (HAVE_FLUID)
|
|
||||||
{
|
|
||||||
source = createMidiSource(srcOps, looped);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
source = createSDLSource(srcOps, ext, STREAM_BUF_SIZE, looped);
|
|
||||||
}
|
|
||||||
catch (const Exception &e)
|
|
||||||
{
|
{
|
||||||
char buf[512];
|
char buf[512];
|
||||||
snprintf(buf, sizeof(buf), "Unable to decode audio stream: %s.%s: %s",
|
snprintf(buf, sizeof(buf), "Unable to decode audio stream: %s: %s",
|
||||||
filename.c_str(), ext, e.msg.c_str());
|
filename.c_str(), handler.errorMsg.c_str());
|
||||||
|
|
||||||
Debug() << buf;
|
Debug() << buf;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -233,13 +233,26 @@ struct BitmapPrivate
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct BitmapOpenHandler : FileSystem::OpenHandler
|
||||||
|
{
|
||||||
|
SDL_Surface *surf;
|
||||||
|
|
||||||
|
BitmapOpenHandler()
|
||||||
|
: surf(0)
|
||||||
|
{}
|
||||||
|
|
||||||
|
bool tryRead(SDL_RWops &ops, const char *ext)
|
||||||
|
{
|
||||||
|
surf = IMG_LoadTyped_RW(&ops, 1, ext);
|
||||||
|
return surf != 0;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
Bitmap::Bitmap(const char *filename)
|
Bitmap::Bitmap(const char *filename)
|
||||||
{
|
{
|
||||||
SDL_RWops ops;
|
BitmapOpenHandler handler;
|
||||||
char ext[8];
|
shState->fileSystem().openRead(handler, filename);
|
||||||
|
SDL_Surface *imgSurf = handler.surf;
|
||||||
shState->fileSystem().openRead(ops, filename, false, ext, sizeof(ext));
|
|
||||||
SDL_Surface *imgSurf = IMG_LoadTyped_RW(&ops, 1, ext);
|
|
||||||
|
|
||||||
if (!imgSurf)
|
if (!imgSurf)
|
||||||
throw Exception(Exception::SDLError, "Error loading image '%s': %s",
|
throw Exception(Exception::SDLError, "Error loading image '%s': %s",
|
||||||
|
|
|
||||||
|
|
@ -37,6 +37,7 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
#include <stack>
|
||||||
|
|
||||||
#ifdef __APPLE__
|
#ifdef __APPLE__
|
||||||
#include <iconv.h>
|
#include <iconv.h>
|
||||||
|
|
@ -249,201 +250,65 @@ strcpySafe(char *dst, const char *src,
|
||||||
return cpyMax;
|
return cpyMax;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Attempt to locate an extension string in a filename.
|
||||||
|
* Either a pointer into the input string pointing at the
|
||||||
|
* extension, or null is returned */
|
||||||
|
static const char *
|
||||||
|
findExt(const char *filename)
|
||||||
|
{
|
||||||
|
size_t len;
|
||||||
|
|
||||||
|
for (len = strlen(filename); len > 0; --len)
|
||||||
|
{
|
||||||
|
if (filename[len] == '/')
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
if (filename[len] == '.')
|
||||||
|
return &filename[len+1];
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
initReadOps(PHYSFS_File *handle,
|
||||||
|
SDL_RWops &ops,
|
||||||
|
bool freeOnClose)
|
||||||
|
{
|
||||||
|
ops.size = SDL_RWopsSize;
|
||||||
|
ops.seek = SDL_RWopsSeek;
|
||||||
|
ops.read = SDL_RWopsRead;
|
||||||
|
ops.write = SDL_RWopsWrite;
|
||||||
|
|
||||||
|
if (freeOnClose)
|
||||||
|
ops.close = SDL_RWopsCloseFree;
|
||||||
|
else
|
||||||
|
ops.close = SDL_RWopsClose;
|
||||||
|
|
||||||
|
ops.type = SDL_RWOPS_PHYSFS;
|
||||||
|
ops.hidden.unknown.data1 = handle;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void strTolower(std::string &str)
|
||||||
|
{
|
||||||
|
for (size_t i = 0; i < str.size(); ++i)
|
||||||
|
str[i] = tolower(str[i]);
|
||||||
|
}
|
||||||
|
|
||||||
const Uint32 SDL_RWOPS_PHYSFS = SDL_RWOPS_UNKNOWN+10;
|
const Uint32 SDL_RWOPS_PHYSFS = SDL_RWOPS_UNKNOWN+10;
|
||||||
|
|
||||||
struct FileSystemPrivate
|
struct FileSystemPrivate
|
||||||
{
|
{
|
||||||
/* Maps: lower case filepath without extension,
|
/* Maps: lower case full filepath,
|
||||||
* To: mixed case full filepath
|
* To: mixed case full filepath */
|
||||||
* This is for compatibility with games that take Windows'
|
|
||||||
* case insensitivity for granted */
|
|
||||||
BoostHash<std::string, std::string> pathCache;
|
BoostHash<std::string, std::string> pathCache;
|
||||||
|
/* Maps: lower case directory path,
|
||||||
|
* To: list of lower case filenames */
|
||||||
|
BoostHash<std::string, std::vector<std::string> > fileLists;
|
||||||
|
|
||||||
|
/* This is for compatibility with games that take Windows'
|
||||||
|
* case insensitivity for granted */
|
||||||
bool havePathCache;
|
bool havePathCache;
|
||||||
|
|
||||||
/* Attempt to locate an extension string in a filename.
|
|
||||||
* Either a pointer into the input string pointing at the
|
|
||||||
* extension, or null is returned */
|
|
||||||
const char *findExt(const char *filename)
|
|
||||||
{
|
|
||||||
size_t len;
|
|
||||||
|
|
||||||
for (len = strlen(filename); len > 0; --len)
|
|
||||||
{
|
|
||||||
if (filename[len] == '/')
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
if (filename[len] == '.')
|
|
||||||
return &filename[len+1];
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
struct CompleteFilenameData
|
|
||||||
{
|
|
||||||
bool found;
|
|
||||||
/* Contains the incomplete filename we're looking for;
|
|
||||||
* when found, we write the complete filename into this
|
|
||||||
* same buffer */
|
|
||||||
char *outBuf;
|
|
||||||
/* Length of incomplete file name */
|
|
||||||
size_t filenameLen;
|
|
||||||
/* Maximum we can write into outBuf */
|
|
||||||
size_t outBufN;
|
|
||||||
};
|
|
||||||
|
|
||||||
static void completeFilenameRegCB(void *data, const char *,
|
|
||||||
const char *fname)
|
|
||||||
{
|
|
||||||
CompleteFilenameData &d = *static_cast<CompleteFilenameData*>(data);
|
|
||||||
|
|
||||||
if (d.found)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (strncmp(d.outBuf, fname, d.filenameLen) != 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
/* If fname matches up to a following '.' (meaning the rest is part
|
|
||||||
* of the extension), or up to a following '\0' (full match), we've
|
|
||||||
* found our file */
|
|
||||||
switch (fname[d.filenameLen])
|
|
||||||
{
|
|
||||||
case '.' :
|
|
||||||
/* Overwrite the incomplete file name we looked for with
|
|
||||||
* the full version containing any extensions */
|
|
||||||
strcpySafe(d.outBuf, fname, d.outBufN, -1);
|
|
||||||
case '\0' :
|
|
||||||
d.found = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
bool completeFilenameReg(const char *filepath,
|
|
||||||
char *outBuffer,
|
|
||||||
size_t outN)
|
|
||||||
{
|
|
||||||
strcpySafe(outBuffer, filepath, outN, -1);
|
|
||||||
|
|
||||||
size_t len = strlen(outBuffer);
|
|
||||||
char *delim;
|
|
||||||
|
|
||||||
/* Find the deliminator separating directory and file name */
|
|
||||||
for (delim = outBuffer + len; delim > outBuffer; --delim)
|
|
||||||
if (*delim == '/')
|
|
||||||
break;
|
|
||||||
|
|
||||||
bool root = (delim == outBuffer);
|
|
||||||
CompleteFilenameData d;
|
|
||||||
|
|
||||||
if (!root)
|
|
||||||
{
|
|
||||||
/* If we have such a deliminator, we set it to '\0' so we
|
|
||||||
* can pass the first half to PhysFS as the directory name,
|
|
||||||
* and compare all filenames against the second half */
|
|
||||||
d.outBuf = delim+1;
|
|
||||||
d.filenameLen = len - (delim - outBuffer + 1);
|
|
||||||
|
|
||||||
*delim = '\0';
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
/* Otherwise the file is in the root directory */
|
|
||||||
d.outBuf = outBuffer;
|
|
||||||
d.filenameLen = len - (delim - outBuffer);
|
|
||||||
}
|
|
||||||
|
|
||||||
d.found = false;
|
|
||||||
d.outBufN = outN - (d.outBuf - outBuffer);
|
|
||||||
|
|
||||||
PHYSFS_enumerateFilesCallback(root ? "" : outBuffer, completeFilenameRegCB, &d);
|
|
||||||
|
|
||||||
if (!d.found)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
/* Now we put the deliminator back in to form the completed
|
|
||||||
* file path (if required) */
|
|
||||||
if (delim != outBuffer)
|
|
||||||
*delim = '/';
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool completeFilenamePC(const char *filepath,
|
|
||||||
char *outBuffer,
|
|
||||||
size_t outN)
|
|
||||||
{
|
|
||||||
std::string lowCase(filepath);
|
|
||||||
|
|
||||||
for (size_t i = 0; i < lowCase.size(); ++i)
|
|
||||||
lowCase[i] = tolower(lowCase[i]);
|
|
||||||
|
|
||||||
if (!pathCache.contains(lowCase))
|
|
||||||
return false;
|
|
||||||
|
|
||||||
const std::string &fullPath = pathCache[lowCase];
|
|
||||||
strcpySafe(outBuffer, fullPath.c_str(), outN, fullPath.size());
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool completeFilename(const char *filepath,
|
|
||||||
char *outBuffer,
|
|
||||||
size_t outN)
|
|
||||||
{
|
|
||||||
if (havePathCache)
|
|
||||||
return completeFilenamePC(filepath, outBuffer, outN);
|
|
||||||
else
|
|
||||||
return completeFilenameReg(filepath, outBuffer, outN);
|
|
||||||
}
|
|
||||||
|
|
||||||
PHYSFS_File *openReadHandle(const char *filename,
|
|
||||||
char *extBuf,
|
|
||||||
size_t extBufN)
|
|
||||||
{
|
|
||||||
char found[512];
|
|
||||||
|
|
||||||
if (!completeFilename(filename, found, sizeof(found)))
|
|
||||||
throw Exception(Exception::NoFileError, "%s", filename);
|
|
||||||
|
|
||||||
PHYSFS_File *handle = PHYSFS_openRead(found);
|
|
||||||
|
|
||||||
if (!handle)
|
|
||||||
throw Exception(Exception::PHYSFSError, "PhysFS: %s", PHYSFS_getLastError());
|
|
||||||
|
|
||||||
if (!extBuf)
|
|
||||||
return handle;
|
|
||||||
|
|
||||||
for (char *q = found+strlen(found); q > found; --q)
|
|
||||||
{
|
|
||||||
if (*q == '/')
|
|
||||||
break;
|
|
||||||
|
|
||||||
if (*q != '.')
|
|
||||||
continue;
|
|
||||||
|
|
||||||
strcpySafe(extBuf, q+1, extBufN, -1);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
return handle;
|
|
||||||
}
|
|
||||||
|
|
||||||
void initReadOps(PHYSFS_File *handle,
|
|
||||||
SDL_RWops &ops,
|
|
||||||
bool freeOnClose)
|
|
||||||
{
|
|
||||||
ops.size = SDL_RWopsSize;
|
|
||||||
ops.seek = SDL_RWopsSeek;
|
|
||||||
ops.read = SDL_RWopsRead;
|
|
||||||
ops.write = SDL_RWopsWrite;
|
|
||||||
|
|
||||||
if (freeOnClose)
|
|
||||||
ops.close = SDL_RWopsCloseFree;
|
|
||||||
else
|
|
||||||
ops.close = SDL_RWopsClose;
|
|
||||||
|
|
||||||
ops.type = SDL_RWOPS_PHYSFS;
|
|
||||||
ops.hidden.unknown.data1 = handle;
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
FileSystem::FileSystem(const char *argv0,
|
FileSystem::FileSystem(const char *argv0,
|
||||||
|
|
@ -484,99 +349,105 @@ void FileSystem::addPath(const char *path)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef __APPLE__
|
struct CacheEnumData
|
||||||
struct CacheEnumCBData
|
|
||||||
{
|
{
|
||||||
FileSystemPrivate *p;
|
FileSystemPrivate *p;
|
||||||
|
std::stack<std::vector<std::string>*> fileLists;
|
||||||
|
|
||||||
|
#ifdef __APPLE__
|
||||||
iconv_t nfd2nfc;
|
iconv_t nfd2nfc;
|
||||||
|
char buf[512];
|
||||||
|
#endif
|
||||||
|
|
||||||
CacheEnumCBData(FileSystemPrivate *fsp)
|
CacheEnumData(FileSystemPrivate *p)
|
||||||
|
: p(p)
|
||||||
{
|
{
|
||||||
p = fsp;
|
#ifdef __APPLE__
|
||||||
nfd2nfc = iconv_open("utf-8", "utf-8-mac");
|
nfd2nfc = iconv_open("utf-8", "utf-8-mac");
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
~CacheEnumCBData()
|
~CacheEnumData()
|
||||||
{
|
{
|
||||||
|
#ifdef __APPLE__
|
||||||
iconv_close(nfd2nfc);
|
iconv_close(nfd2nfc);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void nfcFromNfd(char *dst, const char *src, size_t dstSize)
|
/* Converts in-place */
|
||||||
|
void toNFC(char *inout)
|
||||||
{
|
{
|
||||||
size_t srcSize = strlen(src);
|
#ifdef __APPLE__
|
||||||
|
size_t srcSize = strlen(inout);
|
||||||
|
size_t bufSize = sizeof(buf);
|
||||||
|
char *bufPtr = buf;
|
||||||
|
char *inoutPtr = inout;
|
||||||
|
|
||||||
/* Reserve room for null terminator */
|
/* Reserve room for null terminator */
|
||||||
--dstSize;
|
--bufSize;
|
||||||
/* iconv takes a char** instead of a const char**, even though
|
|
||||||
* the string data isn't written to. */
|
|
||||||
iconv(nfd2nfc,
|
iconv(nfd2nfc,
|
||||||
const_cast<char**>(&src), &srcSize,
|
&inoutPtr, &srcSize,
|
||||||
&dst, &dstSize);
|
&bufPtr, &bufSize);
|
||||||
/* Null-terminate */
|
/* Null-terminate */
|
||||||
*dst = 0;
|
*bufPtr = 0;
|
||||||
|
strcpy(inout, buf);
|
||||||
|
#else
|
||||||
|
(void) inout;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
#endif
|
|
||||||
|
|
||||||
static void cacheEnumCB(void *d, const char *origdir,
|
static void cacheEnumCB(void *d, const char *origdir,
|
||||||
const char *fname)
|
const char *fname)
|
||||||
{
|
{
|
||||||
#ifdef __APPLE__
|
CacheEnumData &data = *static_cast<CacheEnumData*>(d);
|
||||||
CacheEnumCBData *data = static_cast<CacheEnumCBData*>(d);
|
char fullPath[512];
|
||||||
FileSystemPrivate *p = data->p;
|
|
||||||
#else
|
|
||||||
FileSystemPrivate *p = static_cast<FileSystemPrivate*>(d);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
char buf[512];
|
if (!*origdir)
|
||||||
|
snprintf(fullPath, sizeof(fullPath), "%s", fname);
|
||||||
if (*origdir == '\0')
|
|
||||||
strncpy(buf, fname, sizeof(buf));
|
|
||||||
else
|
else
|
||||||
snprintf(buf, sizeof(buf), "%s/%s", origdir, fname);
|
snprintf(fullPath, sizeof(fullPath), "%s/%s", origdir, fname);
|
||||||
|
|
||||||
#ifdef __APPLE__
|
/* Deal with OSX' weird UTF-8 standards */
|
||||||
char bufNfc[sizeof(buf)];
|
data.toNFC(fullPath);
|
||||||
data->nfcFromNfd(bufNfc, buf, sizeof(bufNfc));
|
|
||||||
#else
|
|
||||||
char *const bufNfc = buf;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
char *ptr = bufNfc;
|
std::string mixedCase(fullPath);
|
||||||
|
std::string lowerCase = mixedCase;
|
||||||
|
strTolower(lowerCase);
|
||||||
|
|
||||||
/* Trim leading slash */
|
PHYSFS_Stat stat;
|
||||||
if (*ptr == '/')
|
PHYSFS_stat(fullPath, &stat);
|
||||||
++ptr;
|
|
||||||
|
|
||||||
std::string mixedCase(ptr);
|
if (stat.filetype == PHYSFS_FILETYPE_DIRECTORY)
|
||||||
|
|
||||||
for (char *q = bufNfc; *q; ++q)
|
|
||||||
*q = tolower(*q);
|
|
||||||
|
|
||||||
p->pathCache.insert(std::string(ptr), mixedCase);
|
|
||||||
|
|
||||||
for (char *q = ptr+strlen(ptr); q > ptr; --q)
|
|
||||||
{
|
{
|
||||||
if (*q == '/')
|
/* Create a new list for this directory */
|
||||||
break;
|
std::vector<std::string> &list = data.p->fileLists[lowerCase];
|
||||||
|
|
||||||
if (*q != '.')
|
/* Iterate over its contents */
|
||||||
continue;
|
data.fileLists.push(&list);
|
||||||
|
PHYSFS_enumerateFilesCallback(fullPath, cacheEnumCB, d);
|
||||||
*q = '\0';
|
data.fileLists.pop();
|
||||||
p->pathCache.insert(std::string(ptr), mixedCase);
|
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
/* Get the file list for the directory we're currently
|
||||||
|
* traversing and append this filename to it */
|
||||||
|
std::vector<std::string> &list = *data.fileLists.top();
|
||||||
|
std::string lowerFilename(fname);
|
||||||
|
strTolower(lowerFilename);
|
||||||
|
list.push_back(lowerFilename);
|
||||||
|
|
||||||
PHYSFS_enumerateFilesCallback(mixedCase.c_str(), cacheEnumCB, d);
|
/* Add the lower -> mixed mapping of the file's full path */
|
||||||
|
data.p->pathCache.insert(lowerCase, mixedCase);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void FileSystem::createPathCache()
|
void FileSystem::createPathCache()
|
||||||
{
|
{
|
||||||
#ifdef __APPLE__
|
CacheEnumData data(p);
|
||||||
CacheEnumCBData data(p);
|
data.fileLists.push(&p->fileLists[""]);
|
||||||
PHYSFS_enumerateFilesCallback("", cacheEnumCB, &data);
|
PHYSFS_enumerateFilesCallback("", cacheEnumCB, &data);
|
||||||
#else
|
|
||||||
PHYSFS_enumerateFilesCallback("", cacheEnumCB, p);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
p->havePathCache = true;
|
p->havePathCache = true;
|
||||||
}
|
}
|
||||||
|
|
@ -591,10 +462,9 @@ static void fontSetEnumCB(void *data, const char *,
|
||||||
const char *fname)
|
const char *fname)
|
||||||
{
|
{
|
||||||
FontSetsCBData *d = static_cast<FontSetsCBData*>(data);
|
FontSetsCBData *d = static_cast<FontSetsCBData*>(data);
|
||||||
FileSystemPrivate *p = d->p;
|
|
||||||
|
|
||||||
/* Only consider filenames with font extensions */
|
/* Only consider filenames with font extensions */
|
||||||
const char *ext = p->findExt(fname);
|
const char *ext = findExt(fname);
|
||||||
|
|
||||||
if (!ext)
|
if (!ext)
|
||||||
return;
|
return;
|
||||||
|
|
@ -618,7 +488,7 @@ static void fontSetEnumCB(void *data, const char *,
|
||||||
return;
|
return;
|
||||||
|
|
||||||
SDL_RWops ops;
|
SDL_RWops ops;
|
||||||
p->initReadOps(handle, ops, false);
|
initReadOps(handle, ops, false);
|
||||||
|
|
||||||
d->sfs->initFontSetCB(ops, filename);
|
d->sfs->initFontSetCB(ops, filename);
|
||||||
|
|
||||||
|
|
@ -632,15 +502,147 @@ void FileSystem::initFontSets(SharedFontState &sfs)
|
||||||
PHYSFS_enumerateFilesCallback("Fonts", fontSetEnumCB, &d);
|
PHYSFS_enumerateFilesCallback("Fonts", fontSetEnumCB, &d);
|
||||||
}
|
}
|
||||||
|
|
||||||
void FileSystem::openRead(SDL_RWops &ops,
|
struct OpenReadEnumData
|
||||||
const char *filename,
|
|
||||||
bool freeOnClose,
|
|
||||||
char *extBuf,
|
|
||||||
size_t extBufN)
|
|
||||||
{
|
{
|
||||||
PHYSFS_File *handle = p->openReadHandle(filename, extBuf, extBufN);
|
FileSystem::OpenHandler &handler;
|
||||||
|
SDL_RWops ops;
|
||||||
|
|
||||||
p->initReadOps(handle, ops, freeOnClose);
|
/* The filename (without directory) we're looking for */
|
||||||
|
const char *filename;
|
||||||
|
size_t filenameN;
|
||||||
|
|
||||||
|
/* Optional hash to translate full filepaths
|
||||||
|
* (used with path cache) */
|
||||||
|
BoostHash<std::string, std::string> *pathTrans;
|
||||||
|
|
||||||
|
/* Number of files we've attempted to read and parse */
|
||||||
|
size_t matchCount;
|
||||||
|
bool stopSearching;
|
||||||
|
|
||||||
|
/* In case of a PhysFS error, save it here so it
|
||||||
|
* doesn't get changed before we get back into our code */
|
||||||
|
const char *physfsError;
|
||||||
|
|
||||||
|
OpenReadEnumData(FileSystem::OpenHandler &handler,
|
||||||
|
const char *filename, size_t filenameN,
|
||||||
|
BoostHash<std::string, std::string> *pathTrans)
|
||||||
|
: handler(handler), filename(filename), filenameN(filenameN),
|
||||||
|
pathTrans(pathTrans), matchCount(0), stopSearching(false),
|
||||||
|
physfsError(0)
|
||||||
|
{}
|
||||||
|
};
|
||||||
|
|
||||||
|
static void openReadEnumCB(void *d, const char *dirpath,
|
||||||
|
const char *filename)
|
||||||
|
{
|
||||||
|
OpenReadEnumData &data = *static_cast<OpenReadEnumData*>(d);
|
||||||
|
char buffer[512];
|
||||||
|
const char *fullPath;
|
||||||
|
|
||||||
|
if (data.stopSearching)
|
||||||
|
return;
|
||||||
|
|
||||||
|
/* If there's not even a partial match, continue searching */
|
||||||
|
if (strncmp(filename, data.filename, data.filenameN) != 0)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (!*dirpath)
|
||||||
|
{
|
||||||
|
fullPath = filename;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
snprintf(buffer, sizeof(buffer), "%s/%s", dirpath, filename);
|
||||||
|
fullPath = buffer;
|
||||||
|
}
|
||||||
|
|
||||||
|
char last = filename[data.filenameN];
|
||||||
|
|
||||||
|
/* If fname matches up to a following '.' (meaning the rest is part
|
||||||
|
* of the extension), or up to a following '\0' (full match), we've
|
||||||
|
* found our file */
|
||||||
|
if (last != '.' && last != '\0')
|
||||||
|
return;
|
||||||
|
|
||||||
|
/* If the path cache is active, translate from lower case
|
||||||
|
* to mixed case path */
|
||||||
|
if (data.pathTrans)
|
||||||
|
fullPath = (*data.pathTrans)[fullPath].c_str();
|
||||||
|
|
||||||
|
PHYSFS_File *phys = PHYSFS_openRead(fullPath);
|
||||||
|
|
||||||
|
if (!phys)
|
||||||
|
{
|
||||||
|
/* Failing to open this file here means there must
|
||||||
|
* be a deeper rooted problem somewhere within PhysFS.
|
||||||
|
* Just abort alltogether. */
|
||||||
|
data.stopSearching = true;
|
||||||
|
data.physfsError = PHYSFS_getLastError();
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
initReadOps(phys, data.ops, false);
|
||||||
|
|
||||||
|
const char *ext = findExt(filename);
|
||||||
|
|
||||||
|
if (data.handler.tryRead(data.ops, ext))
|
||||||
|
data.stopSearching = true;
|
||||||
|
|
||||||
|
++data.matchCount;
|
||||||
|
}
|
||||||
|
|
||||||
|
void FileSystem::openRead(OpenHandler &handler, const char *filename)
|
||||||
|
{
|
||||||
|
char buffer[512];
|
||||||
|
size_t len = strcpySafe(buffer, filename, sizeof(buffer), -1);
|
||||||
|
char *delim;
|
||||||
|
|
||||||
|
if (p->havePathCache)
|
||||||
|
for (size_t i = 0; i < len; ++i)
|
||||||
|
buffer[i] = tolower(buffer[i]);
|
||||||
|
|
||||||
|
/* Find the deliminator separating directory and file name */
|
||||||
|
for (delim = buffer + len; delim > buffer; --delim)
|
||||||
|
if (*delim == '/')
|
||||||
|
break;
|
||||||
|
|
||||||
|
const bool root = (delim == buffer);
|
||||||
|
|
||||||
|
const char *file = buffer;
|
||||||
|
const char *dir = "";
|
||||||
|
|
||||||
|
if (!root)
|
||||||
|
{
|
||||||
|
/* Cut the buffer in half so we can use it
|
||||||
|
* for both filename and directory path */
|
||||||
|
*delim = '\0';
|
||||||
|
file = delim+1;
|
||||||
|
dir = buffer;
|
||||||
|
}
|
||||||
|
|
||||||
|
OpenReadEnumData data(handler, file, len + buffer - delim - !root,
|
||||||
|
p->havePathCache ? &p->pathCache : 0);
|
||||||
|
|
||||||
|
if (p->havePathCache)
|
||||||
|
{
|
||||||
|
/* Get the list of files contained in this directory
|
||||||
|
* and manually iterate over them */
|
||||||
|
const std::vector<std::string> &fileList = p->fileLists[dir];
|
||||||
|
|
||||||
|
for (size_t i = 0; i < fileList.size(); ++i)
|
||||||
|
openReadEnumCB(&data, dir, fileList[i].c_str());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
PHYSFS_enumerateFilesCallback(dir, openReadEnumCB, &data);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (data.physfsError)
|
||||||
|
throw Exception(Exception::PHYSFSError, "PhysFS: %s", data.physfsError);
|
||||||
|
|
||||||
|
if (data.matchCount == 0)
|
||||||
|
throw Exception(Exception::NoFileError, "%s", filename);
|
||||||
}
|
}
|
||||||
|
|
||||||
void FileSystem::openReadRaw(SDL_RWops &ops,
|
void FileSystem::openReadRaw(SDL_RWops &ops,
|
||||||
|
|
@ -650,12 +652,10 @@ void FileSystem::openReadRaw(SDL_RWops &ops,
|
||||||
PHYSFS_File *handle = PHYSFS_openRead(filename);
|
PHYSFS_File *handle = PHYSFS_openRead(filename);
|
||||||
assert(handle);
|
assert(handle);
|
||||||
|
|
||||||
p->initReadOps(handle, ops, freeOnClose);
|
initReadOps(handle, ops, freeOnClose);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool FileSystem::exists(const char *filename)
|
bool FileSystem::exists(const char *filename)
|
||||||
{
|
{
|
||||||
char found[512];
|
return PHYSFS_exists(filename);
|
||||||
|
|
||||||
return p->completeFilename(filename, found, sizeof(found));
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -43,17 +43,28 @@ public:
|
||||||
* available font assets */
|
* available font assets */
|
||||||
void initFontSets(SharedFontState &sfs);
|
void initFontSets(SharedFontState &sfs);
|
||||||
|
|
||||||
void openRead(SDL_RWops &ops,
|
struct OpenHandler
|
||||||
const char *filename,
|
{
|
||||||
bool freeOnClose = false,
|
/* Try to read and interpret data provided from ops.
|
||||||
char *extBuf = 0,
|
* If data cannot be parsed, return false, otherwise true.
|
||||||
size_t extBufN = 0);
|
* Can be called multiple times until a parseable file is found.
|
||||||
|
* It's the handler's responsibility to close every passed
|
||||||
|
* ops structure, even when data could not be parsed.
|
||||||
|
* After this function returns, ops becomes invalid, so don't take
|
||||||
|
* references to it. Instead, copy the structure without closing
|
||||||
|
* if you need to further read from it later. */
|
||||||
|
virtual bool tryRead(SDL_RWops &ops, const char *ext) = 0;
|
||||||
|
};
|
||||||
|
|
||||||
|
void openRead(OpenHandler &handler,
|
||||||
|
const char *filename);
|
||||||
|
|
||||||
/* Circumvents extension supplementing */
|
/* Circumvents extension supplementing */
|
||||||
void openReadRaw(SDL_RWops &ops,
|
void openReadRaw(SDL_RWops &ops,
|
||||||
const char *filename,
|
const char *filename,
|
||||||
bool freeOnClose = false);
|
bool freeOnClose = false);
|
||||||
|
|
||||||
|
/* Does not perform extension supplementing */
|
||||||
bool exists(const char *filename);
|
bool exists(const char *filename);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
|
||||||
|
|
@ -184,6 +184,44 @@ void SoundEmitter::stop()
|
||||||
AL::Source::stop(alSrcs[i]);
|
AL::Source::stop(alSrcs[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
struct SoundOpenHandler : FileSystem::OpenHandler
|
||||||
|
{
|
||||||
|
SoundBuffer *buffer;
|
||||||
|
|
||||||
|
SoundOpenHandler()
|
||||||
|
: buffer(0)
|
||||||
|
{}
|
||||||
|
|
||||||
|
bool tryRead(SDL_RWops &ops, const char *ext)
|
||||||
|
{
|
||||||
|
Sound_Sample *sample = Sound_NewSample(&ops, ext, 0, STREAM_BUF_SIZE);
|
||||||
|
|
||||||
|
if (!sample)
|
||||||
|
{
|
||||||
|
SDL_RWclose(&ops);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Do all of the decoding in the handler so we don't have
|
||||||
|
* to keep the source ops around */
|
||||||
|
uint32_t decBytes = Sound_DecodeAll(sample);
|
||||||
|
uint8_t sampleSize = formatSampleSize(sample->actual.format);
|
||||||
|
uint32_t sampleCount = decBytes / sampleSize;
|
||||||
|
|
||||||
|
buffer = new SoundBuffer;
|
||||||
|
buffer->bytes = sampleSize * sampleCount;
|
||||||
|
|
||||||
|
ALenum alFormat = chooseALFormat(sampleSize, sample->actual.channels);
|
||||||
|
|
||||||
|
AL::Buffer::uploadData(buffer->alBuffer, alFormat, sample->buffer,
|
||||||
|
buffer->bytes, sample->actual.rate);
|
||||||
|
|
||||||
|
Sound_FreeSample(sample);
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
SoundBuffer *SoundEmitter::allocateBuffer(const std::string &filename)
|
SoundBuffer *SoundEmitter::allocateBuffer(const std::string &filename)
|
||||||
{
|
{
|
||||||
SoundBuffer *buffer = bufferHash.value(filename, 0);
|
SoundBuffer *buffer = bufferHash.value(filename, 0);
|
||||||
|
|
@ -199,40 +237,22 @@ SoundBuffer *SoundEmitter::allocateBuffer(const std::string &filename)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
/* Buffer not in cashe, needs to be loaded */
|
/* Buffer not in cache, needs to be loaded */
|
||||||
SDL_RWops dataSource;
|
SoundOpenHandler handler;
|
||||||
char ext[8];
|
shState->fileSystem().openRead(handler, filename.c_str());
|
||||||
|
buffer = handler.buffer;
|
||||||
|
|
||||||
shState->fileSystem().openRead(dataSource, filename.c_str(),
|
if (!buffer)
|
||||||
false, ext, sizeof(ext));
|
|
||||||
|
|
||||||
Sound_Sample *sampleHandle = Sound_NewSample(&dataSource, ext, 0, STREAM_BUF_SIZE);
|
|
||||||
|
|
||||||
if (!sampleHandle)
|
|
||||||
{
|
{
|
||||||
char buf[512];
|
char buf[512];
|
||||||
snprintf(buf, sizeof(buf), "Unable to decode sound: %s.%s: %s",
|
snprintf(buf, sizeof(buf), "Unable to decode sound: %s: %s",
|
||||||
filename.c_str(), ext, Sound_GetError());
|
filename.c_str(), Sound_GetError());
|
||||||
Debug() << buf;
|
Debug() << buf;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t decBytes = Sound_DecodeAll(sampleHandle);
|
|
||||||
uint8_t sampleSize = formatSampleSize(sampleHandle->actual.format);
|
|
||||||
uint32_t sampleCount = decBytes / sampleSize;
|
|
||||||
|
|
||||||
buffer = new SoundBuffer;
|
|
||||||
buffer->key = filename;
|
buffer->key = filename;
|
||||||
buffer->bytes = sampleSize * sampleCount;
|
|
||||||
|
|
||||||
ALenum alFormat = chooseALFormat(sampleSize, sampleHandle->actual.channels);
|
|
||||||
|
|
||||||
AL::Buffer::uploadData(buffer->alBuffer, alFormat, sampleHandle->buffer,
|
|
||||||
buffer->bytes, sampleHandle->actual.rate);
|
|
||||||
|
|
||||||
Sound_FreeSample(sampleHandle);
|
|
||||||
|
|
||||||
uint32_t wouldBeBytes = bufferBytes + buffer->bytes;
|
uint32_t wouldBeBytes = bufferBytes + buffer->bytes;
|
||||||
|
|
||||||
/* If memory limit is reached, delete lowest priority buffer
|
/* If memory limit is reached, delete lowest priority buffer
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue