X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/deaf3139671ce0aa53a741b2fece9fbe3fd98c4e..2062d6d479dd1cff81c5434e6678a61e19f68ef1:/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 67654f61..41e129ad 100644 --- a/lib/python/Plugins/Extensions/DVDBurn/Process.py +++ b/lib/python/Plugins/Extensions/DVDBurn/Process.py @@ -1,4 +1,4 @@ -from Components.Task import Task, Job, job_manager, DiskspacePrecondition, Condition +from Components.Task import Task, Job, job_manager, DiskspacePrecondition, Condition, ToolExistsPrecondition from Screens.MessageBox import MessageBox class png2yuvTask(Task): @@ -11,13 +11,11 @@ class png2yuvTask(Task): def run(self, callback, task_progress_changed): Task.run(self, callback, task_progress_changed) + self.container.stdoutAvail.get().remove(self.processStdout) self.container.dumpToFile(self.dumpFile) def processStderr(self, data): - print "[png2yuvTask]", data - - def processStdout(self, data): - pass + print "[png2yuvTask]", data[:-1] class mpeg2encTask(Task): def __init__(self, job, inputfile, outputfile): @@ -32,7 +30,7 @@ class mpeg2encTask(Task): self.container.readFromFile(self.inputFile) def processOutputLine(self, line): - print "[mpeg2encTask]", line + print "[mpeg2encTask]", line[:-1] class spumuxTask(Task): def __init__(self, job, xmlfile, inputfile, outputfile): @@ -45,14 +43,12 @@ class spumuxTask(Task): def run(self, callback, task_progress_changed): Task.run(self, callback, task_progress_changed) + self.container.stdoutAvail.get().remove(self.processStdout) self.container.dumpToFile(self.dumpFile) self.container.readFromFile(self.inputFile) def processStderr(self, data): - print "[spumuxTask]", data - - def processStdout(self, data): - pass + print "[spumuxTask]", data[:-1] class MakeFifoNode(Task): def __init__(self, job, number): @@ -69,6 +65,19 @@ class LinkTS(Task): self.args += ["-s", sourcefile, link_name] self.weighting = 10 +class CopyMeta(Task): + def __init__(self, job, sourcefile): + Task.__init__(self, job, "Copy title meta files") + self.setTool("/bin/cp") + from os import listdir + path, filename = sourcefile.rstrip("/").rsplit("/",1) + tsfiles = listdir(path) + for file in tsfiles: + if file.startswith(filename+"."): + self.args += [path+'/'+file] + self.args += [self.job.workspace] + self.weighting = 10 + class DemuxTask(Task): def __init__(self, job, inputfile): Task.__init__(self, job, "Demux video into ES") @@ -107,7 +116,7 @@ class DemuxTask(Task): self.generated_files.append(file) def haveProgress(self, progress): - print "PROGRESS [%s]" % progress + #print "PROGRESS [%s]" % progress MSG_CHECK = "check & synchronize audio file" MSG_DONE = "done..." if progress == "preparing collection(s)...": @@ -144,22 +153,49 @@ class DemuxTask(Task): for f in self.generated_files: os.remove(f) +class MplexTaskPostcondition(Condition): + def check(self, task): + if task.error == task.ERROR_UNDERRUN: + return True + 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!") + }[task.error] + class MplexTask(Task): + ERROR_UNDERRUN, ERROR_UNKNOWN = range(2) def __init__(self, job, outputfile, inputfiles=None, demux_task=None): Task.__init__(self, job, "Mux ES into PS") self.weighting = 500 self.demux_task = demux_task + self.postconditions.append(MplexTaskPostcondition()) self.setTool("/usr/bin/mplex") self.args += ["-f8", "-o", outputfile, "-v1"] if inputfiles: self.args += inputfiles + def setTool(self, tool): + self.cmd = tool + self.args = [tool] + self.global_preconditions.append(ToolExistsPrecondition()) + # we don't want the ReturncodePostcondition in this case because for right now we're just gonna ignore the fact that mplex fails with a buffer underrun error on some streams (this always at the very end) + def prepare(self): + self.error = None if self.demux_task: self.args += self.demux_task.generated_files def processOutputLine(self, line): - print "[MplexTask] processOutputLine=", line + print "[MplexTask] processOutputLine=", line[:-1] + if line.startswith("**ERROR:"): + if line.find("Frame data under-runs detected") != -1: + self.error = self.ERROR_UNDERRUN + else: + self.error = self.ERROR_UNKNOWN class RemoveESFiles(Task): def __init__(self, job, demux_task): @@ -184,7 +220,7 @@ class DVDAuthorTask(Task): self.menupreview = job.menupreview def processOutputLine(self, line): - print "[DVDAuthorTask] processOutputLine=", line + print "[DVDAuthorTask] processOutputLine=", line[:-1] if not self.menupreview and line.startswith("STAT: Processing"): self.callback(self, [], stay_resident=True) @@ -204,12 +240,14 @@ class WaitForResidentTasks(Task): callback(self, []) class BurnTaskPostcondition(Condition): + RECOVERABLE = True def check(self, task): return task.error is None def getErrorMessage(self, task): return { - task.ERROR_MEDIA: _("Medium is not a writeable DVD!"), + task.ERROR_NOTWRITEABLE: _("Medium is not a writeable DVD!"), + task.ERROR_LOAD: _("Could not load Medium! No disc inserted?"), task.ERROR_SIZE: _("Content does not fit on DVD!"), task.ERROR_WRITE_FAILED: _("Write failed!"), task.ERROR_DVDROM: _("No (supported) DVDROM found!"), @@ -218,8 +256,8 @@ class BurnTaskPostcondition(Condition): }[task.error] class BurnTask(Task): - ERROR_MEDIA, ERROR_SIZE, ERROR_WRITE_FAILED, ERROR_DVDROM, ERROR_ISOFS, ERROR_UNKNOWN = range(6) - def __init__(self, job): + 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") self.weighting = 500 @@ -227,7 +265,8 @@ class BurnTask(Task): self.postconditions.append(BurnTaskPostcondition()) self.setTool("/bin/growisofs") volName = self.getASCIIname(job.project.settings.name.getValue()) - self.args += ["-dvd-video", "-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/cdroms/cdrom0", "-V", volName, "-P", "Dreambox", "-use-the-force-luke=dummy", self.job.workspace + "/dvd"] + self.args += extra_args def getASCIIname(self, name): ASCIIname = "" @@ -253,7 +292,9 @@ class BurnTask(Task): self.progress = 110 elif line.startswith(":-["): if line.find("ASC=30h") != -1: - self.error = self.ERROR_MEDIA + self.error = self.ERROR_NOTWRITEABLE + if line.find("ASC=24h") != -1: + self.error = self.ERROR_LOAD else: self.error = self.ERROR_UNKNOWN print "BurnTask: unknown error %s" % line @@ -265,7 +306,7 @@ class BurnTask(Task): elif line.find("unable to open64(\"/dev/cdroms/cdrom0\",O_RDONLY): No such file or directory") != -1: # fixme self.error = self.ERROR_DVDROM elif line.find("media is not recognized as recordable DVD") != -1: - self.error = self.ERROR_MEDIA + self.error = self.ERROR_NOTWRITEABLE else: self.error = self.ERROR_UNKNOWN print "BurnTask: unknown error %s" % line @@ -291,8 +332,6 @@ class PreviewTask(Task): def run(self, callback, task_progress_changed): self.callback = callback self.task_progress_changed = task_progress_changed - if self.job.project.waitboxref: - self.job.project.waitboxref.close() if self.job.menupreview: self.waitAndOpenPlayer() else: @@ -333,13 +372,6 @@ class PreviewTaskPostcondition(Condition): def getErrorMessage(self, task): return "Cancel" -def getTitlesPerMenu(nr_titles): - if nr_titles < 6: - titles_per_menu = 5 - else: - titles_per_menu = 4 - return titles_per_menu - def formatTitle(template, title, track): template = template.replace("$i", str(track)) template = template.replace("$t", title.name) @@ -361,129 +393,189 @@ def formatTitle(template, title, track): template = template.replace("$Y", "").replace("$M", "").replace("$D", "").replace("$T", "") return template.decode("utf-8") -def CreateMenus(job): - import os, Image, ImageDraw, ImageFont - imgwidth = 720 - imgheight = 576 - s = job.project.settings - im_bg_orig = Image.open(s.menubg.getValue()) - if im_bg_orig.size != (imgwidth, imgheight): - im_bg_orig = im_bg_orig.resize((720, 576)) - - fontsizes = s.font_size.getValue() - fontface = s.font_face.getValue() - - font0 = ImageFont.truetype(fontface, fontsizes[0]) - font1 = ImageFont.truetype(fontface, fontsizes[1]) - font2 = ImageFont.truetype(fontface, fontsizes[2]) +class ImagingPostcondition(Condition): + def check(self, task): + return task.returncode == 0 - color_headline = tuple(s.color_headline.getValue()) - color_button = tuple(s.color_button.getValue()) - color_highlight = tuple(s.color_highlight.getValue()) - spu_palette = [ 0x60, 0x60, 0x60 ] + s.color_highlight.getValue() + def getErrorMessage(self, task): + return "python-imaging " + _("failed") - nr_titles = len(job.project.titles) - titles_per_menu = getTitlesPerMenu(nr_titles) - job.nr_menus = ((nr_titles+titles_per_menu-1)/titles_per_menu) - - #a new menu_count every 5 titles (1,2,3,4,5->1 ; 6,7,8,9,10->2 etc.) - for menu_count in range(1 , job.nr_menus+1): - im_bg = im_bg_orig.copy() - im_high = Image.new("P", (imgwidth, imgheight), 0) - im_high.putpalette(spu_palette) - draw_bg = ImageDraw.Draw(im_bg) - draw_high = ImageDraw.Draw(im_high) - - if menu_count == 1: - headline = s.name.getValue().decode("utf-8") - textsize = draw_bg.textsize(headline, font=font0) - if textsize[0] > imgwidth: - offset = (0 , 20) - else: - offset = (((imgwidth-textsize[0]) / 2) , 20) - draw_bg.text(offset, headline, fill=color_headline, font=font0) +class ImagePrepareTask(Task): + def __init__(self, job): + Task.__init__(self, job, _("please wait, loading picture...")) + self.postconditions.append(ImagingPostcondition()) + self.weighting = 20 + self.job = job + self.Menus = job.Menus - menubgpngfilename = job.workspace+"/dvd_menubg"+str(menu_count)+".png" - highlightpngfilename = job.workspace+"/dvd_highlight"+str(menu_count)+".png" - spuxml = """ - - - """ % (highlightpngfilename, spu_palette[0], spu_palette[1], spu_palette[2]) - s_top, s_rows, s_left = s.space.getValue() - rowheight = (fontsizes[1]+fontsizes[2]+s_rows) - menu_start_title = (menu_count-1)*titles_per_menu + 1 - menu_end_title = (menu_count)*titles_per_menu + 1 - if menu_end_title > nr_titles: - menu_end_title = nr_titles+1 - menu_i = 0 - for title_no in range( menu_start_title , menu_end_title ): - i = title_no-1 - top = s_top + ( menu_i * rowheight ) - menu_i += 1 - title = job.project.titles[i] - titleText = formatTitle(s.titleformat.getValue(), title, title_no) - draw_bg.text((s_left,top), titleText, fill=color_button, font=font1) - draw_high.text((s_left,top), titleText, fill=1, font=font1) - subtitleText = formatTitle(s.subtitleformat.getValue(), title, title_no) - draw_bg.text((s_left,top+36), subtitleText, fill=color_button, font=font2) - bottom = top+rowheight - if bottom > imgheight: - bottom = imgheight - spuxml += """ -