Detect file changes

app/actions.py

@@ -773,8 +773,6 @@ def fileFilter(self, data):
   def fileLoad(self):
     app.log.info('fileLoad', self.fullPath)
     inputFile = None
-    self.isReadOnly = (os.path.isfile(self.fullPath) and
-        not os.access(self.fullPath, os.W_OK))
     if not os.path.exists(self.fullPath):
       self.setMessage('Creating new file')
     else:
@@ -797,7 +795,7 @@ def fileLoad(self):
           app.log.info('error opening file', self.fullPath)
           self.setMessage('error opening file', self.fullPath)
           return
-      self.fileStat = os.stat(self.fullPath)
+    self.fileStats.savedFileStat = self.fileStats.fileStats
     self.relativePath = os.path.relpath(self.fullPath, os.getcwd())
     app.log.info('fullPath', self.fullPath)
     app.log.info('cwd', os.getcwd())
@@ -833,30 +831,31 @@ def restoreUserHistory(self):
       None.
     """
     # Restore the file history.
-    self.fileHistory = app.history.getFileHistory(self.fullPath, self.data)
+    self.fileHistory = app.history.getFileHistory(self.fileStats, self.data)
 
     # Restore all positions and values of variables.
     self.view.cursorRow, self.view.cursorCol = self.fileHistory.setdefault(
         'cursor', (0, 0))
     self.penRow, self.penCol = self.fileHistory.setdefault('pen', (0, 0))
     self.view.scrollRow, self.view.scrollCol =  self.fileHistory.setdefault(
         'scroll', (0, 0))
-    self.doSelectionMode(self.fileHistory.setdefault('selectionMode',
-        app.selectable.kSelectionNone))
-    self.markerRow, self.markerCol = self.fileHistory.setdefault('marker',
-        (0, 0))
     if app.prefs.editor['saveUndo']:
       self.redoChain = self.fileHistory.setdefault('redoChainCompound', [])
       self.savedAtRedoIndex = self.fileHistory.setdefault('savedAtRedoIndexCompound', 0)
       self.redoIndex = self.savedAtRedoIndex
       self.oldRedoIndex = self.savedAtRedoIndex
+    self.tempChange = None
+    self.doSelectionMode(self.fileHistory.setdefault('selectionMode',
+        app.selectable.kSelectionNone))
+    self.markerRow, self.markerCol = self.fileHistory.setdefault('marker',
+        (0, 0))
 
     # Restore file bookmarks
     self.bookmarks = self.fileHistory.setdefault('bookmarks', [])
 
     # Store the file's info.
     self.lastChecksum, self.lastFileSize = app.history.getFileInfo(
-        self.fullPath)
+        self.fileStats)
 
   def updateBasicScrollPosition(self):
     """
@@ -953,7 +952,6 @@ def linesToData(self):
   def fileWrite(self):
     # Preload the message with an error that should be overwritten.
     self.setMessage('Error saving file')
-    self.isReadOnly = not os.access(self.fullPath, os.W_OK)
     try:
       try:
         if app.prefs.editor['onSaveStripTrailingSpaces']:
@@ -980,20 +978,17 @@ def fileWrite(self):
         if app.prefs.editor['saveUndo']:
           self.fileHistory['redoChainCompound'] = self.redoChain
           self.fileHistory['savedAtRedoIndexCompound'] = self.savedAtRedoIndex
-        app.history.saveUserHistory((self.fullPath, self.lastChecksum,
-            self.lastFileSize), self.fileHistory)
+        app.history.saveUserHistory((self.lastChecksum, self.lastFileSize),
+            self.fileStats, self.fileHistory)
         # Store the file's new info
         self.lastChecksum, self.lastFileSize = app.history.getFileInfo(
-            self.fullPath)
-        self.fileStat = os.stat(self.fullPath)
-        # If we're writing this file for the first time, self.isReadOnly will
-        # still be True (from when it didn't exist).
-        self.isReadOnly = False
+            self.fileStats)
+        self.fileStats.savedFileStat = self.fileStats.fileStats
         self.setMessage('File saved')
       except Exception as e:
         color = app.color.get('status_line_error')
-        if self.isReadOnly:
-          self.setMessage("Permission error. Try modifying in sudo mode.",
+        if self.fileStats.getUpdatedFileInfo()['isReadOnly']:
+          self.setMessage("Permission error. Try modifing in sudo mode.",
                           color=color)
         else:
           self.setMessage(

app/background.py

@@ -47,22 +47,40 @@ def put(self, data):
 
 
 def background(inputQueue, outputQueue):
-  block = True
   pid = os.getpid()
   signalNumber = signal.SIGUSR1
+  def redrawProgram(program, callerSemaphore):
+    """
+    Sends a SIGUSR1 signal to the current program and draws its screen.
+
+    Args:
+      program (CiProgram): an instance of the CiProgram object.
+
+    Returns:
+      None.
+    """
+    program.render()
+    outputQueue.put((app.render.frame.grabFrame(), callerSemaphore))
+    os.kill(pid, signalNumber)
+
+  block = True
   while True:
     try:
       try:
-        program, message = inputQueue.get(block)
+        program, message, callerSemaphore = inputQueue.get(block)
         #profile = app.profile.beginPythonProfile()
         if message == 'quit':
           app.log.info('bg received quit message')
           return
+        elif message == 'popup':
+          app.log.meta('bg received popup message')
+          # assert(callerSemaphore != None)
+          outputQueue.put((('popup', None), callerSemaphore))
+          os.kill(pid, signalNumber)
+          continue
         program.executeCommandList(message)
         program.focusedWindow.textBuffer.parseScreenMaybe()
-        program.render()
-        outputQueue.put(app.render.frame.grabFrame())
-        os.kill(pid, signalNumber)
+        redrawProgram(program, callerSemaphore)
         #app.profile.endPythonProfile(profile)
         if not inputQueue.empty():
           continue
@@ -75,18 +93,16 @@ def background(inputQueue, outputQueue):
         program.focusedWindow.textBuffer.parseDocument()
         block = len(tb.parser.rows) >= len(tb.lines)
         if block:
-          program.render()
-          outputQueue.put(app.render.frame.grabFrame())
-          os.kill(pid, signalNumber)
+          redrawProgram(program, callerSemaphore)
     except Exception as e:
       app.log.exception(e)
       app.log.error('bg thread exception', e)
       errorType, value, tracebackInfo = sys.exc_info()
       out = traceback.format_exception(errorType, value, tracebackInfo)
-      outputQueue.put(('exception', out))
+      outputQueue.put((('exception', out), None))
       os.kill(pid, signalNumber)
       while True:
-        program, message = inputQueue.get()
+        program, message, callerSemaphore = inputQueue.get()
         if message == 'quit':
           app.log.info('bg received quit message')
           return

app/buffer_manager.py

@@ -105,6 +105,8 @@ def loadTextBuffer(self, relPath, view):
       textBuffer = app.text_buffer.TextBuffer()
       textBuffer.setFilePath(fullPath)
       textBuffer.view = view
+      self.renameBuffer(textBuffer, fullPath)
+      textBuffer.fileStats.setPopupWindow(view.popupWindow)
       textBuffer.fileLoad()
       self.buffers.append(textBuffer)
     if 0:
@@ -142,6 +144,14 @@ def untrackBuffer_(self, fileBuffer):
     app.log.debug(fileBuffer.fullPath)
     self.buffers.remove(fileBuffer)
 
+  def renameBuffer(self, fileBuffer, fullPath):
+    """
+    For now, when you change the path of a fileBuffer, you should also be
+    updating its fileStat object, so that it tracks the new file as well.
+    """
+    fileBuffer.fullPath = fullPath
+    fileBuffer.changeFileStats() # Track this new file.
+
   def fileClose(self, path):
     pass
 

app/ci_program.py

@@ -102,21 +102,28 @@ def commandLoop(self):
     start = time.time()
     # The first render, to get something on the screen.
     if useBgThread:
-      self.bg.put((self.programWindow, []))
+      self.bg.put((self.programWindow, [], None))
     else:
       self.render()
     # This is the 'main loop'. Execution doesn't leave this loop until the
     # application is closing down.
     while not self.exiting:
       if useBgThread:
         while self.bg.hasMessage():
-          frame = self.bg.get()
+          frame, callerSemaphore = self.bg.get()
           if frame[0] == 'exception':
             for line in frame[1]:
               userMessage(line[:-1])
             self.exiting = True
             return
-          self.refresh(frame[0], frame[1])
+          if frame[0] == 'popup':
+            self.programWindow.changeFocusTo(
+                self.programWindow.inputWindow.popupWindow)
+            callerSemaphore.release()
+          else:
+            self.refresh(frame[0], frame[1])
+            if callerSemaphore:
+              callerSemaphore.release()
       elif 1:
         frame = app.render.frame.grabFrame()
         self.refresh(frame[0], frame[1])
@@ -197,16 +204,21 @@ def commandLoop(self):
             ch = app.curses_util.UNICODE_INPUT
           if ch == 0 and useBgThread:
             # bg response.
-            frame = None
             while self.bg.hasMessage():
-              frame = self.bg.get()
+              frame, callerSemaphore = self.bg.get()
               if frame[0] == 'exception':
                 for line in frame[1]:
                   userMessage(line[:-1])
                 self.exiting = True
                 return
-            if frame is not None:
-              self.refresh(frame[0], frame[1])
+              if frame[0] == 'popup':
+                self.programWindow.changeFocusTo(self.programWindow.
+                    inputWindow.popupWindow)
+                callerSemaphore.release()
+              else:
+                self.refresh(frame[0], frame[1])
+                if callerSemaphore:
+                  callerSemaphore.release()
           elif ch != curses.ERR:
             self.ch = ch
             if ch == curses.KEY_MOUSE:
@@ -220,7 +232,7 @@ def commandLoop(self):
       start = time.time()
       if len(cmdList):
         if useBgThread:
-          self.bg.put((self.programWindow, cmdList))
+          self.bg.put((self.programWindow, cmdList, None))
         else:
           self.programWindow.executeCommandList(cmdList)
           self.render()
@@ -376,7 +388,7 @@ def run(self):
     else:
       self.commandLoop()
     if app.prefs.editor['useBgThread']:
-      self.bg.put((self.programWindow, 'quit'))
+      self.bg.put((self.programWindow, 'quit', None))
       self.bg.join()
 
   def setUpPalette(self):

app/controller.py

@@ -73,6 +73,9 @@ def changeToPaletteWindow(self):
   def changeToPopup(self):
     self.findAndChangeTo('popupWindow')
 
+  def changeToPopup(self):
+    self.host.changeFocusTo(self.host.host.popupWindow)
+
   def changeToPrediction(self):
     self.findAndChangeTo('interactivePrediction')
 

app/cu_editor.py

@@ -378,23 +378,18 @@ def changeToInputWindow(self):
       self.callerSemaphore.release()
       self.callerSemaphore = None
 
-  def setOptions(self, options):
+  def reloadBuffer(self):
     """
-    This function is used to change the options that are displayed in the
-    popup window as well as their functions.
+    Reloads the file on disk into the program. This will get rid of all changes
+    that have been made to the current file. This will also remove all
+    edit history.
 
-    Args:
-      options (dict): A dictionary mapping keys (ints) to its
-                      corresponding action.
-
-    Returns;
-      None.
+    TODO: Make this reloading a new change that can be appended
+    to the redo chain so user can undo out of a reloadBuffer call.
     """
-    self.commandSet = options
-
-  def setTextBuffer(self, textBuffer):
-    self.textBuffer = textBuffer
-
+    mainBuffer = self.view.host.textBuffer
+    mainBuffer.fileLoad()
+    self.changeToInputWindow()
 
 class PaletteDialogController(app.controller.Controller):
   """."""