X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/c913cb3336b5ff9fd6a1f49e5a039fea3e647cd4..8c478db27a2cc610b1cdde952d5a16edba8c2b01:/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 c766ad52..058c30ca 100644
--- a/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py
+++ b/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py
@@ -7,6 +7,7 @@ from Components.Sources.StaticText import StaticText
 from Components.Sources.Progress import Progress
 from Components.Task import Task, Job, job_manager, Condition
 from Components.ScrollLabel import ScrollLabel
+from Components.Harddisk import harddiskmanager
 
 class DVDToolbox(Screen):
 	skin = """
@@ -25,9 +26,8 @@ class DVDToolbox(Screen):
 		    <widget source="space_label" render="Label" position="20,414" size="520,22" zPosition="2" font="Regular;18" halign="center" transparent="1" foregroundColor="#000000" />
 		</screen>"""
 
-	def __init__(self, session, project = None):
+	def __init__(self, session):
 		Screen.__init__(self, session)
-		self.project = project
 		
 		self["key_red"] = StaticText(_("Exit"))
 		self["key_green"] = StaticText(_("Update"))
@@ -68,7 +68,7 @@ class DVDToolbox(Screen):
 		job = DVDinfoJob(self)
 		job_manager.AddJob(job)
 		
-	def infoJobCB(self):
+	def infoJobCB(self, in_background=False):
 		capacity = 1
 		used = 0
 		infotext = ""
@@ -95,8 +95,10 @@ class DVDToolbox(Screen):
 					capacity = used
 					used = 0
 			elif line.find("Free Blocks:") > -1:
-				size = line[15:-3].split('*')
-				size = int(size[0])*int(size[1])*1024
+				try:
+					size = eval(line[14:].replace("KB","*1024"))
+				except:
+					size = 0
 				if size > 0:
 					capacity = size
 					used = capacity-used				
@@ -161,7 +163,7 @@ class DVDformatTask(Task):
 		self.toolbox = job.toolbox
 		self.postconditions.append(DVDformatTaskPostcondition())
 		self.setTool("/bin/dvd+rw-format")
-		self.args += [ "/dev/cdroms/cdrom0" ]
+		self.args += [ "/dev/" + harddiskmanager.getCD() ]
 		self.end = 1100
 
 	def prepare(self):
@@ -205,7 +207,7 @@ class DVDinfoTask(Task):
 		self.toolbox = job.toolbox
 		self.postconditions.append(DVDinfoTaskPostcondition())
 		self.setTool("/bin/dvd+rw-mediainfo")
-		self.args += [ "/dev/cdroms/cdrom0" ]
+		self.args += [ "/dev/" + harddiskmanager.getCD() ]
 
 	def prepare(self):
 		self.error = None