add additional clear text error messages for burntask
[enigma2.git] / lib / python / Plugins / Extensions / DVDBurn / Process.py
index 41e129ad9ee6ee2e78d28f7d3c37fcdc067b6b2c..7a03b7ebd68cdf8c9f54d8ba442f199282f1d6c9 100644 (file)
@@ -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"]
@@ -209,10 +210,8 @@ class RemoveESFiles(Task):
                self.args += [self.demux_task.cutfile]
 
 class DVDAuthorTask(Task):
-       def __init__(self, job, diskspaceNeeded):
+       def __init__(self, job):
                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
@@ -220,7 +219,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)
 
@@ -252,31 +251,21 @@ class BurnTaskPostcondition(Condition):
                        task.ERROR_WRITE_FAILED: _("Write failed!"),
                        task.ERROR_DVDROM: _("No (supported) DVDROM found!"),
                        task.ERROR_ISOFS: _("Medium is not empty!"),
+                       task.ERROR_FILETOOLARGE: _("TS file is too large for ISO9660 level 1!"),
+                       task.ERROR_ISOTOOLARGE: _("ISO file is too large for this filesystem!"),
                        task.ERROR_UNKNOWN: _("An unknown error occured!")
                }[task.error]
 
 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")
-
+       ERROR_NOTWRITEABLE, ERROR_LOAD, ERROR_SIZE, ERROR_WRITE_FAILED, ERROR_DVDROM, ERROR_ISOFS, ERROR_FILETOOLARGE, ERROR_ISOTOOLARGE, ERROR_UNKNOWN = range(9)
+       def __init__(self, job, extra_args=[], tool="/bin/growisofs"):
+               Task.__init__(self, job, job.name)
                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.setTool(tool)
                self.args += extra_args
-
-       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
 
@@ -303,7 +292,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
@@ -316,30 +305,63 @@ class BurnTask(Task):
                        else:
                                self.error = self.ERROR_UNKNOWN
                                print "BurnTask: unknown error %s" % line
+               elif line.find("-allow-limited-size was not specified. There is no way do represent this file size. Aborting.") != -1:
+                       self.error = self.ERROR_FILETOOLARGE
+               elif line.startswith("genisoimage: File too large."):
+                       self.error = self.ERROR_ISOTOOLARGE
 
 class RemoveDVDFolder(Task):
        def __init__(self, job):
                Task.__init__(self, job, "Remove temp. files")
                self.setTool("/bin/rm")
                self.args += ["-rf", self.job.workspace]
+               self.weighting = 10
 
-class PreviewTask(Task):
+class CheckDiskspaceTask(Task):
        def __init__(self, job):
+               Task.__init__(self, job, "Checking free space")
+               totalsize = 50*1024*1024 # require an extra safety 50 MB
+               maxsize = 0
+               for title in job.project.titles:
+                       titlesize = title.estimatedDiskspace
+                       if titlesize > maxsize: maxsize = titlesize
+                       totalsize += titlesize
+               diskSpaceNeeded = totalsize + maxsize
+               self.global_preconditions.append(DiskspacePrecondition(diskSpaceNeeded))
+               self.weighting = 5
+
+       def run(self, callback, task_progress_changed):
+               failed_preconditions = self.checkPreconditions(True) + self.checkPreconditions(False)
+               if len(failed_preconditions):
+                       callback(self, failed_preconditions)
+                       return
+               self.callback = callback
+               self.task_progress_changed = task_progress_changed
+               Task.processFinished(self, 0)
+
+class PreviewTask(Task):
+       def __init__(self, job, path):
                Task.__init__(self, job, "Preview")
                self.postconditions.append(PreviewTaskPostcondition())
                self.job = job
+               self.path = path
+               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)
+                       from Tools import Notifications
+                       Notifications.AddNotificationWithCallback(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)
 
@@ -347,7 +369,8 @@ 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 collection to DVD medium?") )
+                       from Tools import Notifications
+                       Notifications.AddNotificationWithCallback(self.closedCB, MessageBox, _("Do you want to burn this collection to DVD medium?") )
 
        def closedCB(self, answer):
                if answer == True:
@@ -355,15 +378,9 @@ class PreviewTask(Task):
                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
