git.cweiske.de / enigma2.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fix frontend number query
[enigma2.git] / lib / python / Screens / PluginBrowser.py
diff --git a/lib/python/Screens/PluginBrowser.py b/lib/python/Screens/PluginBrowser.py
index e40dc8a6d484827e41e1f3a8f3b0321193e37a96..5459ccce7857c056709ffb2dfa1096cd3832c444 100644 (file)
--- a/lib/python/Screens/PluginBrowser.py
+++ b/lib/python/Screens/PluginBrowser.py
@@ -1,17 +1,15 @@
 from Screen import Screen
 
 from Screen import Screen
 
-from enigma import eConsoleAppContainer
+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.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
 from Plugins.Plugin import PluginDescriptor
 from Components.Label import Label
 from Screens.MessageBox import MessageBox
 from Screens.Console import Console
 from Plugins.Plugin import PluginDescriptor
-from Tools.Directories import resolveFilename, SCOPE_PLUGINS
+from Tools.Directories import resolveFilename, SCOPE_PLUGINS, SCOPE_SKIN_IMAGE
 
 class PluginBrowser(Screen):
        def __init__(self, session):
 
 class PluginBrowser(Screen):
        def __init__(self, session):
@@ -31,7 +29,16 @@ class PluginBrowser(Screen):
                        "red": self.delete,
                        "green": self.download
                })
                        "red": self.delete,
                        "green": self.download
                })
-               
+               self.onExecBegin.append(self.checkWarnings)
+       
+       def checkWarnings(self):
+               if len(plugins.warnings):
+                       text = _("Some plugins are not available:\n")
+                       for (pluginname, error) in plugins.warnings:
+                               text += _("%s (%s)\n") % (pluginname, error)
+                       plugins.resetWarnings()
+                       self.session.open(MessageBox, text = text, type = MessageBox.TYPE_WARNING)
+
        def save(self):
                #self.close()
                self.run()
        def save(self):
                #self.close()
                self.run()
@@ -68,11 +75,13 @@ class PluginDownloadBrowser(Screen):
                self.container.appClosed.get().append(self.runFinished)
                self.container.dataAvail.get().append(self.dataAvail)
                self.onLayoutFinish.append(self.startRun)
                self.container.appClosed.get().append(self.runFinished)
                self.container.dataAvail.get().append(self.dataAvail)
                self.onLayoutFinish.append(self.startRun)
-               self.onShown.append(self.setTitle)
+               self.onShown.append(self.setWindowTitle)
                
                self.list = []
                self["list"] = PluginList(self.list)
                self.pluginlist = []
                
                self.list = []
                self["list"] = PluginList(self.list)
                self.pluginlist = []
+               self.expanded = []
+               self.installedplugins = []
                
                if self.type == self.DOWNLOAD:
                        self["text"] = Label(_("Downloading plugin information. Please wait..."))
                
                if self.type == self.DOWNLOAD:
                        self["text"] = Label(_("Downloading plugin information. Please wait..."))
@@ -88,58 +97,97 @@ class PluginDownloadBrowser(Screen):
                })
                
        def go(self):
                })
                
        def go(self):
-               print "plugin: installing:", self.pluginlist[self["list"].l.getCurrentSelectionIndex()]
-               if self.type == self.DOWNLOAD:
-                       self.session.openWithCallback(self.runInstall, MessageBox, _("Do you really want to download\nthe plugin \"" + self.pluginlist[self["list"].l.getCurrentSelectionIndex()][3] + "\"?"))
-               elif self.type == self.REMOVE:
-                       self.session.openWithCallback(self.runInstall, MessageBox, _("Do you really want to REMOVE\nthe plugin \"" + self.pluginlist[self["list"].l.getCurrentSelectionIndex()][3] + "\"?"))
+               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(sel[0])
+                       self.updateList()
+               else:
+                       if self.type == self.DOWNLOAD:
+                               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 \"" + sel[0].name + "\"?"))
 
        def runInstall(self, val):
                if val:
                        if self.type == self.DOWNLOAD:
 
        def runInstall(self, val):
                if val:
                        if self.type == self.DOWNLOAD:
