fix cuesheets, add multiple menu pages support, add preview support, add project saveing ...

1 files changed, 370 insertions, 101 deletions

diff --git a/lib/python/Plugins/Extensions/DVDBurn/Process.py b/lib/python/Plugins/Extensions/DVDBurn/Process.py
index 217c724c..b9710d5a 100644
--- a/lib/python/Plugins/Extensions/DVDBurn/Process.py
+++ b/lib/python/Plugins/Extensions/DVDBurn/Process.py
@@ -1,33 +1,89 @@
 from Components.Task import Task, Job, job_manager, DiskspacePrecondition, Condition
+from Screens.MessageBox import MessageBox
+
+class png2yuvTask(Task):
+	def __init__(self, job, inputfile, outputfile):
+		Task.__init__(self, job, "Creating menu video")
+		self.setTool("/usr/bin/png2yuv")
+		self.args += ["-n1", "-Ip", "-f25", "-j", inputfile]
+		self.dumpFile = outputfile
+		self.weighting = 10
+
+	def run(self, callback, task_progress_changed):
+		Task.run(self, callback, task_progress_changed)
+		self.container.dumpToFile(self.dumpFile)
+
+	def processStderr(self, data):
+		print "[png2yuvTask]", data
+
+	def processStdout(self, data):
+		pass
+
+class mpeg2encTask(Task):
+	def __init__(self, job, inputfile, outputfile):
+		Task.__init__(self, job, "Encoding menu video")
+		self.setTool("/usr/bin/mpeg2enc")
+		self.args += ["-f8", "-np", "-a2", "-o", outputfile]
+		self.inputFile = inputfile
+		self.weighting = 10
+		
+	def run(self, callback, task_progress_changed):
+		Task.run(self, callback, task_progress_changed)
+		self.container.readFromFile(self.inputFile)
+
+	def processOutputLine(self, line):
+		print "[mpeg2encTask]", line
+
+class spumuxTask(Task):
+	def __init__(self, job, xmlfile, inputfile, outputfile):
+		Task.__init__(self, job, "Muxing buttons into menu")
+		self.setTool("/usr/bin/spumux")
+		self.args += [xmlfile]
+		self.inputFile = inputfile
+		self.dumpFile = outputfile
+		self.weighting = 10
+
+	def run(self, callback, task_progress_changed):
+		Task.run(self, callback, task_progress_changed)
+		self.container.dumpToFile(self.dumpFile)
+		self.container.readFromFile(self.inputFile)
+
+	def processStderr(self, data):
+		print "[spumuxTask]", data
+
+	def processStdout(self, data):
+		pass
 
 class MakeFifoNode(Task):
 	def __init__(self, job, number):
-		Task.__init__(self, job, "Make FIFO Nodes")
+		Task.__init__(self, job, "Make FIFO nodes")
 		self.setTool("/bin/mknod")
 		nodename = self.job.workspace + "/dvd_title_%d" % number + ".mpg"
 		self.args += [nodename, "p"]
+		self.weighting = 10
 
 class LinkTS(Task):
 	def __init__(self, job, sourcefile, link_name):
-		Task.__init__(self, job, "Creating Symlink for source titles")
+		Task.__init__(self, job, "Creating symlink for source titles")
 		self.setTool("/bin/ln")
 		self.args += ["-s", sourcefile, link_name]
+		self.weighting = 10
 
 class DemuxTask(Task):
-	def __init__(self, job, inputfile, cutlist):
+	def __init__(self, job, inputfile):
 		Task.__init__(self, job, "Demux video into ES")
-
-		self.global_preconditions.append(DiskspacePrecondition(4*1024*1024))
+		title = job.project.titles[job.i]
+		self.global_preconditions.append(DiskspacePrecondition(title.estimatedDiskspace))
 		self.setTool("/usr/bin/projectx")
-		self.cutfile = self.job.workspace + "/cut.Xcl"
 		self.generated_files = [ ]
-		self.cutlist = cutlist
-
 		self.end = 300
 		self.prog_state = 0
 		self.weighting = 1000