-               self.job.project.session.openWithCallback(self.playerClosed, DVDPlayer, dvd_filelist= [ self.job.project.workspace + "/dvd/VIDEO_TS/" ])
+               self.job.project.session.openWithCallback(self.playerClosed, DVDPlayer, dvd_filelist= [ self.path ])
 
 class PreviewTaskPostcondition(Condition):
        def check(self, task):
@@ -398,7 +415,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 +450,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 +481,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 = """<?xml version="1.0" encoding="utf-8"?>
                <subpictures>
                <stream>
@@ -471,11 +488,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 +512,7 @@ class MenuImageTask(Task):
                                        bottom = self.Menus.imgheight
                                spuxml += """
                <button name="button%s" x0="%d" x1="%d" y0="%d" y1="%d"/>""" % (str(title_no).zfill(2),s_left,self.Menus.imgwidth,top,bottom )
-                       if self.Menus.menu_count > 1:
-                               prev_page_text = "<<<"
-                               textsize = draw_bg.textsize(prev_page_text, font=fonts[1])
-                               offset = ( 2*s_left, s_top + ( self.job.titles_per_menu * rowheight ) )
-                               draw_bg.text(offset, prev_page_text, fill=self.Menus.color_button, font=fonts[1])
-                               draw_high.text(offset, prev_page_text, fill=1, font=fonts[1])
-                               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 self.Menus.menu_count < self.job.nr_menus:
+                       if self.menu_count < self.job.nr_menus:
                                next_page_text = ">>>"
                                textsize = draw_bg.textsize(next_page_text, font=fonts[1])
                                offset = ( self.Menus.imgwidth-textsize[0]-2*s_left, s_top + ( self.job.titles_per_menu * rowheight ) )
@@ -512,13 +520,20 @@ class MenuImageTask(Task):
                                draw_high.text(offset, next_page_text, fill=1, font=fonts[1])
                                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])
-                                       
+                       if self.menu_count > 1:
+                               prev_page_text = "<<<"
+                               textsize = draw_bg.textsize(prev_page_text, font=fonts[1])
+                               offset = ( 2*s_left, s_top + ( self.job.titles_per_menu * rowheight ) )
+                               draw_bg.text(offset, prev_page_text, fill=self.Menus.color_button, font=fonts[1])
+                               draw_high.text(offset, prev_page_text, fill=1, font=fonts[1])
+                               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])
                        del draw_bg
                        del draw_high
-                       fd=open(self.Menus.menubgpngfilename,"w")
+                       fd=open(self.menubgpngfilename,"w")
                        im_bg.save(fd,"PNG")
                        fd.close()
-                       fd=open(self.Menus.highlightpngfilename,"w")
+                       fd=open(self.highlightpngfilename,"w")
                        im_high.save(fd,"PNG")
                        fd.close()
                        spuxml += """
