take global lock while doing imports

pyfpdb/GuiAutoImport.py

@@ -154,6 +154,12 @@ class GuiAutoImport (threading.Thread):
 #    results to the same pipe.  This means that self.path should be a a list of dirs
 #    to watch.
         if widget.get_active(): # toggled on
+            # - Does the lock acquisition need to be more sophisticated for multiple dirs?
+            # (see comment above about what to do if pipe already open)
+            # - Ideally we want to release the lock if the auto-import is killed by some 
+            # kind of exception - is this possible?
+            if self.settings['global_lock'].acquire(False):   # returns false immediately if lock not acquired
+                print "\nGlobal lock taken ..."
                 self.doAutoImportBool = True
                 widget.set_label(u'  _Stop Autoimport  ')
                 if self.pipe_to_hud is None:
@@ -176,9 +182,12 @@ class GuiAutoImport (threading.Thread):
 
                         interval=int(self.intervalEntry.get_text())
                         gobject.timeout_add(interval*1000, self.do_import)
+            else:
+                print "auto-import aborted - global lock not available"
         else: # toggled off
+            self.settings['global_lock'].release()
             self.doAutoImportBool = False # do_import will return this and stop the gobject callback timer
-            print "Stopping autoimport"
+            print "Stopping autoimport - global lock released."
             if self.pipe_to_hud.poll() is not None:
                 print "HUD already terminated"
             else:
@@ -187,8 +196,6 @@ class GuiAutoImport (threading.Thread):
             self.pipe_to_hud = None
             self.startButton.set_label(u'  _Start Autoimport  ')
 
-                
-
     #end def GuiAutoImport.startClicked
 
     def get_vbox(self):

pyfpdb/GuiBulkImport.py

@@ -49,6 +49,11 @@ class GuiBulkImport():
             self.importer.RunImportThreaded()
 
     def load_clicked(self, widget, data=None):
+        # Does the lock acquisition need to be more sophisticated for multiple dirs?
+        # (see comment above about what to do if pipe already open)
+        if self.settings['global_lock'].acquire(False):   # returns false immediately if lock not acquired
+            try:
+                print "\nGlobal lock taken ..."
                 #    get the dir to import from the chooser
                 self.inputFile = self.chooser.get_filename()
 
@@ -80,6 +85,11 @@ class GuiBulkImport():
                 self.importer.clearFileList()
 
                 self.lab_info.set_text("Import finished")
+            except:
+                pass
+            self.settings['global_lock'].release()
+        else:
+            print "bulk-import aborted - global lock not available"
 
     def get_vbox(self):
         """returns the vbox of this thread"""
@@ -88,8 +98,7 @@ class GuiBulkImport():
     def __init__(self, settings, config):
         self.settings = settings
         self.config = config
-        self.importer = fpdb_import.Importer(self, self.settings,
-                config)
+        self.importer = fpdb_import.Importer(self, self.settings, config)
 
         self.vbox = gtk.VBox(False, 0)
         self.vbox.show()