the new hdd movie directory is /hdd/movie (for 7020 compatibility reasons)

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

diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py
index dcf7657058de9bfff572629cd8540e7e2729a94d..37e957e41db8658d4980deec6acc1ce2849f70ae 100644 (file)
--- a/lib/python/Components/Harddisk.py
+++ b/lib/python/Components/Harddisk.py
@@ -1,5 +1,7 @@
 import os
 
+from Tools.Directories import *
+
 def tryOpen(filename):
        try:
                procFile = open(filename)
@@ -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")
@@ -97,7 +105,8 @@ class Harddisk:
 
        def unmount(self):
                cmd = "/bin/umount " + self.devidex + "part*"
-               os.system(cmd)
+               res = os.system(cmd)
+               return (res >> 8)
 
        def createPartition(self):
                cmd = "/sbin/sfdisk -f " + self.devidex + "disc"
@@ -117,9 +126,11 @@ class Harddisk:
                return (res >> 8)
 
        def createMovieFolder(self):
-               res = os.system("mkdir /hdd/movie")
+               res = os.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()
 
@@ -163,6 +174,12 @@ class HarddiskManager:
                        if hddNum > 8:
                                break
 
+       def HDDCount(self):
+               cnt = 0
+               for hd in self.hdd:
+                       cnt = cnt + 1
+               return cnt      
+
        def HDDList(self):
                list = [ ]
                for hd in self.hdd: