Merge lp:~clicompanion-devs/clicompanion/fix-638243 into lp:clicompanion

[Duane Hinnen]

I have made it where the user can put the symbol @ where user arguments are required.
EX:
cat @ @ | sort | uniq > @
Then the code replaces those with the appropriate {0[0]} {0[1]} {0[2]} etc.
EX
cat {0[0]} {0[1]} | sort | uniq > {0[2]}

 I did this because I thought typing the actual {0[0]} would be confusing to users. I picked @ because I thought it would be the least likely to appear in a command. Anyone have a better suggestion?

[Duane Hinnen (duanedesign)]

review: Approve

=== modified file '.clicompanion'
--- .clicompanion	2010-09-04 02:44:07 +0000
+++ .clicompanion	2010-09-16 16:39:54 +0000
@@ -1,7 +1,7 @@
-dpkg -l: package : Find version of a package
+dpkg -l @: package : Find version of a package
 df -h: : file system disk space usage
 free -m: : show RAM usage
-ps auxww | grep: process : displays information about the active process
+ps auxww | grep @: process : displays information about the active process
 iwconfig: : Display wireless network information
 ifconfig -a: : displays the status of the currently active interfaces
 sudo iwlist: : scan Scan Wireless networks
@@ -11,38 +11,38 @@
 sudo apt-get update && sudo apt-get upgrade: : Refresh update info and update all packages 
 sudo apt-get clean: : clear out all packages in /var/cache/apt/archives
 sudo apt-get autoclean : : clear out obsolete packages(packages with a newer release)
-apt-cache search :package : Find information on a package (not installed)
+apt-cache search @ :package : Find information on a package (not installed)
 sudo lshw : : List hardware 
 lspci : : list all PCI devices
 aplay -l : : List all soundcards and digital audio devices
-cat :path: Read File & Print to Standard Output
-ls :path : List Folders Contents
-ls -lSr :path : Show files by size, biggest last
-mv :path : Move (Rename) Files
-cp :path : Copy Files
+cat @ :path: Read File & Print to Standard Output
+ls @ :path : List Folders Contents
+ls -lSr @ :path : Show files by size, biggest last
+mv @ :path : Move (Rename) Files
+cp @ :path : Copy Files
 sudo lspci : : attached PCI devices
-chmod : permissions file : Change access permissions, change mode
-chown: owner:group file : Change the owner and/or group of each given file
+chmod @ @ : permissions, file : Change access permissions, change mode
+chown @ @: owner:group, file : Change the owner and/or group of each given file
 dmesg : : Print kernel & driver messages
 history : : Command History
-locate : file : Find files (updatedb to update DB)
+locate @ : file : Find files (updatedb to update DB)
 sudo updatedb : : update the database for locate
-which :command : Show full path name of command
-find -maxdepth 1 -type f | xargs grep -F :string : Search all regular files for 'string' in this dir
-gpg -c :file : Encypt a file
-gpg :file.gpg : Decrypt a file
-tar -xjf :archive.tar : Extract all files from archive.tar
-tar -czf :Destination.tar.gz  Source : Create Destination from Source
+which @ :command : Show full path name of command
+find -maxdepth 1 -type f | xargs grep -F @ :string : Search all regular files for 'string' in this dir
+gpg -c @ :file : Encypt a file
+gpg @ :file.gpg : Decrypt a file
+tar -xjf @ :archive.tar : Extract all files from archive.tar
+tar -czf @ :Destination.tar.gz  Source : Create Destination from Source
 iostat : : cpu and I/O statistics
 netstat : : Print network connections and interface statistics
-sudo fdisk -l :disk : List partition tables for specified devices
+sudo fdisk -l @ :disk : List partition tables for specified devices
 sudo ufw enable : : Enable netfilter firewall
-sudo ufw allow :port : Open a port in netfilter firewall
-sudo ufw deny :port : Close a port in netfilter firewall
+sudo ufw allow @ :port : Open a port in netfilter firewall
+sudo ufw deny @ :port : Close a port in netfilter firewall
 sudo ufw disable : : Disable netfilter firewall
-cat file1 file2 | sort | uniq > file3 : file1 file2 file3 : combine, sort and remove duplicates from 2 files
-mkisofs -V LABEL -r dir | gzip > cdrom.iso.gz :isoname.iso.gz : Create cdrom image from contents of directory
+cat @ @ | sort | uniq > @ : file1, file2, file3 : combine, sort and remove duplicates from 2 files
+mkisofs -V LABEL -r dir | gzip > @ :isoname.iso.gz : Create cdrom image from contents of directory
 cdrecord -v dev=/dev/cdrom -audio -pad *.wav : : Make audio CD from all wavs in current dir
 dpkg-query -W -f='${Installed-Size;10}\t${Package}\n' | sort -k1,1n : : List all installed packages by size
 tail -f /var/log/messages : : Monitor messages log file
-apropos :command/package : search the manual page names and descriptions
+apropos @ :command/package : search the manual page names and descriptions

=== modified file 'clicompanion.py'
--- clicompanion.py	2010-09-13 11:53:55 +0000
+++ clicompanion.py	2010-09-16 16:39:54 +0000
@@ -19,6 +19,7 @@
 #
 #
 
+import re
 import sys
 import pygtk
 pygtk.require('2.0')
