add ability to remove plugins

[enigma2.git] / lib / python / Screens / PluginBrowser.py

diff --git a/lib/python/Screens/PluginBrowser.py b/lib/python/Screens/PluginBrowser.py
index 67aac07656906a6d853edc200a63990f24e52512..c0e85c87ad5c13338251796e988be17d468ffe44 100644 (file)
--- a/lib/python/Screens/PluginBrowser.py
+++ b/lib/python/Screens/PluginBrowser.py
@@ -11,12 +11,13 @@ from Components.Label import Label
 from Screens.MessageBox import MessageBox
 from Screens.Console import Console
 from Plugins.Plugin import PluginDescriptor
 from Screens.MessageBox import MessageBox
 from Screens.Console import Console
 from Plugins.Plugin import PluginDescriptor

+from Tools.Directories import resolveFilename, SCOPE_PLUGINS

 
 class PluginBrowser(Screen):
        def __init__(self, session):
                Screen.__init__(self, session)
                
 
 class PluginBrowser(Screen):
        def __init__(self, session):
                Screen.__init__(self, session)
                

-               self["red"] = Label(_("Delete"))
+               self["red"] = Label(_("Remove Plugins"))

                self["green"] = Label(_("Download Plugins"))
                
                self.list = []
                self["green"] = Label(_("Download Plugins"))
                
                self.list = []


@@ -49,15 +50,20 @@ class PluginBrowser(Screen):
                self["list"].l.setList(self.list)
 
        def delete(self):
                self["list"].l.setList(self.list)
 
        def delete(self):

-               pass
+               self.session.openWithCallback(self.updateList, PluginDownloadBrowser, PluginDownloadBrowser.REMOVE)

        
        def download(self):
        
        def download(self):

-               self.session.open(PluginDownloadBrowser)
+               self.session.openWithCallback(self.updateList, PluginDownloadBrowser, PluginDownloadBrowser.DOWNLOAD)

 
 class PluginDownloadBrowser(Screen):
 
 class PluginDownloadBrowser(Screen):

-       def __init__(self, session):
+       DOWNLOAD = 0
+       REMOVE = 1
+       
+       def __init__(self, session, type):

                Screen.__init__(self, session)
                
                Screen.__init__(self, session)
                

+               self.type = type
+               

                self.container = eConsoleAppContainer()
                self.container.appClosed.get().append(self.runFinished)
                self.container.dataAvail.get().append(self.dataAvail)
                self.container = eConsoleAppContainer()
                self.container.appClosed.get().append(self.runFinished)
                self.container.dataAvail.get().append(self.dataAvail)


@@ -67,7 +73,12 @@ class PluginDownloadBrowser(Screen):
                self["list"] = PluginList(self.list)
                self.pluginlist = []
                
                self["list"] = PluginList(self.list)
                self.pluginlist = []
                

-               self["text"] = Label(_("Downloading plugin information. Please wait..."))
+               if self.type == self.DOWNLOAD:
+                       self.session.currentDialog.instance.setTitle(_("Downloadale new plugins"))
+                       self["text"] = Label(_("Downloading plugin information. Please wait..."))
+               elif self.type == self.REMOVE:
+                       self.session.currentDialog.instance.setTitle(_("Remove plugins"))
+                       self["text"] = Label(_("Getting plugin information. Please wait..."))

                
                self.run = 0
                                
                
                self.run = 0
                                


@@ -79,20 +90,32 @@ class PluginDownloadBrowser(Screen):
                
        def go(self):
                print "plugin: installing:", self.pluginlist[self["list"].l.getCurrentSelectionIndex()]
                
        def go(self):
                print "plugin: installing:", self.pluginlist[self["list"].l.getCurrentSelectionIndex()]

-               self.session.openWithCallback(self.runInstall, MessageBox, _("Do you really want to download\nthe plugin \"" + self.pluginlist[self["list"].l.getCurrentSelectionIndex()][3] + "\"?"))
-               
+               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] + "\"?"))
+

        def runInstall(self, val):
                if val:
        def runInstall(self, val):
                if val:

-                       self.session.open(Console, ["ipkg install " + self.pluginlist[self["list"].l.getCurrentSelectionIndex()][0]])
+                       if self.type == self.DOWNLOAD:
+                               self.session.openWithCallback(self.installFinished, Console, ["ipkg install " + self.pluginlist[self["list"].l.getCurrentSelectionIndex()][0]])
+                       elif self.type == self.REMOVE:
+                               self.session.openWithCallback(self.installFinished, Console, ["ipkg remove " + self.pluginlist[self["list"].l.getCurrentSelectionIndex()][0]])

 
        def startRun(self):
                self["list"].instance.hide()
                self.container.execute("ipkg update")
                
 
        def startRun(self):
                self["list"].instance.hide()
                self.container.execute("ipkg update")
                

+       def installFinished(self):
+               plugins.readPluginList(resolveFilename(SCOPE_PLUGINS))
+               

        def runFinished(self, retval):
                if self.run == 0:
                        self.run = 1
        def runFinished(self, retval):
                if self.run == 0:
                        self.run = 1

-                       self.container.execute("ipkg list enigma2-plugin-*")
+                       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-*")

                else:
                        if len(self.pluginlist) > 0:
                                self.updateList()
                else:
                        if len(self.pluginlist) > 0:
                                self.updateList()