@@ -526,7 +541,7 @@ class MenuImageTask(Task):
                </stream>
                </subpictures>"""
        
-                       f = open(self.Menus.spuxmlfilename, "w")
+                       f = open(self.spuxmlfilename, "w")
                        f.write(spuxml)
                        f.close()
                        Task.processFinished(self, 0)
@@ -549,7 +564,6 @@ class Menus:
                self.spu_palette = [ 0x60, 0x60, 0x60 ] + s.color_highlight.getValue()
 
                ImagePrepareTask(job)
-               print "[nach ImagePrepareTask]"
                nr_titles = len(job.project.titles)
                if nr_titles < 6:
                        job.titles_per_menu = 5
@@ -558,21 +572,20 @@ class Menus:
                job.nr_menus = ((nr_titles+job.titles_per_menu-1)/job.titles_per_menu)
 
                #a new menu_count every 4 titles (1,2,3,4->1 ; 5,6,7,8->2 etc.)
-               for self.menu_count in range(1 , job.nr_menus+1):
-                       num = str(self.menu_count)
-                       self.spuxmlfilename = job.workspace+"/spumux"+num+".xml"
-                       self.menubgpngfilename = job.workspace+"/dvd_menubg"+num+".png"
-                       self.highlightpngfilename = job.workspace+"/dvd_highlight"+num+".png"
-
-                       MenuImageTask(job)
-                       png2yuvTask(job, self.menubgpngfilename, job.workspace+"/dvdmenubg"+num+".yuv")
+               for menu_count in range(1 , job.nr_menus+1):
+                       num = str(menu_count)
+                       spuxmlfilename = job.workspace+"/spumux"+num+".xml"
+                       menubgpngfilename = job.workspace+"/dvd_menubg"+num+".png"
+                       highlightpngfilename = job.workspace+"/dvd_highlight"+num+".png"
+                       MenuImageTask(job, menu_count, spuxmlfilename, menubgpngfilename, highlightpngfilename)
+                       png2yuvTask(job, menubgpngfilename, job.workspace+"/dvdmenubg"+num+".yuv")
                        menubgm2vfilename = job.workspace+"/dvdmenubg"+num+".mv2"
                        mpeg2encTask(job, job.workspace+"/dvdmenubg"+num+".yuv", menubgm2vfilename)
                        menubgmpgfilename = job.workspace+"/dvdmenubg"+num+".mpg"
                        menuaudiofilename = s.menuaudio.getValue()
-                       MplexTask(job, outputfile=menubgmpgfilename, inputfiles = [menubgm2vfilename, menuaudiofilename])
+                       MplexTask(job, outputfile=menubgmpgfilename, inputfiles = [menubgm2vfilename, menuaudiofilename], weighting = 20)
                        menuoutputfilename = job.workspace+"/dvdmenu"+num+".mpg"
-                       spumuxTask(job, self.spuxmlfilename, menubgmpgfilename, menuoutputfilename)
+                       spumuxTask(job, spuxmlfilename, menubgmpgfilename, menuoutputfilename)
                
 def CreateAuthoringXML(job):
        nr_titles = len(job.project.titles)
@@ -616,8 +629,8 @@ def CreateAuthoringXML(job):
                authorxml.append('   </menus>\n')
        authorxml.append('   <titles>\n')
        for i in range( nr_titles ):
-               for audiotrack in job.project.titles[i].audiotracks:
-                       authorxml.append('    <audio lang="'+audiotrack[0][:2]+'" format="'+audiotrack[1]+'" />\n')
+               #for audiotrack in job.project.titles[i].audiotracks:
+                       #authorxml.append('    <audio lang="'+audiotrack[0][:2]+'" format="'+audiotrack[1]+'" />\n')
                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)
@@ -644,9 +657,18 @@ def CreateAuthoringXML(job):
                f.write(x)
        f.close()
 
+def getISOfilename(isopath, volName):
+       from Tools.Directories import fileExists
+       i = 0
+       filename = isopath+'/'+volName+".iso"
+       while fileExists(filename):
+               i = i+1
+               filename = isopath+'/'+volName + str(i).zfill(3) + ".iso"
+       return filename
+
 class DVDJob(Job):
        def __init__(self, project, menupreview=False):
-               Job.__init__(self, "DVD Burn")
+               Job.__init__(self, "DVDBurn Job")
                self.project = project
                from time import strftime
                from Tools.Directories import SCOPE_HDD, resolveFilename, createDir
@@ -658,24 +680,17 @@ class DVDJob(Job):
                self.conduct()
 
        def conduct(self):
+               CheckDiskspaceTask(self)
                if self.project.settings.authormode.getValue().startswith("menu") or self.menupreview:
                        Menus(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
-
-               DVDAuthorTask(self, diskSpaceNeeded)
+               DVDAuthorTask(self)
                
                nr_titles = len(self.project.titles)
-               
+
                if self.menupreview:
-                       PreviewTask(self)
+                       PreviewTask(self, self.workspace + "/dvd/VIDEO_TS/")
                else:
                        for self.i in range(nr_titles):
                                title = self.project.titles[self.i]
@@ -686,8 +701,20 @@ class DVDJob(Job):
                                MplexTask(self, outputfile=title_filename, demux_task=demux)
                                RemoveESFiles(self, demux)
                        WaitForResidentTasks(self)
-                       PreviewTask(self)
-                       BurnTask(self,["-dvd-video"])
+                       PreviewTask(self, self.workspace + "/dvd/VIDEO_TS/")
+                       output = self.project.settings.output.getValue()
+                       volName = self.project.settings.name.getValue()
+                       if output == "dvd":
+                               self.name = _("Burn DVD")
+                               tool = "/bin/growisofs"
+                               burnargs = [ "-Z", "/dev/" + harddiskmanager.getCD(), "-dvd-compat" ]
+                       elif output == "iso":
+                               self.name = _("Create DVD-ISO")
+                               tool = "/usr/bin/mkisofs"
+                               isopathfile = getISOfilename(self.project.settings.isopath.getValue(), volName)
+                               burnargs = [ "-o", isopathfile ]
+                       burnargs += [ "-dvd-video", "-publisher", "Dreambox", "-V", volName, self.workspace + "/dvd" ]
+                       BurnTask(self, burnargs, tool)
                RemoveDVDFolder(self)
 
 class DVDdataJob(Job):
@@ -703,31 +730,49 @@ class DVDdataJob(Job):
                self.conduct()
 
        def conduct(self):
-               diskSpaceNeeded = 50*1024*1024 # require an extra safety 50 MB
-               for title in self.project.titles:
-                       diskSpaceNeeded += title.filesize
+               if self.project.settings.output.getValue() == "iso":
+                       CheckDiskspaceTask(self)
                nr_titles = len(self.project.titles)
-
                for self.i in range(nr_titles):
                        title = self.project.titles[self.i]
                        filename = title.inputfile.rstrip("/").rsplit("/",1)[1]
                        link_name =  self.workspace + filename
                        LinkTS(self, title.inputfile, link_name)
                        CopyMeta(self, title.inputfile)
-               BurnTask(self)
-               RemoveDVDFolder(self)
 
-def Burn(session, project):
-       j = DVDJob(project)
-       job_manager.AddJob(j)
-       return j
-
-def PreviewMenu(session, project):
-       j = DVDJob(project, menupreview=True)
-       job_manager.AddJob(j)
-       return j
+               output = self.project.settings.output.getValue()
+               volName = self.project.settings.name.getValue()
+               tool = "/bin/growisofs"
+               if output == "dvd":
+                       self.name = _("Burn DVD")
+                       burnargs = [ "-Z", "/dev/" + harddiskmanager.getCD(), "-dvd-compat" ]
+               elif output == "iso":
+                       tool = "/usr/bin/mkisofs"
+                       self.name = _("Create DVD-ISO")
+                       isopathfile = getISOfilename(self.project.settings.isopath.getValue(), volName)
+                       burnargs = [ "-o", isopathfile ]
+               if self.project.settings.dataformat.getValue() == "iso9660_1":
+                       burnargs += ["-iso-level", "1" ]
+               elif self.project.settings.dataformat.getValue() == "iso9660_4":
+                       burnargs += ["-iso-level", "4", "-allow-limited-size" ]
+               elif self.project.settings.dataformat.getValue() == "udf":
+                       burnargs += ["-udf", "-allow-limited-size" ]
+               burnargs += [ "-publisher", "Dreambox", "-V", volName, "-follow-links", self.workspace ]
+               BurnTask(self, burnargs, tool)
+               RemoveDVDFolder(self)
 
-def BurnDataTS(session, project):
-       j = DVDdataJob(project)
-       job_manager.AddJob(j)
-       return j
+class DVDisoJob(Job):
+       def __init__(self, project, imagepath):
+               Job.__init__(self, _("Burn DVD"))
+               self.project = project
+               self.menupreview = False
+               if imagepath.endswith(".iso"):
+                       PreviewTask(self, imagepath)
+                       burnargs = [ "-Z", "/dev/" + harddiskmanager.getCD() + '='+imagepath, "-dvd-compat" ]
+               else:
+                       PreviewTask(self, imagepath + "/VIDEO_TS/")
+                       volName = self.project.settings.name.getValue()
+                       burnargs = [ "-Z", "/dev/" + harddiskmanager.getCD(), "-dvd-compat" ]
+                       burnargs += [ "-dvd-video", "-publisher", "Dreambox", "-V", volName, imagepath ]
+               tool = "/bin/growisofs"
+               BurnTask(self, burnargs, tool)