cut away 1/4th of enigma loading time by loading languages when they are used

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

diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py
index 79c0d6f8aa8dc20f01136d21516750d8ea5a141a..82535447c50545eb4e8274343f2ef7c9ac093106 100644 (file)
--- a/lib/python/Components/Harddisk.py
+++ b/lib/python/Components/Harddisk.py
@@ -1,8 +1,10 @@
-from os import system, listdir, statvfs, popen
+from os import system, listdir, statvfs, popen, makedirs
 
 from Tools.Directories import SCOPE_HDD, resolveFilename
 from Tools.CList import CList
 
+from SystemInfo import SystemInfo
+
 def tryOpen(filename):
        try:
                procFile = open(filename)
@@ -17,8 +19,8 @@ class Harddisk:
        def __init__(self, index):
                self.index = index
 
-               host = self.index / 4
-               bus = (self.index & 2)
+               host = (self.index & 2) >> 1
+               bus = 0
                target = (self.index & 1)
 
                self.prochdx = num2prochdx(index)
@@ -122,14 +124,17 @@ class Harddisk:
                return (res >> 8)
 
        def mount(self):
-               cmd = "/bin/mount -t ext3 " + self.devidex + "part1 /hdd"
+               cmd = "/bin/mount -t ext3 " + self.devidex + "part1"
                res = system(cmd)
                return (res >> 8)
 
        def createMovieFolder(self):
-               res = system("mkdir " + resolveFilename(SCOPE_HDD))
-               return (res >> 8)
-               
+               try:
+                       makedirs(resolveFilename(SCOPE_HDD))
+               except OSError:
+                       return -1
+               return 0
+
        errorList = [ _("Everything is fine"), _("Creating partition failed"), _("Mkfs failed"), _("Mount failed"), _("Create movie folder failed"), _("Unmount failed")]
 
        def initialize(self):
@@ -144,7 +149,8 @@ class Harddisk:
                if self.mount() != 0:
                        return -3
 
-               if self.createMovieFolder() != 0:
+               #only create a movie folder on the internal hdd
+               if not self.index & 2 and self.createMovieFolder() != 0:
                        return -4
                
                return 0
@@ -211,6 +217,8 @@ class HarddiskManager:
                                hdd = Harddisk(hddNum)
                                self.hdd.append(hdd)
 
+               SystemInfo["Harddisc"] = len(self.hdd) > 0
+
                # 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