Added function to call a method on dbus

- Fixed checking the path for existence (closes:52597)

gpoa/frontend/kde_applier.py

@@ -108,6 +108,21 @@ class kde_applier_user(applier_frontend):
         else:
             log('D201')
 
+dbus_methods_mapping = {
+    'kscreenlockerrc': {
+        'dbus_service': 'org.kde.screensaver',
+        'dbus_path': '/ScreenSaver',
+        'dbus_interface': 'org.kde.screensaver',
+        'dbus_method': 'configure'
+    },
+    'wallpaper': {
+        'dbus_service': 'org.kde.plasmashell',
+        'dbus_path': '/PlasmaShell',
+        'dbus_interface': 'org.kde.PlasmaShell',
+        'dbus_method': 'refreshCurrentShell'
+    },
+}
+
 def create_dict(kde_settings, all_kde_settings, locks_settings, locks_dict, file_cache = None, username = None, plasmaupdate = False):
         for locks in locks_settings:
             locks_dict[locks.valuename] = locks.data
@@ -118,12 +133,7 @@ def create_dict(kde_settings, all_kde_settings, locks_settings, locks_dict, file
                 if file_name == 'wallpaper':
                     apply_for_wallpaper(data, file_cache, username, plasmaupdate)
                 else:
-                    if file_name not in all_kde_settings:
-                        all_kde_settings[file_name] = {}
-                    if section not in all_kde_settings[file_name]:
-                        all_kde_settings[file_name][section] = {}
-                    all_kde_settings[file_name][section][value] = data
-
+                    all_kde_settings.setdefault(file_name, {}).setdefault(section, {})[value] = data
             except Exception as exc:
                 logdata = dict()
                 logdata['file_name'] = file_name
@@ -135,6 +145,7 @@ def create_dict(kde_settings, all_kde_settings, locks_settings, locks_dict, file
 
 def apply(all_kde_settings, locks_dict, username = None):
     logdata = dict()
+    modified_files = set()
     if username is None:
         system_path_settings = '/etc/xdg/'
         system_files = [
@@ -160,11 +171,12 @@ def apply(all_kde_settings, locks_dict, username = None):
                     file.write(f'[{section}]\n')
                     for key, value in keys.items():
                         lock = f"{file_name}.{section}.{key}".replace('][', ')(')
-                        if lock in locks_dict and locks_dict[lock] == 1:
+                        if locks_dict.get(lock) == 1:
                             file.write(f'{key}[$i]={value}\n')
                         else:
                             file.write(f'{key}={value}\n')
                     file.write('\n')
+            modified_files.add(file_name)
     else:
         for file_name, sections in all_kde_settings.items():
             path = f'{get_homedir(username)}/.config/{file_name}'
@@ -214,6 +226,9 @@ def apply(all_kde_settings, locks_dict, username = None):
             except Exception as exc:
                 logdata['exc'] = exc
                 log('W19', logdata)
+            modified_files.add(file_name)
+    for file_name in modified_files:
+        call_dbus_method(file_name)
 
 def clear_locks_settings(username, file_name, key):
     '''
@@ -260,7 +275,6 @@ def apply_for_wallpaper(data, file_cache, username, plasmaupdate):
         os.environ["DISPLAY"] = ":0"
             #Variable for command execution plasma-apply-colorscheme
         os.environ["XDG_RUNTIME_DIR"] = f"/run/user/{os.getuid()}"
-        os.environ["DBUS_SESSION_BUS_ADDRESS"] = f"unix:path=/run/user/{os.getuid()}/bus"#plasma-apply-wallpaperimage
         os.environ["PATH"] = "/usr/lib/kf5/bin:"
             #environment variable for accessing binary files without hard links
         if not flag:
@@ -283,13 +297,7 @@ def apply_for_wallpaper(data, file_cache, username, plasmaupdate):
                         logdata['command'] = command
                         log('E68', logdata)
                 if plasmaupdate == 1:
-                    try:
-                        session_bus = dbus.SessionBus()
-                        plasma_shell = session_bus.get_object('org.kde.plasmashell', '/PlasmaShell', introspect='org.kde.PlasmaShell')
-                        plasma_shell_iface = dbus.Interface(plasma_shell, 'org.kde.PlasmaShell')
-                        plasma_shell_iface.refreshCurrentShell()
-                    except:
-                        pass
+                    call_dbus_method("wallpaper")
         else:
             logdata['file'] = path_to_wallpaper
             log('W21', logdata)
@@ -309,9 +317,24 @@ def get_id_desktop(path_to_wallpaper):
         with open(path_to_wallpaper, 'r') as file:
             file_content = file.read()
         match = re.search(pattern, file_content)
-        if match:
-            return match.group(1)
-        else:
-            return None
+        return match.group(1) if match else None
     except:
         return None
+
+def call_dbus_method(file_name):
+    '''
+    Method to call D-Bus method based on the file name
+    '''
+    os.environ["DBUS_SESSION_BUS_ADDRESS"] = f"unix:path=/run/user/{os.getuid()}/bus"
+    if file_name in dbus_methods_mapping:
+        config = dbus_methods_mapping[file_name]
+        try:
+            session_bus = dbus.SessionBus()
+            dbus_object = session_bus.get_object(config['dbus_service'], config['dbus_path'])
+            dbus_iface = dbus.Interface(dbus_object, config['dbus_interface'])
+            getattr(dbus_iface, config['dbus_method'])()
+        except dbus.exceptions.DBusException as e:
+            logdata = dict({'error': str(exc)})
+            log('E31', logdata)
+    else:
+        pass

gpupdate.spec

@@ -36,7 +36,7 @@
 %add_python3_req_skip util.gpoa_ini_parsing
 
 Name: gpupdate
-Version: 0.12.0
+Version: 0.12.1
 Release: alt1
 
 Summary: GPT applier
@@ -195,6 +195,9 @@ fi
 %exclude %python3_sitelibdir/gpoa/test
 
 %changelog
+* Fri Jan 10 2025 Valery Sinelnikov <greh@altlinux.org> 0.12.1-alt1
+- Fixed checking the path for existence (closes:52597)
+
 * Tue Dec 10 2024 Valery Sinelnikov <greh@altlinux.org> 0.12.0-alt1
 - Special thanks to Andrey Belgorodtsev (andrey@net55.su)
   for valuable pre-release testing and feedback