add very simple scan

[enigma2.git] / lib / python / Screens / HarddiskSetup.py

diff --git a/lib/python/Screens/HarddiskSetup.py b/lib/python/Screens/HarddiskSetup.py
index 9c7f65e8ed43f28b1ce8bf98255c375b54e9e934..8a683a5452a15fc8cbec83a9d501ba269270ac18 100644 (file)
--- a/lib/python/Screens/HarddiskSetup.py
+++ b/lib/python/Screens/HarddiskSetup.py
@@ -10,20 +10,9 @@ class HarddiskSetup(Screen):
                Screen.__init__(self, session)
                self.hdd = hdd
                
-               cap = hdd.capacity() / 1000 * 512 / 1000
-               capstr = "Capacity: %d.%03d GB" % (cap / 1000, cap % 1000)
-
                self["model"] = Label("Model: " + hdd.model())
-               self["capacity"] = Label(capstr)
-
-               idx = hdd.getIndex()
-               
-               if idx & 1:
-                       busstr = "Slave"
-               else:   
-                       busstr = "Master"
-               
-               self["bus"] = Label("Bus: " + busstr)
+               self["capacity"] = Label("Capacity: " + hdd.capacity())
+               self["bus"] = Label("Bus: " + hdd.bus())
                self["initialize"] = Label("Initialize")
 
                self["actions"] = ActionMap(["OkCancelActions"],
@@ -38,18 +27,19 @@ class HarddiskSetup(Screen):
                })
 
        def hddInitialize(self):
-               if self.hdd.getIndex() == 2:            #CF
-                       print "not a good idea!"
-                       self.session.open(MessageBox, "not a good idea - this will kill our rootfs!")
-               else:   
-                       pass
-                       #self.hdd.initialize()
+               print "this will start the initialize now!"
+               self.hdd.initialize()
 
 class HarddiskSelection(Screen):
        def __init__(self, session):
                Screen.__init__(self, session)
-
-               self["hddlist"] = MenuList(harddiskmanager.HDDList())
+               
+               if harddiskmanager.HDDCount() == 0:
+                       tlist = []
+                       tlist.append(("no HDD found", 0))
+                       self["hddlist"] = MenuList(tlist)
+               else:                   
+                       self["hddlist"] = MenuList(harddiskmanager.HDDList())
                
                self["actions"] = ActionMap(["OkCancelActions"],
                {
@@ -59,6 +49,5 @@ class HarddiskSelection(Screen):
 
        def okbuttonClick(self):
                selection = self["hddlist"].getCurrent()
-               self.session.open(HarddiskSetup, selection[1])
-               print "ok"
-               pass
+               if selection[1] != 0:
+                       self.session.open(HarddiskSetup, selection[1])