-                               self.session.openWithCallback(self.installFinished, Console, ["ipkg install " + self.pluginlist[self["list"].l.getCurrentSelectionIndex()][0]])
+                               self.session.openWithCallback(self.installFinished, Console, cmdlist = ["ipkg install " + "enigma2-plugin-" + self["list"].l.getCurrentSelection()[0].name])
                        elif self.type == self.REMOVE:
                        elif self.type == self.REMOVE:
-                               self.session.openWithCallback(self.installFinished, Console, ["ipkg remove " + self.pluginlist[self["list"].l.getCurrentSelectionIndex()][0]])
+                               self.session.openWithCallback(self.installFinished, Console, cmdlist = ["ipkg remove " + "enigma2-plugin-" + self["list"].l.getCurrentSelection()[0].name])
 
 
-       def setTitle(self):
+       def setWindowTitle(self):
                if self.type == self.DOWNLOAD:
                if self.type == self.DOWNLOAD:
-                       self.session.currentDialog.instance.setTitle(_("Downloadable new plugins"))
+                       self.setTitle(_("Downloadable new plugins"))
                elif self.type == self.REMOVE:
                elif self.type == self.REMOVE:
-                       self.session.currentDialog.instance.setTitle(_("Remove plugins"))
+                       self.setTitle(_("Remove plugins"))
 
        def startRun(self):
                self["list"].instance.hide()
 
        def startRun(self):
                self["list"].instance.hide()
-               self.container.execute("ipkg update")
+               if self.type == self.DOWNLOAD:
+                       self.container.execute("ipkg update")
+               elif self.type == self.REMOVE:
+                       self.run = 1
+                       self.container.execute("ipkg list_installed enigma2-plugin-*")
                
        def installFinished(self):
                plugins.readPluginList(resolveFilename(SCOPE_PLUGINS))
                
        def installFinished(self):
                plugins.readPluginList(resolveFilename(SCOPE_PLUGINS))
+               self.close()
                
        def runFinished(self, retval):
                if self.run == 0:
                        self.run = 1
                        if self.type == self.DOWNLOAD:
                
        def runFinished(self, retval):
                if self.run == 0:
                        self.run = 1
                        if self.type == self.DOWNLOAD:
-                               self.container.execute("ipkg list enigma2-plugin-*")
-                       elif self.type == self.REMOVE:
                                self.container.execute("ipkg list_installed 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:
                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:
 
        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):
        
        def updateList(self):
-               for x in self.pluginlist:
-                       plugin = PluginDescriptor(name = x[3], description = x[2])
-                       self.list.append(PluginEntryComponent(plugin))
+               self.list = []
+               expandableIcon = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "expandable-plugins.png"))
+               expandedIcon = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "expanded-plugins.png"))
+               verticallineIcon = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "verticalline-plugins.png"))
                
                
+               self.plugins = {}
+               for x in self.pluginlist:
+                       split = x[3].split('-')
+                       if len(split) < 2:
+                               continue
+                       if not self.plugins.has_key(split[0]):
+                               self.plugins[split[0]] = []
+                               
+                       self.plugins[split[0]].append((PluginDescriptor(name = x[3], description = x[2], icon = verticallineIcon), split[1]))
+                       
+               for x in self.plugins.keys():
+                       if x in self.expanded:
+                               self.list.append(PluginCategoryComponent(x, expandedIcon))
+                               for plugin in self.plugins[x]:
+                                       self.list.append(PluginDownloadComponent(plugin[0], plugin[1]))
+                       else:
+                               self.list.append(PluginCategoryComponent(x, expandableIcon))
                self["list"].l.setList(self.list)
 
                self["list"].l.setList(self.list)
 
Clone of git://git.opendreambox.org/git/enigma2.git before dream multimedia removed all the engima2 sources