X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/3ad1f5540aa20e5b8132ededc367d8f319b2d5dd..5c190ae9fad609392f8f91ae931168acf862dbd9:/lib/python/Screens/PluginBrowser.py

diff --git a/lib/python/Screens/PluginBrowser.py b/lib/python/Screens/PluginBrowser.py
index 67aac076..86f4a6b9 100644
--- 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 Tools.Directories import resolveFilename, SCOPE_PLUGINS
 
 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 = []
@@ -49,15 +50,20 @@ class PluginBrowser(Screen):
 		self["list"].l.setList(self.list)
 
 	def delete(self):
-		pass
+		self.session.openWithCallback(self.updateList, PluginDownloadBrowser, PluginDownloadBrowser.REMOVE)
 	
 	def download(self):
-		self.session.open(PluginDownloadBrowser)
+		self.session.openWithCallback(self.updateList, PluginDownloadBrowser, PluginDownloadBrowser.DOWNLOAD)
 
 class PluginDownloadBrowser(Screen):
-	def __init__(self, session):
+	DOWNLOAD = 0
+	REMOVE = 1
+	
+	def __init__(self, session, type):
 		Screen.__init__(self, session)
 		
+		self.type = type
+		
 		self.container = eConsoleAppContainer()
 		self.container.appClosed.get().append(self.runFinished)
 		self.container.dataAvail.get().append(self.dataAvail)
@@ -67,7 +73,10 @@ class PluginDownloadBrowser(Screen):
 		self["list"] = PluginList(self.list)
 		self.pluginlist = []
 		
-		self["text"] = Label(_("Downloading plugin information. Please wait..."))
+		if self.type == self.DOWNLOAD:
+			self["text"] = Label(_("Downloading plugin information. Please wait..."))
+		elif self.type == self.REMOVE:
+			self["text"] = Label(_("Getting plugin information. Please wait..."))
 		
 		self.run = 0
 				
@@ -79,20 +88,36 @@ class PluginDownloadBrowser(Screen):
 		
 	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:
-			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):
+		if self.type == self.DOWNLOAD:
+			self.session.currentDialog.instance.setTitle(_("Downloadale new plugins"))
+		elif self.type == self.REMOVE:
+			self.session.currentDialog.instance.setTitle(_("Remove plugins"))
 		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
-			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()