nastily pretend the dvd minus rw bruning error never happened

[enigma2.git] / lib / python / Plugins / Extensions / DVDBurn / DVDToolbox.py

diff --git a/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py b/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py
index 32666af8e7ead348b0f231e628aa59844b8f4d7e..d4e6a375337dd8489c52932e755ef7b4177f5afa 100644 (file)
--- a/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py
+++ b/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py
@@ -86,7 +86,7 @@ class DVDToolbox(Screen):
                mediatype = ""
                for line in mediuminfo.splitlines():
                        if line.find("Mounted Media:") > -1:
-                               mediatype = line.rsplit(',',1)[1][1:-1]
+                               mediatype = line.rsplit(',',1)[1][1:]
                                if mediatype.find("RW") > 0:
                                        self.formattable = True
                                else:
@@ -115,7 +115,7 @@ class DVDToolbox(Screen):
                                        if used:
                                                used = capacity-used
                                        print "[free blocks] capacity=%d, used=%d" % (capacity, used)
-                       infotext += line
+                       infotext += line+'\n'
                self["details"].setText(infotext)
                if self.formattable:
                        self["key_yellow"].text = _("Format")
@@ -150,7 +150,7 @@ class DVDformatJob(Job):
                DVDformatTask(self)
                
        def retry(self):
-               self.tasks[0].args += [ "-force" ]
+               self.tasks[0].args += self.tasks[0].retryargs
                Job.retry(self)
 
 class DVDformatTaskPostcondition(Condition):
@@ -174,6 +174,7 @@ class DVDformatTask(Task):
                self.setTool("/bin/dvd+rw-format")
                self.args += [ "/dev/" + harddiskmanager.getCD() ]
                self.end = 1100
+               self.retryargs = [ ]
 
        def prepare(self):
                self.error = None
@@ -181,7 +182,10 @@ class DVDformatTask(Task):
        def processOutputLine(self, line):
                if line.startswith("- media is already formatted"):
                        self.error = self.ERROR_ALREADYFORMATTED
-                       self.force = True
+                       self.retryargs = [ "-force" ]
+               if line.startswith("- media is not blank"):
+                       self.error = self.ERROR_ALREADYFORMATTED
+                       self.retryargs = [ "-blank" ]
                if line.startswith(":-( mounted media doesn't appear to be"):
                        self.error = self.ERROR_NOTWRITEABLE