-
-		self.args += [inputfile, "-demux", "-out", self.job.workspace, "-cut", self.job.workspace + "/" + self.cutfile ]
+		self.cutfile = self.job.workspace + "/cut_%d.Xcl" % (job.i+1)
+		self.cutlist = title.cutlist
+		self.args += [inputfile, "-demux", "-out", self.job.workspace ]
+		if len(self.cutlist) > 1:
+			self.args += [ "-cut", self.cutfile ]
 
 	def prepare(self):
 		self.writeCutfile()
@@ -89,16 +145,18 @@ class DemuxTask(Task):
 				os.remove(f)
 
 class MplexTask(Task):
-	def __init__(self, job, outputfile, demux_task):
+	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.setTool("/usr/bin/mplex")
 		self.args += ["-f8", "-o", outputfile, "-v1"]
+		if inputfiles:
+			self.args += inputfiles
 
 	def prepare(self):
-		self.args += self.demux_task.generated_files
+		if self.demux_task:
+			self.args += self.demux_task.generated_files
 
 	def processOutputLine(self, line):
 		print "[MplexTask] processOutputLine=", line
@@ -115,17 +173,19 @@ class RemoveESFiles(Task):
 		self.args += [self.demux_task.cutfile]
 
 class DVDAuthorTask(Task):
-	def __init__(self, job):
+	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")
 		self.CWD = self.job.workspace
 		self.args += ["-x", self.job.workspace+"/dvdauthor.xml"]
+		self.menupreview = job.menupreview
 
 	def processOutputLine(self, line):
 		print "[DVDAuthorTask] processOutputLine=", line
-		if line.startswith("STAT: Processing"):
+		if not self.menupreview and line.startswith("STAT: Processing"):
 			self.callback(self, [], stay_resident=True)
 
 class DVDAuthorFinalTask(Task):
@@ -165,8 +225,18 @@ 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", "Dreambox_DVD", "-use-the-force-luke=dummy", self.job.workspace + "/dvd"]
+		
+		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"]
 
+	def getASCIIname(self, name):
+		ASCIIname = ""
+		for char in name.decode("utf-8").encode("ascii","replace"):
+			if ord(char) <= 0x20 or ( ord(char) >= 0x3a and ord(char) <= 0x40 ):
+				ASCIIname += '_'
+			else:
+				ASCIIname += char
+		return ASCIIname
+		
 	def prepare(self):
 		self.error = None
 
@@ -205,110 +275,309 @@ class RemoveDVDFolder(Task):
 		self.setTool("/bin/rm")
 		self.args += ["-rf", self.job.workspace]
 
-class DVDJob(Job):
-	def __init__(self, cue):
-		Job.__init__(self, "DVD Burn")
-		self.cue = cue
-		from time import strftime
-		from Tools.Directories import SCOPE_HDD, resolveFilename, createDir
-		new_workspace = resolveFilename(SCOPE_HDD) + "tmp/" + strftime("%Y%m%d%H%M%S")
-		createDir(new_workspace)
-		self.workspace = new_workspace
-		self.fromDescription(self.createDescription())
+class PreviewTask(Task):
+	def __init__(self, job):
+		Task.__init__(self, job, "Preview")
+		self.job = job
+
+	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:
+			self.job.project.session.openWithCallback(self.previewCB, MessageBox, _("Do you want to preview this project before burning?"), timeout = 60, default = False)
+	
+	def previewCB(self, answer):
+		if answer == True:
+			self.waitAndOpenPlayer()
+		else:
+			self.closedCB(True)
+
+	def playerClosed(self):
+		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?") )
+
+	def closedCB(self, answer):
+		if answer == True:
+			Task.processFinished(self, 0)
+		else:
+			Task.processFinished(self, 1)
 
