X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/5933286e78fdb863116d325d9e4a38b6a7a90bf6..8d3ee12aa8f54f1eb40e633e7d2b7f5ec8d91c5f:/lib/python/Components/Harddisk.py diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py index f060c37a..7ba468e9 100644 --- a/lib/python/Components/Harddisk.py +++ b/lib/python/Components/Harddisk.py @@ -1,6 +1,6 @@ -import os +from os import system, listdir, statvfs, popen -from Tools.Directories import * +from Tools.Directories import SCOPE_HDD, resolveFilename def tryOpen(filename): try: @@ -82,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 @@ -92,7 +92,7 @@ class Harddisk: def numPartitions(self): try: - idedir = os.listdir(self.devidex) + idedir = listdir(self.devidex) except OSError: return -1 numPart = -1 @@ -105,28 +105,28 @@ 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 " + resolveFilename(SCOPE_HDD)) + 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")] @@ -168,7 +168,7 @@ class Partition: self.description = description def stat(self): - return os.statvfs(self.mountpoint) + return statvfs(self.mountpoint) def free(self): try: