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

fix bugs #2478

Merged
merged 7 commits into from
Dec 9, 2024
Merged

fix bugs #2478

merged 7 commits into from
Dec 9, 2024

Conversation

Johnson-zs
Copy link
Contributor

No description provided.

Copy link

github-actions bot commented Dec 7, 2024

  • 检测到debian目录文件有变更: debian/control

Copy link

github-actions bot commented Dec 7, 2024

  • 敏感词检查失败, 检测到1个文件存在敏感词
详情
{
    "debian/control": [
        {
            "line": "Homepage: http://www.deepin.org",
            "line_number": 68,
            "rule": "S35",
            "reason": "Url link | 6fe814dfb7"
        }
    ]
}

Copy link

github-actions bot commented Dec 8, 2024

  • 检测到debian目录文件有变更: debian/control

Copy link

github-actions bot commented Dec 8, 2024

  • 敏感词检查失败, 检测到1个文件存在敏感词
详情
{
    "debian/control": [
        {
            "line": "Homepage: http://www.deepin.org",
            "line_number": 68,
            "rule": "S35",
            "reason": "Url link | 6fe814dfb7"
        }
    ]
}

Copy link

github-actions bot commented Dec 9, 2024

  • 检测到debian目录文件有变更: debian/control

1 similar comment
Copy link

github-actions bot commented Dec 9, 2024

  • 检测到debian目录文件有变更: debian/control

Copy link

github-actions bot commented Dec 9, 2024

  • 检测到debian目录文件有变更: debian/control

Copy link

github-actions bot commented Dec 9, 2024

  • 敏感词检查失败, 检测到1个文件存在敏感词
详情
{
    "debian/control": [
        {
            "line": "Homepage: http://www.deepin.org",
            "line_number": 68,
            "rule": "S35",
            "reason": "Url link | 6fe814dfb7"
        }
    ]
}

1 similar comment
Copy link

github-actions bot commented Dec 9, 2024

  • 敏感词检查失败, 检测到1个文件存在敏感词
详情
{
    "debian/control": [
        {
            "line": "Homepage: http://www.deepin.org",
            "line_number": 68,
            "rule": "S35",
            "reason": "Url link | 6fe814dfb7"
        }
    ]
}

Copy link

github-actions bot commented Dec 9, 2024

  • 检测到debian目录文件有变更: debian/control

Copy link

github-actions bot commented Dec 9, 2024

  • 敏感词检查失败, 检测到1个文件存在敏感词
详情
{
    "debian/control": [
        {
            "line": "Homepage: http://www.deepin.org",
            "line_number": 68,
            "rule": "S35",
            "reason": "Url link | 6fe814dfb7"
        }
    ]
}

Copy link

github-actions bot commented Dec 9, 2024

  • 检测到debian目录文件有变更: debian/control

Copy link

github-actions bot commented Dec 9, 2024

  • 敏感词检查失败, 检测到1个文件存在敏感词
详情
{
    "debian/control": [
        {
            "line": "Homepage: http://www.deepin.org",
            "line_number": 68,
            "rule": "S35",
            "reason": "Url link | 6fe814dfb7"
        }
    ]
}

deepin-compressor is no longer a linglong app!

Log: fix bug

Bug: https://pms.uniontech.com/bug-view-286519.html
- Add proper scroll bar policy for vertical scrolling
- Fix dialog height calculation to respect screen boundaries
- Add size policies to maintain proper widget dimensions
- Set maximum width for dialog content
- Improve height adjustment logic for both Wayland and X11
- Fix content widget resizing and geometry updates

Log: fix ui bug

Bug: https://pms.uniontech.com/bug-view-287197.html
- Update dbus interface name from com.deepin.filemanager.daemon to org.deepin.Filemanager.MountControl
- Update dbus object path accordingly
- Add dlnfs package dependency in debian/control

This change fixes compatibility issues with the new dlnfs dbus interface naming convention.

Log:

Bug: https://pms.uniontech.com/bug-view-273567.html
- Move stretch item management to showEvent
- Remove redundant stretch item before adding new one
- Fix potential memory leak by properly deleting old stretch item

This change ensures proper layout spacing in the property dialog and
prevents multiple stretch items from being added unintentionally.

Log:
- Replace manual symlink and home path check with proper canTrash attribute check
- Simplify trash permission validation logic by removing redundant conditions
- Use FileInfo's canAttributes API instead of manual path checks
- Remove unnecessary supportTrash validation since it's handled by canTrash check