-	def fromDescription(self, description):
-		nr_titles = int(description["nr_titles"])
-		authorxml = """
+	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
+		self.job.project.session.openWithCallback(self.playerClosed, DVDPlayer, dvd_filelist= [ self.job.project.workspace + "/dvd/VIDEO_TS/" ])
+
+def getTitlesPerMenu(nr_titles):
+	if nr_titles < 6:
+		titles_per_menu = 5
+	else:
+		titles_per_menu = 4
+	return titles_per_menu
+
+def CreateMenus(job):
+	import os, Image, ImageDraw, ImageFont, re
+	imgwidth = 720
+	imgheight = 576
+	
+	im_bg_orig = Image.open(job.project.menubg)
+	if im_bg_orig.size != (imgwidth, imgheight):
+		im_bg_orig = im_bg_orig.resize((720, 576))
+
+	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)
+
+	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 = job.project.name.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)
+		
+		menubgpngfilename = job.workspace+"/dvd_menubg"+str(menu_count)+".png"
+		highlightpngfilename = job.workspace+"/dvd_highlight"+str(menu_count)+".png"
+		spuxml = """<?xml version="1.0" encoding="utf-8"?>
+	<subpictures>
+	<stream>
+	<spu 
+	highlight="%s"
+	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)
+		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 = job.project.space_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<year>\d{4})(?P<month>\d{2})(?P<day>\d{2}).(?P<hour>\d{2})(?P<minute>\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)
+	
+			bottom = top+rowheight
+			if bottom > imgheight:
+				bottom = imgheight
+			spuxml += """
+	<button name="button%s" x0="%d" x1="%d" y0="%d" y1="%d"/>""" % (str(title_no).zfill(2),job.project.space_left,imgwidth,top,bottom )
+		if menu_count > 1:
+			prev_page_text = "<<<"
+			textsize = draw_bg.textsize(prev_page_text, font=font1)
+			offset = ( 2*job.project.space_left, job.project.space_top + ( titles_per_menu * rowheight ) )
+			draw_bg.text(offset, prev_page_text, fill=job.project.color_button, font=font1)
+			draw_high.text(offset, prev_page_text, fill=1, font=font1)
+			spuxml += """
+	<button name="button_prev" x0="%d" x1="%d" y0="%d" y1="%d"/>""" % (offset[0],offset[0]+textsize[0],offset[1],offset[1]+textsize[1])
+
+		if menu_count < job.nr_menus:
+			next_page_text = ">>>"
+			textsize = draw_bg.textsize(next_page_text, font=font1)
+			offset = ( imgwidth-textsize[0]-2*job.project.space_left, job.project.space_top + ( titles_per_menu * rowheight ) )
+			draw_bg.text(offset, next_page_text, fill=job.project.color_button, font=font1)
+			draw_high.text(offset, next_page_text, fill=1, font=font1)
+			spuxml += """
+	<button name="button_next" x0="%d" x1="%d" y0="%d" y1="%d"/>""" % (offset[0],offset[0]+textsize[0],offset[1],offset[1]+textsize[1])
+				
+		del draw_bg
+		del draw_high
+		fd=open(menubgpngfilename,"w")
+		im_bg.save(fd,"PNG")
+		fd.close()
+		fd=open(highlightpngfilename,"w")
+		im_high.save(fd,"PNG")
+		fd.close()
+	
+		png2yuvTask(job, menubgpngfilename, job.workspace+"/dvdmenubg"+str(menu_count)+".yuv")
+		menubgm2vfilename = job.workspace+"/dvdmenubg"+str(menu_count)+".mv2"
+		mpeg2encTask(job, job.workspace+"/dvdmenubg"+str(menu_count)+".yuv", menubgm2vfilename)
+		menubgmpgfilename = job.workspace+"/dvdmenubg"+str(menu_count)+".mpg"
+		MplexTask(job, outputfile=menubgmpgfilename, inputfiles = [menubgm2vfilename, job.project.menuaudio])
+	
+		spuxml += """
+	</spu>
+	</stream>
+	</subpictures>"""
+		spuxmlfilename = job.workspace+"/spumux"+str(menu_count)+".xml"
+		f = open(spuxmlfilename, "w")
+		f.write(spuxml)
+		f.close()
+		
+		menuoutputfilename = job.workspace+"/dvdmenu"+str(menu_count)+".mpg"
+		spumuxTask(job, spuxmlfilename, menubgmpgfilename, menuoutputfilename)
+		
+def CreateAuthoringXML(job):
+	nr_titles = len(job.project.titles)
+	titles_per_menu = getTitlesPerMenu(nr_titles)
+	authorxml = """<?xml version="1.0" encoding="utf-8"?>
 <dvdauthor dest="%s">
    <vmgm>
       <menus>
          <pgc>
-            <post> jump title 1; </post>
+            <vob file="%s" />
+            <post> jump titleset 1 menu; </post>
          </pgc>
       </menus>
    </vmgm>
    <titleset>
-      <titles>""" % (self.workspace+"/dvd")
-		for i in range(nr_titles):
-			chapterlist_entries = description["chapterlist%d_entries" % i]
-			chapterlist = [ ]
-			print str(chapterlist_entries)
-			for j in range(chapterlist_entries):
-				chapterlist.append(int(description["chapterlist%d_%d" % (i, j)]))
-			print str(chapterlist)
-			chapters = ','.join(["%d:%02d:%02d.%03d," % (p / (90000 * 3600), p % (90000 * 3600) / (90000 * 60), p % (90000 * 60) / 90000, (p % 90000) / 90) for p in chapterlist])
-
-			title_no = i+1
-			MakeFifoNode(self, title_no)
-			vob_tag = """file="%s/dvd_title_%d.mpg" chapters="%s" />""" % (self.workspace, title_no, chapters)
-						
-			if title_no < nr_titles:
-				post_tag = "> jump title %d;</post>" % ( title_no+1 )
-			else:
-				post_tag = " />"
+      <menus>
+         <video aspect="4:3"/>"""% (job.workspace+"/dvd", job.project.vmgm)
+	for menu_count in range(1 , job.nr_menus+1):
+		if menu_count == 1:
+			authorxml += """
+         <pgc entry="root">"""
+		else:
 			authorxml += """
