Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-01-30 00:12:50 -05:00
Code Packages Releases Activity

portal: handle profile setting errors

Browse Source
This commit is contained in:
bbedward
2025-10-20 11:43:14 -04:00
parent c2f42f3f69
commit 62b7492e9f
1 changed files with 102 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
Services/PortalService.qml
View File

@@ -1,6 +1,6 @@
pragma Singleton pragma Singleton
pragma ComponentBehavior: Bound pragma ComponentBehavior
import QtQuick import QtQuick
import Quickshell import Quickshell
@@ -18,18 +18,23 @@ Singleton {
property bool freedeskAvailable: false property bool freedeskAvailable: false
property string colorSchemeCommand: "" property string colorSchemeCommand: ""
property string pendingProfileImage: ""
readonly property string socketPath: Quickshell.env("DMS_SOCKET") readonly property string socketPath: Quickshell.env("DMS_SOCKET")
function init() {} function init() {}
function getSystemProfileImage() { function getSystemProfileImage() {
if (!freedeskAvailable) return if (!freedeskAvailable)
return
const username = Quickshell.env("USER") const username = Quickshell.env("USER")
if (!username) return if (!username)
return
DMSService.sendRequest("freedesktop.accounts.getUserIconFile", { username: username }, response => { DMSService.sendRequest("freedesktop.accounts.getUserIconFile", {
"username": username
}, response => {
if (response.result && response.result.success) { if (response.result && response.result.success) {
const iconFile = response.result.value || "" const iconFile = response.result.value || ""
if (iconFile && iconFile !== "" && iconFile !== "/var/lib/AccountsService/icons/") { if (iconFile && iconFile !== "" && iconFile !== "/var/lib/AccountsService/icons/") {
@@ -57,7 +62,9 @@ Singleton {
return return
} }
DMSService.sendRequest("freedesktop.accounts.getUserIconFile", { username: username }, response => { DMSService.sendRequest("freedesktop.accounts.getUserIconFile", {
"username": username
}, response => {
if (response.result && response.result.success) { if (response.result && response.result.success) {
const icon = response.result.value || "" const icon = response.result.value || ""
if (icon && icon !== "" && icon !== "/var/lib/AccountsService/icons/") { if (icon && icon !== "" && icon !== "/var/lib/AccountsService/icons/") {
@@ -72,13 +79,11 @@ Singleton {
} }
function setProfileImage(imagePath) { function setProfileImage(imagePath) {
profileImage = imagePath
if (accountsServiceAvailable) { if (accountsServiceAvailable) {
if (imagePath) { pendingProfileImage = imagePath
setSystemProfileImage(imagePath) setSystemProfileImage(imagePath || "")
} else { } else {
setSystemProfileImage("") profileImage = imagePath
}
} }
} }
@@ -86,7 +91,8 @@ Singleton {
if (typeof SettingsData !== "undefined" && SettingsData.syncModeWithPortal === false) { if (typeof SettingsData !== "undefined" && SettingsData.syncModeWithPortal === false) {
return return
} }
if (!freedeskAvailable) return if (!freedeskAvailable)
return
DMSService.sendRequest("freedesktop.settings.getColorScheme", null, response => { DMSService.sendRequest("freedesktop.settings.getColorScheme", null, response => {
if (response.result) { if (response.result) {
@@ -118,9 +124,12 @@ Singleton {
} }
function setSystemIconTheme(themeName) { function setSystemIconTheme(themeName) {
if (!settingsPortalAvailable || !freedeskAvailable) return if (!settingsPortalAvailable || !freedeskAvailable)
return
DMSService.sendRequest("freedesktop.settings.setIconTheme", { iconTheme: themeName }, response => { DMSService.sendRequest("freedesktop.settings.setIconTheme", {
"iconTheme": themeName
}, response => {
if (response.error) { if (response.error) {
console.warn("PortalService: Failed to set icon theme:", response.error) console.warn("PortalService: Failed to set icon theme:", response.error)
} }
@@ -128,12 +137,34 @@ Singleton {
} }
function setSystemProfileImage(imagePath) { function setSystemProfileImage(imagePath) {
if (!accountsServiceAvailable || !freedeskAvailable) return if (!accountsServiceAvailable || !freedeskAvailable)
return
DMSService.sendRequest("freedesktop.accounts.setIconFile", { path: imagePath || "" }, response => { DMSService.sendRequest("freedesktop.accounts.setIconFile", {
"path": imagePath || ""
}, response => {
if (response.error) { if (response.error) {
console.warn("PortalService: Failed to set icon file:", response.error) console.warn("PortalService: Failed to set icon file:", response.error)
const errorMsg = response.error.toString()
let userMessage = I18n.tr("Failed to set profile image")
if (errorMsg.includes("too large")) {
userMessage = I18n.tr("Profile image is too large. Please use a smaller image.")
} else if (errorMsg.includes("permission")) {
userMessage = I18n.tr("Permission denied to set profile image.")
} else if (errorMsg.includes("not found") || errorMsg.includes("does not exist")) {
userMessage = I18n.tr("Selected image file not found.")
} else { } else {
userMessage = I18n.tr("Failed to set profile image: ") + errorMsg.split(":").pop().trim()
}
Quickshell.execDetached(["notify-send", "-u", "normal", "-a", "DMS", "-i", "error", I18n.tr("Profile Image Error"), userMessage])
pendingProfileImage = ""
} else {
profileImage = pendingProfileImage
pendingProfileImage = ""
Qt.callLater(() => getSystemProfileImage()) Qt.callLater(() => getSystemProfileImage())
} }
}) })
@@ -186,7 +217,8 @@ Singleton {
} }
function checkAccountsService() { function checkAccountsService() {
if (!freedeskAvailable) return if (!freedeskAvailable)
return
DMSService.sendRequest("freedesktop.getState", null, response => { DMSService.sendRequest("freedesktop.getState", null, response => {
if (response.result && response.result.accounts) { if (response.result && response.result.accounts) {
@@ -199,7 +231,8 @@ Singleton {
} }
function checkSettingsPortal() { function checkSettingsPortal() {
if (!freedeskAvailable) return if (!freedeskAvailable)
return
DMSService.sendRequest("freedesktop.getState", null, response => { DMSService.sendRequest("freedesktop.getState", null, response => {
if (response.result && response.result.settings) { if (response.result && response.result.settings) {
@@ -216,10 +249,7 @@ Singleton {
profileImage = "" profileImage = ""
return return
} }
userProfileCheckProcess.command = [ userProfileCheckProcess.command = ["bash", "-c", `uid=$(id -u ${username} 2>/dev/null) && [ -n "$uid" ] && dbus-send --system --print-reply --dest=org.freedesktop.Accounts /org/freedesktop/Accounts/User$uid org.freedesktop.DBus.Properties.Get string:org.freedesktop.Accounts.User string:IconFile 2>/dev/null | grep -oP 'string "\\K[^"]+' || echo ""`]
"bash", "-c",
`uid=$(id -u ${username} 2>/dev/null) && [ -n "$uid" ] && dbus-send --system --print-reply --dest=org.freedesktop.Accounts /org/freedesktop/Accounts/User$uid org.freedesktop.DBus.Properties.Get string:org.freedesktop.Accounts.User string:IconFile 2>/dev/null | grep -oP 'string "\\K[^"]+' || echo ""`
]
userProfileCheckProcess.running = true userProfileCheckProcess.running = true
} }