Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 修复路径解压与挂载 #1619

Merged
merged 1 commit into from
Sep 10, 2024
Merged

🐛 修复路径解压与挂载 #1619

merged 1 commit into from
Sep 10, 2024

Conversation

HibiKier
Copy link
Owner

@HibiKier HibiKier commented Sep 10, 2024

Summary by Sourcery

通过确保在文件夹列表和文件处理时仅考虑目录,修复路径提取和挂载的问题。增强配置工具中的日志消息格式。

错误修复:

  • 修复 Web UI 公共初始化中的文件夹列表逻辑,仅包含目录。
  • 修正数据源中的文件处理逻辑,以选择目录而不是任何文件。

增强功能:

  • 改进配置工具中的日志消息格式,以正确使用格式化字符串。
Original summary in English

Summary by Sourcery

Fix issues with path extraction and mounting by ensuring only directories are considered in folder listings and file handling. Enhance logging message formatting in the configuration utility.

Bug Fixes:

  • Fix the folder listing logic in the web UI public initialization to only include directories.
  • Correct the file handling logic in the data source to select directories instead of any file.

Enhancements:

  • Improve the logging message format in the configuration utility to correctly use formatted strings.

Copy link
Contributor

sourcery-ai bot commented Sep 10, 2024

审核者指南 by Sourcery

此拉取请求解决了项目中与路径提取和挂载相关的错误。更改的重点是改进目录处理并修复字符串格式化问题。

文件级更改

更改 详情 文件
改进了 Web UI 资产管理中的目录处理
  • 修改了文件夹迭代以仅包含目录
  • 更新了文件提取逻辑以选择第一个目录
zhenxun/builtin_plugins/web_ui/public/__init__.py
zhenxun/builtin_plugins/web_ui/public/data_source.py
修复了配置加载日志消息中的字符串格式化问题
  • 纠正了 f-string 的用法以正确插入变量
zhenxun/configs/utils/__init__.py

提示
  • 通过在拉取请求中评论 @sourcery-ai review 来触发新的 Sourcery 审核。
  • 通过直接回复审核评论继续与 Sourcery 的讨论。
  • 您可以随时通过访问您的仪表板来更改审核设置:
    • 启用或禁用 Sourcery 生成的拉取请求摘要或审核者指南;
    • 更改审核语言;
  • 如果您有任何问题或反馈,您可以随时联系我们
Original review guide in English

Reviewer's Guide by Sourcery

This pull request addresses a bug related to path extraction and mounting in the project. The changes focus on improving the handling of directories and fixing a string formatting issue.

File-Level Changes

Change Details Files
Improved directory handling in web UI asset management
  • Modified folder iteration to only include directories
  • Updated file extraction logic to select the first directory
zhenxun/builtin_plugins/web_ui/public/__init__.py
zhenxun/builtin_plugins/web_ui/public/data_source.py
Fixed string formatting in configuration loading log message
  • Corrected f-string usage for proper variable interpolation
zhenxun/configs/utils/__init__.py

Tips
  • Trigger a new Sourcery review by commenting @sourcery-ai review on the pull request.
  • Continue your discussion with Sourcery by replying directly to review comments.
  • You can change your review settings at any time by accessing your dashboard:
    • Enable or disable the Sourcery-generated pull request summary or reviewer's guide;
    • Change the review language;
  • You can always contact us if you have any questions or feedback.

@HibiKier HibiKier merged commit 95762bd into dev Sep 10, 2024
1 check passed
Copy link
Contributor

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

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

@HibiKier - 我已经审查了你的更改,它们看起来很棒!

这是我在审查期间查看的内容
  • 🟡 一般问题: 发现1个问题
  • 🟢 安全性: 一切看起来都很好
  • 🟢 测试: 一切看起来都很好
  • 🟢 复杂性: 一切看起来都很好
  • 🟢 文档: 一切看起来都很好

Sourcery 对开源项目免费 - 如果你喜欢我们的审查,请考虑分享它们 ✨
帮助我变得更有用!请点击 👍 或 👎 在每条评论上告诉我它是否有帮助。
Original comment in English

