[Harddisk] add findMount for OpenWebif.

[vuplus_dvbapp] / lib / python / Components / Harddisk.py

diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py
old mode 100644 (file)
new mode 100755 (executable)
index 0f1a8fc..ca4ef9e
--- a/lib/python/Components/Harddisk.py
+++ b/lib/python/Components/Harddisk.py
@@ -1,5 +1,7 @@
 from os import system, listdir, statvfs, popen, makedirs, stat, major, minor, path, access
-from Tools.Directories import SCOPE_HDD, resolveFilename
+
+from Tools.Directories import SCOPE_HDD, resolveFilename, fileExists
+
 from Tools.CList import CList
 from SystemInfo import SystemInfo
 import time
@@ -15,6 +17,18 @@ def readFile(filename):
        file.close()
        return data
 
+def getProcMounts():
+       try:
+               mounts = open("/proc/mounts", 'r')
+       except IOError, ex:
+               print "[Harddisk] Failed to open /proc/mounts", ex
+               return []
+       result = [line.strip().split(' ') for line in mounts]
+       for item in result:
+               # Spaces are encoded as \040 in mounts
+               item[1] = item[1].replace('\\040', ' ')
+       return result
+
 DEVTYPE_UDEV = 0
 DEVTYPE_DEVFS = 1
 
@@ -35,6 +49,8 @@ class Harddisk:
 
                self.dev_path = ''
                self.disk_path = ''
+               self.mount_path = None
+               self.mount_device = None
                self.phys_path = path.realpath(self.sysfsPath('device'))
 
                if self.type == DEVTYPE_UDEV:
@@ -95,7 +111,12 @@ class Harddisk:
                return ret
 
        def diskSize(self):
-               line = readFile(self.sysfsPath('size'))
+               try:
+                       line = readFile(self.sysfsPath('size'))
+               except:
+                       harddiskmanager.removeHotplugPartition(self.device)
+                       print "error remove",self.device
+                       return -1
                try:
                        cap = int(line)
                except:
@@ -109,14 +130,19 @@ class Harddisk:
                return "%d.%03d GB" % (cap/1000, cap%1000)
 
        def model(self):
-               if self.device[:2] == "hd":
-                       return readFile('/proc/ide/' + self.device + '/model')
-               elif self.device[:2] == "sd":
-                       vendor = readFile(self.sysfsPath('device/vendor'))
-                       model = readFile(self.sysfsPath('device/model'))
-                       return vendor + '(' + model + ')'
-               else:
-                       assert False, "no hdX or sdX"
+               try:
+                       if self.device[:2] == "hd":
+                               return readFile('/proc/ide/' + self.device + '/model')
+                       elif self.device[:2] == "sd":
+                               vendor = readFile(self.sysfsPath('device/vendor'))
+                               model = readFile(self.sysfsPath('device/model'))
+                               return vendor + '(' + model + ')'
+                       else:
+                               assert False, "no hdX or sdX"
+               except:
+                       harddiskmanager.removeHotplugPartition(self.device)
+                       print "error remove",self.device
+                       return -1
 
        def free(self):
                try:
@@ -163,6 +189,18 @@ class Harddisk:
                                        numPart += 1
                return numPart
 
+       def mountDevice(self):
+               for parts in getProcMounts():
+                       if path.realpath(parts[0]).startswith(self.dev_path):
+                               self.mount_device = parts[0]
+                               self.mount_path = parts[1]
+                               return parts[1]
+
+       def findMount(self):
+               if self.mount_path is None:
+                       return self.mountDevice()
+               return self.mount_path
+
        def unmount(self):
                try:
                        mounts = open("/proc/mounts")
@@ -189,9 +227,45 @@ class Harddisk:
                res = system(cmd)
                return (res >> 8)
 
+        def checkPartionPath(self, path):
+                import time, os
+                for i in range(1,10):
+                        if os.path.exists(path):
+                                return True
+                        time.sleep(1)
+                return False
+
        def createPartition(self):
-               cmd = 'printf "0,\n;\n;\n;\ny\n" | sfdisk -f ' + self.disk_path
+               def CheckPartedVer():
+                       cmd = 'parted --version'
+                       lines = popen(cmd).readlines()
+                       for l in lines:
+                               if l.find("parted (GNU parted)") != -1:
+                                       ver = l.split()[3].strip()
+                                       break
+                       try:
+                               ver = float(ver)
+                       except:
+                               print "[CheckPartedVer] check parted version Failed!"
+                               return 0
+                       return ver
+
+               disk_size = self.diskSize()
+
+               if disk_size > 2.2 * 1000 * 1000: # if 2.2 TB
+                       setAlign = ""
+                       partedVer = CheckPartedVer()
+                       if partedVer >= 2.1: # align option is supported in version 2.1 or later
+                               setAlign = "--align optimal"
+                       cmd = 'parted %s %s --script mklabel gpt mkpart disk ext2 0%% 100%%' % ( setAlign, self.disk_path )
+
+               else:
+                       cmd = 'printf "8,\n;0,0\n;0,0\n;0,0\ny\n" | sfdisk -f -uS ' + self.disk_path
+
                res = system(cmd)
+               if not self.checkPartionPath(self.partitionPath("1")):
+                       print "no exist : ", self.partitionPath("1")
+                       return 1
                return (res >> 8)
 
        def mkfs(self):
@@ -229,6 +303,10 @@ class Harddisk:
 
        def createMovieFolder(self):
                try:
+                       if not fileExists("/hdd", 0):
+                               print "not found /hdd"
+                               system("ln -s /media/hdd /hdd")
+       
                        makedirs(resolveFilename(SCOPE_HDD))
                except OSError:
                        return -1
@@ -337,6 +415,10 @@ class Harddisk:
                idle_time = t - self.last_access
 
                stats = self.readStats()
+
+               if stats == -1:
+                       self.setIdleTime(0)
+                       return
                print "nr_read", stats[0], "nr_write", stats[1]
                l = sum(stats)
                print "sum", l, "prev_sum", self.last_stat
@@ -533,6 +615,7 @@ class HarddiskManager:
        def getAutofsMountpoint(self, device):
                return "/autofs/%s/" % (device)
 
+
        def is_hard_mounted(self, device):
                mounts = file('/proc/mounts').read().split('\n')
                for x in mounts:
@@ -601,6 +684,8 @@ class HarddiskManager:
        def HDDList(self):
                list = [ ]
                for hd in self.hdd:
+                       if hd.model() == -1:
+                               continue
                        hdd = hd.model() + " - " + hd.bus()
                        cap = hd.capacity()
                        if cap != "":