X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/e7364f6c8cd59562884f895042980b88a962c945..e6a3b9fdb8f5ac0774a27794b175d79cf0973976:/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
old mode 100644
new mode 100755
index ce16259e..53287a36
--- a/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py
+++ b/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py
@@ -13,15 +13,13 @@ from Plugins.SystemPlugins.Hotplug.plugin import hotplugNotifier
 
 class DVDToolbox(Screen):
 	skin = """
-		<screen position="90,83" size="560,445" title="DVD media toolbox" >
+		<screen name="DVDToolbox" position="center,center"  size="560,445" title="DVD media toolbox" >
 		    <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
 		    <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
 		    <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on" />
-		    <ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on" />
 		    <widget source="key_red" render="Label" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
 		    <widget source="key_green" render="Label" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
 		    <widget source="key_yellow" render="Label" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1" />
-		    <widget source="key_blue" render="Label" position="420,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1" />
 		    <widget source="info" render="Label" position="20,60" size="520,100" font="Regular;20" />
 		    <widget name="details" position="20,200" size="520,200" font="Regular;16" />
 		    <widget source="space_bar" render="Progress" position="10,410" size="540,26" borderWidth="1" backgroundColor="#254f7497" />
@@ -34,7 +32,6 @@ class DVDToolbox(Screen):
 		self["key_red"] = StaticText(_("Exit"))
 		self["key_green"] = StaticText(_("Update"))
 		self["key_yellow"] = StaticText()
-		self["key_blue"] = StaticText()
 		
 		self["space_label"] = StaticText()
 		self["space_bar"] = Progress()
@@ -49,14 +46,17 @@ class DVDToolbox(Screen):
 		    "red": self.exit,
 		    "green": self.update,
 		    "yellow": self.format,
-		    #"blue": self.eject,
 		    "cancel": self.exit,
 		    "pageUp": self.pageUp,
 		    "pageDown": self.pageDown
 		})
 		self.update()
 		hotplugNotifier.append(self.update)
-		
+		self.onLayoutFinish.append(self.layoutFinished)
+
+	def layoutFinished(self):
+		self.setTitle(_("DVD media toolbox"))
+
 	def pageUp(self):
 		self["details"].pageUp()
 
@@ -82,7 +82,9 @@ class DVDToolbox(Screen):
 		self.update()
 
 	def mediainfoCB(self, mediuminfo, retval, extra_args):
-		capacity = 1
+		formatted_capacity = 0
+		read_capacity = 0
+		capacity = 0
 		used = 0
 		infotext = ""
 		mediatype = ""
@@ -93,21 +95,17 @@ class DVDToolbox(Screen):
 					self.formattable = True
 				else:
 					self.formattable = False
-			if line.find("Legacy lead-out at:") > -1:
+			elif line.find("Legacy lead-out at:") > -1:
 				used = int(line.rsplit('=',1)[1]) / 1048576.0
-				print "[lead out] used =", used
+				print "[dvd+rw-mediainfo] lead out used =", used
 			elif line.find("formatted:") > -1:
-				capacity = int(line.rsplit('=',1)[1]) / 1048576.0
-				print "[formatted] capacity =", capacity
-			elif capacity == 1 and line.find("READ CAPACITY:") > -1:
-				capacity = int(line.rsplit('=',1)[1]) / 1048576.0
-				print "[READ CAP] capacity =", capacity
-			elif line.find("Disc status:") > -1:
-				if line.find("blank") > -1:
-					print "[Disc status] capacity=%d, used=0" % (capacity)
-					capacity = used
-					used = 0
-			elif line.find("Free Blocks:") > -1:
+				formatted_capacity = int(line.rsplit('=',1)[1]) / 1048576.0
+				print "[dvd+rw-mediainfo] formatted capacity =", formatted_capacity
+			elif formatted_capacity == 0 and line.find("READ CAPACITY:") > -1:
+				read_capacity = int(line.rsplit('=',1)[1]) / 1048576.0
+				print "[dvd+rw-mediainfo] READ CAPACITY =", read_capacity
+		for line in mediuminfo.splitlines():
+			if line.find("Free Blocks:") > -1:
 				try:
 					size = eval(line[14:].replace("KB","*1024"))
 				except:
@@ -116,8 +114,22 @@ class DVDToolbox(Screen):
 					capacity = size / 1048576
 					if used:
 						used = capacity-used
-					print "[free blocks] capacity=%d, used=%d" % (capacity, used)
+					print "[dvd+rw-mediainfo] free blocks capacity=%d, used=%d" % (capacity, used)
+			elif line.find("Disc status:") > -1:
+				if line.find("blank") > -1:
+					print "[dvd+rw-mediainfo] Disc status blank capacity=%d, used=0" % (capacity)
+					capacity = used
+					used = 0
+				elif line.find("complete") > -1 and formatted_capacity == 0:
+					print "[dvd+rw-mediainfo] Disc status complete capacity=0, used=%d" % (capacity)
+					used = read_capacity
+					capacity = 1
+				else:
+					capacity = formatted_capacity
 			infotext += line+'\n'
+		if capacity and used > capacity:
+			used = read_capacity or capacity
+			capacity = formatted_capacity or capacity
 		self["details"].setText(infotext)
 		if self.formattable:
 			self["key_yellow"].text = _("Format")