This change makes the code more maintainable and follows the proper attribute
checking pattern defined in the FileInfo interface.

Log:
- Add canonicalUrlList utility to properly handle symlink paths
- Preserve symlink's original path while resolving parent directory
- Process source URLs before trash operations to ensure correct paths
- Handle symlinks in directories that are themselves symlinks

This fixes an issue where symlinks would be incorrectly resolved when moving
to trash, especially when the symlink is located in a directory that is also
a symlink. The new implementation maintains the symlink's identity while
ensuring its parent path is properly resolved.

Log: fix bug

Bug: https://pms.uniontech.com/bug-view-287739.html
Copy link

github-actions bot commented Dec 9, 2024

  • 检测到debian目录文件有变更: debian/control

Copy link

github-actions bot commented Dec 9, 2024

  • 敏感词检查失败, 检测到1个文件存在敏感词
详情
{
    "debian/control": [
        {
            "line": "Homepage: http://www.deepin.org",
            "line_number": 68,
            "rule": "S35",
            "reason": "Url link | 6fe814dfb7"
        }
    ]
}

- Remove unnecessary Conflicts fields since Replaces is sufficient
- Remove Conflicts with dde-desktop-plugins as it's already covered by Replaces
- Remove duplicate package conflicts that are handled by Replaces
- Remove redundant Conflicts with dfmplugin-disk-encrypt

The Replaces field already handles package replacement properly, making the
Conflicts declarations redundant in these cases. This simplifies the package
relationships while maintaining the same functionality.

Log:
@deepin-ci-robot
Copy link

deepin pr auto review

代码审查意见:

  1. dfm-dlnfs-automount脚本中,gdbus call命令的参数格式可能需要调整,以确保与DBus接口的调用规范一致。例如,"${abs_path}""{'fsType': <'dlnfs'>}"的格式可能需要确认。

  2. debian/control文件中,ReplacesConflicts字段中列出的软件包名称应该与实际存在的软件包名称一致。例如,dde-file-manager-oemdde-desktop-plugins是否确实存在,以及dlnfs是否是一个有效的软件包。

  3. fileutils.cpp文件中,isSameFile函数的注释//! 需要判断设备号应该更详细地说明为什么需要判断设备号,以便其他开发者理解。

  4. fileutils.cpp文件中,fileCanTrash函数中使用了kFileAllTrashkCanTrash,这些键值应该定义在配置文件或常量头文件中,而不是硬编码。

  5. systempathutil.cpp文件中,canonicalUrlList函数中对于符号链接的处理逻辑可能需要更详细的错误处理,以防止路径解析错误。

  6. systempathutil.cpp文件中,canonicalUrlList函数中使用了QFileInfocanonicalPath方法,这个方法在处理符号链接时可能会返回空字符串,应该添加相应的错误处理。

  7. trashfileeventreceiver.cpp文件中,processedSources变量名可能需要更具体地反映其用途,例如canonicalizedSources

  8. filepropertydialog.cpp文件中,processHeight函数中对于窗口高度的调整逻辑可能需要更详细的注释,以便其他开发者理解。

  9. filepropertydialog.cpp文件中,showEvent函数中添加了一个QTimer::singleShot调用,这可能会导致界面闪烁或性能问题,应该评估是否有必要使用定时器,或者是否有更优的解决方案。

  10. appendcompresshelper.cpp文件中,appendCompress函数中直接使用了deepin-compressor命令,这可能会导致在不同环境中无法运行。建议使用更通用的命令或检查环境变量来确定压缩工具的路径。

Copy link

github-actions bot commented Dec 9, 2024

  • 检测到debian目录文件有变更: debian/control

Copy link

github-actions bot commented Dec 9, 2024

  • 敏感词检查失败, 检测到1个文件存在敏感词
详情
{
    "debian/control": [
        {
            "line": "Homepage: http://www.deepin.org",
            "line_number": 68,
            "rule": "S35",
            "reason": "Url link | 6fe814dfb7"
        }
    ]
}

@deepin-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: Clauszy, Johnson-zs, liyigang1

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@Johnson-zs
Copy link
Contributor Author

/merge

@deepin-bot
Copy link
Contributor

deepin-bot bot commented Dec 9, 2024

This pr cannot be merged! (status: unstable)

@Johnson-zs Johnson-zs merged commit 9f6602e into linuxdeepin:master Dec 9, 2024
19 of 20 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.

4 participants