X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d737336f55ea7bb0a714d73cabd351d6db8bdddd..2ea3c0f4cdde1978d6517e8f8fae16a8070cb792:/lib/python/Screens/PluginBrowser.py

diff --git a/lib/python/Screens/PluginBrowser.py b/lib/python/Screens/PluginBrowser.py
old mode 100644
new mode 100755
index 15e6dc8a..3a7df9fb
--- a/lib/python/Screens/PluginBrowser.py
+++ b/lib/python/Screens/PluginBrowser.py
@@ -23,7 +23,6 @@ class PluginBrowser(Screen):
 		
 		self.list = []
 		self["list"] = PluginList(self.list)
-		self.updateList()
 		
 		self["actions"] = ActionMap(["WizardActions", "ColorActions"],
 		{
@@ -32,7 +31,8 @@ class PluginBrowser(Screen):
 			"red": self.delete,
 			"green": self.download
 		})
-		self.onExecBegin.append(self.checkWarnings)
+		self.onFirstExecBegin.append(self.checkWarnings)
+		self.onShown.append(self.updateList)
 	
 	def checkWarnings(self):
 		if len(plugins.warnings):
@@ -48,20 +48,23 @@ class PluginBrowser(Screen):
 	
 	def run(self):
 		plugin = self["list"].l.getCurrentSelection()[0]
-		
 		plugin(session=self.session)
 		
 	def updateList(self):
 		self.pluginlist = plugins.getPlugins(PluginDescriptor.WHERE_PLUGINMENU)
 		self.list = [PluginEntryComponent(plugin) for plugin in self.pluginlist]
-
 		self["list"].l.setList(self.list)
 
 	def delete(self):
-		self.session.openWithCallback(self.updateList, PluginDownloadBrowser, PluginDownloadBrowser.REMOVE)
+		self.session.openWithCallback(self.PluginDownloadBrowserClosed, PluginDownloadBrowser, PluginDownloadBrowser.REMOVE)
 	
 	def download(self):
-		self.session.openWithCallback(self.updateList, PluginDownloadBrowser, PluginDownloadBrowser.DOWNLOAD)
+		self.session.openWithCallback(self.PluginDownloadBrowserClosed, PluginDownloadBrowser, PluginDownloadBrowser.DOWNLOAD)
+
+	def PluginDownloadBrowserClosed(self):
+		self.updateList()
+		self.checkWarnings()
+
 
 class PluginDownloadBrowser(Screen):
 	DOWNLOAD = 0
@@ -135,6 +138,9 @@ class PluginDownloadBrowser(Screen):
 	def startIpkgListInstalled(self):
 		self.container.execute("ipkg list_installed enigma2-plugin-*")
 
+	def startIpkgListAvailable(self):
+		self.container.execute("ipkg list enigma2-plugin-*")
+
 	def startRun(self):
 		self["list"].instance.hide()
 		if self.type == self.DOWNLOAD:
@@ -143,7 +149,7 @@ class PluginDownloadBrowser(Screen):
 				self.container.execute("ipkg update")
 				PluginDownloadBrowser.lastDownloadDate = time()
 			else:
-				self.startIpkgListInstalled()
+				self.startIpkgListAvailable()
 		elif self.type == self.REMOVE:
 			self.run = 1
 			self.startIpkgListInstalled()
@@ -162,7 +168,7 @@ class PluginDownloadBrowser(Screen):
 				self.startIpkgListInstalled()
 		elif self.run == 1 and self.type == self.DOWNLOAD:
 			self.run = 2
-			self.container.execute("ipkg list enigma2-plugin-*")
+			self.startIpkgListAvailable()
 		else:
 			if len(self.pluginlist) > 0:
 				self.updateList()
@@ -187,7 +193,8 @@ class PluginDownloadBrowser(Screen):
 			plugin = x.split(" - ", 2)
 			if len(plugin) == 3:
 				if self.run == 1 and self.type == self.DOWNLOAD:
-					self.installedplugins.append(plugin[0])
+					if plugin[0] not in self.installedplugins:
+						self.installedplugins.append(plugin[0])
 				else:
 					if plugin[0] not in self.installedplugins:
 						plugin.append(plugin[0][15:])