don't crash when list is empty. Add 'list of storage devices' when directory=None.

[enigma2.git] / lib / python / Components / FileList.py

diff --git a/lib/python/Components/FileList.py b/lib/python/Components/FileList.py
index a0b01b2e76aaaab41ab9fb9a8733caa2c36cfd0f..0c8a8814dcdfd62e98ede29cb0be5025227671b2 100644 (file)
--- a/lib/python/Components/FileList.py
+++ b/lib/python/Components/FileList.py
@@ -3,6 +3,7 @@ from GUIComponent import *
 import re
 
 from MenuList import MenuList
+from Components.Harddisk import harddiskmanager
 
 from Tools.Directories import *
 
@@ -52,6 +53,8 @@ class FileList(MenuList, HTMLComponent, GUIComponent):
                GUIComponent.__init__(self)
                self.l = eListboxPythonMultiContent()
                
+               self.mount_point = None
+               self.current_directory = None
                self.useServiceRef = useServiceRef
                self.showDirectories = showDirectories
                self.showFiles = showFiles
@@ -63,18 +66,30 @@ class FileList(MenuList, HTMLComponent, GUIComponent):
                self.l.setFont(0, gFont("Regular", 18))
                
        def getSelection(self):
+               if self.l.getCurrentSelection() is None:
+                       return None
                return self.l.getCurrentSelection()[0]
        
        def getFileList(self):
                return self.list
        
-       def changeDir(self, directory):
+       def changeDir(self, directory, select = None):
                self.list = []
                
+               # if we are just entering from the list of mount points:
+               if self.current_directory is None:
+                       self.mount_point = directory
+               self.current_directory = directory
                directories = []
                files = []
                
-               if self.useServiceRef:
+               if directory is None: # present available mountpoints
+                       print "listing partitions:"
+                       for p in harddiskmanager.getMountedPartitions():
+                               self.list.append(FileEntryComponent(name = p.description, absolute = p.mountpoint, isDir = True))
+                       files = [ ]
+                       directories = [ ]
+               elif self.useServiceRef:
                        root = eServiceReference("2:0:1:0:0:0:0:0:0:0:" + directory)
                        serviceHandler = eServiceCenter.getInstance()
                        list = serviceHandler.list(root)
@@ -100,8 +115,11 @@ class FileList(MenuList, HTMLComponent, GUIComponent):
                                        directories.append(directory + x + "/")
                                        files.remove(x)
                
-               if directory != "/" and self.showDirectories and not self.isTop:
-                       self.list.append(FileEntryComponent(name = "..", absolute = '/'.join(directory.split('/')[:-2]) + '/', isDir = True))
+               if directory is not None and self.showDirectories and not self.isTop:
+                       if directory == self.mount_point:
+                               self.list.append(FileEntryComponent(name = ".. (" +_("List of Storage Devices") + ")", absolute = None, isDir = True))
+                       else:
+                               self.list.append(FileEntryComponent(name = "..", absolute = '/'.join(directory.split('/')[:-2]) + '/', isDir = True))
 
                if self.showDirectories:
                        for x in directories:
@@ -122,20 +140,50 @@ class FileList(MenuList, HTMLComponent, GUIComponent):
                                                self.list.append(FileEntryComponent(name = name, absolute = x , isDir = False))
                                else:
                                        self.list.append(FileEntryComponent(name = name, absolute = x , isDir = False))
-                               
+
                self.l.setList(self.list)
                
+               if select is not None:
+                       i = 0
+                       self.moveToIndex(0)
+                       for x in self.list:
+                               p = x[0][0]
+                               
+                               if isinstance(p, eServiceReference):
+                                       p = p.getPath()
+                               
+                               if p == select:
+                                       self.moveToIndex(i)
+                               i += 1
+
+       def getCurrentDirectory(self):
+               return self.current_directory
+
        def canDescent(self):
+               if self.getSelection() is None:
+                       return False
                return self.getSelection()[1]
        
        def descent(self):
-               self.changeDir(self.getSelection()[0])
+               if self.getSelection() is None:
+                       return
+               self.changeDir(self.getSelection()[0], select = self.current_directory)
                
        def getFilename(self):
-               return self.getSelection()[0].getPath()
+               if self.getSelection() is None:
+                       return None
+               x = self.getSelection()[0]
+               if isinstance(x, eServiceReference):
+                       x = x.getPath()
+               return x
 
        def getServiceRef(self):
-               return self.getSelection()[0]
+               if self.getSelection() is None:
+                       return None
+               x = self.getSelection()[0]
+               if isinstance(x, eServiceReference):
+                       return x
+               return None
 
        GUI_WIDGET = eListbox