fix pid locking problem on OS X

On OS X the lock wasn't released properly.  The lock was
therefore moved into the config namespace and we can use
it from there to also lock it when the pyobjc application
terminates.

selfspy/__init__.py

@@ -82,8 +82,8 @@ def check_with_encrypter(password):
         pass
 
     lockname = os.path.join(args['data_dir'], cfg.LOCK_FILE)
-    lock  = LockFile(lockname)
-    if lock.is_locked():
+    cfg.LOCK  = LockFile(lockname)
+    if cfg.LOCK.is_locked():
         print '%s is locked! I am probably already running.' % lockname
         print 'If you can find no selfspy process running, it is a stale lock and you can safely remove it.'
         print 'Shutting down.'
@@ -119,14 +119,15 @@ def check_with_encrypter(password):
     astore = ActivityStore(os.path.join(args['data_dir'], cfg.DBNAME),
                            encrypter,
                            store_text=(not args['no_text']))
-    lock.acquire()
+    cfg.LOCK.acquire()
     try:
         astore.run()
     except SystemExit:
         astore.close()
     except KeyboardInterrupt:
         pass
-    lock.release()
+    # In OS X this is has to be released in sniff_cocoa
+    cfg.LOCK.release()
 
 if __name__ == '__main__':
     main()

selfspy/config.py

@@ -20,3 +20,4 @@
 DATA_DIR = '~/.selfspy'
 DBNAME = 'selfspy.sqlite'
 LOCK_FILE = 'selfspy.pid'
+LOCK = None

selfspy/sniff_cocoa.py

@@ -30,6 +30,7 @@
                    NSApplicationActivationPolicyProhibited)
 from Quartz import CGWindowListCopyWindowInfo, kCGWindowListOptionOnScreenOnly, kCGNullWindowID
 from PyObjCTools import AppHelper
+import config as cfg
 
 class Sniffer:
     def __init__(self):
@@ -42,6 +43,7 @@ def createAppDelegate(self):
         sc = self
 
         class AppDelegate(NSObject):
+
             def applicationDidFinishLaunching_(self, notification):
                 mask = (NSKeyDownMask
                         | NSKeyUpMask
@@ -53,6 +55,14 @@ def applicationDidFinishLaunching_(self, notification):
                         | NSScrollWheelMask
                         | NSFlagsChangedMask)
                 NSEvent.addGlobalMonitorForEventsMatchingMask_handler_(mask, sc.handler)
+
+            def applicationWillTerminate_(self, application):
+                # need to release the lock here as when the
+                # application terminates it does not run the rest the
+                # original main, only the code that has crossed the
+                # pyobc bridge.
+                if cfg.LOCK.is_locked():
+                    cfg.LOCK.release()
         return AppDelegate
 
     def run(self):