Resume last activity using Ctl-Space. (#678)

This allows toggling the tracking of an activity on and off with
Ctl-Space. This fixes #595.

Author: GeraldJansen

help/C/keys.page

@@ -34,15 +34,15 @@ than one page.</p>
 All details of the selected activity, except start/end, are copied to the new activity.</p>
 
 <p><key>Ctrl</key>+<key>+</key>: Same as the <key>+</key> button.
-Create a new activity. 
-If an existing activity is selected, 
-it will be resumed (same as <key>Ctrl</key>+<key>R</key>), 
+Create a new activity.
+If an existing activity is selected,
+it will be resumed (same as <key>Ctrl</key>+<key>R</key>),
 otherwise, new from stratch (same as <key>Ctrl</key>+<key>N</key>).</p>
 
 
 
 <p><key>Ctrl</key>+<key>Space</key>: Stop tracking the ongoing activity, if
-any. Same as the stop button in the action bar.</p>
+any. Otherwise restart tracking the last activity. Useful for toggling tracking on and off.</p>
 
 <p><key>Return</key>: Edit/update the selected activity if any. Same as double
 click.</p>

src/hamster-service.py

@@ -282,6 +282,12 @@ def StopTracking(self, end_time):
         return self.stop_tracking(end_time)
 
 
+    @dbus.service.method("org.gnome.Hamster")
+    def StopOrRestartTracking(self):
+        """Stops or restarts tracking the last activity"""
+        return self.stop_or_restart_tracking()
+
+
     @dbus.service.method("org.gnome.Hamster", in_signature='i')
     def RemoveFact(self, fact_id):
         """Remove fact from storage by it's ID"""

src/hamster/client.py

@@ -227,6 +227,10 @@ def stop_tracking(self, end_time = None):
         end_time = timegm((end_time or dt.datetime.now()).timetuple())
         return self.conn.StopTracking(end_time)
 
+    def stop_or_restart_tracking(self):
+        """Stop or restart tracking last activity."""
+        return self.conn.StopOrRestartTracking(0)
+
     def remove_fact(self, fact_id):
         "delete fact from database"
         self.conn.RemoveFact(fact_id)

src/hamster/overview.py

@@ -515,7 +515,7 @@ def on_key_press(self, window, event):
                 # Resume/run; clear separation between Ctrl-R and Ctrl-N
                 self.start_new_fact(clone_selected=True, fallback=False)
             elif event.keyval == gdk.KEY_space:
-                self.storage.stop_tracking()
+                self.storage.stop_or_restart_tracking()
             elif event.keyval in (gdk.KEY_KP_Add, gdk.KEY_plus):
                 # same as pressing the + icon
                 self.start_new_fact(clone_selected=True, fallback=True)

src/hamster/storage/storage.py

@@ -146,6 +146,18 @@ def stop_tracking(self, end_time):
             self.facts_changed()
 
 
+    def stop_or_restart_tracking(self):
+        """Stops or restarts tracking the last activity"""
+        facts = self.__get_todays_facts()
+        if facts:
+            if facts[-1].end_time:
+                self.add_fact(facts[-1].copy(start_time=dt.datetime.now(),
+                                             end_time = None))
+            else:
+                self.__touch_fact(facts[-1], end_time=dt.datetime.now())
+            self.facts_changed()
+
+
     def remove_fact(self, fact_id):
         """Remove fact from storage by it's ID"""
         self.start_transaction()