Fixed the fileStats thread to work with the new popup window from master. Changed a lot of the API for the popup window to make it more thread safe

Author: aaxu

app/buffer_manager.py

@@ -93,6 +93,7 @@ def loadTextBuffer(self, relPath, view):
       textBuffer = app.text_buffer.TextBuffer()
       textBuffer.view = view
       self.renameBuffer(textBuffer, fullPath)
+      textBuffer.fileStats.setPopupWindow(view.popupWindow)
       textBuffer.fileLoad()
       self.buffers.append(textBuffer)
     if 0:

app/ci_program.py

@@ -131,7 +131,7 @@ def commandLoop(self):
             self.exiting = True
             return
           if frame[0] == 'popup':
-            self.changeFocusTo(self.popupWindow)
+            self.changeFocusTo(self.inputWindow.popupWindow)
             callerSemaphore.release()
           else:
             self.refresh(frame[0], frame[1])
@@ -224,7 +224,7 @@ def commandLoop(self):
                 self.exiting = True
                 return
               if frame[0] == 'popup':
-                self.changeFocusTo(self.popupWindow)
+                self.changeFocusTo(self.inputWindow.popupWindow)
                 callerSemaphore.release()
               else:
                 self.refresh(frame[0], frame[1])
@@ -295,7 +295,6 @@ def startup(self):
       self.debugWindow = None
       self.debugUndoWindow = None
       self.logWindow = None
-    self.popupWindow = app.window.PopupWindow(self)
     self.paletteWindow = app.window.PaletteWindow(self)
     self.inputWindow = app.window.InputWindow(self)
     self.zOrder.append(self.inputWindow)

app/cu_editor.py

@@ -434,23 +434,9 @@ def reloadBuffer(self):
     TODO: Make this reloading a new change that can be appended
     to the redo chain so user can undo out of a reloadBuffer call.
     """
-    mainBuffer = self.view.host.inputWindow.textBuffer
+    mainBuffer = self.view.host.textBuffer
     mainBuffer.fileLoad()
-    self.changeToMainWindow()
-
-  def setOptions(self, options):
-    """
-    This function is used to change the options that are displayed in the
-    popup window as well as their functions.
-
-    Args:
-      options (dict): A dictionary mapping keys (ints) to its
-                      corresponding action.
-
-    Returns;
-      None.
-    """
-    self.commandSet = options
+    self.changeToInputWindow()
 
 class PaletteDialogController(app.controller.Controller):
   """."""

app/file_stats.py

@@ -13,14 +13,14 @@
 # limitations under the License.
 
 import app.background
+import app.curses_util
 import app.log
 import app.prefs
 import os
 import time
 import threading
 import app.window
 
-
 class FileTracker(threading.Thread):
   def __init__(self, *args, **keywords):
     threading.Thread.__init__(self, *args, **keywords)
@@ -66,10 +66,12 @@ def run(self):
       redraw = False
       waitOnSemaphore = False
       if program:
-        if self.fileContentChangedSinceCheck():
-          program.popupWindow.setMessage(
-              "The file on disk has changed.\nReload file?")
-          program.popupWindow.controller.callerSemaphore = self.thread.semaphore
+        if self.fileContentChangedSinceCheck() and self.__popupWindow:
+          self.__popupWindow.setUpWindow(
+              message="The file on disk has changed.\nReload file?",
+              displayOptions=self.__popupDisplayOptions,
+              controllerOptions=self.__popupControllerOptions)
+          self.__popupWindow.controller.callerSemaphore = self.thread.semaphore
           app.background.bg.put((program, 'popup', self.thread.semaphore))
           self.thread.semaphore.acquire() # Wait for popup to load
           redraw = True
@@ -143,6 +145,29 @@ def getCurrentFileInfo(self):
     """
     return self.currentFileInfo
 
+  def setPopupWindow(self, popupWindow):
+    """
+    Sets the file stat's object's reference to the popup window that
+    it will use to notify the user of any changes.
+
+    Args:
+      popupWindow (PopupWindow): The popup window that this object will use.
+
+    Returns:
+      None.
+    """
+    # The keys that the user can press to respond to the popup window.
+    self.__popupControllerOptions = {
+      ord('Y'): popupWindow.controller.reloadBuffer,
+      ord('y'): popupWindow.controller.reloadBuffer,
+      ord('N'): popupWindow.controller.changeToInputWindow,
+      ord('n'): popupWindow.controller.changeToInputWindow,
+      app.curses_util.KEY_ESCAPE: popupWindow.controller.changeToInputWindow,
+    }
+    # The options that will be displayed on the popup window.
+    self.__popupDisplayOptions = ['Y', 'N']
+    self.__popupWindow = popupWindow
+
   def setTextBuffer(self, textBuffer):
     self.textBuffer = textBuffer
 

