Merge pull request #1749 from mwestphal/cleanup_commands

Cleanup commands

application/testing/CMakeLists.txt

@@ -1,7 +1,7 @@
 # F3D Testing
 function(f3d_test)
 
-	cmake_parse_arguments(F3D_TEST "TONE_MAPPING;LONG_TIMEOUT;INTERACTION;INTERACTION_CONFIGURE;NO_BASELINE;NO_RENDER;NO_OUTPUT;WILL_FAIL;NO_DATA_FORCE_RENDER;UI" "NAME;CONFIG;RESOLUTION;THRESHOLD;REGEXP;REGEXP_FAIL;HDRI;RENDERING_BACKEND" "DATA;DEPENDS;ENV;ARGS" ${ARGN})
+	cmake_parse_arguments(F3D_TEST "TONE_MAPPING;LONG_TIMEOUT;INTERACTION;INTERACTION_CONFIGURE;NO_BASELINE;NO_RENDER;NO_OUTPUT;WILL_FAIL;NO_DATA_FORCE_RENDER;UI" "NAME;CONFIG;RESOLUTION;THRESHOLD;REGEXP;REGEXP_FAIL;HDRI;SCRIPT;RENDERING_BACKEND" "DATA;DEPENDS;ENV;ARGS" ${ARGN})
 
   if(F3D_TEST_CONFIG)
     list(APPEND F3D_TEST_ARGS "--config=${F3D_TEST_CONFIG}")
@@ -29,6 +29,10 @@ function(f3d_test)
     set(F3D_TEST_LONG_TIMEOUT ON)
   endif()
 
+  if (F3D_TEST_SCRIPT)
+    list(APPEND F3D_TEST_ARGS "--command-script=${F3D_SOURCE_DIR}/testing/scripts/${F3D_TEST_SCRIPT}")
+  endif()
+
   if(F3D_TEST_NO_RENDER)
     list(APPEND F3D_TEST_ARGS "--no-render" "--verbose=debug")
   else()
@@ -527,8 +531,7 @@ if(F3D_MODULE_RAYTRACING)
   f3d_test(NAME TestRaytracingNoBackground DATA suzanne.ply ARGS -rd --samples=4 --no-background)
 
 else(F3D_MODULE_RAYTRACING)
-  # XXX: This test is disabled until this code can be reached again using `--command-script`
-  # f3d_test(NAME TestInteractionRaytracingDenoiseNoRaytracing DATA suzanne.ply INTERACTION NO_BASELINE REGEXP "Raytracing options can't be used if F3D has not been built with raytracing") #RD
+  f3d_test(NAME TestCommandScriptRaytracingNoRaytracing DATA suzanne.ply SCRIPT TestCommandScriptRaytracing.txt NO_BASELINE REGEXP "Raytracing options can't be used if F3D has not been built with raytracing")
 endif()
 
 if(F3D_MODULE_EXR)
