Merge lp:~kerry.hatcher/oggconvert/trunk into lp:oggconvert

[Kerry Hatcher]

I add the ability to set the input file though a command line arg.

ie:

kwhatcher@kwhatcher-desktop:/media/webdata/Projects/oggconvert$ ./oggconvert /home/kwhatcher/Desktop/OilSlick.avi

This is my first time helping write code for a project. Thought I'd start small ;)

I really need OggConvert to work just from the command line, figured this would be the first step.

-Kerry

Unmerged revisions

27. By Kerry Hatcher on 2010-05-26

set selected file at start with command args

26. By Kerry Hatcher <kwhatcher@kwhatcher-desktop> on 2010-05-26

added command line arg input

=== modified file 'OggConvert/ocv_main.py'
--- OggConvert/ocv_main.py	2010-05-23 14:56:10 +0000
+++ OggConvert/ocv_main.py	2010-05-26 14:20:48 +0000
@@ -40,7 +40,7 @@
 from ocv_info import app_name, gladepath, localepath, pixmappath
 
 class Main:
-    def __init__(self):
+    def __init__(self, input_file_name):
             
         # Init the list of languages to support
         langs = []
@@ -117,7 +117,7 @@
             self._container_expander.show()
             self._container_combobox.show()
 
-        self._set_up_filechooser()
+        self._set_up_filechooser(input_file_name)
               
         self._wtree.signal_autoconnect(signals)
         
@@ -286,7 +286,7 @@
     def _about(self, button):
         about_dialogue(self._window)
 
-    def _set_up_filechooser(self):     
+    def _set_up_filechooser(self, start_file_name):     
         video = gtk.FileFilter()
         video.set_name(_("Video Files"))
         video.add_mime_type("video/*")
@@ -307,10 +307,15 @@
         self._file_chooser_button.add_filter(video)
         self._file_chooser_button.add_filter(audio)
         self._file_chooser_button.add_filter(allfiles)
+
+	#default_file_selected =  os.path.join(os.path.expanduser("~"), "example.avi")
         
         self._file_chooser_button.set_current_folder(
                         os.path.expanduser("~"))
         
+	self._file_chooser_button.set_filename(start_file_name)
+
+	
         self._file_chooser_button.set_local_only(False)
                
     def _set_up_liststores(self):

=== modified file 'oggconvert'
--- oggconvert	2007-11-18 21:22:33 +0000
+++ oggconvert	2010-05-26 14:20:48 +0000
@@ -28,6 +28,24 @@
 
 import OggConvert.ocv_main as OC
 
-main = OC.Main()
+import sys
+
+input_file = ""
+
+try:
+ input_file = sys.argv[1]
+except (IndexError):
+ print "Input file arg is null"
+ 
+
+
+
+#output_file = sys.argv[2]
+   
+
+
+main = OC.Main(input_file)
+
+
 
 gtk.main()