lisacvuk
/
Minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow for getting world name and path separately on the command line (#6555) 

Change to --worldlist instead of --world list.

Gets rid of --worldpath parameter added as part of this pull request,
instead moving the listing function to a command --worldlist that
accepts either name, path, or both and prints out the corresponding
information.
master
Brian 2018-03-04 11:34:09 -05:00 committed by SmallJoker
parent 48493a979b
commit 929792e15e
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/main.cpp
View File

@ -74,11 +74,11 @@ static void print_help(const OptionList &allowed_options);
static void print_allowed_options(const OptionList &allowed_options); static void print_allowed_options(const OptionList &allowed_options);
static void print_version(); static void print_version();
static void print_worldspecs(const std::vector<WorldSpec> &worldspecs, static void print_worldspecs(const std::vector<WorldSpec> &worldspecs,
std::ostream &os); std::ostream &os, bool print_name = true, bool print_path = true);
static void print_modified_quicktune_values(); static void print_modified_quicktune_values();
static void list_game_ids(); static void list_game_ids();
static void list_worlds(); static void list_worlds(bool print_name, bool print_path);
static void setup_log_params(const Settings &cmd_args); static void setup_log_params(const Settings &cmd_args);
static bool create_userdata_path(); static bool create_userdata_path();
static bool init_common(const Settings &cmd_args, int argc, char *argv[]); static bool init_common(const Settings &cmd_args, int argc, char *argv[]);
@ -160,9 +160,15 @@ int main(int argc, char *argv[])
return 0; return 0;
} }
// List worlds if requested // List worlds, world names, and world paths if requested
if (cmd_args.exists("world") && cmd_args.get("world") == "list") { if (cmd_args.exists("worldlist")) {
list_worlds(); if (cmd_args.get("worldlist") == "name") {
list_worlds(true, false);
} else if (cmd_args.get("worldlist") == "path") {
list_worlds(false, true);
} else {
list_worlds(true, true);
}
return 0; return 0;
} }
@ -252,9 +258,12 @@ static void set_allowed_options(OptionList *allowed_options)
allowed_options->insert(std::make_pair("map-dir", ValueSpec(VALUETYPE_STRING, allowed_options->insert(std::make_pair("map-dir", ValueSpec(VALUETYPE_STRING,
_("Same as --world (deprecated)")))); _("Same as --world (deprecated)"))));
allowed_options->insert(std::make_pair("world", ValueSpec(VALUETYPE_STRING, allowed_options->insert(std::make_pair("world", ValueSpec(VALUETYPE_STRING,
_("Set world path (implies local game) ('list' lists all)")))); _("Set world path (implies local game)"))));
allowed_options->insert(std::make_pair("worldname", ValueSpec(VALUETYPE_STRING, allowed_options->insert(std::make_pair("worldname", ValueSpec(VALUETYPE_STRING,
_("Set world by name (implies local game)")))); _("Set world by name (implies local game)"))));
allowed_options->insert(std::make_pair("worldlist", ValueSpec(VALUETYPE_STRING,
_("Get list of worlds (implies local game) ('path' lists paths, "
"'name' lists names, 'both' lists both)"))));
allowed_options->insert(std::make_pair("quiet", ValueSpec(VALUETYPE_FLAG, allowed_options->insert(std::make_pair("quiet", ValueSpec(VALUETYPE_FLAG,
_("Print to console errors only")))); _("Print to console errors only"))));
allowed_options->insert(std::make_pair("info", ValueSpec(VALUETYPE_FLAG, allowed_options->insert(std::make_pair("info", ValueSpec(VALUETYPE_FLAG,
@ -336,24 +345,26 @@ static void list_game_ids()
std::cout << gameid <<std::endl; std::cout << gameid <<std::endl;
} }
static void list_worlds() static void list_worlds(bool print_name, bool print_path)
{ {
std::cout << _("Available worlds:") << std::endl; std::cout << _("Available worlds:") << std::endl;
std::vector<WorldSpec> worldspecs = getAvailableWorlds(); std::vector<WorldSpec> worldspecs = getAvailableWorlds();
print_worldspecs(worldspecs, std::cout); print_worldspecs(worldspecs, std::cout, print_name, print_path);
} }
static void print_worldspecs(const std::vector<WorldSpec> &worldspecs, static void print_worldspecs(const std::vector<WorldSpec> &worldspecs,
std::ostream &os) std::ostream &os, bool print_name, bool print_path)
{ {
for (const WorldSpec &worldspec : worldspecs) { for (const WorldSpec &worldspec : worldspecs) {
std::string name = worldspec.name; std::string name = worldspec.name;
std::string path = worldspec.path; std::string path = worldspec.path;
if (name.find(' ') != std::string::npos) if (print_name && print_path) {
name = std::string("'").append(name).append("'"); os << "\t" << name << "\t\t" << path << std::endl;
path = std::string("'").append(path).append("'"); } else if (print_name) {
name = padStringRight(name, 14); os << "\t" << name << std::endl;
os << " " << name << " " << path << std::endl; } else if (print_path) {
os << "\t" << path << std::endl;
}
} }
} }