X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/25a66e5ff609eeb03907030f16c408197b646ecc..be092c47edfd4babfd3b4c5ea511710e6458343f:/lib/python/Plugins/Extensions/DVDBurn/Process.py

diff --git a/lib/python/Plugins/Extensions/DVDBurn/Process.py b/lib/python/Plugins/Extensions/DVDBurn/Process.py
index b8a3788e..49054596 100644
--- a/lib/python/Plugins/Extensions/DVDBurn/Process.py
+++ b/lib/python/Plugins/Extensions/DVDBurn/Process.py
@@ -10,8 +10,8 @@ class png2yuvTask(Task):
 		self.dumpFile = outputfile
 		self.weighting = 15
 
-	def run(self, callback, task_progress_changed):
-		Task.run(self, callback, task_progress_changed)
+	def run(self, callback):
+		Task.run(self, callback)
 		self.container.stdoutAvail.remove(self.processStdout)
 		self.container.dumpToFile(self.dumpFile)
 
@@ -26,8 +26,8 @@ class mpeg2encTask(Task):
 		self.inputFile = inputfile
 		self.weighting = 25
 		
-	def run(self, callback, task_progress_changed):
-		Task.run(self, callback, task_progress_changed)
+	def run(self, callback):
+		Task.run(self, callback)
 		self.container.readFromFile(self.inputFile)
 
 	def processOutputLine(self, line):
@@ -42,8 +42,8 @@ class spumuxTask(Task):
 		self.dumpFile = outputfile
 		self.weighting = 15
 
-	def run(self, callback, task_progress_changed):
-		Task.run(self, callback, task_progress_changed)
+	def run(self, callback):
+		Task.run(self, callback)
 		self.container.stdoutAvail.remove(self.processStdout)
 		self.container.dumpToFile(self.dumpFile)
 		self.container.readFromFile(self.inputFile)
@@ -212,7 +212,7 @@ class RemoveESFiles(Task):
 class DVDAuthorTask(Task):
 	def __init__(self, job):
 		Task.__init__(self, job, "Authoring DVD")
-		self.weighting = 300
+		self.weighting = 20
 		self.setTool("/usr/bin/dvdauthor")
 		self.CWD = self.job.workspace
 		self.args += ["-x", self.job.workspace+"/dvdauthor.xml"]
@@ -222,6 +222,14 @@ class DVDAuthorTask(Task):
 		print "[DVDAuthorTask] ", line[:-1]
 		if not self.menupreview and line.startswith("STAT: Processing"):
 			self.callback(self, [], stay_resident=True)
+		elif line.startswith("STAT: VOBU"):
+			try:
+				progress = int(line.split("MB")[0].split(" ")[-1])
+				if progress:
+					self.job.mplextask.progress = progress
+					print "[DVDAuthorTask] update mplextask progress:", self.job.mplextask.progress, "of", self.job.mplextask.end
+			except:
+				print "couldn't set mux progress"
 
 class DVDAuthorFinalTask(Task):
 	def __init__(self, job):
@@ -233,7 +241,7 @@ class WaitForResidentTasks(Task):
 	def __init__(self, job):
 		Task.__init__(self, job, "waiting for dvdauthor to finalize")
 		
-	def run(self, callback, task_progress_changed):
+	def run(self, callback):
 		print "waiting for %d resident task(s) %s to finish..." % (len(self.job.resident_tasks),str(self.job.resident_tasks))
 		if self.job.resident_tasks == 0:
 			callback(self, [])
@@ -241,7 +249,11 @@ class WaitForResidentTasks(Task):
 class BurnTaskPostcondition(Condition):
 	RECOVERABLE = True
 	def check(self, task):
-		return task.error is None
+		if task.returncode == 0:
+			return True
+		elif task.error is None or task.error is task.ERROR_MINUSRWBUG:
+			return True
+		return False
 
 	def getErrorMessage(self, task):
 		return {
@@ -251,11 +263,13 @@ class BurnTaskPostcondition(Condition):
 			task.ERROR_WRITE_FAILED: _("Write failed!"),
 			task.ERROR_DVDROM: _("No (supported) DVDROM found!"),
 			task.ERROR_ISOFS: _("Medium is not empty!"),
+			task.ERROR_FILETOOLARGE: _("TS file is too large for ISO9660 level 1!"),
+			task.ERROR_ISOTOOLARGE: _("ISO file is too large for this filesystem!"),
 			task.ERROR_UNKNOWN: _("An unknown error occured!")
 		}[task.error]
 
 class BurnTask(Task):
