LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-18 03:34:23 +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_File.cpp
+28 -5
View File
@@ -24,6 +24,8 @@
#include "common/Exception.h"
#include "common/int.h"
#include "data/wrap_DataModule.h"
namespace love
{
namespace filesystem
@@ -108,9 +110,18 @@ int w_File_isOpen(lua_State *L)
int w_File_read(lua_State *L)
{
File *file = luax_checkfile(L, 1);
StrongRef<Data> d = nullptr;
StrongRef<FileData> d = nullptr;
int64 size = (int64) luaL_optnumber(L, 2, (lua_Number) File::ALL);
love::data::ContainerType ctype = love::data::CONTAINER_STRING;
int startidx = 2;
if (lua_type(L, 2) == LUA_TSTRING)
{
ctype = love::data::luax_checkcontainertype(L, 2);
startidx = 3;
}
int64 size = (int64) luaL_optnumber(L, startidx, (lua_Number) File::ALL);
try
{
@@ -121,9 +132,21 @@ int w_File_read(lua_State *L)
return luax_ioError(L, "%s", e.what());
}
lua_pushlstring(L, (const char *) d->getData(), d->getSize());
lua_pushnumber(L, d->getSize());
return 2;
int nret = 0;
if (ctype == love::data::CONTAINER_DATA)
{
luax_pushtype(L, d.get());
nret = 1;
}
else
{
lua_pushlstring(L, (const char *) d->getData(), d->getSize());
lua_pushinteger(L, d->getSize());
nret = 2;
}
return nret;
}
int w_File_write(lua_State *L)