code cleanup ... use more /proc/stb/avs/0/* auto functions

[vuplus_dvbapp] / lib / python / Components / Harddisk.py

diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py
index 1fc629a..44245eb 100644 (file)
--- a/lib/python/Components/Harddisk.py
+++ b/lib/python/Components/Harddisk.py
@@ -97,7 +97,7 @@ class Harddisk:
                        line = procfile.readline()
                        if line == "":
                                break
-                       if line.startswith(self.devidex):
+                       if line.startswith(self.devidex) or line.startswith(self.devidex2):
                                parts = line.strip().split(" ")
                                try:
                                        stat = statvfs(parts[1])
@@ -130,7 +130,7 @@ class Harddisk:
                cmd = "/bin/umount"
 
                for line in procfile:
-                       if line.startswith(self.devidex):
+                       if line.startswith(self.devidex) or line.startswith(self.devidex2):
                                parts = line.split()
                                cmd = ' '.join([cmd, parts[1]])
 
@@ -248,15 +248,21 @@ class Harddisk:
 
                idle_time = t - self.last_access
 
-               l = sum(self.readStats())
+               stats = self.readStats()
+               print "nr_read", stats[0], "nr_write", stats[1]
+               l = sum(stats)
+               print "sum", l, "prev_sum", self.last_stat
 
                if l != self.last_stat: # access
+                       print "hdd was accessed since previous check!"
                        self.last_stat = l
                        self.last_access = t
                        self.idle_time = 0
                        self.is_sleeping = False
+               else:
+                       print "hdd IDLE!"
 
-               #print "[IDLE]", idle_time, self.max_idle_time, self.is_sleeping
+               print "[IDLE]", idle_time, self.max_idle_time, self.is_sleeping
                if idle_time >= self.max_idle_time and not self.is_sleeping:
                        self.setSleep()
                        self.is_sleeping = True
@@ -270,7 +276,7 @@ class Harddisk:
                        if not idle:
                                self.timer.stop()
                        else:
-                               self.timer.start(idle * 250, False)  # poll 4 times per period.
+                               self.timer.start(idle * 100, False)  # poll 10 times per period.
 
        def isSleeping(self):
                return self.is_sleeping