use finishedFlag to signal processTape has finished, removed Keyboard…

…Interrupt
KBNLresearch · Dec 4, 2018 · 752db32 · 752db32
1 parent 2709490
commit 752db32
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 39 deletions.
diff --git a/tapeimgr/cli.py b/tapeimgr/cli.py
@@ -195,22 +195,22 @@ def main():
     # Start main processing function
     try:
         myCLI.process()
-    except KeyboardInterrupt:
-        if myCLI.tape.tapeDeviceIOError:
-            # Tape device not accessible
-            msg = ('Cannot access tape device ' + myCLI.tape.tapeDevice +
-                   '. Check that device exists, and that tapeimgr is run as root')
-            errorExit(msg)
-        elif myCLI.tape.successFlag:
-            # Tape extraction completed with no errors
-            msg = ('Tape processed successfully without errors!')
-            printInfo(msg)
-            sys.exit(0)
-        else:
-            # Tape extraction resulted in errors
-            msg = ('One or more errors occurred while processing tape, '
-                   'check log file for details')
-            errorExit(msg)
+        if myCLI.tape.finishedFlag:
+            if myCLI.tape.tapeDeviceIOError:
+                # Tape device not accessible
+                msg = ('Cannot access tape device ' + myCLI.tape.tapeDevice +
+                    '. Check that device exists, and that tapeimgr is run as root')
+                errorExit(msg)
+            elif myCLI.tape.successFlag:
+                # Tape extraction completed with no errors
+                msg = ('Tape processed successfully without errors!')
+                printInfo(msg)
+                sys.exit(0)
+            else:
+                # Tape extraction resulted in errors
+                msg = ('One or more errors occurred while processing tape, '
+                    'check log file for details')
+                errorExit(msg)
     except Exception as e:
         # Unexpected error
         msg = 'An unexpected error occurred, see log file for details'

diff --git a/tapeimgr/gui.py b/tapeimgr/gui.py
@@ -39,6 +39,7 @@ def __init__(self, parent, *args, **kwargs):
         self.queue_handler = QueueHandler(self.log_queue)
         # Create tape instance
         self.tape = Tape()
+        self.t1 = None
         # Read configuration file
         self.tape.getConfiguration()
         # Build the GUI
@@ -119,8 +120,9 @@ def on_submit(self):
                 self.quit_button.config(state='disabled')
 
                 # Launch tape processing function as subprocess
-                t1 = threading.Thread(target=self.tape.processTape)
-                t1.start()
+                self.t1 = threading.Thread(target=self.tape.processTape)
+                self.t1.start()
+
 
     def selectOutputDirectory(self, event=None):
         """Select output directory"""
@@ -339,25 +341,27 @@ def main():
             root.update_idletasks()
             root.update()
             time.sleep(0.1)
-        except KeyboardInterrupt:
-            if myGUI.tape.tapeDeviceIOError:
-                # Tape device not accessible
-                msg = ('Cannot access tape device ' + myGUI.tape.tapeDevice +
-                       '. Check that device exits, and that tapeimgr is run as root')
-                errorExit(msg)
-            elif myGUI.tape.successFlag:
-                # Tape extraction completed with no errors
-                msg = ('Tape processed successfully without errors')
-                tkMessageBox.showinfo("Success", msg)
-            else:
-                # Tape extraction resulted in errors
-                msg = ('One or more errors occurred while processing tape, '
-                       'check log file for details')
-                tkMessageBox.showwarning("Errors occurred", msg)
-
-            # Restart the program
-            python = sys.executable
-            os.execl(python, python, * sys.argv)
+            if myGUI.tape.finishedFlag:
+                myGUI.t1.join()
+                if myGUI.tape.tapeDeviceIOError:
+                    # Tape device not accessible
+                    msg = ('Cannot access tape device ' + myGUI.tape.tapeDevice +
+                           '. Check that device exits, and that tapeimgr is run as root')
+                    errorExit(msg)
+                elif myGUI.tape.successFlag:
+                    # Tape extraction completed with no errors
+                    msg = ('Tape processed successfully without errors')
+                    tkMessageBox.showinfo("Success", msg)
+                else:
+                    # Tape extraction resulted in errors
+                    msg = ('One or more errors occurred while processing tape, '
+                           'check log file for details')
+                    tkMessageBox.showwarning("Errors occurred", msg)
+
+                # Restart the program
+                python = sys.executable
+                os.execl(python, python, * sys.argv)
+
         except Exception as e:
             # Unexpected error
             msg = 'An unexpected error occurred, see log file for details'

diff --git a/tapeimgr/tape.py b/tapeimgr/tape.py
@@ -45,6 +45,7 @@ def __init__(self):
         self.logFileName = ''
         self.checksumFileName = ''
         self.initBlockSizeDefault = ''
+        self.finishedFlag = False
         self.tapeDeviceIOError = False
         self.successFlag = True
         self.configSuccess = True
@@ -229,10 +230,11 @@ def processTape(self):
             logging.error('One or more errors occurred while processing tape, \
             check log file for details')
 
+        # Set finishedFlag
+        self.finishedFlag = True
+
         # Wait 2 seconds to avoid race condition
         time.sleep(2)
-        # This triggers a KeyboardInterrupt in the main thread
-        thread.interrupt_main()
 
     def processFile(self):
         """Process a file"""