[Quickrip-cvs] ng/cli cli.py,1.7,1.8

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

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

Modified Files:
	cli.py 
Log Message:
Added remaining encoding functions (mp3/ogg audio, divx/xvid/mpeg2 video, avi/ogm container)
Added ability to detect PAL/NTSC/NTSCPROG format

Index: cli.py
===================================================================
RCS file: /cvsroot/quickrip/ng/cli/cli.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** cli.py	7 Mar 2004 23:34:28 -0000	1.7
--- cli.py	18 Mar 2004 01:30:26 -0000	1.8
***************
*** 151,156 ****
  		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'])
--- 151,156 ----
  		print "(m) Mplayer path: \t%s" % (self.config['mplayer'])
  		print "(e) Mencoder path: \t%s" % (self.config['mencoder'])
! 		print "(o) Oggenc path: \t%s" % (self.config['oggenc'])
! 		print "(g) 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'])
***************
*** 178,186 ****
  					'param'		: 'mencoder',
  					'object'	: self.config }
! 		self.choices['t'] = { 'question'	: 'Enter new path for transcode: ',
  					'options'	: '^[\w\/]+$',
! 					'param'		: 'transcode',
  					'object'	: self.config }
! 		self.choices['o'] = { 'question'	: 'Enter new path for ogmmerge: ',
  					'options'	: '^[\w\/]+$',
  					'param'		: 'ogmmerge',
--- 178,186 ----
  					'param'		: 'mencoder',
  					'object'	: self.config }
! 		self.choices['o'] = { 'question'	: 'Enter new path for oggenc: ',
  					'options'	: '^[\w\/]+$',
! 					'param'		: 'oggenc',
  					'object'	: self.config }
! 		self.choices['g'] = { 'question'	: 'Enter new path for ogmmerge: ',
  					'options'	: '^[\w\/]+$',
  					'param'		: 'ogmmerge',
***************
*** 228,232 ****
  			end = "mpeg"
  		elif self.config['audiocodec'] == 'ogg':
! 			end = "ogg"
  		else:
  			end = "avi"
--- 228,232 ----
  			end = "mpeg"
  		elif self.config['audiocodec'] == 'ogg':
! 			end = "ogm"
  		else:
  			end = "avi"
***************
*** 413,421 ****
                  slashn = ""
  		# Finish off last pass' line
!                 #if passtype != "audio":
!                 #        sys.stdout.write(" 100% ")
!                 #        for i in range(self.n):
!                 #                sys.stdout.write("=")
!                 #        sys.stdout.write("|\n")
                  sys.stdout.write(slashn + passtype + " |")
  		sys.stdout.flush()
--- 413,421 ----
                  slashn = ""
  		# Finish off last pass' line
!                 if passtype != "audio":
!                         sys.stdout.write(" 100% ")
!                         for i in range(self.n):
!                                 sys.stdout.write("=")
!                         sys.stdout.write("|\n")
                  sys.stdout.write(slashn + passtype + " |")
  		sys.stdout.flush()
***************
*** 438,443 ****
  		if int(perc) <= 9:
  			sys.stdout.write("   " + str(int(perc)) + "% |")
! 		else:
  			sys.stdout.write("  " + str(int(perc)) + "% |")
  		# Rewrite bar
  		sys.stdout.write("=" * n)
--- 438,445 ----
  		if int(perc) <= 9:
  			sys.stdout.write("   " + str(int(perc)) + "% |")
! 		elif int(perc) < 100:
  			sys.stdout.write("  " + str(int(perc)) + "% |")
+ 		else:
+ 			sys.stdout.write(" " + str(int(perc)) + "% |")
  		# Rewrite bar
  		sys.stdout.write("=" * n)