+         <pgc>"""
+		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
+		for i in range( menu_start_title , menu_end_title ):
+			authorxml += """
+            <button name="button%s">jump title %d;</button>""" % (str(i).zfill(2), i)
+		
+		if menu_count > 1:
+			authorxml += """
+            <button name="button_prev">jump menu %d;</button>""" % (menu_count-1)
+			
+		if menu_count < job.nr_menus:
+			authorxml += """
+            <button name="button_next">jump menu %d;</button>""" % (menu_count+1)
+
+		menuoutputfilename = job.workspace+"/dvdmenu"+str(menu_count)+".mpg"
+		authorxml += """
+            <vob file="%s" pause="inf"/>
+	 </pgc>""" % menuoutputfilename
+	authorxml += """
+      </menus>
+      <titles>"""
+	for i in range( nr_titles ):
+		chapters = ','.join(["%d:%02d:%02d.%03d" % (p / (90000 * 3600), p % (90000 * 3600) / (90000 * 60), p % (90000 * 60) / 90000, (p % 90000) / 90) for p in job.project.titles[i].chaptermarks])
+
+		title_no = i+1
+		title_filename = job.workspace + "/dvd_title_%d.mpg" % (title_no)
+		
+		if job.menupreview:
+			LinkTS(job, job.project.vmgm, title_filename)
+		else:
+			MakeFifoNode(job, title_no)
+		
+		vob_tag = """file="%s" chapters="%s" />""" % (title_filename, chapters)
+					
+		if title_no < nr_titles:
+			post_tag = "jump title %d;" % ( title_no+1 )
+		else:
+			post_tag = "call vmgm menu 1;"
+		authorxml += """
          <pgc>
             <vob %s
-            <post%s
+            <post> %s </post>
          </pgc>""" % (vob_tag, post_tag)
-	 	authorxml += """
-      </titles>
+	 
+	authorxml += """
+     </titles>
    </titleset>
 </dvdauthor>
 """
-		f = open(self.workspace+"/dvdauthor.xml", "w")
-		f.write(authorxml)
-		f.close()
+	f = open(job.workspace+"/dvdauthor.xml", "w")
+	f.write(authorxml)
+	f.close()
 
