git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
avswitch: reset video mode only when it has changed
[enigma2.git]
/
lib
/
python
/
Components
/
Harddisk.py
diff --git
a/lib/python/Components/Harddisk.py
b/lib/python/Components/Harddisk.py
index 6283f51ceead9b3da0ff48357ba062c26bf1eed8..37e957e41db8658d4980deec6acc1ce2849f70ae 100644
(file)
--- a/
lib/python/Components/Harddisk.py
+++ b/
lib/python/Components/Harddisk.py
@@
-1,5
+1,7
@@
import os
import os
+from Tools.Directories import *
+
def tryOpen(filename):
try:
procFile = open(filename)
def tryOpen(filename):
try:
procFile = open(filename)
@@
-21,11
+23,27
@@
class Harddisk:
self.prochdx = num2prochdx(index)
self.devidex = "/dev/ide/host%d/bus%d/target%d/lun0/" % (host, bus, target)
self.prochdx = num2prochdx(index)
self.devidex = "/dev/ide/host%d/bus%d/target%d/lun0/" % (host, bus, target)
+ def getIndex(self):
+ return self.index
+
+ def bus(self):
+ ret = ""
+
+ if self.index & 2:
+ ret = "External (CF) - "
+ else:
+ ret = "Internal - "
+
+ if self.index & 1:
+ return ret + "Slave"
+ else:
+ return ret + "Master"
+
def capacity(self):
procfile = tryOpen(self.prochdx + "capacity")
if procfile == "":
def capacity(self):
procfile = tryOpen(self.prochdx + "capacity")
if procfile == "":
- return
-1
+ return
""
line = procfile.readline()
procfile.close()
line = procfile.readline()
procfile.close()
@@
-33,10
+51,12
@@
class Harddisk:
try:
cap = int(line)
except:
try:
cap = int(line)
except:
- return
-1
+ return
""
- return cap
-
+ cap = cap / 1000 * 512 / 1000
+
+ return "%d.%03d GB" % (cap/1024, cap%1024)
+
def model(self):
procfile = tryOpen(self.prochdx + "model")
def model(self):
procfile = tryOpen(self.prochdx + "model")
@@
-85,7
+105,8
@@
class Harddisk:
def unmount(self):
cmd = "/bin/umount " + self.devidex + "part*"
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"
def createPartition(self):
cmd = "/sbin/sfdisk -f " + self.devidex + "disc"
@@
-105,9
+126,11
@@
class Harddisk:
return (res >> 8)
def createMovieFolder(self):
return (res >> 8)
def createMovieFolder(self):
- res = os.system("mkdir
/hdd/movie"
)
+ res = os.system("mkdir
" + resolveFilename(SCOPE_HDD)
)
return (res >> 8)
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()
def initialize(self):
self.unmount()
@@
-150,27
+173,26
@@
class HarddiskManager:
if hddNum > 8:
break
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:
def HDDList(self):
list = [ ]
for hd in self.hdd:
- cap = hd.capacity() / 1000 * 512 / 1000
hdd = hd.model() + " ("
hdd = hd.model() + " ("
- if hd.index & 1:
- hdd += "slave"
- else:
- hdd += "master"
- if cap > 0:
- hdd += ", %d,%d GB" % (cap/1024, cap%1024)
+ hdd += hd.bus()
+ cap = hd.capacity()
+ if cap != "":
+ hdd += ", " + cap
hdd += ")"
hdd += ")"
-
- print hdd
-
-# if hd.index == 0:
-# if hd.initialize() == 0:
-# print "hdd status ok"
-# else:
-# print "hdd status ok"
-
list.append((hdd, hd))
list.append((hdd, hd))
+
return list
return list
+
+harddiskmanager = HarddiskManager()
+
+