app/window.py

@@ -24,6 +24,7 @@
 import app.text_buffer
 import app.vi_editor
 import bisect
+import threading
 import os
 import sys
 import curses
@@ -1193,26 +1194,30 @@ def __init__(self, host):
     self.host = host
     self.controller = app.cu_editor.PopupController(self)
     self.setTextBuffer(app.text_buffer.TextBuffer())
-    self.longestLineLength = 0
     self.__message = []
     self.showOptions = True
     # This will be displayed and should contain the keys that respond to user
     # input. This should be updated if you change the controller's command set.
-    self.options = []
+    self.__displayOptions = []
+    # Prevent sync issues from occuring when setting options.
+    self.__optionsLock = threading.Lock()
 
   def render(self):
     """
     Display a box of text in the center of the window.
     """
     maxRows, maxCols = self.host.rows, self.host.cols
-    cols = min(self.longestLineLength + 6, maxCols)
+    longestLineLength = 0
+    if len(self.__message):
+      longestLineLength = len(max(self.__message, key=len))
+    cols = min(longestLineLength + 6, maxCols)
     rows = min(len(self.__message) + 4, maxRows)
     self.resizeTo(rows, cols)
     self.moveTo(maxRows / 2 - rows / 2, maxCols / 2 - cols / 2)
     color = app.color.get('popup_window')
     for row in range(rows):
       if row == rows - 2 and self.showOptions:
-        message = '/'.join(self.options)
+        message = '/'.join(self.__displayOptions)
       elif row == 0 or row >= rows - 3:
         self.addStr(row, 0, ' ' * cols, color)
         continue
@@ -1223,27 +1228,73 @@ def render(self):
       spacing2 = cols - lineLength - spacing1
       self.addStr(row, 0, ' ' * spacing1 + message + ' ' * spacing2, color)
 
-  def setMessage(self, message):
+  def __setMessage(self, message):
     """
     Sets the Popup window's message to the given message.
-    message (str): A string that you want to display.
+    This function should only be called by setUpWindow.
+
+    Args:
+      message (str): A string that you want to display.
 
     Returns:
       None.
     """
     self.__message = message.split("\n")
-    self.longestLineLength = max([len(line) for line in self.__message])
 
-  def setOptionsToDisplay(self, options):
+  def __setDisplayOptions(self, displayOptions):
     """
     This function is used to change the options that are displayed in the
     popup window. They will be separated by a '/' character when displayed.
+    This function should only be called by setUpWindow.
+
+    Args:
+      displayOptions (list): A list of possible keys which the user can press
+                             and should be responded to by the controller.
+    """
+    self.__displayOptions = displayOptions
+
+  def __setControllerOptions(self, controllerOptions):
+    """
+    This function is used to change the options that are displayed in the
+    popup window as well as their functions. This function should only be
+    called by setUpWindow.
+
+    Args:
+      controllerOptions (dict): A dictionary mapping keys (ints) to its
+                                corresponding action.
+
+    Returns;
+      None.
+    """
+    self.controller.commandSet = controllerOptions
+
+  def setUpWindow(self, message=None, displayOptions=None,
+                  controllerOptions=None):
+    """
+    Sets up the popup window. You should pass in the following arguments in
+    case of any sync issues, even if the values seem to already be set. By
+    default, the values will be set to None, meaning that the values will
+    not be changed. However, if you wish to set each value to be empty,
+    message should be an empty string, displayOptions should be an empty list,
+    and controllerOptions should be an empty dictionary.
 
     Args:
-      options (list): A list of possible keys which the user can press and
-                      should be responded to by the controller.
+      message (str): The string that you want the popup window to display.
+      displayOptions (list): The list of strings representing the options
+                             that will be displayed on the popup window.
+      controllerOptions (dict): The mapping of user keypresses to functions.
+
+    Returns:
+      None.
     """
-    self.options = options
+    self.__optionsLock.acquire()
+    if message is not None:
+      self.__setMessage(message)
+    if displayOptions is not None:
+      self.__setDisplayOptions(displayOptions)
+    if controllerOptions is not None:
+      self.__setControllerOptions(controllerOptions)
+    self.__optionsLock.release()
 
   def setTextBuffer(self, textBuffer):
     Window.setTextBuffer(self, textBuffer)