From 3728486e40b02d9d316a7491d2b7b1e3577c1872 Mon Sep 17 00:00:00 2001 From: Andreas Frisch Date: Fri, 5 Sep 2008 16:46:08 +0000 Subject: [PATCH] introduce a collection settings screen, delivery of template and menu source files --- .../Plugins/Extensions/DVDBurn/DVDProject.py | 150 ++++++++--------- .../Plugins/Extensions/DVDBurn/DVDTitle.py | 12 +- .../Plugins/Extensions/DVDBurn/Makefile.am | 6 +- .../Plugins/Extensions/DVDBurn/Process.py | 126 +++++++++------ .../Plugins/Extensions/DVDBurn/TitleList.py | 152 ++++-------------- .../Extensions/DVDBurn/data/Makefile.am | 6 + .../Extensions/DVDBurn/data/dreamdvd_boat.jpg | Bin 0 -> 187417 bytes .../Extensions/DVDBurn/data/dreamvmgm.mpg | Bin 0 -> 575488 bytes .../Extensions/DVDBurn/{ => data}/silence.mp2 | Bin .../Plugins/Extensions/DVDBurn/dreamvmgm.mpg | 0 .../Plugins/Extensions/DVDBurn/keymap.xml | 2 +- .../template/DreamboxDVDtemplate.ddvdp.xml | 18 +++ .../Extensions/DVDBurn/template/Makefile.am | 7 + 13 files changed, 229 insertions(+), 250 deletions(-) create mode 100644 lib/python/Plugins/Extensions/DVDBurn/data/Makefile.am create mode 100755 lib/python/Plugins/Extensions/DVDBurn/data/dreamdvd_boat.jpg create mode 100644 lib/python/Plugins/Extensions/DVDBurn/data/dreamvmgm.mpg rename lib/python/Plugins/Extensions/DVDBurn/{ => data}/silence.mp2 (100%) delete mode 100644 lib/python/Plugins/Extensions/DVDBurn/dreamvmgm.mpg create mode 100644 lib/python/Plugins/Extensions/DVDBurn/template/DreamboxDVDtemplate.ddvdp.xml create mode 100644 lib/python/Plugins/Extensions/DVDBurn/template/Makefile.am diff --git a/lib/python/Plugins/Extensions/DVDBurn/DVDProject.py b/lib/python/Plugins/Extensions/DVDBurn/DVDProject.py index fe09642b..9ee3bdb9 100644 --- a/lib/python/Plugins/Extensions/DVDBurn/DVDProject.py +++ b/lib/python/Plugins/Extensions/DVDBurn/DVDProject.py @@ -1,9 +1,32 @@ from Tools.Directories import fileExists +from Components.config import config, ConfigSubsection, ConfigInteger, ConfigYesNo, ConfigText, ConfigSelection, getConfigListEntry, ConfigSequence + +class ConfigColor(ConfigSequence): + def __init__(self): + ConfigSequence.__init__(self, seperator = "#", limits = [(0,255),(0,255),(0,255)]) + +class ConfigPixelvals(ConfigSequence): + def __init__(self): + ConfigSequence.__init__(self, seperator = ",", limits = [(0,200),(0,200),(0,200)]) class DVDProject: def __init__(self): self.titles = [ ] self.target = None + self.settings = ConfigSubsection() + self.settings.name = ConfigText(visible_width = 40) + self.settings.authormode = ConfigSelection(choices = [("menu_linked", _("Linked titles with a DVD menu")), ("just_linked", _("Direct playback of linked titles without menu")), ("menu_seperate", _("Seperate titles with a main menu")), ]) + self.settings.menubg = ConfigText(visible_width = 40) + self.settings.menuaudio = ConfigText(visible_width = 40) + self.settings.titleformat = ConfigText(visible_width = 40) + self.settings.subtitleformat = ConfigText(visible_width = 40) + self.settings.color_headline = ConfigColor() + self.settings.color_highlight = ConfigColor() + self.settings.color_button = ConfigColor() + self.settings.font_face = ConfigText(visible_width = 40) + self.settings.font_size = ConfigPixelvals() + self.settings.space = ConfigPixelvals() + self.settings.vmgm = ConfigText(visible_width = 40) def addService(self, service): import DVDTitle @@ -18,26 +41,11 @@ class DVDProject: list = [] list.append('\n') list.append('\n') - list.append('\t\n') - list.append('\t\n') - list.append('\t\n') + list.append('\t\n') + list.append('\t\n') for title in self.titles: list.append('\t\t') list.append(stringToXML(title.source.getPath())) @@ -45,65 +53,61 @@ class DVDProject: list.append('\t\n') list.append('\n') + name = self.settings.name.getValue() i = 0 - filename = path + "/" + self.name + ".ddvdp.xml" + filename = path + name + ".ddvdp.xml" while fileExists(filename): i = i+1 - filename = path + "/" + self.name + str(i).zfill(3) + ".ddvdp.xml" - - file = open(filename, "w") - for x in list: - file.write(x) - file.close() + filename = path + name + str(i).zfill(3) + ".ddvdp.xml" + try: + file = open(filename, "w") + for x in list: + file.write(x) + file.close() + except: + return False + return filename def loadProject(self, filename): import xml.dom.minidom - print "[loadProject]", filename try: - if not fileExists(filename): - self.error = "file not found!" - raise AttributeError - else: - self.error = "" - file = open(filename, "r") - data = file.read().decode("utf-8").replace('&',"&").encode("ascii",'xmlcharrefreplace') - file.close() - projectfiledom = xml.dom.minidom.parseString(data) - for project in projectfiledom.childNodes[0].childNodes: - if project.nodeType == xml.dom.minidom.Element.nodeType: - if project.tagName == 'project': - self.name = project.getAttribute("name").encode("utf-8") - self.vmgm = project.getAttribute("vmgm").encode("utf-8") - if project.tagName == 'menu': - self.menu = eval(project.getAttribute("use")) - self.menubg = project.getAttribute("bg").encode("utf-8") - self.menuaudio = project.getAttribute("audio").encode("utf-8") - # tuples with R, G, B values - self.color_button = eval(project.getAttribute("color_button")) - self.color_highlight = eval(project.getAttribute("color_highlight")) - self.color_headline = eval(project.getAttribute("color_headline")) - self.font_face = project.getAttribute("font_face").encode("utf-8") - # tuple with three pixel sizes ( headline, title, subtitle ) - self.font_size = eval(project.getAttribute("font_size")) - # please supply even numbers for all dimensions - self.space_left = int(project.getAttribute("space_left")) - self.space_top = int(project.getAttribute("space_top")) - self.space_rows = int(project.getAttribute("space_rows")) - if project.tagName == 'titles': - self.linktitles = eval(project.getAttribute("link")) - if not fileExists(self.vmgm): - self.error += "\nvmgm '%s' not found" % self.vmgm - if not fileExists(self.menubg): - self.error += "\nmenu background '%s' not found" % self.menubg - if not fileExists(self.menuaudio): - self.error += "\nmenu audio '%s' not found" % self.menuaudio - if not fileExists(self.font_face): - self.error += "\nmenu font '%s' not found" % self.font_face - print "len(self.error):", len(self.error) - if len(self.error): - raise AttributeError - except: - print "len(self.error):, error", len(self.error), len(self.error) - self.error = ("error parsing project xml file '%s'" % filename) + self.error + if not fileExists(filename): + self.error = "xml file not found!" + raise AttributeError + else: + self.error = "" + file = open(filename, "r") + data = file.read().decode("utf-8").replace('&',"&").encode("ascii",'xmlcharrefreplace') + file.close() + projectfiledom = xml.dom.minidom.parseString(data) + for project in projectfiledom.childNodes[0].childNodes: + if project.nodeType == xml.dom.minidom.Element.nodeType: + if project.tagName == 'settings': + i = 0 + if project.attributes.length < 11: + self.error = "project attributes missing" + raise AttributeError + while i < project.attributes.length: + item = project.attributes.item(i) + key = item.name.encode("utf-8") + try: + val = eval(item.nodeValue) + except (NameError, SyntaxError): + val = item.nodeValue.encode("utf-8") + try: + self.settings.dict()[key].setValue(val) + except (KeyError): + self.error = "unknown attribute '%s'" % (key) + raise AttributeError + i += 1 + checkfiles = ["vmgm", "menubg", "menuaudio", "font_face"] + for key in checkfiles: + val = self.settings.dict()[key].getValue() + if not fileExists(val): + self.error += "\n%s '%s' not found" % (key, val) + if len(self.error): + raise AttributeError + except AttributeError: + self.error += (" in project '%s'") % (filename) return False return True diff --git a/lib/python/Plugins/Extensions/DVDBurn/DVDTitle.py b/lib/python/Plugins/Extensions/DVDBurn/DVDTitle.py index 96bb1e73..dad16e7e 100644 --- a/lib/python/Plugins/Extensions/DVDBurn/DVDTitle.py +++ b/lib/python/Plugins/Extensions/DVDBurn/DVDTitle.py @@ -1,4 +1,3 @@ - class DVDTitle: def __init__(self): self.cuesheet = [ ] @@ -22,6 +21,7 @@ class DVDTitle: self.inputfile = service.getPath() self.filesize = path.getsize(self.inputfile) self.estimatedDiskspace = self.filesize + self.length = info.getLength(service) def produceFinalCuesheet(self): print "[produceFinalCuesheet] >>> ", self.inputfile, self.cuesheet @@ -67,12 +67,8 @@ class DVDTitle: print "cutlist =", self.cutlist, "chaptermarks =", self.chaptermarks, "accumulated_in =", accumulated_in if len(self.cutlist) > 1: - from enigma import eServiceCenter, iServiceInformation - serviceHandler = eServiceCenter.getInstance() - service = self.source - info = serviceHandler.info(service) - lenpts = info.getLength(service) * 90000 - part = accumulated_in / float(lenpts) + part = accumulated_in / (self.length*90000.0) usedsize = int ( part * self.filesize ) - print "lenpts=", lenpts, "part=", part, "filesize=", self.filesize, "estimatedDiskspace=", usedsize + print "part=", part, "filesize=", self.filesize, "estimatedDiskspace=", usedsize self.estimatedDiskspace = usedsize + self.length = accumulated_in / 90000 diff --git a/lib/python/Plugins/Extensions/DVDBurn/Makefile.am b/lib/python/Plugins/Extensions/DVDBurn/Makefile.am index 5906757c..886876cc 100644 --- a/lib/python/Plugins/Extensions/DVDBurn/Makefile.am +++ b/lib/python/Plugins/Extensions/DVDBurn/Makefile.am @@ -3,6 +3,8 @@ installdir = $(LIBDIR)/enigma2/python/Plugins/Extensions/DVDBurn install_PYTHON = \ __init__.py \ plugin.py \ - DVDProject.py DVDTitle.py TitleCutter.py TitleList.py Process.py + DVDProject.py DVDTitle.py TitleCutter.py TitleList.py Process.py ProjectSettings.py -install_DATA = keymap.xml silence.mp2 dreamvmgm.mpg +install_DATA = keymap.xml + +SUBDIRS = data template diff --git a/lib/python/Plugins/Extensions/DVDBurn/Process.py b/lib/python/Plugins/Extensions/DVDBurn/Process.py index 42af6ca6..072085ef 100644 --- a/lib/python/Plugins/Extensions/DVDBurn/Process.py +++ b/lib/python/Plugins/Extensions/DVDBurn/Process.py @@ -209,12 +209,12 @@ class BurnTaskPostcondition(Condition): 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): @@ -226,8 +226,8 @@ class BurnTask(Task): 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-video", "-dvd-compat", "-Z", "/dev/cdroms/cdrom0", "-V", volName, "-P", "Dreambox", "-use-the-force-luke=dummy", self.job.workspace + "/dvd"] def getASCIIname(self, name): ASCIIname = "" @@ -285,6 +285,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): @@ -325,6 +326,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 +340,47 @@ def getTitlesPerMenu(nr_titles): titles_per_menu = 4 return titles_per_menu +def formatTitle(template, title, track): + import re + 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("$f", title.inputfile) + l = title.length + lengthstring = "%d:%02d:%02d" % (l/3600, l%3600/60, l%60) + template = template.replace("$l", lengthstring) + res = re.search("(?:/.*?).*/(?P\d{4})(?P\d{2})(?P\d{2}).(?P\d{2})(?P\d{2}).-.*.?.ts", title.inputfile) + if res: + template = template.replace("$Y", res.group("year")) + template = template.replace("$M", res.group("month")) + template = template.replace("$D", res.group("day")) + template = template.replace("$h", res.group("hour")) + template = template.replace("$m", res.group("minute")) + else: + template = template.replace("$Y", "").replace("$M", "").replace("$D", "").replace("$h", "").replace("$m", "") + return template.decode("utf-8") + def CreateMenus(job): - import os, Image, ImageDraw, ImageFont, re + import os, Image, ImageDraw, ImageFont 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 = ImageFont.truetype(fontface, fontsizes[0]) + font1 = ImageFont.truetype(fontface, fontsizes[1]) + font2 = ImageFont.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 +395,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 +413,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 +422,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 += """ -