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

Merge pull request #585 from BenLubar/fix/stockpiles-directory 

plugins/stockpiles: only create the stocksettings directory when it is requested
develop
Lethosor 2015-03-24 21:15:21 -04:00
parent 5c877e4012 d182b6c1c3
commit b94dd447cf
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/lua/stockpiles.lua
Unescape Escape View File

@ -138,6 +138,9 @@ function save_settings(stockpile)
if filename == nil or filename == '' then
script.showMessage('Stockpile Settings', 'Invalid File Name', COLOR_RED)
else
if not dfhack.filesystem.exists(path) then
dfhack.filesystem.mkdir(path)
end
print("saving...", path..'/'..filename)
stockpiles_save(path..'/'..filename)
end

17
plugins/stockpiles/stockpiles.cpp
Unescape Escape View File

@ -95,14 +95,6 @@ DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <Plug
);
}
if ( !Filesystem::isdir ( "stocksettings" ) )
{
if ( !Filesystem::mkdir( "stocksettings" ) )
{
out.printerr("stockpiles: could not create 'stocksettings' directory!\n");
}
}
return CR_OK;
}
@ -503,14 +495,8 @@ static bool isEnabled( lua_State *L )
static int stockpiles_list_settings ( lua_State *L )
{
auto path = luaL_checkstring ( L, 1 );
if ( !Filesystem::exists ( path ) )
{
lua_pushfstring ( L, "stocksettings folder doesn't exist: %s", path );
lua_error ( L );
return 0;
}
color_ostream &out = *Lua::GetOutput ( L );
if ( !Filesystem::isdir(path) )
if ( Filesystem::exists ( path ) && !Filesystem::isdir ( path ) )
{
lua_pushfstring ( L, "stocksettings path invalid: %s", path );
lua_error ( L );
@ -535,7 +521,6 @@ static void stockpiles_load ( color_ostream &out, std::string filename )
static void stockpiles_save ( color_ostream &out, std::string filename )
{
out << "stockpiles_save " << filename << " ";
std::vector<std::string> params;
params.push_back ( filename );