Various fixes #355
Merged
Various fixes #355
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
Contributor
senko
commented
Dec 10, 2023
senko
commented
- fix Windows file path escaping in file modifications
- be explicit about the log code page (also helps for Windows)
- improve file overwrite message
senko
commented
Dec 10, 2023
| escaped_file_path = re.escape(file_path) | ||
|
|
||
| pattern = rf'\*\*{escaped_file_path}\*\*:\n```\n(.*?)\n```' | ||
| pattern = rf'\*\*{re.escape(file_path)}\*\*:\n```\n(.*?)\n```' |
There was a problem hiding this comment.
This just removes escape_file_path variable to avoid confusion with similarly-named but differently escaped file path a few lines below. No changes to the pattern.
|
|
||
| new_section_content = f'**{file_path}**\n```\n{new_content_escaped}\n```' | ||
| new_section_content = f'**{file_path_escaped}**\n```\n{new_content_escaped}\n```' |
There was a problem hiding this comment.
Windows paths have plenty of occurrences of \ which were not escaped in a recent change to this.
pilot/helpers/Project.py
Outdated
| @@ -121,7 +121,7 @@ def start(self): | |||
| print('yes/no', type='button') | |||
| should_overwrite_files = styled_text( | |||
| self, | |||
| f'Do you want to overwrite the dev step {self.args["skip_until_dev_step"]} code with system changes? Type y/n', | |||
| f"Can I overwrite any changes that you might have made to the project since last running GPT Pilot (y/n)?", | |||
There was a problem hiding this comment.
Unrelated to other changes, this is just a rewording of the message because the previous one is really unclear even to people who work on GPT Pilot (ie. me 😄 ).
| file_handler = logging.FileHandler( | ||
| filename=os.path.join(os.path.dirname(__file__), 'debug.log'), | ||
| mode='w', | ||
| encoding='utf-8', |
There was a problem hiding this comment.
Adding encoding so logging doesn't crash on Windows when there are characters which don't fit into whatever code page is active by default.
* fix Windows file path escaping in file modifications * be explicit about the log code page (also helps for Windows) * improve file overwrite message
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in 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.