From d8636f0f2cc8957b0b4a5b7cc95f3f0802971855 Mon Sep 17 00:00:00 2001
From: Romain Vigier <romain@romainvigier.fr>
Date: Sun, 20 Feb 2022 03:06:30 +0100
Subject: [PATCH] Put extension in a class

---
 src/extension.js | 189 ++++++++++++++++++++++-------------------------
 1 file changed, 90 insertions(+), 99 deletions(-)

diff --git a/src/extension.js b/src/extension.js
index 2660b4d..ec6e268 100644
--- a/src/extension.js
+++ b/src/extension.js
@@ -17,109 +17,100 @@ const { Timer } = Me.imports.modules.Timer;
 
 
 var enabled = false;
-var timer = null;
-var switcherThemeGtk = null;
-var switcherThemeShell = null;
-var switcherThemeIcon = null;
-var switcherThemeCursor = null;
-var switcherCommands = null;
 
 
+class NightThemeSwitcher {
+    #timer = null;
+    #switcherThemeGtk = null;
+    #switcherThemeShell = null;
+    #switcherThemeIcon = null;
+    #switcherThemeCursor = null;
+    #switcherCommands = null;
+
+    constructor() {
+        console.debug('Initializing extension...');
+        extensionUtils.initTranslations();
+        this.#migrateBackgroundSettings();
+        console.debug('Extension initialized.');
+    }
+
+    enable() {
+        this.#waitForExtensionManager().then(() => this.start());
+    }
+
+    start() {
+        console.debug('Starting extension...');
+        this.#timer = new Timer();
+        this.#switcherThemeGtk = new SwitcherThemeGtk({ timer: this.#timer });
+        this.#switcherThemeIcon = new SwitcherThemeIcon({ timer: this.#timer });
+        this.#switcherThemeShell = new SwitcherThemeShell({ timer: this.#timer });
+        this.#switcherThemeCursor = new SwitcherThemeCursor({ timer: this.#timer });
+        this.#switcherCommands = new SwitcherCommands({ timer: this.#timer });
+
+        this.#timer.enable();
+        this.#switcherThemeGtk.enable();
+        this.#switcherThemeShell.enable();
+        this.#switcherThemeIcon.enable();
+        this.#switcherThemeCursor.enable();
+        this.#switcherCommands.enable();
+
+        enabled = true;
+        console.debug('Extension started.');
+    }
+
+    disable() {
+        console.debug('Disabling extension...');
+        enabled = false;
+
+        this.#switcherThemeGtk.disable();
+        this.#switcherThemeShell.disable();
+        this.#switcherThemeIcon.disable();
+        this.#switcherThemeCursor.disable();
+        this.#switcherCommands.disable();
+        this.#timer.disable();
+
+        this.#timer = null;
+        this.#switcherThemeGtk = null;
+        this.#switcherThemeShell = null;
+        this.#switcherThemeIcon = null;
+        this.#switcherThemeCursor = null;
+        this.#switcherCommands = null;
+        console.debug('Extension disabled.');
+    }
+
+    #waitForExtensionManager() {
+        return new Promise(resolve => {
+            console.debug('Waiting for Extension Manager initialization...');
+            GLib.idle_add(GLib.PRIORITY_DEFAULT_IDLE, () => {
+                while (!extensionManager._initialized)
+                    continue;
+                return false;
+            });
+            console.debug('Extension Manager initialized.');
+            resolve();
+        });
+    }
+
+    #migrateBackgroundSettings() {
+        const systemSettings = new Gio.Settings({ schema: 'org.gnome.desktop.background' });
+        const extensionSettings = extensionUtils.getSettings(utils.getSettingsSchema('backgrounds'));
+
+        if (extensionSettings.get_string('day')) {
+            systemSettings.set_string('picture-uri', extensionSettings.get_string('day'));
+            systemSettings.set_string('picture-uri-dark', extensionSettings.get_string('day'));
+            extensionSettings.set_string('day', '');
+        }
+
+        if (extensionSettings.get_string('night')) {
+            systemSettings.set_string('picture-uri-dark', extensionSettings.get_string('night'));
+            extensionSettings.set_string('night', '');
+        }
+    }
+}
+
 /**
  * Extension initialization.
  */
 function init() {
-    console.debug('Initializing extension...');
-    extensionUtils.initTranslations();
-    _migrateBackgroundSettings();
-    console.debug('Extension initialized.');
-}
-
-/**
- * When the extension is enabled, we wait for the Extension Manager to be
- * initialized before starting.
- */
-function enable() {
-    _waitForExtensionManager().then(() => start());
-}
-
-/**
- * When the extension is started, we create and enable all the modules.
- */
-function start() {
-    console.debug('Enabling extension...');
-    timer = new Timer();
-    switcherThemeGtk = new SwitcherThemeGtk({ timer });
-    switcherThemeIcon = new SwitcherThemeIcon({ timer });
-    switcherThemeShell = new SwitcherThemeShell({ timer });
-    switcherThemeCursor = new SwitcherThemeCursor({ timer });
-    switcherCommands = new SwitcherCommands({ timer });
-
-    timer.enable();
-    switcherThemeGtk.enable();
-    switcherThemeShell.enable();
-    switcherThemeIcon.enable();
-    switcherThemeCursor.enable();
-    switcherCommands.enable();
-
-    enabled = true;
-    console.debug('Extension enabled.');
-}
-
-/**
- * When the extension is disabled, we disable and remove all the modules.
- */
-function disable() {
-    console.debug('Disabling extension...');
-    enabled = false;
-
-    switcherThemeGtk.disable();
-    switcherThemeShell.disable();
-    switcherThemeIcon.disable();
-    switcherThemeCursor.disable();
-    switcherCommands.disable();
-    timer.disable();
-
-    timer = null;
-    switcherThemeGtk = null;
-    switcherThemeShell = null;
-    switcherThemeIcon = null;
-    switcherThemeCursor = null;
-    switcherCommands = null;
-    console.debug('Extension disabled.');
-}
-
-/**
- * Wait for the Extension Manager to be initialized. Returns a Promise.
- */
-function _waitForExtensionManager() {
-    return new Promise(resolve => {
-        console.debug('Waiting for Extension Manager initialization...');
-        GLib.idle_add(GLib.PRIORITY_DEFAULT_IDLE, () => {
-            while (!extensionManager._initialized)
-                continue;
-            return false;
-        });
-        console.debug('Extension Manager initialized.');
-        resolve();
-    });
-}
-
-/**
- * Migrate background settings from the extension to the system.
- */
-function _migrateBackgroundSettings() {
-    const systemSettings = new Gio.Settings({ schema: 'org.gnome.desktop.background' });
-    const extensionSettings = extensionUtils.getSettings(utils.getSettingsSchema('backgrounds'));
-
-    if (extensionSettings.get_string('day')) {
-        systemSettings.set_string('picture-uri', extensionSettings.get_string('day'));
-        systemSettings.set_string('picture-uri-dark', extensionSettings.get_string('day'));
-        extensionSettings.set_string('day', '');
-    }
-
-    if (extensionSettings.get_string('night')) {
-        systemSettings.set_string('picture-uri-dark', extensionSettings.get_string('night'));
-        extensionSettings.set_string('night', '');
-    }
+    return new NightThemeSwitcher();
 }