[patch] external editor file not saved fix

ccal-0.6-empty-editor-entry.patch (text/plain), 1.46 KB, created by Gabi Shaar on 2006-08-21 02:10:39 UTC

--- ccal-0.6.py	2006-08-21 11:50:41.000000000 +0300
+++ ccal-0.6.1.py	2006-08-21 11:51:26.000000000 +0300
@@ -81,6 +81,8 @@
 import calendar
 import datetime
 import os
+# tempfile is used as a variable name a lot.
+from tempfile import mkstemp
 import sys
 import httplib, urllib, pickle, urllib2
 import ConfigParser
@@ -846,11 +848,26 @@
 			except:
 				pass
 
-			os.system(self.editor+" "+self.temppath+"/"+temptime)
-			tempfile=open(self.temppath+"/"+temptime)
-			tempstring=tempfile.read()
-			templines=tempstring.split("\n")
-			entry=templines[0]
+			# this is safer. should be used everywhere.
+			(fd, tempfilename) = mkstemp(".entry","ccal")
+			os.close(fd)
+			# open editor
+			os.system(" ".join((self.editor,tempfilename)))
+			# get the new entry (due to mkstemp file gets created anyway,
+			# but still better to "try")
+			try:
+				tempfile=open(tempfilename)
+				tempstring=tempfile.read()
+				templines=tempstring.splitlines()
+				entry=templines[0]
+				fullentry=templines[1:]
+			except:
+				if tempfile:
+					tempfile.close()
+				entry=""
+			
+			# cleanup temp file
+			os.unlink(tempfilename)
 			
 			#re-initialise stuff as vim seems to mess it up
 			self.scr=curses.initscr()
@@ -868,12 +885,12 @@
 				self.handleException(e)
 			#refresh
 			self.scr.refresh()
-			fullentry=templines[1:]
 		
 		try:
 			curses.curs_set(0)
 		except:
 			pass
+			
 		if entry!="":
 			self._cal.addItem(ccalItem(entry,fullentry=fullentry))
 		curses.noecho()