Python: expand variables in app.saveProject and app.saveProjectAs

CHANGELOG.md

@@ -22,6 +22,7 @@
 - Fix Retina/High-DPI display issues on macOS, Windows and Linux/X11. #635
 - Fix multi-dimensional parameter linking (bug introduced in 2.4.0 #594). #631
 - Fix bug where any argument containing an integer between commas would be interpreted as a frame range. #644
+- Python: `app.saveProject`  and `app.saveProjectAs` now do project variable substitution, as in `app.saveProjectAs("[Variable]/output.ntp")`.
 
 ### Plugins
 
@@ -30,6 +31,7 @@
 - Merge: Fix behavior on most operators when A is not connected or A's RoD and B's RoD are disjoint. #647
 - Reformat: fix bugs when "turn" is checked with Resize Type = None or Type = Scale.
 
+
 ## Version 2.4.0
 
 ### Changes

Engine/PyAppInstance.cpp

@@ -416,13 +416,23 @@ App::saveTempProject(const QString& filename)
 bool
 App::saveProject(const QString& filename)
 {
-    return getInternalApp()->save( filename.toStdString() );
+    std::string outFile = filename.toStdString();
+    std::map<std::string, std::string> env;
+    getInternalApp()->getProject()->getEnvironmentVariables(env);
+    Project::expandVariable(env, outFile);
+
+    return getInternalApp()->save(outFile);
 }
 
 bool
 App::saveProjectAs(const QString& filename)
 {
-    return getInternalApp()->saveAs( filename.toStdString() );
+    std::string outFile = filename.toStdString();
+    std::map<std::string, std::string> env;
+    getInternalApp()->getProject()->getEnvironmentVariables(env);
+    Project::expandVariable(env, outFile);
+
+    return getInternalApp()->saveAs(outFile);
 }
 
 App*