Replaced state cacher with gsettings

ErikReider · Jun 19, 2022 · aab565d · aab565d
1 parent 8425afb
commit aab565d
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 94 deletions.
diff --git a/build-aux/meson/postinstall.py b/build-aux/meson/postinstall.py
@@ -0,0 +1,13 @@
+#!/usr/bin/env python3
+
+from os import environ, path
+from subprocess import call
+
+prefix = environ.get('MESON_INSTALL_PREFIX', '/usr/local')
+datadir = path.join(prefix, 'share')
+destdir = environ.get('DESTDIR', '')
+
+# Package managers set this so we don't need to run
+if not destdir:
+    print('Compiling GSettings schemas...')
+    call(['glib-compile-schemas', path.join(datadir, 'glib-2.0', 'schemas')])
diff --git a/data/meson.build b/data/meson.build
@@ -0,0 +1,10 @@
+install_data('org.erikreider.swaync.gschema.xml',
+  install_dir: join_paths(get_option('datadir'), 'glib-2.0/schemas')
+)
+
+compile_schemas = find_program('glib-compile-schemas', required: false)
+if compile_schemas.found()
+  test('Validate schema file', compile_schemas,
+    args: ['--strict', '--dry-run', meson.current_source_dir()]
+  )
+endif
diff --git a/data/org.erikreider.swaync.gschema.xml b/data/org.erikreider.swaync.gschema.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist gettext-domain="swaync">
+	<schema id="org.erikreider.swaync" path="/org/erikreider/swaync/">
+		<key name="dnd-state" type="b">
+			<default>false</default>
+			<summary>The current do not disturb state</summary>
+			<description>Whether notifications should be silent or not</description>
+		</key>
+	</schema>
+</schemalist>
diff --git a/meson.build b/meson.build
@@ -7,6 +7,9 @@ project('sway-notificaton-center', ['c', 'vala'],
 add_project_arguments(['--enable-gobject-tracing'], language: 'vala')
 add_project_arguments(['--enable-checking'], language: 'vala')
 
+i18n = import('i18n')
+
+subdir('data')
 subdir('src')
 
 datadir = get_option('datadir')

diff --git a/src/cacher/cacher.vala b/src/cacher/cacher.vala
diff --git a/src/main.vala b/src/main.vala
@@ -3,11 +3,15 @@ namespace SwayNotificationCenter {
     static string ? style_path;
     static string ? config_path;
 
+    static Settings self_settings;
+
     public void main (string[] args) {
         Gtk.init (ref args);
         Hdy.init ();
         Functions.init ();
 
+        self_settings = new Settings ("org.erikreider.swaync");
+
         if (args.length > 0) {
             for (uint i = 1; i < args.length; i++) {
                 string arg = args[i];

diff --git a/src/meson.build b/src/meson.build
@@ -32,7 +32,6 @@ app_sources = [
   'notification/notification.vala',
   'controlCenter/controlCenter.vala',
   'controlCenter/topAction/topAction.vala',
-  'cacher/cacher.vala',
   'blankWindow/blankWindow.vala',
   'functions.vala',
   constants,

diff --git a/src/notiDaemon/notiDaemon.vala b/src/notiDaemon/notiDaemon.vala
@@ -12,12 +12,8 @@ namespace SwayNotificationCenter {
         public NotiDaemon (SwayncDaemon swaync_daemon) {
             this.notify["dnd"].connect (() => on_dnd_toggle (dnd));
 
-            // Init from state cache
-            swaync_daemon.cache_state.bind_property ("dnd-state",
-                                                     this,
-                                                     "dnd",
-                                                     BindingFlags.BIDIRECTIONAL
-                                                     | BindingFlags.SYNC_CREATE);
+            // Init dnd from gsettings
+            self_settings.bind ("dnd-state", this, "dnd", SettingsBindFlags.DEFAULT);
 
             this.noti_window = new NotificationWindow ();
             this.control_center = new ControlCenter (swaync_daemon, this);

diff --git a/src/swayncDaemon/swayncDaemon.vala b/src/swayncDaemon/swayncDaemon.vala
@@ -7,20 +7,12 @@ namespace SwayNotificationCenter {
 
     [DBus (name = "org.erikreider.swaync.cc")]
     public class SwayncDaemon : Object {
-        public StateCache cache_state;
-
         public NotiDaemon noti_daemon;
 
         private Array<BlankWindow> blank_windows = new Array<BlankWindow> ();
         private unowned Gdk.Display ? display = Gdk.Display.get_default ();
 
         public SwayncDaemon () {
-            this.cache_state = Cacher.instance.get_state_cache ();
-            this.cache_state.notify.connect ((x, r) => {
-                debug ("State changed: %s\n", r.name);
-                Cacher.instance.cache_state (cache_state);
-            });
-
             // Init noti_daemon
             this.noti_daemon = new NotiDaemon (this);
             Bus.own_name (BusType.SESSION, "org.freedesktop.Notifications",