Merge lp:~bdfhjk/clicompanion/version-parser-add into lp:clicompanion

[Marek Bardoński]

[Duane Hinnen (duanedesign)]

review: Approve

=== modified file 'clicompanion'
--- clicompanion	2011-03-18 15:46:30 +0000
+++ clicompanion	2011-06-06 19:35:46 +0000
@@ -16,7 +16,7 @@
     print "using locale in source code folder"
 
 
-parser = OptionParser()
+parser = OptionParser(usage="%prog [-f] [-q]", version="%prog 1.0")
 parser.add_option("-f", "--file", dest="filename",
                   help="write report to FILE", metavar="FILE")
 parser.add_option("-q", "--quiet",

=== modified file 'clicompanionlib/controller.py'
--- clicompanionlib/controller.py	2011-04-02 22:50:51 +0000
+++ clicompanionlib/controller.py	2011-06-06 19:35:46 +0000
@@ -157,11 +157,14 @@
             text3 = entry3.get_text()
             '''open flat file, add the new command, update CMNDS variable
             ## update commands in liststore (on screen) '''
-            with open(CHEATSHEET, "a") as cheatfile:
-                if text1 != "":
-                    ## write new commands to .clicompanion2 file
-                    cheatfile.write(text1+":"+text2+":"+text3+'\n')
+            if text1 != "":
+                with open(CHEATSHEET, "r") as cheatfile:
+                    cheatlines = cheatfile.readlines()
+                    cheatlines.append(text1+":"+text2+":"+text3+'\n')
                     cheatfile.close()
+                with open(CHEATSHEET, "w") as cheatfile2:
+                    cheatfile2.writelines(cheatlines)
+                    cheatfile2.close()
                     l = str(text1+":"+text2+":"+text3)
                     #ls = l.split(':',2)
                     ## update view.CMNDS variable
@@ -257,18 +260,22 @@
                 self.remove_command(widget, liststore)
                 '''open flat file, add the new command, update CMNDS variable
                 ## update commands in liststore (on screen) '''
-                with open(CHEATSHEET, "a") as cheatfile:
-                        ## write new commands to .clicompanion2 file
-                        cheatfile.write(text1+":"+text2+":"+text3+'\n')
-                        cheatfile.close()
-                        l = str(text1+":"+text2+":"+text3)
-                        #ls = l.split(':',2)
-                        ## update view.CMNDS variable
-                        filteredcommandplus = text1, text2, text3
-                        view.CMNDS.append(filteredcommandplus)
-                        ## update the command list on screen
-                        liststore.append([text1,text2,text3])
-
+                
+                with open(CHEATSHEET, "r") as cheatfile:
+                    cheatlines = cheatfile.readlines()
+                    cheatlines.append(text1+":"+text2+":"+text3+'\n')
+                    cheatfile.close()
+                with open(CHEATSHEET, "w") as cheatfile2:
+                    cheatfile2.writelines(cheatlines)
+                    cheatfile2.close()
+                    l = str(text1+":"+text2+":"+text3)
+                    #ls = l.split(':',2)
+                    ## update view.CMNDS variable
+                    filteredcommandplus = text1, text2, text3
+                    view.CMNDS.append(filteredcommandplus)
+                    ## update the command list on screen
+                    liststore.append([text1,text2,text3])
+                
         ## The destroy method must be called otherwise the 'Close' button will
         ## not work.
         dialog.destroy()