X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2c46a6c23b8612611143791cb217a4c58a846ff3..daa673f3b6bc40c4d1251335e233ffb1956f1722:/lib/python/Components/Harddisk.py

diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py
index dcf76570..72093701 100644
--- a/lib/python/Components/Harddisk.py
+++ b/lib/python/Components/Harddisk.py
@@ -1,4 +1,6 @@
-import os
+from os import system, listdir, statvfs, popen
+
+from Tools.Directories import SCOPE_HDD, resolveFilename
 
 def tryOpen(filename):
 	try:
@@ -25,11 +27,17 @@ class Harddisk:
 		return self.index
 
 	def bus(self):
-		#TODO: add the host
+		ret = ""
+
+		if self.index & 2:
+			ret = "External (CF) - "
+		else:
+			ret = "Internal - "
+		
 		if self.index & 1:
-			return "Slave"
+			return ret + "Slave"
 		else:
-			return "Master"
+			return ret + "Master"
 
 	def capacity(self):
 		procfile = tryOpen(self.prochdx + "capacity")
@@ -51,7 +59,7 @@ class Harddisk:
 								
 	def model(self):
 		procfile = tryOpen(self.prochdx + "model")
-		
+
 		if procfile == "":
 			return ""
 
@@ -74,7 +82,7 @@ class Harddisk:
 			if line.startswith(self.devidex):
 				parts = line.strip().split(" ")
 				try:
-					stat = os.statvfs(parts[1])
+					stat = statvfs(parts[1])
 				except OSError:
 					continue
 				free = stat.f_bfree/1000 * stat.f_bsize/1000
@@ -84,7 +92,7 @@ class Harddisk:
 
 	def numPartitions(self):
 		try:
-			idedir = os.listdir(self.devidex)
+			idedir = listdir(self.devidex)
 		except OSError:
 			return -1
 		numPart = -1
@@ -97,29 +105,32 @@ class Harddisk:
 
 	def unmount(self):
 		cmd = "/bin/umount " + self.devidex + "part*"
-		os.system(cmd)
+		res = system(cmd)
+		return (res >> 8)
 
 	def createPartition(self):
 		cmd = "/sbin/sfdisk -f " + self.devidex + "disc"
-		sfdisk = os.popen(cmd, "w")
+		sfdisk = popen(cmd, "w")
 		sfdisk.write("0,\n;\n;\n;\ny\n")
 		sfdisk.close()
 		return 0
 
 	def mkfs(self):
 		cmd = "/sbin/mkfs.ext3 -T largefile -m0 " + self.devidex + "part1"
-		res = os.system(cmd)
+		res = system(cmd)
 		return (res >> 8)
 
 	def mount(self):
 		cmd = "/bin/mount -t ext3 " + self.devidex + "part1 /hdd"
-		res = os.system(cmd)
+		res = system(cmd)
 		return (res >> 8)
 
 	def createMovieFolder(self):
-		res = os.system("mkdir /hdd/movie")
+		res = system("mkdir " + resolveFilename(SCOPE_HDD))
 		return (res >> 8)
 		
+	errorList = [ _("Everything is fine"), _("Creating partition failed"), _("Mkfs failed"), _("Mount failed"), _("Create movie folder failed"), _("Unmount failed")]
+
 	def initialize(self):
 		self.unmount()
 
@@ -151,17 +162,70 @@ def existHDD(num):
 	
 	return -1
 
+class Partition:
+	def __init__(self, mountpoint, description = ""):
+		self.mountpoint = mountpoint
+		self.description = description
+
+	def stat(self):
+		return statvfs(self.mountpoint)
+
+	def free(self):
+		try:
+			s = self.stat()
+			return s.f_bavail * s.f_bsize
+		except OSError:
+			return None
+	
+	def total(self):
+		try:
+			s = self.stat()
+			return s.f_blocks * s.f_bsize
+		except OSError:
+			return None
+
+	def mounted(self):
+		# THANK YOU PYTHON FOR STRIPPING AWAY f_fsid.
+		# TODO: can os.path.ismount be used?
+		procfile = tryOpen("/proc/mounts")
+		for n in procfile.readlines():
+			if n.split(' ')[1] == self.mountpoint:
+				return True
+		return False
+
 class HarddiskManager:
 	def __init__(self):
 		hddNum = 0
 		self.hdd = [ ]
-		while 1:
-			if existHDD(hddNum) == 1:
-				self.hdd.append(Harddisk(hddNum))
-			hddNum += 1
-			
-			if hddNum > 8:
-				break
+		
+		self.partitions = [ ]
+		
+		for hddNum in range(8):
+			if existHDD(hddNum):
+				hdd = Harddisk(hddNum)
+				self.hdd.append(hdd)
+
+		# currently, this is just an enumeration of what's possible,
+		# this probably has to be changed to support automount stuff.
+		# still, if stuff is mounted into the correct mountpoints by
+		# external tools, everything is fine (until somebody inserts 
+		# a second usb stick.)
+		p = [
+					("/media/hdd", _("Harddisk")), 
+					("/media/card", _("Card")), 
+					("/media/cf", _("Compact Flash")),
+					("/media/mmc1", _("MMC Card")),
+					("/media/net", _("Network Mount")),
+					("/media/ram", _("Ram Disk")),
+					("/media/usb", _("USB Stick")),
+					("/", _("Internal Flash"))
+				]
+		
+		for x in p:
+			self.partitions.append(Partition(mountpoint = x[0], description = x[1]))
+
+	def HDDCount(self):
+		return len(self.hdd)
 
 	def HDDList(self):
 		list = [ ]
@@ -176,6 +240,7 @@ class HarddiskManager:
 
 		return list
 
-harddiskmanager = HarddiskManager()
-
+	def getMountedPartitions(self):
+		return [x for x in self.partitions if x.mounted()]
 
+harddiskmanager = HarddiskManager()