From 4141bafaf6d7312e5437b6f895e495ae1eaac63f Mon Sep 17 00:00:00 2001
From: Romain <romain@romainvigier.fr>
Date: Sat, 9 May 2020 10:05:27 +0000
Subject: [PATCH] Improve error handling

---
 src/modules/Switcher.js | 14 ++++----------
 src/modules/Themer.js   |  6 ++----
 src/modules/Timer.js    |  7 ++-----
 src/utils.js            |  8 ++++++++
 4 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/modules/Switcher.js b/src/modules/Switcher.js
index b3cfbb5..f2efb4f 100644
--- a/src/modules/Switcher.js
+++ b/src/modules/Switcher.js
@@ -22,7 +22,7 @@ const { main } = imports.ui;
 const Me = extensionUtils.getCurrentExtension();
 const config = Me.imports.config;
 
-const { log_debug } = Me.imports.utils;
+const { log_debug, log_error } = Me.imports.utils;
 
 const { Themer } = Me.imports.modules.Themer;
 const { Timer } = Me.imports.modules.Timer;
@@ -65,9 +65,7 @@ var Switcher = class {
 			log_debug('Extension enabled.');
 		}
 		catch(e) {
-			if ( e.message ) {
-				main.notifyError(Me.metadata.name, e.message);
-			}
+			log_error(e);
 		}
 	}
 
@@ -91,9 +89,7 @@ var Switcher = class {
 			this.theme.set_variant(this.time.current);
 		}
 		catch(e) {
-			if ( e.message ) {
-				main.notifyError(Me.metadata.name, e.message);
-			}
+			log_error(e);
 		}
 	}
 
@@ -102,9 +98,7 @@ var Switcher = class {
 			this.theme.set_variant(this.time.current);
 		}
 		catch(e) {
-			if ( e.message ) {
-				main.notifyError(Me.metadata.name, e.message);
-			}
+			log_error(e);
 		}
 	}
 
diff --git a/src/modules/Themer.js b/src/modules/Themer.js
index 1ac6cf4..22a8cca 100644
--- a/src/modules/Themer.js
+++ b/src/modules/Themer.js
@@ -24,7 +24,7 @@ const Me = extensionUtils.getCurrentExtension();
 const config = Me.imports.config;
 const utils = Me.imports.utils;
 
-const { log_debug } = Me.imports.utils;
+const { log_debug, log_error } = Me.imports.utils;
 
 const { Variants } = Me.imports.modules.Variants;
 
@@ -66,9 +66,7 @@ var Themer = class {
 			log_debug('Themer enabled.');
 		}
 		catch(e) {
-			if ( e.message ) {
-				main.notifyError(Me.metadata.name, e.message);
-			}
+			log_error(e);
 		}
 	}
 
diff --git a/src/modules/Timer.js b/src/modules/Timer.js
index bc6c362..6681554 100644
--- a/src/modules/Timer.js
+++ b/src/modules/Timer.js
@@ -19,12 +19,11 @@ this program. If not, see <http s ://www.gnu.org/licenses/>.
 const MainLoop = imports.mainloop;
 const { Gio, GLib } = imports.gi;
 const { extensionUtils, fileUtils } = imports.misc;
-const { main } = imports.ui;
 
 const Me = extensionUtils.getCurrentExtension();
 const config = Me.imports.config;
 
-const { log_debug } = Me.imports.utils;
+const { log_debug, log_error } = Me.imports.utils;
 
 const Gettext = imports.gettext.domain(Me.metadata.uuid);
 const _ = Gettext.gettext;
@@ -85,9 +84,7 @@ var Timer = class {
 			log_debug('Timer enabled.');
 		}
 		catch(e) {
-			if ( e.message ) {
-				main.notifyError(Me.metadata.name, e.message);
-			}
+			log_error(e);
 		}
 	}
 
diff --git a/src/utils.js b/src/utils.js
index c16b566..88b963c 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -18,6 +18,7 @@ this program. If not, see <http s ://www.gnu.org/licenses/>.
 
 const { Gio, GLib, Gtk } = imports.gi;
 const { extensionUtils } = imports.misc;
+const { main } = imports.ui;
 
 const Me = extensionUtils.getCurrentExtension();
 const config = Me.imports.config;
@@ -29,6 +30,13 @@ var log_debug = function(message) {
 	}
 }
 
+var log_error = function(error) {
+	logError(error, Me.metadata.name);
+	if ( error.message ) {
+		main.notifyError(Me.metadata.name, error.message);
+	}
+}
+
 var get_installed_themes = function() {
 	const themes = new Set(['Adwaita', 'HighContrast', 'HighContrastInverse']);