Skip to content

fix: wrong file path when choosing file#446

Merged
MakinoharaShoko merged 5 commits intoOpenWebGAL:devfrom
HardyNLee:fix-choose-file
Jul 15, 2025
Merged

fix: wrong file path when choosing file#446
MakinoharaShoko merged 5 commits intoOpenWebGAL:devfrom
HardyNLee:fix-choose-file

Conversation

@HardyNLee
Copy link
Contributor

介绍

fix #436
现在, 用图形编辑器选择文件时, 若目录名称包含与 basePath 相同的字符串, 路径不会被意外裁剪

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Summary of Changes

Hello @HardyNLee, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

I've reviewed this pull request, which addresses a critical bug in file path handling within the graphical editor. The core issue was that file paths were being incorrectly truncated when a directory name happened to contain a string identical to the basePath. This fix ensures that file paths are now accurately determined, preventing data loss or incorrect references when selecting files.

Highlights

  • Path Resolution Bug Fix: I've updated the logic for extracting the relative file name in ChooseFile.tsx. Previously, a split operation could lead to unintended truncation if a directory name contained the basePath string. The new implementation uses a regular expression with a start-of-string anchor (^) to precisely remove only the leading basePath, ensuring correct relative paths.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point in your pull request via creating an issue comment (i.e. comment on the pull request page) using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in issue comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist is currently in preview and may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments to provide feedback.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

The code changes introduce a fix for a bug where file paths were incorrectly truncated. The fix replaces a split/join method with a replace using a regular expression. A suggestion has been made to improve the correctness and quality of the new implementation by using native string methods, which are safer and more readable for this use case than a regular expression that would require escaping.

Comment on lines +37 to +45
const combinedBasePath = basePath.join('/');
// 移除开头的 basePath/
const basePathRegex = new RegExp(`^${combinedBasePath}/`, 'g');
let fileName = file?.path.replace(basePathRegex, '');
props.onChange({
...file,
name: fileName,
});
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

Using a regular expression here has a potential pitfall: if a folder name in basePath contains special regex characters (e.g., ., +, *), it could lead to incorrect path trimming or even an error. A simpler and safer approach would be to use String.prototype.startsWith() and String.prototype.substring() to avoid regular expressions altogether and be more explicit about what's happening.

    const prefix = `${basePath.join('/')}/`;
    const fileName = file.path.startsWith(prefix)
      ? file.path.substring(prefix.length)
      : file.path;
    props.onChange({
      ...file,
      name: fileName,
    });

@MakinoharaShoko MakinoharaShoko merged commit 4a335a0 into OpenWebGAL:dev Jul 15, 2025
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants