Merge lp:~edgar-b-dsouza/acire/run_modified_code into lp:acire

[Ed S]

[Ed S (edgar-b-dsouza)]

Implemented run-modified-code-from-editor as in Bug #514124 by saving to temp file and execing.

Please review.

Thanks,
Ed.

=== modified file 'bin/acire'
--- bin/acire	2010-02-05 06:38:43 +0000
+++ bin/acire	2010-02-07 11:14:11 +0000
@@ -25,6 +25,7 @@
 import gtksourceview
 import gnome.vfs
 import pango
+import tempfile     #Used in run_snippet to run user-modded snippet
 
 # Check if we are working in the source tree or from the installed 
 # package and mangle the python path accordingly
@@ -217,6 +218,7 @@
         self.editor_buffer.set_text(all_the_text)
         self.editor_buffer.set_data('filename', self.current_filename)
         self.editor_view.show()
+        self.editor_buffer.set_modified(False)  #Reqd for check in run_snippet()
                     
         self.location_label.set_text(self.current_filename)
         self.description_label.set_text(self.current_description)
@@ -225,10 +227,27 @@
         """Run the currently selected snippet"""
 
         cmd = "/usr/bin/python"
-        argv = [cmd, self.current_filename]
-        directory = os.path.split(self.current_filename)[0]
+        #If user has changed code in the editor, save as a temp file and exec that instead.
+        tmp_sn_filename = self.current_filename
+        #Check for mods needs set_modified(False) in snippet_selected()
+        if self.editor_buffer.get_modified() == True:
+            (tmp_sn_fd, tmp_sn_filename) = tempfile.mkstemp(
+                prefix = os.path.basename(self.current_filename).split(".")[0] + '-', 
+                suffix = ".py")     #get_snippets_file_list() also mandates '.py' extn
+            e = self.editor_buffer
+            #mkstemp returns fd NUMBER, not Py file object - so used os.* below
+            os.write(tmp_sn_fd, e.get_text(e.get_start_iter(), e.get_end_iter()))
+            os.fdatasync(tmp_sn_fd)            
+            os.close(tmp_sn_fd)
+            
+        argv = [cmd, tmp_sn_filename]
+        directory = os.path.split(tmp_sn_filename)[0]
         self.terminal.fork_command(command=cmd, argv=argv, envv=None, directory=directory)
         self.terminal_expander.set_expanded(True)
+        ###if self.editor_buffer.get_modified() == True:
+            #TO-DO: rm'ing the temp file here deletes it before it is exec'd in vte terminal :-(
+            #For now, leaving the file(s) there; need ideas for cleanup - on app shutdown?
+            ###os.unlink(tmp_sn_filename)
                                 
     def get_snippets_file_list(self):
         """Read in the snippets directory and put all Python files into a list."""