[gnome-break-timer] Organize daemon into namespaces

From: Dylan McCall <dylanmccall src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-break-timer] Organize daemon into namespaces
Date: Sun, 15 Nov 2020 05:42:11 +0000 (UTC)
commit 093f0da71c06dbfdcd4739674b2e9ddba87bbeca
Author: Dylan McCall <dylan dylanmccall ca>
Date:   Sat Nov 14 21:40:50 2020 -0800

    Organize daemon into namespaces
    
    This should make it easier to keep track of dependencies between code.

 src/daemon/Application.vala                              |  1 +
 src/daemon/BreakManager.vala                             |  5 +++++
 src/daemon/BreakManagerDBusObject.vala                   |  1 +
 src/daemon/UIFragment.vala                               |  2 ++
 src/daemon/UIManager.vala                                |  2 ++
 .../{activity-monitor => activity}/ActivityMonitor.vala  |  3 ++-
 .../ActivityMonitorBackend.vala                          |  3 ++-
 .../MutterActivityMonitorBackend.vala                    |  3 ++-
 .../{activity-monitor => activity}/UserActivity.vala     |  2 +-
 src/daemon/break/BreakController.vala                    |  4 +++-
 src/daemon/break/BreakType.vala                          |  2 +-
 src/daemon/break/BreakView.vala                          |  4 +++-
 src/daemon/meson.build                                   | 16 ++++++++--------
 src/daemon/microbreak/MicroBreakController.vala          |  5 ++++-
 src/daemon/microbreak/MicroBreakType.vala                |  6 +++++-
 src/daemon/microbreak/MicroBreakView.vala                |  5 ++++-
 src/daemon/restbreak/RestBreakController.vala            |  6 +++++-
 src/daemon/restbreak/RestBreakType.vala                  |  6 +++++-
 src/daemon/restbreak/RestBreakView.vala                  |  5 ++++-
 .../{break => timerbreak}/TimerBreakController.vala      |  6 +++++-
 .../{break => timerbreak}/TimerBreakDBusObject.vala      |  2 +-
 src/daemon/{break => timerbreak}/TimerBreakType.vala     |  4 +++-
 src/daemon/{break => timerbreak}/TimerBreakView.vala     |  4 +++-
 src/daemon/util/Countdown.vala                           |  2 +-
 src/daemon/util/PausableTimeout.vala                     |  2 +-
 src/daemon/util/SimpleFocusManager.vala                  |  2 +-
 src/daemon/util/StatefulTimer.vala                       |  2 +-
 src/daemon/util/TimeUnit.vala                            |  2 +-
 28 files changed, 77 insertions(+), 30 deletions(-)
---
diff --git a/src/daemon/Application.vala b/src/daemon/Application.vala
index 39f36ae..d061760 100644
--- a/src/daemon/Application.vala
+++ b/src/daemon/Application.vala
@@ -16,6 +16,7 @@
  */
 
 using BreakTimer.Common;
