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

Add variants of File:read and love.filesystem.read which take an enum to determine whether they return a FileData or string.

Browse Source
This commit is contained in:
Alex Szpakowski
2017-12-22 16:32:54 -04:00
parent 9fa73f8b87
commit 0b7cb4a353
3 changed files with 55 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/filesystem/wrap_Filesystem.cpp
+26 -8
View File
@@ -25,6 +25,7 @@
#include "wrap_DroppedFile.h"
#include "wrap_FileData.h"
#include "data/wrap_Data.h"
#include "data/wrap_DataModule.h"
#include "physfs/Filesystem.h"
@@ -445,10 +446,19 @@ int w_remove(lua_State *L)
int w_read(lua_State *L)
{
const char *filename = luaL_checkstring(L, 1);
int64 len = (int64) luaL_optinteger(L, 2, File::ALL);
love::data::ContainerType ctype = love::data::CONTAINER_STRING;
int startidx = 1;
Data *data = nullptr;
if (lua_type(L, 2) == LUA_TSTRING)
{
ctype = love::data::luax_checkcontainertype(L, 1);
startidx = 2;
}
const char *filename = luaL_checkstring(L, startidx + 0);
int64 len = (int64) luaL_optinteger(L, startidx + 1, File::ALL);
FileData *data = nullptr;
try
{
data = instance()->read(filename, len);
@@ -461,16 +471,24 @@ int w_read(lua_State *L)
if (data == nullptr)
return luax_ioError(L, "File could not be read.");
// Push the string.
lua_pushlstring(L, (const char *) data->getData(), data->getSize());
int nret = 0;
// Push the size.
lua_pushinteger(L, data->getSize());
if (ctype == love::data::CONTAINER_DATA)
{
luax_pushtype(L, data);
nret = 1;
}
else
{
lua_pushlstring(L, (const char *) data->getData(), data->getSize());
lua_pushinteger(L, data->getSize());
nret = 2;
}
// Lua has a copy now, so we can free it.
data->release();
return 2;
return nret;
}
static int w_write_or_append(lua_State *L, File::Mode mode)