Hey @HibiKier - I've reviewed your changes and they look great!

Here's what I looked at during the review
  • 🟡 General issues: 1 issue found
  • 🟢 Security: all looks good
  • 🟢 Testing: all looks good
  • 🟢 Complexity: all looks good
  • 🟢 Documentation: all looks good

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment to tell me if it was helpful.

@@ -35,7 +35,7 @@ def _file_handle(webui_assets_path: Path):
logger.debug("解压 webui_assets 成功...", COMMAND_NAME)
else:
raise Exception("解压 webui_assets 失败,文件不存在...", COMMAND_NAME)
download_file_path = TMP_PATH / next(iter(TMP_PATH.iterdir()))
download_file_path = next(f for f in TMP_PATH.iterdir() if f.is_dir())
Copy link
Contributor

Choose a reason for hiding this comment

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

建议: 考虑为未找到目录的情况添加错误处理

虽然此更改通过明确查找目录来改进代码,但如果未找到目录,可能会引发 StopIteration 错误。考虑在这种情况下添加回退或引发特定异常,以使代码更健壮。

Suggested change
download_file_path = next(f for f in TMP_PATH.iterdir() if f.is_dir())
try:
download_file_path = next(f for f in TMP_PATH.iterdir() if f.is_dir())
except StopIteration:
raise FileNotFoundError("No directory found in TMP_PATH")
Original comment in English

suggestion: Consider adding error handling for the case when no directory is found

While this change improves the code by explicitly looking for a directory, it might raise a StopIteration error if no directory is found. Consider adding a fallback or raising a specific exception in this case to make the code more robust.

Suggested change
download_file_path = next(f for f in TMP_PATH.iterdir() if f.is_dir())
try:
download_file_path = next(f for f in TMP_PATH.iterdir() if f.is_dir())
except StopIteration:
raise FileNotFoundError("No directory found in TMP_PATH")

@HibiKier HibiKier deleted the bugfix/webui branch September 10, 2024 12:19
@HibiKier HibiKier mentioned this pull request Sep 30, 2024
HibiKier added a commit that referenced this pull request Sep 30, 2024
* ✨ 父级插件加载

