From: Fraxinas <andreas.frisch@multimedia-labs.de>
Date: Tue, 4 Nov 2008 14:27:06 +0000 (+0100)
Subject: implement blanking of dvd minus rw media
X-Git-Tag: 2.6.0~350^2~36
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/61e2eca2450a20da4ecd5cc138058e221df9837f

implement blanking of dvd minus rw media
---

diff --git a/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py b/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py
index 0c375129..d4e6a375 100644
--- a/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py
+++ b/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py
@@ -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