[Quickrip-cvs] quickrip base.py,1.2,1.3 config.py,1.11,1.12 quickrip.py,1.10,1.11 cli.py,1.18,NONE

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

Update of /cvsroot/quickrip/quickrip
In directory sc8-pr-cvs1:/tmp/cvs-serv11184

Modified Files:
	base.py config.py quickrip.py 
Removed Files:
	cli.py 
Log Message:
Removed old CLI, added new one 'cli/cli.py' - not at all working yet!
Adjusted quickrip.py accordingly


Index: base.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/base.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** base.py	6 Aug 2003 01:18:48 -0000	1.2
--- base.py	6 Aug 2003 01:36:05 -0000	1.3
***************
*** 36,40 ****
  		self.dio = config.dio
  		self.aro = config.dio
- 		self.langs = config.langs
  		self.configfile = os.path.join(os.path.expanduser("~"), ".quickriprc")
  		self.loadConfig()
--- 36,39 ----
***************
*** 227,234 ****
  
  		self.numtitles = self.getDVDInfo()
  
  		for i in range(int(self.numtitles) + 1):
  			if i is not 0:
- 				print i
  				# Get title information from disc
  				chapters, alangs, slangs, time, time_label = self.getTitleInfo(i)
--- 226,233 ----
  
  		self.numtitles = self.getDVDInfo()
+ 		self.int_dispDVD(self.numtitles)
  
  		for i in range(int(self.numtitles) + 1):
  			if i is not 0:
  				# Get title information from disc
  				chapters, alangs, slangs, time, time_label = self.getTitleInfo(i)
***************
*** 422,426 ****
  		pass
  
! 	def int_dispDVD(self):
  		pass
  
--- 421,425 ----
  		pass
  
! 	def int_dispDVD(self, numtitles):
  		pass
  
***************
*** 438,447 ****
  
  	def int_newPass(self, passtype):
! 		#pass
! 		print passtype
  
  	def int_updateProgress(self, perc, trem, tpass):
! 		#pass
! 		print "%s percent, %s remaining in %s" % (perc, trem, tpass)
  
  	def int_finishRipping(self):
--- 437,444 ----
  
  	def int_newPass(self, passtype):
! 		pass
  
  	def int_updateProgress(self, perc, trem, tpass):
! 		pass
  
  	def int_finishRipping(self):

Index: config.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/config.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** config.py	5 Aug 2003 17:50:36 -0000	1.11
--- config.py	6 Aug 2003 01:36:05 -0000	1.12
***************
*** 14,23 ****
  app = "QuickRip"
  author = "Tom Chance <tom...@gm...>"
! version = "0.8-rc1"
! date = "2003-07-30"
  copyright = "(C) 2003 Tom Chance"
  license = "GNU General Public License (GPL) (see LICENSE file)"
  paths = os.environ['PATH'].split(":")
- #paths = ['/bin', '/usr/bin/', '/usr/local/bin/', '/opt/bin/', '/sbin/', '/usr/sbin/', '/usr/X11R6/lib/X11/bin']
  icon = os.path.join("icons", "quickrip.xpm")
  qr_dir = "/usr/share/quickrip"
--- 14,22 ----
  app = "QuickRip"
  author = "Tom Chance <tom...@gm...>"
! version = "0.9-cvs"
! date = "2003-08-05"
  copyright = "(C) 2003 Tom Chance"
  license = "GNU General Public License (GPL) (see LICENSE file)"
  paths = os.environ['PATH'].split(":")
  icon = os.path.join("icons", "quickrip.xpm")
  qr_dir = "/usr/share/quickrip"

Index: quickrip.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/quickrip.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** quickrip.py	5 Aug 2003 17:50:36 -0000	1.10
--- quickrip.py	6 Aug 2003 01:36:05 -0000	1.11
***************
*** 28,35 ****
  
  Options:  (with none, runs PyQt GUI mode)
! 	-h, --help			  print this help message
! 	-c, --cli			   trun in command line interface mode
! 	-a, --autoresize		automatically resize the cli progress bar as
! 							the terminal is resized (small performance hit)
  """ % sys.argv[0]
  
--- 28,34 ----
  
  Options:  (with none, runs PyQt GUI mode)
! 	-h, --help \t print this help message
! 	-c, --cli \t run with the command line interface
! 	-g, --gtk \t run with the Gtk interface
  """ % sys.argv[0]
  
***************
*** 46,60 ****
  		if opt in ("-h", "--help"):
  			usage()
! 			sys.exit()
  		elif opt in ("-g", "--gtk"):
  			sys.path.append("gtk")
  			import gtkmain
  			gtkmain.main()
  		elif opt in ("-c", "--cli"):
  			import cli
  			cli.main()
! 		elif opt in ("-a", "--autoresize"):
! 			# Help!  What do I do here???
! 			pass
  
  	# Fallback to GUI mode...
--- 45,59 ----
  		if opt in ("-h", "--help"):
  			usage()
! 			sys.exit(2)
  		elif opt in ("-g", "--gtk"):
  			sys.path.append("gtk")
  			import gtkmain
  			gtkmain.main()
+ 			sys.exit(2)
  		elif opt in ("-c", "--cli"):
+ 			sys.path.append("cli")
  			import cli
  			cli.main()
! 			sys.exit(2)
  
  	# Fallback to GUI mode...

--- cli.py DELETED ---