* ✅ 添加测试:更新与添加插件 (#1594)

* ✅ 测试更新与添加插件

* ✅ Sourcery建议

* 👷 添加pytest

* 🎨 优化代码

* 🐛 bug修复

* 🐛修复添加插件返回403的问题 (#1595)

* 完善测试方法
* vscode测试配置
* 重构插件安装过程

* 🎨 修改readme

* Update README.md

* 🐛 修改bug与版本锁定

* 🐛 修复超级用户对群组功能开关

* 🐛 修复插件商店检查插件更新问题 (#1597)

* 🐛 修复插件商店检查插件更新问题

* 🐛 恶意命令检测问题

* 🐛 增加插件状态检查 (#1598)

* ✅ 优化测试用例

* 🐛 更改插件更新与安装逻辑

* 🐛 修复更新群组成员信息

* 🎨 代码优化

* 🚀 更新Dockerfile (#1599)

* 🎨 更新requirements

* ➕ 添加依赖aiocache

* ⚡ 添加github镜像

* ✨ 添加仓库目录多获取渠道

* 🐛 修复测试用例

* ✨ 添加API缓存

* 🎨 采取Sourcery建议

* 🐛 文件下载逻辑修改

* 🎨 优化代码

* 🐛 修复插件开关有时出现错误

* ✨ 重构自检ui

* 🐛 自检html修正

* 修复签到逻辑bug,并使代码更灵活以适应签到好感度等级配置 (#1606)

* 修复签到功能已知问题

* 修复签到功能已知问题

* 修改参数名称

* 修改uid判断

---------

Co-authored-by: HibiKier <[email protected]>

* 🎨 代码结构优化

* 🐛 私聊时修改插件时删除私聊帮助

* 🐛 过滤父插件

* 🐛 修复自检在ARM上的问题 (#1607)

* 🐛 修复自检在ARM上的问题

* ✅ 优化测试

* ✨ 支持mysql,psql,sqlite随机函数

* 🔧 VSCode配置修改

* 🔧 VSCode配置修改

* ✨ 添加金币排行

Co-Authored-By: HibiKier <[email protected]>

* 📝 修改README

Co-Authored-By: HibiKier <[email protected]>

* 🔨 提取GitHub相关操作 (#1609)

* 🔨 提取GitHub相关操作

* 🔨 重构API策略

* ✨ 签到/金币排行限制最大数量 (#1616)

* ✨ 签到/金币排行限制最大数量

* 🐛 修复超级用户id获取问题

* 🐛 修复路径解压与挂载 (#1619)

* 🐛 修复功能少时zhenxun帮助图片排序问题 (#1620)

* 🐛 签到文本适应 (#1622)

* 🐛 好感度排行提供默认值 (#1624)

* 🎈 优先使用github api (#1625)

* ✨ 重构帮助,限制普通用户查询管理插件 (#1626)

* 🐛 修复群权限与插件等级匹配 (#1627)

* ✨ 当管理员尝试ban真寻时将被反杀 (#1628)

* ✨ 群组发言时间检测提供开关配置 (#1630)

* 🐳 chore: 支持自动修改版本号 (#1629)

* 🎈 perf(github_utils): 支持github url下载遍历 (#1632)

* 🎈 perf(github_utils): 支持github url下载遍历

* 🐞 fix(http_utils): 修复一些下载问题

* 🦄 refactor(http_utils): 部分重构

* chore(version): Update version to v0.2.2-e6f17c4

---------

Co-authored-by: AkashiCoin <[email protected]>

* 🧪 test(auto_update): 修复测试用例 (#1633)

* 🐛 修复商店商品为空时报错 (#1634)

* 🐛 修复群权限与插件等级匹配 (#1635)

* ✨ message_build支持AtAll (#1639)

* 🎈 perf: 使用commit号下载插件 (#1641)

* 🎈 perf: 使用commit号下载插件

* chore(version): Update version to v0.2.2-f9c7360

---------

Co-authored-by: AkashiCoin <[email protected]>

* 🐳 chore: 修改运行检查触发路径 (#1642)

* 🐳 chore: 修改运行检查触发路径

* 🐳 chore: 添加tests目录

* ✨ 重构qq群事件处理 (#1643)

* 🐛 签到名称自适应 (#1644)

* 🎨  更新README (#1645)

* 🐛 fix(http_utils): 流式下载Content-Length错误 (#1647)

* 🐛 修复群组中帮助功能状态显示问题 (#1650)

* 🐛 修复群欢迎消息设置 (#1651)

* 🐛 修复webui下载后首次启动错误 (#1652)

* 🐛 修复webui下载后首次启动错误

* chore(version): Update version to v0.2.2-4a8ef85

---------

Co-authored-by: HibiKier <[email protected]>

* ✨ 移除默认图片文件夹:爬 (#1653)

* ✨ 安装/移除插件提供插件安装/卸载方法用于插件初始化 (#1654)

* ✨ 新增超级用户与管理员帮助模板 (#1655)

* ✨ 新增个人信息命令 (#1657)

* ✨ 修改个人信息菜单名称 (#1658)

* ✨ 新增插件商店api (#1659)

* ✨ 新增插件商店api

* chore(version): Update version to v0.2.2-7e15f20

---------

Co-authored-by: HibiKier <[email protected]>

* ✨ 将cd,block,count限制复原配置文件 (#1662)

* 🎨 修改README (#1663)

* 🎨 修改版本号 (#1664)

* 🎨 修改requirements (#1665)

---------

Co-authored-by: AkashiCoin <[email protected]>
Co-authored-by: fanyinrumeng <[email protected]>
Co-authored-by: AkashiCoin <[email protected]>
Co-authored-by: Elaga <[email protected]>
Co-authored-by: AkashiCoin <[email protected]>
Co-authored-by: HibiKier <[email protected]>
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.

1 participant