X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/eaa8bc374ff5eca1bb3caf9517dc6772cae34dd6..4ea4f33a6a0382249996c4dae4db31ae2e059dbb:/lib/python/Plugins/Extensions/IpkgInstaller/plugin.py diff --git a/lib/python/Plugins/Extensions/IpkgInstaller/plugin.py b/lib/python/Plugins/Extensions/IpkgInstaller/plugin.py index f6dfc965..4893dc47 100644 --- a/lib/python/Plugins/Extensions/IpkgInstaller/plugin.py +++ b/lib/python/Plugins/Extensions/IpkgInstaller/plugin.py @@ -20,7 +20,7 @@ class IpkgInstaller(Screen): def __init__(self, session, list): self.skin = IpkgInstaller.skin Screen.__init__(self, session) - + self.list = SelectionList() self["list"] = self.list for listindex in range(len(list)): @@ -47,14 +47,13 @@ class IpkgInstaller(Screen): self.session.open(Ipkg, cmdList = cmdList) def filescan_open(list, session, **kwargs): - session.open(IpkgInstaller, list) # list + filelist = [x.path for x in list] + session.open(IpkgInstaller, filelist) # list -def filescan(): - # we expect not to be called if the MediaScanner plugin is not available, - # thus we don't catch an ImportError exception here - from Plugins.Extensions.MediaScanner.plugin import Scanner, ScanPath +def filescan(**kwargs): + from Components.Scanner import Scanner, ScanPath return \ - Scanner(extensions = ["ipk"], + Scanner(mimetypes = ["application/x-debian-package"], paths_to_scan = [ ScanPath(path = "ipk", with_subdirs = True), @@ -62,8 +61,7 @@ def filescan(): ], name = "Ipkg", description = "Install software updates...", - openfnc = filescan_open, - ) - + openfnc = filescan_open, ) + def Plugins(**kwargs): - return [ PluginDescriptor(name="Ipkg", where = PluginDescriptor.WHERE_FILESCAN, fnc = filescan) ] \ No newline at end of file + return [ PluginDescriptor(name="Ipkg", where = PluginDescriptor.WHERE_FILESCAN, fnc = filescan) ]