X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2a8ecd871020fdd668cf5500460e5a6e7851b4b0..256eda99abcf5486ed8433180a75da1e6afb86ac:/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 6d0439ed..e3df4de9
--- a/lib/python/Screens/PluginBrowser.py
+++ b/lib/python/Screens/PluginBrowser.py
@@ -12,6 +12,7 @@ from Plugins.Plugin import PluginDescriptor
 from Tools.Directories import resolveFilename, SCOPE_PLUGINS, SCOPE_SKIN_IMAGE
 from Tools.LoadPixmap import LoadPixmap
 
+from time import time
 
 class PluginBrowser(Screen):
 	def __init__(self, session):
@@ -51,11 +52,9 @@ class PluginBrowser(Screen):
 		plugin(session=self.session)
 		
 	def updateList(self):
-		self.list = [ ]
 		self.pluginlist = plugins.getPlugins(PluginDescriptor.WHERE_PLUGINMENU)
-		for plugin in self.pluginlist:
-			self.list.append(PluginEntryComponent(plugin))
-		
+		self.list = [PluginEntryComponent(plugin) for plugin in self.pluginlist]
+
 		self["list"].l.setList(self.list)
 
 	def delete(self):
@@ -67,15 +66,16 @@ class PluginBrowser(Screen):
 class PluginDownloadBrowser(Screen):
 	DOWNLOAD = 0
 	REMOVE = 1
-	
+	lastDownloadDate = None
+
 	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)
+		self.container.appClosed.append(self.runFinished)
+		self.container.dataAvail.append(self.dataAvail)
 		self.onLayoutFinish.append(self.startRun)
 		self.onShown.append(self.setWindowTitle)
 		
@@ -106,17 +106,18 @@ class PluginDownloadBrowser(Screen):
 		if sel is None:
 			return
 
-		if type(sel[0]) is str: # category
-			if sel[0] in self.expanded:
-				self.expanded.remove(sel[0])
+		sel = sel[0]
+		if isinstance(sel, str): # category
+			if sel in self.expanded:
+				self.expanded.remove(sel)
 			else:
-				self.expanded.append(sel[0])
+				self.expanded.append(sel)
 			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 + "\"?"))
+				self.session.openWithCallback(self.runInstall, MessageBox, _("Do you really want to download\nthe plugin \"%s\"?") % sel.name)
 			elif self.type == self.REMOVE:
-				self.session.openWithCallback(self.runInstall, MessageBox, _("Do you really want to REMOVE\nthe plugin \"" + sel[0].name + "\"?"))
+				self.session.openWithCallback(self.runInstall, MessageBox, _("Do you really want to REMOVE\nthe plugin \"%s\"?") % sel.name)
 
 	def runInstall(self, val):
 		if val:
@@ -131,18 +132,29 @@ class PluginDownloadBrowser(Screen):
 		elif self.type == self.REMOVE:
 			self.setTitle(_("Remove plugins"))
 
+	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:
-			self.container.execute("ipkg update")
+			if not PluginDownloadBrowser.lastDownloadDate or (time() - PluginDownloadBrowser.lastDownloadDate) > 3600:
+				# Only update from internet once per hour
+				self.container.execute("ipkg update")
+				PluginDownloadBrowser.lastDownloadDate = time()
+			else:
+				self.startIpkgListAvailable()
 		elif self.type == self.REMOVE:
 			self.run = 1
-			self.container.execute("ipkg list_installed enigma2-plugin-*")
-		
+			self.startIpkgListInstalled()
+
 	def installFinished(self):
 		plugins.readPluginList(resolveFilename(SCOPE_PLUGINS))
-		self.container.appClosed.get().remove(self.runFinished)
-		self.container.dataAvail.get().remove(self.dataAvail)
+		self.container.appClosed.remove(self.runFinished)
+		self.container.dataAvail.remove(self.dataAvail)
 		self.close()
 
 	def runFinished(self, retval):
@@ -150,10 +162,10 @@ class PluginDownloadBrowser(Screen):
 		if self.run == 0:
 			self.run = 1
 			if self.type == self.DOWNLOAD:
-				self.container.execute("ipkg list_installed enigma2-plugin-*")
+				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()
@@ -175,7 +187,7 @@ class PluginDownloadBrowser(Screen):
 			self.remainingdata = ""
 
 		for x in lines:
-			plugin = x.split(" - ")
+			plugin = x.split(" - ", 2)
 			if len(plugin) == 3:
 				if self.run == 1 and self.type == self.DOWNLOAD:
 					self.installedplugins.append(plugin[0])
@@ -186,14 +198,14 @@ class PluginDownloadBrowser(Screen):
 						self.pluginlist.append(plugin)
 	
 	def updateList(self):
-		self.list = []
+		list = []
 		expandableIcon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/expandable-plugins.png"))
 		expandedIcon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/expanded-plugins.png"))
 		verticallineIcon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/verticalline-plugins.png"))
 		
 		self.plugins = {}
 		for x in self.pluginlist:
-			split = x[3].split('-')
+			split = x[3].split('-', 1)
 			if len(split) < 2:
 				continue
 			if not self.plugins.has_key(split[0]):
@@ -203,10 +215,10 @@ class PluginDownloadBrowser(Screen):
 			
 		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]))
+				list.append(PluginCategoryComponent(x, expandedIcon))
+				list.extend([PluginDownloadComponent(plugin[0], plugin[1]) for plugin in self.plugins[x]])
 			else:
-				self.list.append(PluginCategoryComponent(x, expandableIcon))
-		self["list"].l.setList(self.list)
+				list.append(PluginCategoryComponent(x, expandableIcon))
+		self.list = list
+		self["list"].l.setList(list)