-		DVDAuthorTask(self)
-
-		for i in range(nr_titles):
-			inputfile = description["inputfile%d" % i]
-			cutlist_entries = description["cutlist%d_entries" % i]
-			cutlist = [ ]
-			for j in range(cutlist_entries):
-				cutlist.append(int(description["cutlist%d_%d" % (i, j)]))
-
-			link_name =  self.workspace + "/source_title_%d.ts" % (i+1)
-			LinkTS(self, inputfile, link_name)
-			demux = DemuxTask(self, inputfile = link_name, cutlist = cutlist)
-			title_filename =  self.workspace + "/dvd_title_%d.mpg" % (i+1)
-			MplexTask(self, title_filename, demux)
-			RemoveESFiles(self, demux)
-			
-			#RemovePSFile(self, title_filename)
-		#DVDAuthorFinalTask(self)
-		WaitForResidentTasks(self)
-		BurnTask(self)
+class DVDJob(Job):
+	def __init__(self, project, menupreview=False):
+		Job.__init__(self, "DVD Burn")
+		self.project = project
+		from time import strftime
+		from Tools.Directories import SCOPE_HDD, resolveFilename, createDir
+		new_workspace = resolveFilename(SCOPE_HDD) + "tmp/" + strftime("%Y%m%d%H%M%S")
+		createDir(new_workspace)
+		self.workspace = new_workspace
+		self.project.workspace = self.workspace
+		self.menupreview = menupreview
+		self.conduct()
+
+	def conduct(self):
+		CreateMenus(self)
+		CreateAuthoringXML(self)
+
+		totalsize = 50*1024*1024 # require an extra safety 50 MB
+		maxsize = 0
+		for title in self.project.titles:
+			titlesize = title.estimatedDiskspace
+			if titlesize > maxsize: maxsize = titlesize
+			totalsize += titlesize
+		diskSpaceNeeded = totalsize + maxsize
+		print "diskSpaceNeeded:", diskSpaceNeeded
+
+		DVDAuthorTask(self, diskSpaceNeeded)
+		
+		nr_titles = len(self.project.titles)
+		
+		if self.menupreview:
+			PreviewTask(self)
+		else:
+			for self.i in range(nr_titles):
+				title = self.project.titles[self.i]
+				link_name =  self.workspace + "/source_title_%d.ts" % (self.i+1)
+				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)
+				RemoveESFiles(self, demux)
+			WaitForResidentTasks(self)
+			PreviewTask(self)
+			BurnTask(self)
 		#RemoveDVDFolder(self)
 
-	def createDescription(self):
-		# self.cue is a list of titles, with 
-		#   each title being a tuple of 
-		#     inputfile,
-		#     a list of cutpoints (in,out)
-		#     a list of chaptermarks
-		# we turn this into a flat dict with
-		# nr_titles = the number of titles,
-		# cutlist%d_entries = the number of cutlist entries for title i,
-		# cutlist%d_%d = cutlist entry j for title i,
-		# chapterlist%d_entries = the number of chapters for title i,
-		# chapterlist%d_%d = chapter j for title i
-		res = { "nr_titles": len(self.cue) }
-		for i in range(len(self.cue)):
-			c = self.cue[i]
-			res["inputfile%d" % i] = c[0]
-			res["cutlist%d_entries" % i] = len(c[1])
-			for j in range(len(c[1])):
-				res["cutlist%d_%d" % (i,j)] = c[1][j]
-
-			res["chapterlist%d_entries" % i] = len(c[2])
-			for j in range(len(c[2])):
-				res["chapterlist%d_%d" % (i,j)] = c[2][j]
-		return res
-
-def Burn(session, cue):
+def Burn(session, project):
 	print "burning cuesheet!"
-	j = DVDJob(cue)
+	j = DVDJob(project)
+	job_manager.AddJob(j)
+	return j
+
+def PreviewMenu(session, project):
+	print "preview DVD menu!"
+	j = DVDJob(project, menupreview=True)
 	job_manager.AddJob(j)
 	return j