optimize indicators for error/starting state

fixes #11
hardpixel · Aug 22, 2022 · 85e74b7 · 85e74b7
1 parent dc8cb87
commit 85e74b7
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 14 deletions.
diff --git a/[email protected]/extension.js b/[email protected]/extension.js
@@ -41,27 +41,27 @@ const SystemdManager = GObject.registerClass(
       const cmdMethod   = this._settings.get_enum('command-method')
 
       const services    = entries.map(data => JSON.parse(data))
-      const fetchStates = type => Utils.isServiceActive(
+      const fetchStates = type => Utils.getServicesState(
         type, services.filter(ob => ob.type == type).map(ob => ob.service)
       )
 
       const stateTypes  = ['system', 'user']
-      const activeState = stateTypes.reduce(
+      const unitStates  = stateTypes.reduce(
         (all, type) => ({ ...all, [type]: fetchStates(type) }), {}
       )
 
       services.forEach(({ type, name, service }) => {
-        const active = activeState[type][service]
-        const widget = new PopupServiceItem(name, active, showRestart)
+        const state = unitStates[type][service]
+        const entry = new PopupServiceItem(name, state, showRestart)
 
-        this.menu.addMenuItem(widget)
+        this.menu.addMenuItem(entry)
 
-        widget.connect('toggled', () => {
-          const action = active ? 'stop' : 'start'
+        entry.connect('toggled', (actor, active) => {
+          const action = active ? 'start' : 'stop'
           Utils.runServiceAction(cmdMethod, action, type, service)
         })
 
-        widget.connect('restarted', () => {
+        entry.connect('restarted', () => {
           Utils.runServiceAction(cmdMethod, 'restart', type, service)
           this.menu.close()
         })

diff --git a/[email protected]/stylesheet.css b/[email protected]/stylesheet.css
@@ -6,6 +6,11 @@
   min-height: 18px;
 }
 
+.systemd-manager-error {
+  color: #e01b24;
+  font-weight: bold;
+}
+
 .systemd-manager-item .toggle-switch {
   margin-left: 10px;
 }

diff --git a/[email protected]/utils.js b/[email protected]/utils.js
@@ -43,12 +43,12 @@ function getServicesList(type) {
   })
 }
 
-function isServiceActive(type, services) {
+function getServicesState(type, services) {
   const res = systemctl(type, ['is-active', ...services])
   const out = Bytes.toString(res[1])
 
   return out.split('\n').reduce(
-    (all, value, idx) => ({ ...all, [services[idx]]: value == 'active' }), {}
+    (all, value, idx) => ({ ...all, [services[idx]]: value }), {}
   )
 }
 

diff --git a/[email protected]/widgets.js b/[email protected]/widgets.js
@@ -1,19 +1,45 @@
+const Atk            = imports.gi.Atk
 const St             = imports.gi.St
 const GObject        = imports.gi.GObject
+const Animation      = imports.ui.animation
+const Panel          = imports.ui.panel
 const PopupMenu      = imports.ui.popupMenu
 const Util           = imports.misc.util
 const ExtensionUtils = imports.misc.extensionUtils
 const Me             = ExtensionUtils.getCurrentExtension()
 const VERSION        = Me.imports.utils.VERSION
 
+const LOADING_STATES = ['reloading', 'activating', 'deactivating', 'maintenance']
+
 var PopupServiceItem = GObject.registerClass({
   Signals: {
     'restarted': {}
   }
 }, class PopupServiceItem extends PopupMenu.PopupSwitchMenuItem {
-    _init(text, active, showRestart) {
+    _init(text, state, showRestart) {
+      const loading  = LOADING_STATES.includes(state)
+      const active   = state == 'active'
+      const reactive = loading == false
+      const failure  = state == 'failed'
+
       super._init(text, active, { style_class: 'systemd-manager-item' })
 
+      if (failure) {
+        this.label.add_style_class_name('systemd-manager-error')
+      }
+
+      if (loading) {
+        const spinner = new Animation.Spinner(Panel.PANEL_ICON_SIZE, {
+          animate: true,
+          hideOnStop: true
+        })
+
+        this.insert_child_above(spinner, this.label)
+
+        this.reactive = false
+        spinner.play()
+      }
+
       if (showRestart) {
         const icon = new St.Icon({
           icon_name:   'view-refresh-symbolic',
@@ -22,9 +48,9 @@ var PopupServiceItem = GObject.registerClass({
 
         const button = new St.Button({
           x_align:         1,
-          reactive:        true,
-          can_focus:       true,
-          track_hover:     true,
+          reactive:        reactive,
+          can_focus:       reactive,
+          track_hover:     reactive,
           accessible_name: 'restart',
           style_class:     'system-menu-action systemd-manager-button',
           child:           icon