+using BreakTimer.Daemon.Activity;
 
 namespace BreakTimer.Daemon {
 
diff --git a/src/daemon/BreakManager.vala b/src/daemon/BreakManager.vala
index 172cc14..4885227 100644
--- a/src/daemon/BreakManager.vala
+++ b/src/daemon/BreakManager.vala
@@ -15,6 +15,11 @@
  * along with GNOME Break Timer.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+using BreakTimer.Daemon.Activity;
+using BreakTimer.Daemon.Break;
+using BreakTimer.Daemon.MicroBreak;
+using BreakTimer.Daemon.RestBreak;
+
 namespace BreakTimer.Daemon {
 
 public class BreakManager : GLib.Object {
diff --git a/src/daemon/BreakManagerDBusObject.vala b/src/daemon/BreakManagerDBusObject.vala
index de7771b..8af4ae9 100644
--- a/src/daemon/BreakManagerDBusObject.vala
+++ b/src/daemon/BreakManagerDBusObject.vala
@@ -16,6 +16,7 @@
  */
 
 using BreakTimer.Common;
+using BreakTimer.Daemon.Break;
 
 namespace BreakTimer.Daemon {
 
diff --git a/src/daemon/UIFragment.vala b/src/daemon/UIFragment.vala
index c2817c9..e7f4808 100644
--- a/src/daemon/UIFragment.vala
+++ b/src/daemon/UIFragment.vala
@@ -15,6 +15,8 @@
  * along with GNOME Break Timer.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+using BreakTimer.Daemon.Util;
+
 namespace BreakTimer.Daemon {
 
 /**
diff --git a/src/daemon/UIManager.vala b/src/daemon/UIManager.vala
index 279b417..bd69126 100644
--- a/src/daemon/UIManager.vala
+++ b/src/daemon/UIManager.vala
@@ -16,6 +16,8 @@
  */
 
 using BreakTimer.Common;
+using BreakTimer.Daemon.Break;
+using BreakTimer.Daemon.Util;
 
 namespace BreakTimer.Daemon {
 
diff --git a/src/daemon/activity-monitor/ActivityMonitor.vala b/src/daemon/activity/ActivityMonitor.vala
similarity index 98%
rename from src/daemon/activity-monitor/ActivityMonitor.vala
rename to src/daemon/activity/ActivityMonitor.vala
index a4f7e26..c123206 100644
--- a/src/daemon/activity-monitor/ActivityMonitor.vala
+++ b/src/daemon/activity/ActivityMonitor.vala
@@ -16,8 +16,9 @@
  */
 
 using BreakTimer.Common;
+using BreakTimer.Daemon.Util;
 
-namespace BreakTimer.Daemon {
+namespace BreakTimer.Daemon.Activity {
 
 public class ActivityMonitor : GLib.Object {
     public signal void detected_idle (UserActivity activity);
diff --git a/src/daemon/activity-monitor/ActivityMonitorBackend.vala 
b/src/daemon/activity/ActivityMonitorBackend.vala
similarity index 97%
rename from src/daemon/activity-monitor/ActivityMonitorBackend.vala
rename to src/daemon/activity/ActivityMonitorBackend.vala
index 937498f..26740b6 100644
--- a/src/daemon/activity-monitor/ActivityMonitorBackend.vala
+++ b/src/daemon/activity/ActivityMonitorBackend.vala
@@ -16,8 +16,9 @@
  */
 
 using BreakTimer.Common;
+using BreakTimer.Daemon.Util;
 
-namespace BreakTimer.Daemon {
+namespace BreakTimer.Daemon.Activity {
 
 public abstract class ActivityMonitorBackend : GLib.Object {
     private int64 last_real_time = 0;
diff --git a/src/daemon/activity-monitor/MutterActivityMonitorBackend.vala 
b/src/daemon/activity/MutterActivityMonitorBackend.vala
similarity index 98%
rename from src/daemon/activity-monitor/MutterActivityMonitorBackend.vala
rename to src/daemon/activity/MutterActivityMonitorBackend.vala
index 3dfa69c..b58bac2 100644
--- a/src/daemon/activity-monitor/MutterActivityMonitorBackend.vala
+++ b/src/daemon/activity/MutterActivityMonitorBackend.vala
@@ -16,8 +16,9 @@
  */
 
 using BreakTimer.Common;
+using BreakTimer.Daemon.Util;
 
-namespace BreakTimer.Daemon {
+namespace BreakTimer.Daemon.Activity {
 
 public class MutterActivityMonitorBackend : ActivityMonitorBackend {
     private IMutterIdleMonitor? mutter_idle_monitor;
diff --git a/src/daemon/activity-monitor/UserActivity.vala b/src/daemon/activity/UserActivity.vala
similarity index 97%
rename from src/daemon/activity-monitor/UserActivity.vala
rename to src/daemon/activity/UserActivity.vala
index ccd455c..3aa6446 100644
--- a/src/daemon/activity-monitor/UserActivity.vala
+++ b/src/daemon/activity/UserActivity.vala
@@ -15,7 +15,7 @@
  * along with GNOME Break Timer.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace BreakTimer.Daemon {
+namespace BreakTimer.Daemon.Activity {
 
 public enum ActivityType {
     SLEEP,
diff --git a/src/daemon/break/BreakController.vala b/src/daemon/break/BreakController.vala
index dfcb156..142bcf6 100644
--- a/src/daemon/break/BreakController.vala
+++ b/src/daemon/break/BreakController.vala
@@ -15,7 +15,9 @@
  * along with GNOME Break Timer.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace BreakTimer.Daemon {
+using BreakTimer.Daemon.Util;
+
+namespace BreakTimer.Daemon.Break {
 
 /**
  * Base class for a break's activity tracking functionality.
diff --git a/src/daemon/break/BreakType.vala b/src/daemon/break/BreakType.vala
index c9c99ea..f6743cd 100644
--- a/src/daemon/break/BreakType.vala
+++ b/src/daemon/break/BreakType.vala
@@ -15,7 +15,7 @@
  * along with GNOME Break Timer.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace BreakTimer.Daemon {
+namespace BreakTimer.Daemon.Break {
 
 public abstract class BreakType : GLib.Object {
     public string id;
diff --git a/src/daemon/break/BreakView.vala b/src/daemon/break/BreakView.vala
index c7351bf..40157f7 100644
--- a/src/daemon/break/BreakView.vala
+++ b/src/daemon/break/BreakView.vala
@@ -15,7 +15,9 @@
  * along with GNOME Break Timer.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace BreakTimer.Daemon {
+using BreakTimer.Daemon.Util;
+
+namespace BreakTimer.Daemon.Break {
 
 public abstract class BreakView : UIFragment {
     protected weak BreakController break_controller;
diff --git a/src/daemon/meson.build b/src/daemon/meson.build
index 05c8c81..ed7db03 100644
--- a/src/daemon/meson.build
+++ b/src/daemon/meson.build
@@ -1,18 +1,14 @@
 daemon_sources = files(
-    'activity-monitor/ActivityMonitorBackend.vala',
-    'activity-monitor/ActivityMonitor.vala',
-    'activity-monitor/MutterActivityMonitorBackend.vala',
-    'activity-monitor/UserActivity.vala',
+    'activity/ActivityMonitorBackend.vala',
+    'activity/ActivityMonitor.vala',
+    'activity/MutterActivityMonitorBackend.vala',
+    'activity/UserActivity.vala',
     'Application.vala',
     'break/BreakController.vala',
     'break/BreakType.vala',
     'break/BreakView.vala',
     'BreakManagerDBusObject.vala',
     'BreakManager.vala',
-    'break/TimerBreakController.vala',
-    'break/TimerBreakDBusObject.vala',
-    'break/TimerBreakType.vala',
-    'break/TimerBreakView.vala',
     'main.vala',
     'microbreak/MicroBreakController.vala',
     'microbreak/MicroBreakType.vala',
@@ -21,6 +17,10 @@ daemon_sources = files(
     'restbreak/RestBreakType.vala',
     'restbreak/RestBreakView.vala',
     'SessionStatus.vala',
+    'timerbreak/TimerBreakController.vala',
+    'timerbreak/TimerBreakDBusObject.vala',
+    'timerbreak/TimerBreakType.vala',
+    'timerbreak/TimerBreakView.vala',
     'UIFragment.vala',
     'UIManager.vala',
     'util/Countdown.vala',
diff --git a/src/daemon/microbreak/MicroBreakController.vala b/src/daemon/microbreak/MicroBreakController.vala
index b24ff36..c5805d6 100644
--- a/src/daemon/microbreak/MicroBreakController.vala
+++ b/src/daemon/microbreak/MicroBreakController.vala
@@ -15,7 +15,10 @@
  * along with GNOME Break Timer.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace BreakTimer.Daemon {
+using BreakTimer.Daemon.Activity;
+using BreakTimer.Daemon.TimerBreak;
+
+namespace BreakTimer.Daemon.MicroBreak {
 
 /**
  * A type of timer break that should activate frequently and for short
diff --git a/src/daemon/microbreak/MicroBreakType.vala b/src/daemon/microbreak/MicroBreakType.vala
index 5c5c220..6109199 100644
--- a/src/daemon/microbreak/MicroBreakType.vala
+++ b/src/daemon/microbreak/MicroBreakType.vala
@@ -15,7 +15,11 @@
  * along with GNOME Break Timer.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace BreakTimer.Daemon {
+using BreakTimer.Daemon.Activity;
+using BreakTimer.Daemon.Break;
+using BreakTimer.Daemon.TimerBreak;
+
+namespace BreakTimer.Daemon.MicroBreak {
 
 public class MicroBreakType : TimerBreakType {
     private ActivityMonitor activity_monitor;
diff --git a/src/daemon/microbreak/MicroBreakView.vala b/src/daemon/microbreak/MicroBreakView.vala
index 7d1ffe5..540d716 100644
--- a/src/daemon/microbreak/MicroBreakView.vala
+++ b/src/daemon/microbreak/MicroBreakView.vala
@@ -16,8 +16,11 @@
  */
 
 using BreakTimer.Common;
+using BreakTimer.Daemon.Break;
+using BreakTimer.Daemon.TimerBreak;
+using BreakTimer.Daemon.Util;
 
-namespace BreakTimer.Daemon {
+namespace BreakTimer.Daemon.MicroBreak {
 
 /* TODO: notification when user is away for rest duration */
 /* TODO: replace pause break if appropriate */
diff --git a/src/daemon/restbreak/RestBreakController.vala b/src/daemon/restbreak/RestBreakController.vala
index 1fd6c58..905bec2 100644
--- a/src/daemon/restbreak/RestBreakController.vala
+++ b/src/daemon/restbreak/RestBreakController.vala
@@ -15,7 +15,11 @@
  * along with GNOME Break Timer.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace BreakTimer.Daemon {
+using BreakTimer.Daemon.Activity;
+using BreakTimer.Daemon.TimerBreak;
+using BreakTimer.Daemon.Util;
+
+namespace BreakTimer.Daemon.RestBreak {
 
 /**
  * A type of timer break designed for longer durations. Satisfied when the user
diff --git a/src/daemon/restbreak/RestBreakType.vala b/src/daemon/restbreak/RestBreakType.vala
index ff96789..694b00a 100644
--- a/src/daemon/restbreak/RestBreakType.vala
+++ b/src/daemon/restbreak/RestBreakType.vala
@@ -15,7 +15,11 @@
  * along with GNOME Break Timer.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace BreakTimer.Daemon {
+using BreakTimer.Daemon.Activity;
+using BreakTimer.Daemon.Break;
+using BreakTimer.Daemon.TimerBreak;
+
+namespace BreakTimer.Daemon.RestBreak {
 
 public class RestBreakType : TimerBreakType {
     private ActivityMonitor activity_monitor;
diff --git a/src/daemon/restbreak/RestBreakView.vala b/src/daemon/restbreak/RestBreakView.vala
index 8f72321..69af105 100644
--- a/src/daemon/restbreak/RestBreakView.vala
+++ b/src/daemon/restbreak/RestBreakView.vala
@@ -16,8 +16,11 @@
  */
 
 using BreakTimer.Common;
+using BreakTimer.Daemon.Break;
+using BreakTimer.Daemon.TimerBreak;
+using BreakTimer.Daemon.Util;
 
-namespace BreakTimer.Daemon {
+namespace BreakTimer.Daemon.RestBreak {
 
 /* TODO: Use a single persistent notification throughout a given break */
 
diff --git a/src/daemon/break/TimerBreakController.vala b/src/daemon/timerbreak/TimerBreakController.vala
similarity index 98%
rename from src/daemon/break/TimerBreakController.vala
rename to src/daemon/timerbreak/TimerBreakController.vala
index 82dee4b..22a2f07 100644
--- a/src/daemon/break/TimerBreakController.vala
+++ b/src/daemon/timerbreak/TimerBreakController.vala
@@ -15,7 +15,11 @@
  * along with GNOME Break Timer.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace BreakTimer.Daemon {
+using BreakTimer.Daemon.Activity;
+using BreakTimer.Daemon.Break;
+using BreakTimer.Daemon.Util;
+
+namespace BreakTimer.Daemon.TimerBreak {
 
 /**
  * A type of break that times user activity. It activates after a particular
diff --git a/src/daemon/break/TimerBreakDBusObject.vala b/src/daemon/timerbreak/TimerBreakDBusObject.vala
similarity index 97%
rename from src/daemon/break/TimerBreakDBusObject.vala
rename to src/daemon/timerbreak/TimerBreakDBusObject.vala
index adfdad1..3ea5318 100644
--- a/src/daemon/break/TimerBreakDBusObject.vala
+++ b/src/daemon/timerbreak/TimerBreakDBusObject.vala
@@ -17,7 +17,7 @@
 
 using BreakTimer.Common;
 
-namespace BreakTimer.Daemon {
+namespace BreakTimer.Daemon.TimerBreak {
 
 [DBus (name = "org.gnome.BreakTimer.TimerBreak")]
 private class TimerBreakDBusObject : GLib.Object, IBreakTimer_TimerBreak {
diff --git a/src/daemon/break/TimerBreakType.vala b/src/daemon/timerbreak/TimerBreakType.vala
similarity index 96%
rename from src/daemon/break/TimerBreakType.vala
rename to src/daemon/timerbreak/TimerBreakType.vala
index 8e2bc66..c6aab25 100644
--- a/src/daemon/break/TimerBreakType.vala
+++ b/src/daemon/timerbreak/TimerBreakType.vala
@@ -15,7 +15,9 @@
  * along with GNOME Break Timer.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace BreakTimer.Daemon {
+using BreakTimer.Daemon.Break;
+
+namespace BreakTimer.Daemon.TimerBreak {
 
 public abstract class TimerBreakType : BreakType {
     private TimerBreakDBusObject dbus_object;
diff --git a/src/daemon/break/TimerBreakView.vala b/src/daemon/timerbreak/TimerBreakView.vala
similarity index 96%
rename from src/daemon/break/TimerBreakView.vala
rename to src/daemon/timerbreak/TimerBreakView.vala
index f8422d2..a045d12 100644
--- a/src/daemon/break/TimerBreakView.vala
+++ b/src/daemon/timerbreak/TimerBreakView.vala
@@ -15,7 +15,9 @@
  * along with GNOME Break Timer.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace BreakTimer.Daemon {
+using BreakTimer.Daemon.Break;
+
+namespace BreakTimer.Daemon.TimerBreak {
 
 public abstract class TimerBreakView : BreakView {
     protected TimerBreakController timer_break {
diff --git a/src/daemon/util/Countdown.vala b/src/daemon/util/Countdown.vala
index 1fc81cd..bc728f6 100644
--- a/src/daemon/util/Countdown.vala
+++ b/src/daemon/util/Countdown.vala
@@ -15,7 +15,7 @@
  * along with GNOME Break Timer.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace BreakTimer.Daemon {
+namespace BreakTimer.Daemon.Util {
 
 /**
  * A countdown timer that counts seconds from a start time down to 0. Uses
diff --git a/src/daemon/util/PausableTimeout.vala b/src/daemon/util/PausableTimeout.vala
index 523740e..7185ff5 100644
--- a/src/daemon/util/PausableTimeout.vala
+++ b/src/daemon/util/PausableTimeout.vala
@@ -15,7 +15,7 @@
  * along with GNOME Break Timer.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace BreakTimer.Daemon {
+namespace BreakTimer.Daemon.Util {
 
 /**
  * Calls a function continuously with a particular interval, in seconds. An
diff --git a/src/daemon/util/SimpleFocusManager.vala b/src/daemon/util/SimpleFocusManager.vala
index cac6469..377022d 100644
--- a/src/daemon/util/SimpleFocusManager.vala
+++ b/src/daemon/util/SimpleFocusManager.vala
@@ -15,7 +15,7 @@
  * along with GNOME Break Timer.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace BreakTimer.Daemon {
+namespace BreakTimer.Daemon.Util {
 
 public interface IFocusable : GLib.Object {
     public abstract void focus_started ();
diff --git a/src/daemon/util/StatefulTimer.vala b/src/daemon/util/StatefulTimer.vala
index a897814..a465556 100644
--- a/src/daemon/util/StatefulTimer.vala
+++ b/src/daemon/util/StatefulTimer.vala
@@ -15,7 +15,7 @@
  * along with GNOME Break Timer.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace BreakTimer.Daemon {
+namespace BreakTimer.Daemon.Util {
 
 /**
  * A simple GTimer lookalike that keeps track of its own state.
diff --git a/src/daemon/util/TimeUnit.vala b/src/daemon/util/TimeUnit.vala
index 65aaf76..31bdd0d 100644
--- a/src/daemon/util/TimeUnit.vala
+++ b/src/daemon/util/TimeUnit.vala
@@ -15,7 +15,7 @@
  * along with GNOME Break Timer.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace BreakTimer.Daemon {
+namespace BreakTimer.Daemon.Util {
 
 public class TimeUnit {
     public const int MILLISECONDS_IN_SECONDS = 1000;
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]