-	ERROR_NOTWRITEABLE, ERROR_LOAD, ERROR_SIZE, ERROR_WRITE_FAILED, ERROR_DVDROM, ERROR_ISOFS, ERROR_UNKNOWN = range(7)
+	ERROR_NOTWRITEABLE, ERROR_LOAD, ERROR_SIZE, ERROR_WRITE_FAILED, ERROR_DVDROM, ERROR_ISOFS, ERROR_FILETOOLARGE, ERROR_ISOTOOLARGE, ERROR_MINUSRWBUG, ERROR_UNKNOWN = range(10)
 	def __init__(self, job, extra_args=[], tool="/bin/growisofs"):
 		Task.__init__(self, job, job.name)
 		self.weighting = 500
@@ -282,12 +296,17 @@ class BurnTask(Task):
 				self.error = self.ERROR_NOTWRITEABLE
 			if line.find("ASC=24h") != -1:
 				self.error = self.ERROR_LOAD
+			if line.find("SK=5h/ASC=A8h/ACQ=04h") != -1:
+				self.error = self.ERROR_MINUSRWBUG
 			else:
 				self.error = self.ERROR_UNKNOWN
 				print "BurnTask: unknown error %s" % line
 		elif line.startswith(":-("):
 			if line.find("No space left on device") != -1:
 				self.error = self.ERROR_SIZE
+			elif self.error == self.ERROR_MINUSRWBUG:
+				print "*sigh* this is a known bug. we're simply gonna assume everything is fine."
+				self.postconditions = []
 			elif line.find("write failed") != -1:
 				self.error = self.ERROR_WRITE_FAILED
 			elif line.find("unable to open64(") != -1 and line.find(",O_RDONLY): No such file or directory") != -1:
@@ -303,6 +322,15 @@ class BurnTask(Task):
 			else:
 				self.error = self.ERROR_UNKNOWN
 				print "BurnTask: unknown error %s" % line
+		elif line.find("-allow-limited-size was not specified. There is no way do represent this file size. Aborting.") != -1:
+			self.error = self.ERROR_FILETOOLARGE
+		elif line.startswith("genisoimage: File too large."):
+			self.error = self.ERROR_ISOTOOLARGE
+	
+	def setTool(self, tool):
+		self.cmd = tool
+		self.args = [tool]
+		self.global_preconditions.append(ToolExistsPrecondition())
 
 class RemoveDVDFolder(Task):
 	def __init__(self, job):
@@ -314,23 +342,24 @@ class RemoveDVDFolder(Task):
 class CheckDiskspaceTask(Task):
 	def __init__(self, job):
 		Task.__init__(self, job, "Checking free space")
-		totalsize = 50*1024*1024 # require an extra safety 50 MB
+		totalsize = 0 # require an extra safety 50 MB
 		maxsize = 0
 		for title in job.project.titles:
 			titlesize = title.estimatedDiskspace
 			if titlesize > maxsize: maxsize = titlesize
 			totalsize += titlesize
 		diskSpaceNeeded = totalsize + maxsize
+		job.estimateddvdsize = totalsize / 1024 / 1024
+		totalsize += 50*1024*1024 # require an extra safety 50 MB
 		self.global_preconditions.append(DiskspacePrecondition(diskSpaceNeeded))
 		self.weighting = 5
 
-	def run(self, callback, task_progress_changed):
+	def run(self, callback):
 		failed_preconditions = self.checkPreconditions(True) + self.checkPreconditions(False)
 		if len(failed_preconditions):
 			callback(self, failed_preconditions)
 			return
 		self.callback = callback
-		self.task_progress_changed = task_progress_changed
 		Task.processFinished(self, 0)
 
 class PreviewTask(Task):
@@ -341,9 +370,8 @@ class PreviewTask(Task):
 		self.path = path
 		self.weighting = 10
 
-	def run(self, callback, task_progress_changed):
+	def run(self, callback):
 		self.callback = callback
-		self.task_progress_changed = task_progress_changed
 		if self.job.menupreview:
 			self.previewProject()
 		else:
