X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/3c066dfc061d51c59caf201e302cfb2301b5f0f7..ad916414180e6d210b827ae9efdcd4ee1dca9e02:/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 42af6ca6..b60cca20 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,30 +240,32 @@ 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_SIZE: ("Content does not fit on DVD!"), - task.ERROR_WRITE_FAILED: ("Write failed!"), - task.ERROR_DVDROM: ("No (supported) DVDROM found!"), - task.ERROR_ISOFS: ("Medium is not empty!"), - task.ERROR_UNKNOWN: ("An unknown error occured!") + task.ERROR_MEDIA: _("Medium is not a writeable DVD!"), + task.ERROR_SIZE: _("Content does not fit on DVD!"), + task.ERROR_WRITE_FAILED: _("Write failed!"), + task.ERROR_DVDROM: _("No (supported) DVDROM found!"), + task.ERROR_ISOFS: _("Medium is not empty!"), + task.ERROR_UNKNOWN: _("An unknown error occured!") }[task.error] class BurnTask(Task): ERROR_MEDIA, ERROR_SIZE, ERROR_WRITE_FAILED, ERROR_DVDROM, ERROR_ISOFS, ERROR_UNKNOWN = range(6) - def __init__(self, job): + def __init__(self, job, extra_args=[]): Task.__init__(self, job, "burn") 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") - - self.args += ["-dvd-video", "-dvd-compat", "-Z", "/dev/cdroms/cdrom0", "-V", self.getASCIIname(job.project.name), "-P", "Dreambox", "-use-the-force-luke=dummy", self.job.workspace + "/dvd"] + 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 += extra_args def getASCIIname(self, name): ASCIIname = "" @@ -285,6 +323,7 @@ class RemoveDVDFolder(Task): class PreviewTask(Task): def __init__(self, job): Task.__init__(self, job, "Preview") + self.postconditions.append(PreviewTaskPostcondition()) self.job = job def run(self, callback, task_progress_changed): @@ -295,7 +334,7 @@ class PreviewTask(Task): if self.job.menupreview: self.waitAndOpenPlayer() else: - self.job.project.session.openWithCallback(self.previewCB, MessageBox, _("Do you want to preview this project before burning?"), timeout = 60, default = False) + self.job.project.session.openWithCallback(self.previewCB, MessageBox, _("Do you want to preview this DVD before burning?"), timeout = 60, default = False) def previewCB(self, answer): if answer == True: @@ -307,7 +346,7 @@ class PreviewTask(Task): if self.job.menupreview: self.closedCB(True) else: - self.job.project.session.openWithCallback(self.closedCB, MessageBox, _("Do you want to burn this project to DVD medium?") ) + self.job.project.session.openWithCallback(self.closedCB, MessageBox, _("Do you want to burn this collection to DVD medium?") ) def closedCB(self, answer): if answer == True: @@ -325,6 +364,13 @@ class PreviewTask(Task): from Plugins.Extensions.DVDPlayer.plugin import DVDPlayer self.job.project.session.openWithCallback(self.playerClosed, DVDPlayer, dvd_filelist= [ self.job.project.workspace + "/dvd/VIDEO_TS/" ]) +class PreviewTaskPostcondition(Condition): + def check(self, task): + return task.returncode == 0 + + def getErrorMessage(self, task): + return "Cancel" + def getTitlesPerMenu(nr_titles): if nr_titles < 6: titles_per_menu = 5 @@ -332,19 +378,55 @@ def getTitlesPerMenu(nr_titles): 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) + template = template.replace("$d", title.descr) + template = template.replace("$c", str(len(title.chaptermarks)+1)) + template = template.replace("$A", str(title.audiotracks)) + template = template.replace("$f", title.inputfile) + template = template.replace("$C", title.channel) + l = title.length + lengthstring = "%d:%02d:%02d" % (l/3600, l%3600/60, l%60) + template = template.replace("$l", lengthstring) + if title.timeCreate: + template = template.replace("$Y", str(title.timeCreate[0])) + template = template.replace("$M", str(title.timeCreate[1])) + template = template.replace("$D", str(title.timeCreate[2])) + timestring = "%d:%02d" % (title.timeCreate[3], title.timeCreate[4]) + template = template.replace("$T", timestring) + else: + template = template.replace("$Y", "").replace("$M", "").replace("$D", "").replace("$T", "") + return template.decode("utf-8") + def CreateMenus(job): - import os, Image, ImageDraw, ImageFont, re + try: + from ImageFont import truetype + import ImageDraw, Image, os + except ImportError: + job.project.session.open(MessageBox, ("missing python-imaging"), type = MessageBox.TYPE_ERROR) + if job.project.waitboxref: + job.project.waitboxref.close() + return False + imgwidth = 720 imgheight = 576 - - im_bg_orig = Image.open(job.project.menubg) + 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 = truetype(fontface, fontsizes[0]) + font1 = truetype(fontface, fontsizes[1]) + font2 = truetype(fontface, fontsizes[2]) - font0 = ImageFont.truetype(job.project.font_face, job.project.font_size[0]) - font1 = ImageFont.truetype(job.project.font_face, job.project.font_size[1]) - font2 = ImageFont.truetype(job.project.font_face, job.project.font_size[2]) - spu_palette = [ 0x60, 0x60, 0x60 ] + list(job.project.color_highlight) + 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() nr_titles = len(job.project.titles) titles_per_menu = getTitlesPerMenu(nr_titles) @@ -359,13 +441,13 @@ def CreateMenus(job): draw_high = ImageDraw.Draw(im_high) if menu_count == 1: - headline = job.project.name.decode("utf-8") + 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=job.project.color_headline, font=font0) + draw_bg.text(offset, headline, fill=color_headline, font=font0) menubgpngfilename = job.workspace+"/dvd_menubg"+str(menu_count)+".png" highlightpngfilename = job.workspace+"/dvd_highlight"+str(menu_count)+".png" @@ -377,8 +459,8 @@ def CreateMenus(job): transparent="%02x%02x%02x" start="00:00:00.00" force="yes" >""" % (highlightpngfilename, spu_palette[0], spu_palette[1], spu_palette[2]) - - rowheight = (job.project.font_size[1]+job.project.font_size[2]+job.project.space_rows) + 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: @@ -386,33 +468,24 @@ def CreateMenus(job): menu_i = 0 for title_no in range( menu_start_title , menu_end_title ): i = title_no-1 - top = job.project.space_top + ( menu_i * rowheight ) + top = s_top + ( menu_i * rowheight ) menu_i += 1 title = job.project.titles[i] - titlename = title.name.decode("utf-8") - menuitem = "%d. %s" % (title_no, titlename) - draw_bg.text((job.project.space_left,top), menuitem, fill=job.project.color_button, font=font1) - draw_high.text((job.project.space_left,top), menuitem, fill=1, font=font1) - res = re.search("(?:/.*?).*/(?P\d{4})(?P\d{2})(?P\d{2}).(?P\d{2})(?P\d{2}).-.*.?.ts", title.inputfile) - subtitle = "" - if res: - subtitle = "%s-%s-%s, %s:%s. " % (res.group("year"),res.group("month"),res.group("day"),res.group("hour"),res.group("minute")) - if len(title.descr) > 1: - subtitle += title.descr.decode("utf-8") + ". " - if len(title.chaptermarks) > 1: - subtitle += (" (%d %s)" % (len(title.chaptermarks)+1, _("chapters"))) - draw_bg.text((job.project.space_left,top+36), subtitle, fill=job.project.color_button, font=font2) - + 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 += """ -