Fix problems with base_file containing a directory #1371
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This serves two purposes: it allows removing all the duplicate code in each language that effectively does the same thing, and it handles a duplicate initial folder.
Returning std::pair means a directory can always be returned, and the second part is a boolean indicating if an output filename was appended.
When generating code from the command line, no UI should be called. This method provides an accurate check for whether command-line code generation is under way.
MainApp() should be used rather than flag_no_ui since it's a more accurate flag as to whether any UI can be used or not.
wxMessageBox() can truncate a long filename, so wxMessageDialog() is required.
Handle being passed a Project node. Handle being passed a non-form, non-folder node.
The trailing '/' was removed in order to check for a duplicate folder name, but was not being correctly added back before the base_file was appended.
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds a new function to the
ProjectHandlerclass that retrieves the full path to the output file for the specified form and language. This also eliminates a duplicate single-level folder. E.g., given a project output file calledgenerateand a form base_file calledgenerate/my_formthis will remove the duplicategeneratefolder. The upside is that this will fix the most common error where the folder portion was entered by hand even though it wasn't needed. It will, however, prevent the user from specifying nested folders containing the same name (i.e.,generate/generate/my_formwon't work if project output directory is set togenerate/).The second part of this PR adds a
isGenerating()to App and uses that in FileCodeWriter::WriteFile() to determine whether or not to ask the user permission to create a directory that was specified, but doesn't exist. This allows the code writer to create a missing directory as long as code generation is running from the command line.See #1366