[Quickrip-cvs] ng/cli cli.py,1.2,1.3

[<te...@us...>]

Update of /cvsroot/quickrip/ng/cli
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25234/cli

Modified Files:
	cli.py 
Log Message:
Made ogmmerge and transcode optional dependencies (base.py & config.py).
Started configuration screen in cli.py and added audio/subtitle language to title screen options.

Index: cli.py
===================================================================
RCS file: /cvsroot/quickrip/ng/cli/cli.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** cli.py	3 Mar 2004 01:45:15 -0000	1.2
--- cli.py	4 Mar 2004 02:30:02 -0000	1.3
***************
*** 49,52 ****
--- 49,55 ----
  			self.level = 'title'
  			self.showTitle(title)
+ 		elif mode == 'configure':
+ 			self.level = 'configure'
+ 			self.configure()
  	
  
***************
*** 94,101 ****
  		print "(n)  Name: \t\t%s" % (title['name'])
  		print "     Length: \t\t%s" % (title['timelabel'])
! 		print "(s)  File size: \t%sMB" % (str(int(title['size'])))
  		print "(v)  Video bitrate: \t%skbps" % (str(int(title['vbr'])))
  		print "(a)  Audio bitrate: \t%skbps" % (str(int(title['abr'])))
! 		print "(r)  Rip title? \t%s" % (title['rip'])
  		print ""
  		print output.bold("Enter letter to change information, or 'b' to go back to the title listing")
--- 97,108 ----
  		print "(n)  Name: \t\t%s" % (title['name'])
  		print "     Length: \t\t%s" % (title['timelabel'])
! 		print "(r)  Rip title? \t%s" % (title['rip'])
! 		print ""
! 		print "(f)  File size: \t%sMB" % (str(int(title['size'])))
  		print "(v)  Video bitrate: \t%skbps" % (str(int(title['vbr'])))
  		print "(a)  Audio bitrate: \t%skbps" % (str(int(title['abr'])))
! 		print ""
! 		print "(l)  Audio language: \t%s" % (title['alang'])
! 		print "(s)  Subtitles: \t%s" % (title['slang'])
  		print ""
  		print output.bold("Enter letter to change information, or 'b' to go back to the title listing")
***************
*** 105,109 ****
  					'param'		: 'name',
  					'object'	: self.titles[t_index] }
! 		self.choices['s'] = { 'question'	: 'Enter new file size in MB:',
  					'options'	: '\d+',
  					'param'		: 'size',
--- 112,116 ----
  					'param'		: 'name',
  					'object'	: self.titles[t_index] }
! 		self.choices['f'] = { 'question'	: 'Enter new file size in MB:',
  					'options'	: '\d+',
  					'param'		: 'size',
***************
*** 114,124 ****
  					'object'	: self.titles[t_index] }
  		self.choices['a'] = { 'question'	: 'Enter new audio bitrate in kbps:',
! 					'options'	: ['32', '48', '64', '96', '128', '160', '192', '256', '350'],
  					'param'		: 'abr',
  					'object'	: self.titles[t_index] }
! 		self.choices['r'] = { 'question' : 'Rip title? [yes/no]:',
! 					'options' : ['yes', 'no'],
  					'param'		: 'rip',
  					'object'	: self.titles[t_index] }
  		self.askLevelOrQuestion()
  		
--- 121,165 ----
  					'object'	: self.titles[t_index] }
  		self.choices['a'] = { 'question'	: 'Enter new audio bitrate in kbps:',
! 					'options'	: ['32', '48', '64', '96', '128', '160', '192', \
! 								'256', '350'],
  					'param'		: 'abr',
  					'object'	: self.titles[t_index] }
! 		self.choices['r'] = { 'question'	: 'Rip title? [yes/no]:',
! 					'options'	: ['yes', 'no'],
  					'param'		: 'rip',
  					'object'	: self.titles[t_index] }
+ 		self.choices['l'] = { 'question'	: 'Choose an audio language: ',
+ 					'options'	: title['alangs'],
+ 					'param'		: 'alang',
+ 					'object'	: self.titles[t_index] }
+ 		self.choices['s'] = { 'question'	: 'Choose an subtitle language: ',
+ 					'options'	: title['slangs'],
+ 					'param'		: 'slang',
+ 					'object'	: self.titles[t_index] }
+ 		self.askLevelOrQuestion()
+ 		
+ 		
+ 	def configure(self):
+ 		"""show the configuration screen"""
+ 		print output.bold('Configure QuickRip')
+ 		print ""
+ 		print "Paths:"
+ 		print "(m) Mplayer path: \t%s" % (self.config['mplayer'])
+ 		print "(e) Mencoder path: \t%s" % (self.config['mencoder'])
+ 		print "(t) Transcode path: \t%s" % (self.config['transcode'])
+ 		print "(o) Ogmmerge path: \t%s" % (self.config['ogmmerge'])
+ 		print "(p) Output directory: \t%s" % (self.config['outputdir'])
+ 		print "(d) DVD device: \t%s" % (self.config['dvd_device'])
+ 		print ""
+ 		print "Encoding:"
+ 		print "(v) Video codec: \t%s" % (self.config['videocodec'])
+ 		print "(s) Video aspect ratio:\t%s" % (self.config['aspectratio'])
+ 		print "(i) De-interlacing: \t%s" % (self.config['deinterlacing'])
+ 		print "(z) PDA Mode: \t\t%s" % (self.config['pdamode'])
+ 		print "(a) Audio codec: \t%s" % (self.config['audiocodec'])
+ 		print "(v) Volume adjustment: \t%s" % (self.config['volumead'])
+ 		print ""
+ 		print output.bold("Enter letter to change option, or 'b' to return to the title list screen")
+ 		self.choices = {}
  		self.askLevelOrQuestion()