mirrors/love-nativefs
1
0
Fork 0
mirror of https://github.com/EngineerSmith/nativefs.git synced 2025-11-08 23:15:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

create FileData from ByteData if possible

Browse Source
This commit is contained in:
megagrump
2021-12-13 17:13:32 +01:00
parent dbfefa28c2
commit a8ab3c465d
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
nativefs.lua
View File

@@ -23,6 +23,11 @@ SOFTWARE.
local ffi, bit = require('ffi'), require('bit') local ffi, bit = require('ffi'), require('bit')
local C = ffi.C local C = ffi.C
local fopen, getcwd, chdir, unlink, mkdir, rmdir
local BUFFERMODE, MODEMAP
local ByteArray = ffi.typeof('unsigned char[?]')
local function _ptr(p) return p ~= nil and p or nil end -- NULL pointer to nil
local File = { local File = {
getBuffer = function(self) return self._bufferMode, self._bufferSize end, getBuffer = function(self) return self._bufferMode, self._bufferSize end,
getFilename = function(self) return self._name end, getFilename = function(self) return self._name end,
@@ -30,11 +35,6 @@ local File = {
isOpen = function(self) return self._mode ~= 'c' and self._handle ~= nil end, isOpen = function(self) return self._mode ~= 'c' and self._handle ~= nil end,
} }
local fopen, getcwd, chdir, unlink, mkdir, rmdir
local BUFFERMODE, MODEMAP
local ByteArray = ffi.typeof('unsigned char[?]')
local function _ptr(p) return p ~= nil and p or nil end -- NULL pointer to nil
function File:open(mode) function File:open(mode)
if self._mode ~= 'c' then return false, "File " .. self._name .. " is already open" end if self._mode ~= 'c' then return false, "File " .. self._name .. " is already open" end
if not MODEMAP[mode] then return false, "Invalid open mode for " .. self._name .. ": " .. mode end if not MODEMAP[mode] then return false, "Invalid open mode for " .. self._name .. ": " .. mode end
@@ -114,6 +114,12 @@ function File:read(containerOrBytes, bytes)
local data = love.data.newByteData(bytes) local data = love.data.newByteData(bytes)
local r = tonumber(C.fread(data:getFFIPointer(), 1, bytes, self._handle)) local r = tonumber(C.fread(data:getFFIPointer(), 1, bytes, self._handle))
if container == 'data' then
-- FileData from ByteData requires LÖVE 11.4+
local ok, fd = pcall(love.filesystem.newFileData, data, self._name)
if ok then return fd end
end
local str = data:getString() local str = data:getString()
data:release() data:release()
data = container == 'data' and love.filesystem.newFileData(str, self._name) or str data = container == 'data' and love.filesystem.newFileData(str, self._name) or str