@@ -142,11 +143,14 @@
         dialog.run()
 
         ## user text assigned to a variable
+
         text = entry.get_text()
+        user_input = text.split(' ')
+
         ## The destroy method must be called otherwise the 'Close' button will
         ## not work.
         dialog.destroy()
-        return text
+        return user_input
 
     def responseToDialog(self, text, dialog, response):
         dialog.response(response)
@@ -326,7 +330,6 @@
 
     def _filter_commands(self, widget, data=None):
         """Show commands matching a given search term.
-
         The user should enter a term in the search box and the treeview should
         only display the rows which contain the search term.
         Pretty straight-forward.
@@ -364,16 +367,55 @@
         widget = self.notebook.get_nth_page(pagenum)
         page_widget = widget.get_child()
 
-        cmnd = CMNDS[row_int] ## CMNDS is where commands are stored
+        ## CMNDS is where commands are stored
+        cmnd = CMNDS[row_int] 
+        ## find how many @(user arguments) are in command
+        match = re.findall('@', cmnd) 
+        #print match ## debug
+        #match_group = match.group()
+        
+        '''
+        Make sure user arguments were found. Replace @ with something
+        .format can read. This is done so the user can just enter @, when
+        adding a command where arguments are needed, instead
+        of {0[1]}, {0[1]}, {0[2]}
+        '''    
+        if match == False:
+            pass
+        else:
+            num = len(match)
+            ran = 0
+            new_cmnd = self.replace(cmnd, num, ran)
+            print new_cmnd ## debug
+
         if not self.liststore[row_int][1] == " ": # command with user input
             text = Companion.get_info(self, text)
-            page_widget.feed_child(cmnd+" "+text+"\n") #send command w/ input
+            #print text ## debug
+            print new_cmnd
+            c = new_cmnd.format(text)
+            print c ## debug
+            page_widget.feed_child(c+"\n") #send command w/ input
             page_widget.show()
         else: ## command that has no user input
             page_widget.feed_child(cmnd+"\n") #send command
             page_widget.show()
             page_widget.grab_focus()
+            
+    ## replace @ with {0[n]}
+    def replace(self, cmnd, num, ran):
+        replace_cmnd=re.sub('@', '{0['+str(ran)+']}', cmnd, count=1)
+        cmnd = replace_cmnd
+        ran += 1
+        if ran < num:
+            return self.replace(cmnd, num, ran)    
+        else:
+            pass
+        return cmnd     
 
+            
+        
+        
+        
     ## open the man page for selected command
     def man_page(self, widget, data=None):
         row_int = int(ROW[0][0]) # removes everything but number from EX: [5,]
@@ -463,9 +505,9 @@
         closebtn.connect("clicked", self.close_tab, vte_tab) # signal handler for tab
         self.window.show_all()
 
-
         return vte_tab
 
+
     ## Remove a page from the notebook
     def close_tab(self, sender, widget):
         ## get the page number of the tab we wanted to close
@@ -519,8 +561,9 @@
             self.treeview.columns[1] = gtk.TreeViewColumn(_('User Argument'))
             self.treeview.columns[2] = gtk.TreeViewColumn(_('Description'))
             
-            ## right click menu event captur
-            bar = menus_buttons.FileMenu()
+            ## right click menu event capture
+            #bar = clicompanion.menus_buttons.FileMenu() ##### packaged version
+            bar = menus_buttons.FileMenu() ################### local version
             self.treeview.connect ("button_press_event", bar.right_click, self)
             
             for n in range(3):
@@ -608,6 +651,8 @@
         self.search_label.set_alignment(xalign=-1, yalign=0)
         self.search_box = gtk.Entry()
         self.search_box.connect("changed", self._filter_commands)
+        ## search box tooltip
+        self.search_box.set_tooltip_text("Search your list of commands")
         # Set the search box sensitive at program start, because expander is not
         # unfolded by default
         self.search_box.set_sensitive(False)
@@ -618,8 +663,11 @@
         menu_search_hbox.pack_start(menu_bar, True)
         
         
+
+        ## TODO Do we want to start with the command list open or closed?
+        ## This code opens the app with it open
+        ## We would also need to change the search field disable code
         ## start program with expander open
-        ## TODO Do we want to start with the command list open or closed?
         #expander.set_expanded(True)
         #self.expanded_cb(expander, None)
 
@@ -631,10 +679,15 @@
         image = gtk.Image()
         image.set_from_stock(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON)
         label = gtk.Label(' Command List')
+        ## tooltip for the label of the expander
+        expander_hbox.set_tooltip_text("Click to show/hide command list")
+        
+
         ## hbox to hold expander widget
         expander_hbox.pack_start(image, False, False)
-        expander_hbox.pack_start(label, False, False)
+        expander_hbox.pack_start(label, True, False)
         expander.set_label_widget(expander_hbox)
+
        
     
         ## Add the first tab with the Terminal
@@ -644,6 +697,8 @@
 
         ## The "Add Tab" tab
         add_tab_button = gtk.Button("+")
+        ## tooltip for "Add Tab" tab
+        add_tab_button.set_tooltip_text("Click to add another Tab")
         add_tab_button.connect("clicked", self.add_tab)
         self.notebook.append_page(gtk.Label(""), add_tab_button)