Skip to content

Conversation

@deepin-ci-robot
Copy link
Contributor

@deepin-ci-robot deepin-ci-robot commented May 28, 2025

Synchronize source files from linuxdeepin/dde-session-shell.

Source-pull-request: linuxdeepin/dde-session-shell#11

Summary by Sourcery

Introduce optional DSS_SNIPE integration to improve inhibitor icon lookup and adjust configuration naming.

Enhancements:

  • Add conditional DSS_SNIPE support in InhibitWarnView to fetch application icons via ApplicationManager DBus interface.
  • Simplify fallback icon lookup for inhibited processes and unify theme icon assignment logic.
  • Use a DSS_SNIPE-specific dconfig key for lastore in ShutdownWidget when the feature is enabled.

Synchronize source files from linuxdeepin/dde-session-shell.

Source-pull-request: linuxdeepin/dde-session-shell#11
@deepin-ci-robot
Copy link
Contributor Author

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: deepin-ci-robot

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

Details 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

@sourcery-ai
Copy link

sourcery-ai bot commented May 28, 2025

Reviewer's Guide

Sync upstream changes from linuxdeepin/dde-session-shell: add optional DSS_SNIPE support for retrieving application icons over D-Bus, refactor inhibitor icon lookup with improved fallback logic, and conditionally update LASTORE DConfig key in shutdown widget.

Class Diagram: InhibitWarnView and Dependencies for Icon Retrieval

classDiagram
    class InhibitWarnView {
        +setInhibitorList(const QList<InhibitorData> &list) void
    }
    class InhibitorData {
        QString icon
        int pid
        QString name
        QString appName
        QString reason
    }
    class DSGApplication {
        <<Utility>>
        +static getId(pid) : QString
    }
    class DDBusSender {
        +service(QString) : DDBusSender
        +path(QString) : DDBusSender
        +interface(QString) : DDBusSender
        +property(QString) : DDBusSender
        +get() : QDBusReply
    }
    class DUtil {
        <<Utility>>
        +static escapeToObjectPath(QString) : QString
    }
    class QIcon {
        <<Utility>>
        +static fromTheme(QString) : QIcon
        +static fromTheme(QString, QIcon) : QIcon
    }

    InhibitWarnView ..> InhibitorData : uses
    InhibitWarnView ..> QIcon : uses
    InhibitWarnView ..> DSGApplication : "uses (if ENABLE_DSS_SNIPE)"
    InhibitWarnView ..> DDBusSender : "uses (if ENABLE_DSS_SNIPE)"
    InhibitWarnView ..> DUtil : "uses (if ENABLE_DSS_SNIPE)"
Loading

File-Level Changes

Change Details Files
Enhanced inhibitor icon retrieval pipeline
  • Introduce ENABLE_DSS_SNIPE: include DSGApplication, DUtil, DDBusSender and define AMDBUS_* constants
  • Under ENABLE_DSS_SNIPE, fetch ‘Desktop Entry’ icon via Dtk::Core::DSGApplication.getId and DDBusSender property call
  • Refactor fallback: drop file existence check for containerized executables, extract filename from /proc//exe, then apply QIcon::fromTheme(iconName)
src/widgets/inhibitwarnview.cpp
Conditionalize LASTORE DConfig name
  • Under ENABLE_DSS_SNIPE define LASTORE_DCONFIG_NAME as “org.deepin.dde.lastore”
  • Fallback to existing “org.deepin.lastore” if DSS_SNIPE is disabled
src/widgets/shutdownwidget.cpp

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

Copy link

@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.

Hey @deepin-ci-robot - 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 and I'll use the feedback to improve your reviews.

QIcon icon;

if (inhibitor.icon.isEmpty() && inhibitor.pid) {
if (inhibitor.icon.isEmpty()) {
Copy link

Choose a reason for hiding this comment

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

issue (bug_risk): Removed pid check causes missing fallback icon for non-pid entries

Without the PID check, entries without a PID and with an empty icon will not display a fallback icon. Please restore the PID check or provide a default icon when pid == 0.

@mhduiy mhduiy merged commit 179fc48 into master May 28, 2025
26 of 28 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.

3 participants