@@ -857,9 +860,9 @@ f3d_test(NAME TestInteractionRecord DATA cow.vtp ARGS --interaction-test-record=
 f3d_test(NAME TestInteractionPlay DATA cow.vtp ARGS --interaction-test-play=${CMAKE_BINARY_DIR}/Testing/Temporary/interaction.log DEPENDS TestInteractionRecord NO_BASELINE)
 
 # Command Script Test
-f3d_test(NAME TestCommandScriptBasic DATA dragon.vtu ARGS --command-script=${F3D_SOURCE_DIR}/testing/data/TestCommandScriptBasic.txt --ref=${F3D_SOURCE_DIR}/testing/baselines/TestCommandScriptBasic.png)
-f3d_test(NAME TestCommandScriptInvalidCommand DATA dragon.vtu ARGS --command-script=${F3D_SOURCE_DIR}/testing/data/TestCommandScriptInvalid.txt REGEXP "Command: \"INVALID_COMMAND_1\" is not recognized, ignoring" NO_BASELINE)
-f3d_test(NAME TestCommandScriptMissingFile DATA dragon.vtu ARGS --command-script=${F3D_SOURCE_DIR}/testing/data/TestCommandScriptMissingFile.txt REGEXP "Unable to open command script file" NO_BASELINE)
+f3d_test(NAME TestCommandScriptBasic DATA dragon.vtu SCRIPT TestCommandScriptBasic.txt --ref=${F3D_SOURCE_DIR}/testing/baselines/TestCommandScriptBasic.png)
+f3d_test(NAME TestCommandScriptInvalidCommand DATA dragon.vtu SCRIPT TestCommandScriptInvalid.txt REGEXP "Command: \"INVALID_COMMAND_1\" is not recognized, ignoring" NO_BASELINE)
+f3d_test(NAME TestCommandScriptMissingFile DATA dragon.vtu SCRIPT TestCommandScriptMissingFile.txt REGEXP "Unable to open command script file" NO_BASELINE)
 
 # Window position test
 f3d_test(NAME TestPosition DATA dragon.vtu ARGS --position=100,100 NO_BASELINE)

doc/user/COMMANDS.md

@@ -79,25 +79,29 @@ eg: `add_files_or_set_hdri /path/to/dragon.vtu /path/to/file.hdr`.
 
 ## Command Script (`--command-script`)
 
-F3D provides a feature to execute commands from a script file using the `--command-script` [CLI option[(OPTIONS.md)]]. This allows users to automate a sequence of commands by listing them in a plain text file.
-eg: `f3d --command-script path/to/command_script.txt`.
-Example Command Script, commands are separated by new lines:
-```
+F3D provides a feature to execute commands from a script file using the `--command-script` [CLI option](OPTIONS.md). This allows users to automate a sequence of commands by listing them in a plain text file, eg: `f3d --command-script path/to/command_script.txt`.
+
+Example Command Script, commands are separated by new lines, comments are supported:
+
+```shell
+# A comment
 roll_camera 90
 toggle ui.scalar_bar
-print_scene_info
+print_scene_info # Another comment
 increase_light_intensity
 ```
 
 ## Command syntax
 
 Command syntax is similar to bash, as in they will be split by "token" to be processed.
-Tokens are spaces separated, eg: `set scene.up.direction +Z`.
-Tokens can also be quoted to support spaces inside, eg:  `set render.hdri.file "/path/to/file with spaces.png"`.
-Supported quotes are `` `'" ``, eg: `set render.hdri.file '/path/to/file with spaces.png'`.
-Quotes inside quotes are supported as well, eg: `set render.hdri.file "/path/to/file'with'quotes.png"`.
-Quotes and spaces can be escaped, eg: `set render.hdri.file /path/to/file\ with\ spaces\ and\ \'quotes\".png`.
-Escapes can be escaped too: eg: `set render.hdri.file C:\\path\\to\\windows\\file.png`.
-Other escaped character will be processed as if the escape was not present, eg: `set scene.up.direction +\Z`
-Unfinished quoted section is invalid, eg: `set scene.up.direction "+Z`
-A escape at the end is also invalid, eg: `set scene.up.direction +Z\`
+
+ - Tokens are spaces separated, eg: `set scene.up.direction +Z`.
+ - Tokens can also be quoted to support spaces inside, eg:  `set render.hdri.file "/path/to/file with spaces.png"`.
+ - Supported quotes are `` `'" ``, eg: `set render.hdri.file '/path/to/file with spaces.png'`.
+ - Quotes inside quotes are supported as well, eg: `set render.hdri.file "/path/to/file'with'quotes.png"`.
+ - Quotes and spaces can be escaped, eg: `set render.hdri.file /path/to/file\ with\ spaces\ and\ \'quotes\".png`.
+ - Comment are supported using `#`, Any character after will be ignored. Use `\#` to add it verbatim.
+ - Escapes can be escaped too: eg: `set render.hdri.file C:\\path\\to\\windows\\file.png`.
+ - Other escaped character will be processed as if the escape was not present, eg: `set scene.up.direction +\Z`
+ - Unfinished quoted section is invalid, eg: `set scene.up.direction "+Z`
+ - A escape at the end is also invalid, eg: `set scene.up.direction +Z\`

doc/user/CONFIGURATION_FILE.md

@@ -106,7 +106,7 @@ A typical config file with bindings may look like this:
 
 Here, the first block define new bindings for all and any files.
 It even replace an existing default [interaction](INTERACTIONS.md) on the `O` key with its own.
-Each bind is associated to the [command](COMMANDS.mnd) to execute when it is pressed.
+Each bind is associated to the [command](COMMANDS.md) to execute when it is pressed.
 
 In the second block, new bindings are defined for files ending in `.vtu`, and there bindings
 will only be available when loading such a file.

library/public/utils.h

@@ -32,20 +32,22 @@ class F3D_EXPORT utils
    *  - Split by quoted section and remove the quotes
    *  - Supported quotes are: '"`
    *  - Use escaped \ quotes, spaces and escape to add them verbatim
+   *  - Comments are supported with `#`, any characters after are ignored
+   *  - Use escaped \# to add it verbatim
    *  - Other escaped characters are also added verbatim
    * Throw a tokenize_exception if a quoted section is not closed or if finishing with an escape
    *
    * Examples:
    * `set scene.up.direction +Z` -> `set` `scene.up.direction` `+Z`
-   * `set render.hdri.file "/path/to/file with spaces.png"` -> `set`, `render.hdri.file`,
-   * `/path/to/file with spaces.png` `set render.hdri.file '/path/to/file with spaces.png'` ->
-   * `set`, `render.hdri.file`, `/path/to/file with spaces.png` `set render.hdri.file
-   * "/path/to/file'with'quotes.png"` -> `set`, `render.hdri.file`, `/path/to/file'with'quotes.png`
-   * `set render.hdri.file /path/to/file\ spaces\ \'quotes\".png` -> `set`, `render.hdri.file`,
-   * `/path/to/file spaces 'quotes".png` `set render.hdri.file C:\\path\\to\\windows\\file.png` ->
-   * `set`, `render.hdri.file`, `C:\path\to\windows\file.png` `set scene.up.direction +\Z` -> `set`,
-   * `scene.up.direction`, `+Z` `set scene.up.direction "+Z` -> tokenize_exception `set
-   * scene.up.direction +Z\` -> tokenize_exception
+   * `set render.hdri.file "/path/to/file with spaces.png"` -> `set`, `render.hdri.file`, `/path/to/file with spaces.png`
+   * `set render.hdri.file '/path/to/file with spaces.png'` -> `set`, `render.hdri.file`, `/path/to/file with spaces.png`
+   * `set render.hdri.file "/path/to/file'with'quotes.png"` -> `set`, `render.hdri.file`, `/path/to/file'with'quotes.png`
+   * `set render.hdri.file /path/to/file\ spaces\ \'quotes\".png` -> `set`, `render.hdri.file`, `/path/to/file spaces 'quotes".png`
+   * `set render.hdri.file C:\\path\\to\\windows\\file.png` -> `set`, `render.hdri.file`, `C:\path\to\windows\file.png`
+   * `set scene.up.direction +Z # A comment` -> `set`, `scene.up.direction`, `+Z`
+   * `set scene.up.direction +\Z` -> `set`, `scene.up.direction`, `+Z`
+   * `set scene.up.direction "+Z` -> tokenize_exception
+   * `set scene.up.direction +Z\` -> tokenize_exception
    */
   static std::vector<std::string> tokenize(std::string_view str);
   // clang-format on

library/src/interactor_impl.cxx

@@ -684,6 +684,11 @@ bool interactor_impl::triggerCommand(std::string_view command)
     return false;
   }
 
+  if (tokens.empty())
+  {
+    return true;
+  }
+
   const std::string& action = tokens[0];
   try
   {

library/src/utils.cxx

@@ -26,6 +26,7 @@ std::vector<std::string> utils::tokenize(std::string_view str)
   };
   bool escaped = false;
   char quoted = '\0';
+  bool commented = false;
   for (char c : str)
   {
     switch (c)
@@ -66,11 +67,27 @@ std::vector<std::string> utils::tokenize(std::string_view str)
         }
         escaped = false;
         break;
+      case '#':
+        if (!escaped && !quoted)
+        {
+          commented = true;
+        }
+        else
+        {
+          accumulate(c);
+        }
+        escaped = false;
+        break;
       default:
         accumulate(c);
         escaped = false;
         break;
     }
+
+    if (commented)
+    {
+      break;
+    }
   }
   if (quoted || escaped)
   {

library/testing/TestSDKUtils.cxx

@@ -50,6 +50,14 @@ int TestSDKUtils(int argc, char* argv[])
     f3d::utils::tokenize(R"(set render.hdri.file file\ pa\th\ esc\ape)") ==
       std::vector<std::string>{ "set", "render.hdri.file", "file path escape" });
 
+  test("tokenize comments",
+    f3d::utils::tokenize(R"(set render.hdri.file file # A comment)") ==
+      std::vector<std::string>{ "set", "render.hdri.file", "file" });
+
+  test("tokenize escaped comments",
+    f3d::utils::tokenize(R"(set render.hdri.file fi\#le)") ==
+      std::vector<std::string>{ "set", "render.hdri.file", "fi#le" });
+
   test("tokenize backslashes",
     f3d::utils::tokenize(R"(set render.hdri.file file\\pa\\th\\backsl\\ashes)") ==
       std::vector<std::string>{ "set", "render.hdri.file", R"(file\pa\th\backsl\ashes)" });

testing/scripts/TestCommandScriptBasic.txt

@@ -0,0 +1,6 @@
+# A comment at the beginning of the script
+roll_camera 90 # A comment at the and of a command
+toggle ui.scalar_bar
+# A comment in the middle of the script
+print_scene_info
+increase_light_intensity

testing/scripts/TestCommandScriptInvalid.txt

@@ -0,0 +1 @@
+INVALID_COMMAND_1

testing/scripts/TestCommandScriptRaytracing.txt

@@ -0,0 +1,2 @@
+toggle render.raytracing.enable
+toggle render.raytracing.denoise