fix

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

diff --git a/lib/python/Components/FileList.py b/lib/python/Components/FileList.py
index b85b8ea337548a79dbb054245113e90e06c693c5..d842cfefbe353de786cdb353f0bff09a3b0fbdf9 100644 (file)
--- a/lib/python/Components/FileList.py
+++ b/lib/python/Components/FileList.py
@@ -1,5 +1,3 @@
-from HTMLComponent import *
-from GUIComponent import *
 import re
 
 from os import path as os_path, listdir
@@ -8,8 +6,9 @@ from Components.Harddisk import harddiskmanager
 
 from Tools.Directories import SCOPE_SKIN_IMAGE, resolveFilename
 
-from enigma import RT_HALIGN_LEFT, loadPNG, eListbox, eListboxPythonMultiContent, \
+from enigma import RT_HALIGN_LEFT, eListbox, eListboxPythonMultiContent, \
        eServiceReference, eServiceCenter, gFont
+from Tools.LoadPixmap import LoadPixmap
 
 EXTENSIONS = {
                "mp3": "music",
@@ -29,12 +28,12 @@ def FileEntryComponent(name, absolute = None, isDir = False):
        res = [ (absolute, isDir) ]
        res.append((eListboxPythonMultiContent.TYPE_TEXT, 35, 1, 470, 20, 0, RT_HALIGN_LEFT, name))
        if isDir:
-               png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "extensions/directory.png"))
+               png = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "extensions/directory.png"))
        else:
                extension = name.split('.')
                extension = extension[-1].lower()
                if EXTENSIONS.has_key(extension):
-                       png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "extensions/" + EXTENSIONS[extension] + ".png"))
+                       png = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "extensions/" + EXTENSIONS[extension] + ".png"))
                else:
                        png = None
        if png is not None:
@@ -42,11 +41,9 @@ def FileEntryComponent(name, absolute = None, isDir = False):
        
        return res
 
-class FileList(MenuList, HTMLComponent, GUIComponent):
-       def __init__(self, directory, showDirectories = True, showFiles = True, matchingPattern = None, useServiceRef = False, isTop = False):
-               GUIComponent.__init__(self)
-               self.l = eListboxPythonMultiContent()
-               
+class FileList(MenuList):
+       def __init__(self, directory, showDirectories = True, showFiles = True, matchingPattern = None, useServiceRef = False, isTop = False, enableWrapAround = False):
+               MenuList.__init__(self, list, enableWrapAround, eListboxPythonMultiContent)
                self.mount_point = None
                self.current_directory = None
                self.useServiceRef = useServiceRef
@@ -58,25 +55,34 @@ class FileList(MenuList, HTMLComponent, GUIComponent):
                self.changeDir(directory)
 
                self.l.setFont(0, gFont("Regular", 18))
-               
+               self.l.setItemHeight(23)
+               self.serviceHandler = eServiceCenter.getInstance()
+
        def getSelection(self):
                if self.l.getCurrentSelection() is None:
                        return None
                return self.l.getCurrentSelection()[0]
-       
+
+       def getCurrentEvent(self):
+               l = self.l.getCurrentSelection()
+               if not l or l[0][1] == True:
+                       return None
+               else:
+                       return self.serviceHandler.info(l[0][0]).getEvent(l[0][0])
+
        def getFileList(self):
                return self.list
-       
+
        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 directory is None: # present available mountpoints
                        print "listing partitions:"
                        for p in harddiskmanager.getMountedPartitions():
@@ -90,7 +96,7 @@ class FileList(MenuList, HTMLComponent, GUIComponent):
                        root = eServiceReference("2:0:1:0:0:0:0:0:0:0:" + directory)
                        serviceHandler = eServiceCenter.getInstance()
                        list = serviceHandler.list(root)
-                       
+
                        while 1:
                                s = list.getNext()
                                if not s.valid():
@@ -111,7 +117,7 @@ class FileList(MenuList, HTMLComponent, GUIComponent):
                                if os_path.isdir(directory + x):
                                        directories.append(directory + x + "/")
                                        files.remove(x)
-               
+
                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))
@@ -131,7 +137,7 @@ class FileList(MenuList, HTMLComponent, GUIComponent):
                                else:
                                        path = directory + x
                                        name = x
-                               
+
                                if self.matchingPattern is not None:
                                        if re.compile(self.matchingPattern).search(path):
                                                self.list.append(FileEntryComponent(name = name, absolute = x , isDir = False))
@@ -139,7 +145,7 @@ class FileList(MenuList, HTMLComponent, GUIComponent):
                                        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)
@@ -160,12 +166,12 @@ class FileList(MenuList, HTMLComponent, GUIComponent):
                if self.getSelection() is None:
                        return False
                return self.getSelection()[1]
-       
+
        def descent(self):
                if self.getSelection() is None:
                        return
                self.changeDir(self.getSelection()[0], select = self.current_directory)
-               
+
        def getFilename(self):
                if self.getSelection() is None:
                        return None
@@ -182,8 +188,15 @@ class FileList(MenuList, HTMLComponent, GUIComponent):
                        return x
                return None
 
-       GUI_WIDGET = eListbox
+       def execBegin(self):
+               harddiskmanager.on_partition_list_change.append(self.partitionListChanged)
+
+       def execEnd(self):
+               harddiskmanager.on_partition_list_change.remove(self.partitionListChanged)
 
-       def postWidgetCreate(self, instance):
-               instance.setContent(self.l)
-               instance.setItemHeight(23)
+       def refresh(self):
+               self.changeDir(self.current_directory, self.getFilename())
+
+       def partitionListChanged(self, action, device):
+               if self.current_directory is None:
+                       self.refresh()