MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add Filesystem::listdir()

develop
lethosor 2015-01-28 19:15:58 -05:00
parent e8c0482fdc
commit bebceffa5f
7 changed files with 52 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
library/Core.cpp
Unescape Escape View File

@ -45,6 +45,7 @@ using namespace std;
#include "PluginManager.h"
#include "ModuleFactory.h"
#include "modules/EventManager.h"
#include "modules/Filesystem.h"
#include "modules/Gui.h"
#include "modules/World.h"
#include "modules/Graphic.h"
@ -252,7 +253,7 @@ static std::string getScriptHelp(std::string path, std::string helpprefix)
static void listScripts(PluginManager *plug_mgr, std::map<string,string> &pset, std::string path, bool all, std::string prefix = "")
{
std::vector<string> files;
getdir(path, files);
Filesystem::listdir(path, files);
for (size_t i = 0; i < files.size(); i++)
{

39
library/LuaApi.cpp
Unescape Escape View File

@ -1991,6 +1991,26 @@ static const LuaWrapper::FunctionReg dfhack_filesystem_module[] = {
{NULL, NULL}
};
static int filesystem_listdir(lua_State *L)
{
luaL_checktype(L,1,LUA_TSTRING);
std::string dir=lua_tostring(L,1);
std::vector<std::string> files;
DFHack::Filesystem::listdir(dir, files);
lua_newtable(L);
for(int i=0;i<files.size();i++)
{
lua_pushinteger(L,i+1);
lua_pushstring(L,files[i].c_str());
lua_settable(L,-3);
}
return 1;
}
static const luaL_Reg dfhack_filesystem_funcs[] = {
{"listdir", filesystem_listdir},
{NULL, NULL}
};
/***** Internal module *****/
@ -2283,21 +2303,6 @@ static int internal_diffscan(lua_State *L)
lua_pushnil(L);
return 1;
}
static int internal_getDir(lua_State *L)
{
luaL_checktype(L,1,LUA_TSTRING);
std::string dir=lua_tostring(L,1);
std::vector<std::string> files;
DFHack::getdir(dir,files);
lua_newtable(L);
for(int i=0;i<files.size();i++)
{
lua_pushinteger(L,i+1);
lua_pushstring(L,files[i].c_str());
lua_settable(L,-3);
}
return 1;
}
static int internal_runCommand(lua_State *L)
{
@ -2384,7 +2389,7 @@ static const luaL_Reg dfhack_internal_funcs[] = {
{ "memcmp", internal_memcmp },
{ "memscan", internal_memscan },
{ "diffscan", internal_diffscan },
{ "getDir", internal_getDir },
{ "getDir", filesystem_listdir },
{ "runCommand", internal_runCommand },
{ "getModifiers", internal_getModifiers },
{ NULL, NULL }
@ -2412,6 +2417,6 @@ void OpenDFHackApi(lua_State *state)
OpenModule(state, "buildings", dfhack_buildings_module, dfhack_buildings_funcs);
OpenModule(state, "constructions", dfhack_constructions_module);
OpenModule(state, "screen", dfhack_screen_module, dfhack_screen_funcs);
OpenModule(state, "filesystem", dfhack_filesystem_module);
OpenModule(state, "filesystem", dfhack_filesystem_module, dfhack_filesystem_funcs);
OpenModule(state, "internal", dfhack_internal_module, dfhack_internal_funcs);
}

5
library/PluginManager.cpp
Unescape Escape View File

@ -23,6 +23,7 @@ distribution.
*/
#include "modules/EventManager.h"
#include "modules/Filesystem.h"
#include "Internal.h"
#include "Core.h"
#include "MemAccess.h"
@ -727,7 +728,7 @@ void PluginManager::init(Core * core)
const string searchstr = ".plug.dll";
#endif
vector <string> filez;
getdir(path, filez);
Filesystem::listdir(path, filez);
for(size_t i = 0; i < filez.size();i++)
{
if(hasEnding(filez[i],searchstr))
@ -757,7 +758,7 @@ Plugin *PluginManager::getPluginByCommand(const std::string &command)
if (iter != belongs.end())
return iter->second;
else
return NULL;
return NULL;
}
// FIXME: handle name collisions...

14
library/Types.cpp
Unescape Escape View File

@ -28,6 +28,8 @@ distribution.
#include "Error.h"
#include "Types.h"
#include "modules/Filesystem.h"
#ifndef LINUX_BUILD
#include <Windows.h>
#include "wdirent.h"
@ -47,17 +49,7 @@ distribution.
int DFHack::getdir(std::string dir, std::vector<std::string> &files)
{
DIR *dp;
struct dirent *dirp;
if((dp = opendir(dir.c_str())) == NULL)
{
return errno;
}
while ((dirp = readdir(dp)) != NULL) {
files.push_back(std::string(dirp->d_name));
}
closedir(dp);
return 0;
return DFHack::Filesystem::listdir(dir, files);
}
bool DFHack::hasEnding (std::string const &fullString, std::string const &ending)

2
library/include/Types.h
Unescape Escape View File

@ -121,4 +121,4 @@ namespace DFHack
DFHACK_EXPORT df::specific_ref *findRef(std::vector<df::specific_ref*> &vec, df::specific_ref_type type);
DFHACK_EXPORT bool removeRef(std::vector<df::specific_ref*> &vec, df::specific_ref_type type, void *ptr);
}// namespace DFHack
}// namespace DFHack

3
library/include/modules/Filesystem.h
Unescape Escape View File

@ -47,6 +47,7 @@ SOFTWARE.
#pragma once
#include "Export.h"
#include <vector>
#ifndef _WIN32
#ifndef _AIX
@ -80,6 +81,7 @@ SOFTWARE.
#include <sys/utime.h>
#endif
#include <fcntl.h>
#include "wdirent.h"
#else
#include <unistd.h>
#include <dirent.h>
@ -157,5 +159,6 @@ namespace DFHack {
DFHACK_EXPORT int64_t atime (std::string path);
DFHACK_EXPORT int64_t ctime (std::string path);
DFHACK_EXPORT int64_t mtime (std::string path);
DFHACK_EXPORT int listdir (std::string dir, std::vector<std::string> &files);
}
}

20
library/modules/Filesystem.cpp
Unescape Escape View File

@ -124,7 +124,7 @@ bool Filesystem::stat (std::string path, STAT_STRUCT &info)
bool Filesystem::exists (std::string path)
{
STAT_STRUCT info;
return (bool)Filesystem::stat(path.c_str(), info);
return (bool)Filesystem::stat(path, info);
}
_filetype Filesystem::filetype (std::string path)
@ -148,7 +148,7 @@ bool Filesystem::isdir (std::string path)
int64_t Filesystem::attr (std::string path) \
{ \
STAT_STRUCT info; \
if (!Filesystem::stat(path.c_str(), info)) \
if (!Filesystem::stat(path, info)) \
return -1; \
return (int64_t)info.st_##attr; \
}
@ -158,3 +158,19 @@ DEFINE_STAT_TIME_WRAPPER(ctime);
DEFINE_STAT_TIME_WRAPPER(mtime);
#undef DEFINE_STAT_TIME_WRAPPER
int Filesystem::listdir (std::string dir, std::vector<std::string> &files)
{
DIR *dp;
struct dirent *dirp;
if((dp = opendir(dir.c_str())) == NULL)
{
return errno;
}
while ((dirp = readdir(dp)) != NULL) {
files.push_back(std::string(dirp->d_name));
}
closedir(dp);
return 0;
}