@@ -419,9 +447,8 @@ class ImagePrepareTask(Task):
 		self.job = job
 		self.Menus = job.Menus
 		
-	def run(self, callback, task_progress_changed):			
+	def run(self, callback):
 		self.callback = callback
-		self.task_progress_changed = task_progress_changed
 		# we are doing it this weird way so that the TaskView Screen actually pops up before the spinner comes
 		from enigma import eTimer
 		self.delayTimer = eTimer()
@@ -431,7 +458,7 @@ class ImagePrepareTask(Task):
 	def conduct(self):
 		try:
 			from ImageFont import truetype
-			from Image import open as Image_open		
+			from Image import open as Image_open
 			s = self.job.project.settings
 			self.Menus.im_bg_orig = Image_open(s.menubg.getValue())
 			if self.Menus.im_bg_orig.size != (self.Menus.imgwidth, self.Menus.imgheight):
@@ -455,9 +482,8 @@ class MenuImageTask(Task):
 		self.menubgpngfilename = menubgpngfilename
 		self.highlightpngfilename = highlightpngfilename
 
-	def run(self, callback, task_progress_changed):
+	def run(self, callback):
 		self.callback = callback
-		self.task_progress_changed = task_progress_changed
 		try:
 			import ImageDraw, Image, os
 			s = self.job.project.settings
@@ -692,7 +718,8 @@ class DVDJob(Job):
 				title_filename = self.workspace + "/dvd_title_%d.mpg" % (self.i+1)
 				LinkTS(self, title.inputfile, link_name)
 				demux = DemuxTask(self, link_name)
-				MplexTask(self, outputfile=title_filename, demux_task=demux)
+				self.mplextask = MplexTask(self, outputfile=title_filename, demux_task=demux)
+				self.mplextask.end = self.estimateddvdsize
 				RemoveESFiles(self, demux)
 			WaitForResidentTasks(self)
 			PreviewTask(self, self.workspace + "/dvd/VIDEO_TS/")
@@ -701,7 +728,7 @@ class DVDJob(Job):
 			if output == "dvd":
 				self.name = _("Burn DVD")
 				tool = "/bin/growisofs"
-				burnargs = [ "-Z", "/dev/" + harddiskmanager.getCD(), "-dvd-compat", "-use-the-force-luke=dummy" ]
+				burnargs = [ "-Z", "/dev/" + harddiskmanager.getCD(), "-dvd-compat" ]
 			elif output == "iso":
 				self.name = _("Create DVD-ISO")
 				tool = "/usr/bin/mkisofs"
@@ -739,7 +766,7 @@ class DVDdataJob(Job):
 		tool = "/bin/growisofs"
 		if output == "dvd":
 			self.name = _("Burn DVD")
-			burnargs = [ "-Z", "/dev/" + harddiskmanager.getCD(), "-dvd-compat", "-use-the-force-luke=dummy" ]
+			burnargs = [ "-Z", "/dev/" + harddiskmanager.getCD(), "-dvd-compat" ]
 		elif output == "iso":
 			tool = "/usr/bin/mkisofs"
 			self.name = _("Create DVD-ISO")
@@ -762,11 +789,11 @@ class DVDisoJob(Job):
 		self.menupreview = False
 		if imagepath.endswith(".iso"):
 			PreviewTask(self, imagepath)
-			burnargs = [ "-Z", "/dev/" + harddiskmanager.getCD() + '='+imagepath, "-dvd-compat", "-use-the-force-luke=dummy" ]
+			burnargs = [ "-Z", "/dev/" + harddiskmanager.getCD() + '='+imagepath, "-dvd-compat" ]
 		else:
 			PreviewTask(self, imagepath + "/VIDEO_TS/")
 			volName = self.project.settings.name.getValue()
-			burnargs = [ "-Z", "/dev/" + harddiskmanager.getCD(), "-dvd-compat", "-use-the-force-luke=dummy" ]
+			burnargs = [ "-Z", "/dev/" + harddiskmanager.getCD(), "-dvd-compat" ]
 			burnargs += [ "-dvd-video", "-publisher", "Dreambox", "-V", volName, imagepath ]
 		tool = "/bin/growisofs"
 		BurnTask(self, burnargs, tool)