X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2062d6d479dd1cff81c5434e6678a61e19f68ef1..1b01c9c3c05fdd42327406161bd5c51e05fbca19:/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 41e129ad..f54fcb00 100644 --- a/lib/python/Plugins/Extensions/DVDBurn/Process.py +++ b/lib/python/Plugins/Extensions/DVDBurn/Process.py @@ -1,4 +1,5 @@ -from Components.Task import Task, Job, job_manager, DiskspacePrecondition, Condition, ToolExistsPrecondition +from Components.Task import Task, Job, DiskspacePrecondition, Condition, ToolExistsPrecondition +from Components.Harddisk import harddiskmanager from Screens.MessageBox import MessageBox class png2yuvTask(Task): @@ -7,11 +8,11 @@ class png2yuvTask(Task): self.setTool("/usr/bin/png2yuv") self.args += ["-n1", "-Ip", "-f25", "-j", inputfile] self.dumpFile = outputfile - self.weighting = 10 + self.weighting = 15 def run(self, callback, task_progress_changed): Task.run(self, callback, task_progress_changed) - self.container.stdoutAvail.get().remove(self.processStdout) + self.container.stdoutAvail.remove(self.processStdout) self.container.dumpToFile(self.dumpFile) def processStderr(self, data): @@ -23,7 +24,7 @@ class mpeg2encTask(Task): self.setTool("/usr/bin/mpeg2enc") self.args += ["-f8", "-np", "-a2", "-o", outputfile] self.inputFile = inputfile - self.weighting = 10 + self.weighting = 25 def run(self, callback, task_progress_changed): Task.run(self, callback, task_progress_changed) @@ -39,11 +40,11 @@ class spumuxTask(Task): self.args += [xmlfile] self.inputFile = inputfile self.dumpFile = outputfile - self.weighting = 10 + self.weighting = 15 def run(self, callback, task_progress_changed): Task.run(self, callback, task_progress_changed) - self.container.stdoutAvail.get().remove(self.processStdout) + self.container.stdoutAvail.remove(self.processStdout) self.container.dumpToFile(self.dumpFile) self.container.readFromFile(self.inputFile) @@ -76,7 +77,7 @@ class CopyMeta(Task): if file.startswith(filename+"."): self.args += [path+'/'+file] self.args += [self.job.workspace] - self.weighting = 10 + self.weighting = 15 class DemuxTask(Task): def __init__(self, job, inputfile): @@ -160,7 +161,6 @@ class MplexTaskPostcondition(Condition): return task.error is None def getErrorMessage(self, task): - print "[MplexTaskPostcondition] getErrorMessage", task return { task.ERROR_UNDERRUN: ("Can't multiplex source video!"), task.ERROR_UNKNOWN: ("An unknown error occured!") @@ -168,9 +168,9 @@ class MplexTaskPostcondition(Condition): class MplexTask(Task): ERROR_UNDERRUN, ERROR_UNKNOWN = range(2) - def __init__(self, job, outputfile, inputfiles=None, demux_task=None): + def __init__(self, job, outputfile, inputfiles=None, demux_task=None, weighting = 500): Task.__init__(self, job, "Mux ES into PS") - self.weighting = 500 + self.weighting = weighting self.demux_task = demux_task self.postconditions.append(MplexTaskPostcondition()) self.setTool("/usr/bin/mplex") @@ -190,7 +190,7 @@ class MplexTask(Task): self.args += self.demux_task.generated_files def processOutputLine(self, line): - print "[MplexTask] processOutputLine=", line[:-1] + print "[MplexTask] ", line[:-1] if line.startswith("**ERROR:"): if line.find("Frame data under-runs detected") != -1: self.error = self.ERROR_UNDERRUN @@ -202,6 +202,7 @@ class RemoveESFiles(Task): Task.__init__(self, job, "Remove temp. files") self.demux_task = demux_task self.setTool("/bin/rm") + self.weighting = 10 def prepare(self): self.args += ["-f"] @@ -211,7 +212,6 @@ class RemoveESFiles(Task): class DVDAuthorTask(Task): def __init__(self, job, diskspaceNeeded): Task.__init__(self, job, "Authoring DVD") - self.global_preconditions.append(DiskspacePrecondition(diskspaceNeeded)) self.weighting = 300 self.setTool("/usr/bin/dvdauthor") @@ -220,7 +220,7 @@ class DVDAuthorTask(Task): self.menupreview = job.menupreview def processOutputLine(self, line): - print "[DVDAuthorTask] processOutputLine=", line[:-1] + print "[DVDAuthorTask] ", line[:-1] if not self.menupreview and line.startswith("STAT: Processing"): self.callback(self, [], stay_resident=True) @@ -258,14 +258,14 @@ class BurnTaskPostcondition(Condition): class BurnTask(Task): ERROR_NOTWRITEABLE, ERROR_LOAD, ERROR_SIZE, ERROR_WRITE_FAILED, ERROR_DVDROM, ERROR_ISOFS, ERROR_UNKNOWN = range(7) def __init__(self, job, extra_args=[]): - Task.__init__(self, job, "burn") + Task.__init__(self, job, _("Burn to DVD...")) self.weighting = 500 self.end = 120 # 100 for writing, 10 for buffer flush, 10 for closing disc self.postconditions.append(BurnTaskPostcondition()) self.setTool("/bin/growisofs") volName = self.getASCIIname(job.project.settings.name.getValue()) - self.args += ["-dvd-compat", "-Z", "/dev/cdroms/cdrom0", "-V", volName, "-P", "Dreambox", "-use-the-force-luke=dummy", self.job.workspace + "/dvd"] + self.args += [ "-dvd-compat", "-Z", "/dev/" + harddiskmanager.getCD(), "-V", volName, "-publisher", "Dreambox", "-use-the-force-luke=dummy" ] self.args += extra_args def getASCIIname(self, name): @@ -303,7 +303,7 @@ class BurnTask(Task): self.error = self.ERROR_SIZE elif line.find("write failed") != -1: self.error = self.ERROR_WRITE_FAILED - elif line.find("unable to open64(\"/dev/cdroms/cdrom0\",O_RDONLY): No such file or directory") != -1: # fixme + elif line.find("unable to open64(") != -1 and line.find(",O_RDONLY): No such file or directory") != -1: self.error = self.ERROR_DVDROM elif line.find("media is not recognized as recordable DVD") != -1: self.error = self.ERROR_NOTWRITEABLE @@ -322,24 +322,29 @@ class RemoveDVDFolder(Task): Task.__init__(self, job, "Remove temp. files") self.setTool("/bin/rm") self.args += ["-rf", self.job.workspace] + self.weighting = 10 class PreviewTask(Task): def __init__(self, job): Task.__init__(self, job, "Preview") self.postconditions.append(PreviewTaskPostcondition()) self.job = job + self.weighting = 10 def run(self, callback, task_progress_changed): self.callback = callback self.task_progress_changed = task_progress_changed if self.job.menupreview: - self.waitAndOpenPlayer() + self.previewProject() else: self.job.project.session.openWithCallback(self.previewCB, MessageBox, _("Do you want to preview this DVD before burning?"), timeout = 60, default = False) + + def abort(self): + self.finish(aborted = True) def previewCB(self, answer): if answer == True: - self.waitAndOpenPlayer() + self.previewProject() else: self.closedCB(True) @@ -354,12 +359,6 @@ class PreviewTask(Task): Task.processFinished(self, 0) else: Task.processFinished(self, 1) - - def waitAndOpenPlayer(self): - from enigma import eTimer - self.delayTimer = eTimer() - self.delayTimer.callback.append(self.previewProject) - self.delayTimer.start(10,1) def previewProject(self): from Plugins.Extensions.DVDPlayer.plugin import DVDPlayer @@ -398,7 +397,7 @@ class ImagingPostcondition(Condition): return task.returncode == 0 def getErrorMessage(self, task): - return "python-imaging " + _("failed") + return _("Failed") + ": python-imaging" class ImagePrepareTask(Task): def __init__(self, job): @@ -433,29 +432,30 @@ class ImagePrepareTask(Task): Task.processFinished(self, 1) class MenuImageTask(Task): - def __init__(self, job): - Task.__init__(self, job, "Create Menu %d Image" % job.Menus.menu_count) + def __init__(self, job, menu_count, spuxmlfilename, menubgpngfilename, highlightpngfilename): + Task.__init__(self, job, "Create Menu %d Image" % menu_count) self.postconditions.append(ImagingPostcondition()) - self.weighting = 20 + self.weighting = 10 self.job = job self.Menus = job.Menus + self.menu_count = menu_count + self.spuxmlfilename = spuxmlfilename + self.menubgpngfilename = menubgpngfilename + self.highlightpngfilename = highlightpngfilename def run(self, callback, task_progress_changed): self.callback = callback self.task_progress_changed = task_progress_changed try: import ImageDraw, Image, os - s = self.job.project.settings fonts = self.Menus.fonts - im_bg = self.Menus.im_bg_orig.copy() im_high = Image.new("P", (self.Menus.imgwidth, self.Menus.imgheight), 0) im_high.putpalette(self.Menus.spu_palette) draw_bg = ImageDraw.Draw(im_bg) draw_high = ImageDraw.Draw(im_high) - - if self.Menus.menu_count == 1: + if self.menu_count == 1: headline = s.name.getValue().decode("utf-8") textsize = draw_bg.textsize(headline, font=fonts[0]) if textsize[0] > self.Menus.imgwidth: @@ -463,7 +463,6 @@ class MenuImageTask(Task): else: offset = (((self.Menus.imgwidth-textsize[0]) / 2) , 20) draw_bg.text(offset, headline, fill=self.Menus.color_headline, font=fonts[0]) - spuxml = """ @@ -471,11 +470,11 @@ class MenuImageTask(Task): highlight="%s" transparent="%02x%02x%02x" start="00:00:00.00" - force="yes" >""" % (self.Menus.highlightpngfilename, self.Menus.spu_palette[0], self.Menus.spu_palette[1], self.Menus.spu_palette[2]) + force="yes" >""" % (self.highlightpngfilename, self.Menus.spu_palette[0], self.Menus.spu_palette[1], self.Menus.spu_palette[2]) s_top, s_rows, s_left = s.space.getValue() rowheight = (self.Menus.fontsizes[1]+self.Menus.fontsizes[2]+s_rows) - menu_start_title = (self.Menus.menu_count-1)*self.job.titles_per_menu + 1 - menu_end_title = (self.Menus.menu_count)*self.job.titles_per_menu + 1 + menu_start_title = (self.menu_count-1)*self.job.titles_per_menu + 1 + menu_end_title = (self.menu_count)*self.job.titles_per_menu + 1 nr_titles = len(self.job.project.titles) if menu_end_title > nr_titles: menu_end_title = nr_titles+1 @@ -495,16 +494,7 @@ class MenuImageTask(Task): bottom = self.Menus.imgheight spuxml += """