LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-16 00:02:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removed the callback argument from love.filesystem.getDirectoryItems (resolves issue #877.)

Browse Source 
Cleaned up the getDirectoryItems ccde to no longer call Lua API functions from Filesystem.cpp (now it's all in wrap_Filesystem.cpp.)
This commit is contained in:
Alex Szpakowski
2015-04-25 00:16:10 -03:00
parent 289eeb4fe0
commit e7f56241ec
4 changed files with 19 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/filesystem/physfs/Filesystem.cpp
+2 -24
View File
@@ -545,36 +545,14 @@ void Filesystem::append(const char *filename, const void *data, int64 size) cons
throw love::Exception("Data could not be written.");
}
int Filesystem::getDirectoryItems(lua_State *L)
void Filesystem::getDirectoryItems(const char *dir, std::vector<std::string> &items)
{
const char *dir = luaL_checkstring(L, 1);
bool hascallback = !lua_isnoneornil(L, 2);
if (hascallback)
luaL_checktype(L, 2, LUA_TFUNCTION);
char **rc = PHYSFS_enumerateFiles(dir);
int index = 1;
lua_newtable(L);
for (char **i = rc; *i != 0; i++)
{
if (hascallback)
{
lua_pushvalue(L, 2);
lua_pushstring(L, *i);
lua_call(L, 1, 0);
}
lua_pushstring(L, *i);
lua_rawseti(L, -2, index);
index++;
}
items.push_back(*i);
PHYSFS_freeList(rc);
return 1;
}
int64 Filesystem::getLastModified(const char *filename) const
src/modules/filesystem/physfs/Filesystem.h
+1 -1
View File
@@ -86,7 +86,7 @@ public:
void write(const char *filename, const void *data, int64 size) const;
void append(const char *filename, const void *data, int64 size) const;
int getDirectoryItems(lua_State *L);
void getDirectoryItems(const char *dir, std::vector<std::string> &items);
int64 getLastModified(const char *filename) const;
int64 getSize(const char *filename) const;