fix frontend number query
[enigma2.git] / lib / python / Screens / PluginBrowser.py
index f5d0c8a11bee8d50947d467f06ee1c0755fe7a72..5459ccce7857c056709ffb2dfa1096cd3832c444 100644 (file)
@@ -2,11 +2,9 @@ from Screen import Screen
 
 from enigma import eConsoleAppContainer, loadPNG
 
-from Components.MenuList import MenuList
 from Components.ActionMap import ActionMap
 from Components.PluginComponent import plugins
 from Components.PluginList import *
-from Components.config import config
 from Components.Label import Label
 from Screens.MessageBox import MessageBox
 from Screens.Console import Console
@@ -83,6 +81,7 @@ class PluginDownloadBrowser(Screen):
                self["list"] = PluginList(self.list)
                self.pluginlist = []
                self.expanded = []
+               self.installedplugins = []
                
                if self.type == self.DOWNLOAD:
                        self["text"] = Label(_("Downloading plugin information. Please wait..."))
@@ -98,17 +97,22 @@ class PluginDownloadBrowser(Screen):
                })
                
        def go(self):
-               if type(self["list"].l.getCurrentSelection()[0]) is str: # category
-                       if self["list"].l.getCurrentSelection()[0] in self.expanded:
-                               self.expanded.remove(self["list"].l.getCurrentSelection()[0])
+               sel = self["list"].l.getCurrentSelection()
+
+               if sel is None:
+                       return
+
+               if type(sel[0]) is str: # category
+                       if sel[0] in self.expanded:
+                               self.expanded.remove(sel[0])
                        else:
-                               self.expanded.append(self["list"].l.getCurrentSelection()[0])
+                               self.expanded.append(sel[0])
                        self.updateList()
                else:
                        if self.type == self.DOWNLOAD:
-                               self.session.openWithCallback(self.runInstall, MessageBox, _("Do you really want to download\nthe plugin \"" + self["list"].l.getCurrentSelection()[0].name + "\"?"))
+                               self.session.openWithCallback(self.runInstall, MessageBox, _("Do you really want to download\nthe plugin \"" + sel[0].name + "\"?"))
                        elif self.type == self.REMOVE:
-                               self.session.openWithCallback(self.runInstall, MessageBox, _("Do you really want to REMOVE\nthe plugin \"" + self["list"].l.getCurrentSelection()[0].name + "\"?"))
+                               self.session.openWithCallback(self.runInstall, MessageBox, _("Do you really want to REMOVE\nthe plugin \"" + sel[0].name + "\"?"))
 
        def runInstall(self, val):
                if val:
@@ -139,21 +143,28 @@ class PluginDownloadBrowser(Screen):
                if self.run == 0:
                        self.run = 1
                        if self.type == self.DOWNLOAD:
-                               self.container.execute("ipkg list enigma2-plugin-*")
+                               self.container.execute("ipkg list_installed enigma2-plugin-*")
+               elif self.run == 1 and self.type == self.DOWNLOAD:
+                       self.run = 2
+                       self.container.execute("ipkg list enigma2-plugin-*")
                else:
                        if len(self.pluginlist) > 0:
                                self.updateList()
                                self["list"].instance.show()
                        else:
-                               self["text"].setText("No plugins found")
+                               self["text"].setText("No new plugins found")
 
        def dataAvail(self, str):
                for x in str.split('\n'):
                        plugin = x.split(" - ")
                        if len(plugin) == 3:
-                               plugin.append(plugin[0][15:])
+                               if self.run == 1 and self.type == self.DOWNLOAD:
+                                       self.installedplugins.append(plugin[0])
+                               else:
+                                       if plugin[0] not in self.installedplugins:
+                                               plugin.append(plugin[0][15:])
 
-                               self.pluginlist.append(plugin)
+                                               self.pluginlist.append(plugin)
        
        def updateList(self):
                self.list = []