UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Implement File.Size (#2131)

Browse Source 
* Implement file size method for already open files

* Switch from fseek/ftell to fileno/fstat size reading
This commit is contained in:
Peak 2024-04-13 14:14:52 -04:00 committed by GitHub
parent dbec0b165c
commit 5c507cc35c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bridge/include/IFileSystemBridge.h
View File

@ -44,6 +44,7 @@ public:
virtual char *ReadLine(char *pOutput, int maxChars, FileHandle_t file) = 0;
virtual bool EndOfFile(FileHandle_t file) = 0;
virtual bool FileExists(const char *pFileName, const char *pPathID = 0) = 0;
virtual unsigned int Size(FileHandle_t file) = 0;
virtual unsigned int Size(const char *pFileName, const char *pPathID = 0) = 0;
virtual int Read(void* pOutput, int size, FileHandle_t file) = 0;
virtual int Write(void const* pInput, int size, FileHandle_t file) = 0;

39
core/logic/smn_filesystem.cpp
View File

@ -73,6 +73,7 @@ class FileObject
public:
virtual ~FileObject()
{}
virtual size_t Size() = 0;
virtual size_t Read(void *pOut, int size) = 0;
virtual char *ReadLine(char *pOut, int size) = 0;
virtual size_t Write(const void *pData, int size) = 0;
@ -119,6 +120,10 @@ public:
return true;
}
size_t Size() override {
return (size_t)bridge->filesystem->Size(handle_);
}
size_t Read(void *pOut, int size) override {
return (size_t)bridge->filesystem->Read(pOut, size, handle_);
}
@ -183,6 +188,30 @@ public:
return unlink(path) == 0;
}
size_t Size() override {
#ifdef PLATFORM_WINDOWS
struct _stat s;
int fd = _fileno(fp_);
if (fd == -1)
return -1;
if (_fstat(fd, &s) != 0)
return -1;
if (s.st_mode & S_IFREG)
return static_cast<size_t>(s.st_size);
return -1;
#elif defined PLATFORM_POSIX
struct stat s;
int fd = fileno(fp_);
if (fd == -1)
return -1;
if (fstat(fd, &s) != 0)
return -1;
if (S_ISREG(s.st_mode))
return static_cast<size_t>(s.st_size);
return -1;
#endif
}
size_t Read(void *pOut, int size) override {
return fread(pOut, 1, size, fp_);
}
@ -1125,6 +1154,15 @@ static cell_t sm_RemoveGameLogHook(IPluginContext *pContext, const cell_t *param
return 1;
}
static cell_t File_Size(IPluginContext *pContext, const cell_t *params)
{
OpenHandle<FileObject> file(pContext, params[1], g_FileType);
if (!file.Ok())
return -1;
return file->Size();
}
template <typename T>
static cell_t File_ReadTyped(IPluginContext *pContext, const cell_t *params)
{
@ -1197,6 +1235,7 @@ REGISTER_NATIVES(filesystem)
{"File.Seek", sm_FileSeek},
{"File.Flush", sm_FlushFile},
{"File.Position.get", sm_FilePosition},
{"File.Size", File_Size},
{"File.ReadInt8", File_ReadTyped<int8_t>},
{"File.ReadUint8", File_ReadTyped<uint8_t>},
{"File.ReadInt16", File_ReadTyped<int16_t>},

4
core/logic_bridge.cpp
View File

@ -138,6 +138,10 @@ public:
{
return filesystem->FileExists(pFileName, pPathID);
}
unsigned int Size(FileHandle_t file) override
{
return filesystem->Size(file);
}
unsigned int Size(const char *pFileName, const char *pPathID = 0) override
{
return filesystem->Size(pFileName, pPathID);

5
plugins/include/files.inc
View File

@ -112,6 +112,11 @@ methodmap File < Handle
CloseHandle(this);
}
// Get the file size in bytes.
//
// @return File size in bytes, -1 on error.
public native int Size();
// Reads a line of text from a file.
//
// @param buffer String buffer to hold the line.