git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.opendreambox.org:/git/enigma2
[enigma2.git]
/
lib
/
python
/
Components
/
Harddisk.py
diff --git
a/lib/python/Components/Harddisk.py
b/lib/python/Components/Harddisk.py
index 75d68fadd5cf73d229dad26efc7d213271533431..37905b7d70ee03f5af70dfc5d9babc3a82010cb5 100755
(executable)
--- a/
lib/python/Components/Harddisk.py
+++ b/
lib/python/Components/Harddisk.py
@@
-44,8
+44,8
@@
class Harddisk:
self.timer.callback.remove(self.runIdle)
def bus(self):
self.timer.callback.remove(self.runIdle)
def bus(self):
- ide_cf = self.device
.find("hd") == 0 and self.devidex2.find("host0") == -1
# 7025 specific
- internal = self.device
.find("hd") == 0
+ ide_cf = self.device
[:2] == "hd" and "host0" not in self.devidex2
# 7025 specific
+ internal = self.device
[:2] == "hd"
if ide_cf:
ret = "External (CF)"
elif internal:
if ide_cf:
ret = "External (CF)"
elif internal:
@@
-73,14
+73,14
@@
class Harddisk:
return "%d.%03d GB" % (cap/1024, cap%1024)
def model(self):
return "%d.%03d GB" % (cap/1024, cap%1024)
def model(self):
- if self.device
.find("hd") == 0
:
+ if self.device
[:2] == "hd"
:
procfile = tryOpen("/proc/ide/"+self.device+"/model")
if procfile == "":
return ""
line = procfile.readline()
procfile.close()
return line.strip()
procfile = tryOpen("/proc/ide/"+self.device+"/model")
if procfile == "":
return ""
line = procfile.readline()
procfile.close()
return line.strip()
- elif self.device
.find("sd") == 0
:
+ elif self.device
[:2] == "sd"
:
procfile = tryOpen("/sys/block/"+self.device+"/device/vendor")
if procfile == "":
return ""
procfile = tryOpen("/sys/block/"+self.device+"/device/vendor")
if procfile == "":
return ""
@@
-230,9
+230,8
@@
class Harddisk:
# we set the hdd into standby.
def readStats(self):
l = open("/sys/block/%s/stat" % self.device).read()
# we set the hdd into standby.
def readStats(self):
l = open("/sys/block/%s/stat" % self.device).read()
- nr_read = int(l[:8].strip())
- nr_write = int(l[4*9:4*9+8].strip())
- return nr_read, nr_write
+ (nr_read, _, _, _, nr_write) = l.split()[:5]
+ return int(nr_read), int(nr_write)
def startIdle(self):
self.last_access = time.time()
def startIdle(self):
self.last_access = time.time()
@@
-358,8
+357,7
@@
class HarddiskManager:
("/", _("Internal Flash"))
]
("/", _("Internal Flash"))
]
- for x in p:
- self.partitions.append(Partition(mountpoint = x[0], description = x[1]))
+ self.partitions.extend([ Partition(mountpoint = x[0], description = x[1]) for x in p ])
def getBlockDevInfo(self, blockdev):
devpath = "/sys/block/" + blockdev
def getBlockDevInfo(self, blockdev):
devpath = "/sys/block/" + blockdev
@@
-371,14
+369,14
@@
class HarddiskManager:
try:
removable = bool(int(open(devpath + "/removable").read()))
dev = int(open(devpath + "/dev").read().split(':')[0])
try:
removable = bool(int(open(devpath + "/removable").read()))
dev = int(open(devpath + "/dev").read().split(':')[0])
- if dev in
[7, 31]
: # loop, mtdblock
+ if dev in
(7, 31)
: # loop, mtdblock
blacklisted = True
if blockdev[0:2] == 'sr':
is_cdrom = True
if blockdev[0:2] == 'hd':
try:
media = open("/proc/ide/%s/media" % blockdev).read()
blacklisted = True
if blockdev[0:2] == 'sr':
is_cdrom = True
if blockdev[0:2] == 'hd':
try:
media = open("/proc/ide/%s/media" % blockdev).read()
- if
media.find("cdrom") != -1
:
+ if
"cdrom" in media
:
is_cdrom = True
except IOError:
error = True
is_cdrom = True
except IOError:
error = True