asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #33149 from Calinou/cli-scene-path-parsing-stricter

Browse source 
Be stricter on what's considered a scene path in CLI argument parsing
This commit is contained in:
Rémi Verschelde 2020-01-10 13:48:28 +01:00 committed by GitHub
commit 25c024acfd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
main/main.cpp
View file

@ -1402,6 +1402,7 @@ bool Main::start() {
bool hasicon = false; bool hasicon = false;
String doc_tool; String doc_tool;
List<String> removal_docs; List<String> removal_docs;
String positional_arg;
String game_path; String game_path;
String script; String script;
String test; String test;
@ -1429,8 +1430,18 @@ bool Main::start() {
} else if (args[i] == "-p" || args[i] == "--project-manager") { } else if (args[i] == "-p" || args[i] == "--project-manager") {
project_manager = true; project_manager = true;
#endif #endif
} else if (args[i].length() && args[i][0] != '-' && game_path == "") { } else if (args[i].length() && args[i][0] != '-' && positional_arg == "") {
game_path = args[i]; positional_arg = args[i];
if (args[i].ends_with(".scn") || args[i].ends_with(".tscn") || args[i].ends_with(".escn")) {
// Only consider the positional argument to be a scene path if it ends with
// a file extension associated with Godot scenes. This makes it possible
// for projects to parse command-line arguments for custom CLI arguments
// or other file extensions without trouble. This can be used to implement
// "drag-and-drop onto executable" logic, which can prove helpful
// for non-game applications.
game_path = args[i];
}
} }
//parameters that have an argument to the right //parameters that have an argument to the right
else if (i < (args.size() - 1)) { else if (i < (args.size() - 1)) {
@ -1525,7 +1536,7 @@ bool Main::start() {
} }
if (_export_preset != "") { if (_export_preset != "") {
if (game_path == "") { if (positional_arg == "") {
String err = "Command line includes export parameter option, but no destination path was given.\n"; String err = "Command line includes export parameter option, but no destination path was given.\n";
err += "Please specify the binary's file path to export to. Aborting export."; err += "Please specify the binary's file path to export to. Aborting export.";
ERR_PRINT(err); ERR_PRINT(err);
@ -1716,7 +1727,7 @@ bool Main::start() {
sml->get_root()->add_child(editor_node); sml->get_root()->add_child(editor_node);
if (_export_preset != "") { if (_export_preset != "") {
editor_node->export_preset(_export_preset, game_path, export_debug, export_pack_only); editor_node->export_preset(_export_preset, positional_arg, export_debug, export_pack_only);
game_path = ""; // Do not load anything. game_path = ""; // Do not load anything.
} }
} }