dont show display contrast setting in display setup when a oled is detected

[enigma2.git] / lib / python / Components / Harddisk.py

diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py
index 09864fc9f374d72ef3be0f9499ec60d37e9989ed..79c0d6f8aa8dc20f01136d21516750d8ea5a141a 100644 (file)
--- a/lib/python/Components/Harddisk.py
+++ b/lib/python/Components/Harddisk.py
@@ -1,4 +1,7 @@
-import os
+from os import system, listdir, statvfs, popen
+
+from Tools.Directories import SCOPE_HDD, resolveFilename
+from Tools.CList import CList
 
 def tryOpen(filename):
        try:
@@ -57,7 +60,7 @@ class Harddisk:
                                                                
        def model(self):
                procfile = tryOpen(self.prochdx + "model")
-               
+
                if procfile == "":
                        return ""
 
@@ -80,7 +83,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
@@ -90,7 +93,7 @@ class Harddisk:
 
        def numPartitions(self):
                try:
-                       idedir = os.listdir(self.devidex)
+                       idedir = listdir(self.devidex)
                except OSError:
                        return -1
                numPart = -1
@@ -103,33 +106,34 @@ class Harddisk:
 
        def unmount(self):
                cmd = "/bin/umount " + self.devidex + "part*"
-               res = 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/movies")
+               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):
-               if self.unmount() != 0:
-                       return -5
+               self.unmount()
 
                if self.createPartition() != 0:
                        return -1
@@ -159,23 +163,90 @@ def existHDD(num):
        
        return -1
 
+class Partition:
+       def __init__(self, mountpoint, description = "", force_mounted = False):
+               self.mountpoint = mountpoint
+               self.description = description
+               self.force_mounted = force_mounted
+
+       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?
+               if self.force_mounted:
+                       return True
+               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 = [ ]
+               
+               self.on_partition_list_change = CList()
+               
+               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 getAutofsMountpoint(self, device):
+               return "/autofs/%s/" % (device)
+
+       def addHotplugPartition(self, device, description):
+               p = Partition(mountpoint = self.getAutofsMountpoint(device), description = description, force_mounted = True)
+               self.partitions.append(p)
+               self.on_partition_list_change("add", p)
+
+       def removeHotplugPartition(self, device):
+               mountpoint = self.getAutofsMountpoint(device)
+               for x in self.partitions[:]:
+                       if x.mountpoint == mountpoint:
+                               self.partitions.remove(x)
+                               self.on_partition_list_change("remove", x)
 
        def HDDCount(self):
-               cnt = 0
-               for hd in self.hdd:
-                       cnt = cnt + 1
-               return cnt      
+               return len(self.hdd)
 
        def HDDList(self):
                list = [ ]
@@ -190,6 +261,7 @@ class HarddiskManager:
 
                return list
 
-harddiskmanager = HarddiskManager()
-
+       def getMountedPartitions(self):
+               return [x for x in self.partitions if x.mounted()]
 
+harddiskmanager = HarddiskManager()