[Quickrip-cvs] quickrip dvd.py,1.20,1.21

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

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

Modified Files:
	dvd.py 
Log Message:
Added method calcFileSize, which calculates the new file size (for when 
the user directly changes the bitrate).
Probably other minor changes while I was tweaking the code :)


Index: dvd.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/dvd.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** dvd.py	26 Jun 2003 03:22:10 -0000	1.20
--- dvd.py	14 Jul 2003 17:43:13 -0000	1.21
***************
*** 125,134 ****
  			self.length = int(length)
  			self.audiobr = int(audiobr)
! 			self.rate = ((((self.filesize*1024*8)/1000)*1024)-(self.audiobr*self.length))/(self.length);
! 			self.rate = self.rate * 0.96  # Correction based on addition of credits and usual error
  			return self.rate
  		except:
  			return 1
  
  	def scanDVD(self):
  		"""Scan DVD drive for titles with mplayer, and chapters and playback time with tcprobe"""
--- 125,149 ----
  			self.length = int(length)
  			self.audiobr = int(audiobr)
! 			self.rate = ((self.filesize * 8192) / self.length) - self.audiobr
! 			self.rate = self.rate * 0.98  # Correction based on addition of credits and usual error
  			return self.rate
  		except:
  			return 1
  
+ 	def calcFileSize(self, length, audiobr, bitrate):
+ 		"""Calculate vilesize for video based on:
+ 		- length of track (seconds)
+ 		- audio bitrate (kbps)
+ 		- bitrate of track (Kbps)"""
+ 		try:
+ 			self.length = int(length)
+ 			self.audiobr = int(audiobr)
+ 			self.bitrate = int(bitrate)
+ 			self.filesize = ((self.bitrate + self.audiobr) * self.length) / 8192
+ 			self.filesize = self.filesize * (1 / 0.98)  # Correction based on addition of credits and usual error
+ 			return self.filesize
+ 		except:
+ 			return 1
+ 
  	def scanDVD(self):
  		"""Scan DVD drive for titles with mplayer, and chapters and playback time with tcprobe"""
***************
*** 288,293 ****
  
  			pipe_perc = re.compile('.*f \((.\d)\%\)*')
  			perc = 0
! 			
  			# Clean up output dir in case QuickRip crashed out there
  			os.popen("".join(["rm ", self.outdir, "frameno.avi 2>/dev/null"]))
--- 303,310 ----
  
  			pipe_perc = re.compile('.*f \((.\d)\%\)*')
+ 			pipe_Trem = re.compile('(?P<int>[0-9]+)min')
  			perc = 0
! 			Trem = 0
! 
  			# Clean up output dir in case QuickRip crashed out there
  			os.popen("".join(["rm ", self.outdir, "frameno.avi 2>/dev/null"]))
***************
*** 337,341 ****
  						perc = pipe_perc.search(line).group(1)
  						perc = re.sub(' ', '', perc)
! 					self.int_updateProgress(perc, "audio")
  				os.waitpid(pid, os.WNOHANG)
  
--- 354,360 ----
  						perc = pipe_perc.search(line).group(1)
  						perc = re.sub(' ', '', perc)
! 					if pipe_Trem.search(line):
! 						Trem = pipe_Trem.search(line).group(0)
! 					self.int_updateProgress(perc, Trem, "audio")
  				os.waitpid(pid, os.WNOHANG)
  
***************
*** 393,397 ****
  						perc = pipe_perc.search(line).group(1)
  						perc = re.sub(' ', '', perc)
! 					self.int_updateProgress(perc, "audio")
  				os.waitpid(pid, os.WNOHANG)
  
--- 412,418 ----
  						perc = pipe_perc.search(line).group(1)
  						perc = re.sub(' ', '', perc)
! 					if pipe_Trem.search(line):
! 						Trem = pipe_Trem.search(line).group(0)
! 					self.int_updateProgress(perc, Trem, "audio")
  				os.waitpid(pid, os.WNOHANG)
  
***************
*** 412,416 ****
  						perc = pipe_perc.search(line).group(1)
  						perc = re.sub(' ', '', perc)
! 					self.int_updateProgress(perc, "video1")
  				os.waitpid(pid, os.WNOHANG)
  
--- 433,439 ----
  						perc = pipe_perc.search(line).group(1)
  						perc = re.sub(' ', '', perc)
! 					if pipe_Trem.search(line):
! 						Trem = pipe_Trem.search(line).group(0)
! 					self.int_updateProgress(perc, Trem, "video1")
  				os.waitpid(pid, os.WNOHANG)
  
***************
*** 477,481 ****
  						perc = pipe_perc.search(line).group(1)
  						perc = re.sub(' ', '', perc)
! 					self.int_updateProgress(perc, "audio")
  				os.waitpid(pid, os.WNOHANG)
  
--- 500,506 ----
  						perc = pipe_perc.search(line).group(1)
  						perc = re.sub(' ', '', perc)
! 					if pipe_Trem.search(line):
! 						Trem = pipe_Trem.search(line).group(0)
! 					self.int_updateProgress(perc, Trem, "audio")
  				os.waitpid(pid, os.WNOHANG)
  
***************
*** 496,500 ****
  						perc = pipe_perc.search(line).group(1)
  						perc = re.sub(' ', '', perc)
! 					self.int_updateProgress(perc, "video1")
  				os.waitpid(pid, os.WNOHANG)
  
--- 521,527 ----
  						perc = pipe_perc.search(line).group(1)
  						perc = re.sub(' ', '', perc)
! 					if pipe_Trem.search(line):
! 						Trem = pipe_Trem.search(line).group(0)
! 					self.int_updateProgress(perc, Trem, "video1")
  				os.waitpid(pid, os.WNOHANG)
  
***************
*** 514,518 ****
  						perc = pipe_perc.search(line).group(1)
  						perc = re.sub(' ', '', perc)
! 					self.int_updateProgress(perc, "video2")
  
  				os.popen("rm divx2pass.log 2>/dev/null")
--- 541,547 ----
  						perc = pipe_perc.search(line).group(1)
  						perc = re.sub(' ', '', perc)
! 					if pipe_Trem.search(line):
! 						Trem = pipe_Trem.search(line).group(0)
! 					self.int_updateProgress(perc, Trem, "video2")
  
  				os.popen("rm divx2pass.log 2>/dev/null")