X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/699e95c18614b5e6c659a82ae955be6c3920f6e5..5b48886f30532694e2bad8d5cc839b607293423d:/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py

diff --git a/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py b/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
index 6162d8a5..4917855f 100755
--- a/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
@@ -137,8 +137,8 @@ class UpdatePluginMenu(Screen):
 			self.list.append(("advancedrestore", _("Advanced restore"), _("\nRestore your backups by date." ) + self.oktext, None))
 			self.list.append(("backuplocation", _("Choose backup location"),  _("\nSelect your backup device.\nCurrent device: " ) + config.plugins.configurationbackup.backuplocation.value + self.oktext, None))
 			self.list.append(("backupfiles", _("Choose backup files"),  _("Select files for backup. Currently selected:\n" ) + self.backupdirs + self.oktext, None))
-			#if config.usage.setup_level.index >= 2: # expert+
-			#	self.list.append(("ipkg-manager", _("Packet management"),  _("\nView, install and remove available or installed packages." ) + self.oktext, None))
+			if config.usage.setup_level.index >= 2: # expert+
+				self.list.append(("ipkg-manager", _("Packet management"),  _("\nView, install and remove available or installed packages." ) + self.oktext, None))
 			self.list.append(("ipkg-source",_("Choose upgrade source"), _("\nEdit the upgrade source address." ) + self.oktext, None))
 			for p in plugins.getPlugins(PluginDescriptor.WHERE_SOFTWAREMANAGER):
 				if p.__call__.has_key("AdvancedSoftwareSupported"):
@@ -326,10 +326,12 @@ class PluginManager(Screen, DreamInfoHandler):
 			<widget source="status" render="Label" position="5,410" zPosition="10" size="540,30" halign="center" valign="center" font="Regular;22" transparent="1" shadowColor="black" shadowOffset="-1,-1" />
 		</screen>"""
 
-	def __init__(self, session, plugin_path, args = None):
+	def __init__(self, session, plugin_path = None, args = None):
 		Screen.__init__(self, session)
 		self.session = session
 		self.skin_path = plugin_path
+		if self.skin_path == None:
+			self.skin_path = resolveFilename(SCOPE_CURRENT_PLUGIN, "SystemPlugins/SoftwareManager")
 
 		self["shortcuts"] = ActionMap(["ShortcutActions", "WizardActions", "InfobarEPGActions", "HelpActions" ],
 		{
@@ -418,7 +420,7 @@ class PluginManager(Screen, DreamInfoHandler):
 
 	def getUpdateInfos(self):
 		self.setState('update')
-		iSoftwareTools.getUpdates(self.getUpdateInfosCB)
+		iSoftwareTools.startSoftwareTools(self.getUpdateInfosCB)
 
 	def getUpdateInfosCB(self, retval = None):
 		if retval is not None:
@@ -427,9 +429,10 @@ class PluginManager(Screen, DreamInfoHandler):
 					self["status"].setText(_("There are at least ") + str(iSoftwareTools.available_updates) + _(" updates available."))
 				else:
 					self["status"].setText(_("There are no updates available."))
+				self.rebuildList()
 			elif retval is False:
+				self.setState('error')
 				self["status"].setText(_("No network connection available."))
-			self.rebuildList()
 
 	def rebuildList(self, retval = None):
 		if self.currentSelectedTag is None:
@@ -567,9 +570,7 @@ class PluginManager(Screen, DreamInfoHandler):
 					for foundtag in prerequisites["tag"]:
 						if categorytag == foundtag:
 							attributes = package[0]["attributes"]
-							print "ATTRIBUTES",attributes
 							if attributes.has_key("packagetype"):
-								print "PACKAGETYPE",attributes["packagetype"]
 								if attributes["packagetype"] == "internal":
 									continue
 								self.packetlist.append([attributes["name"], attributes["details"], attributes["shortdescription"], attributes["packagename"]])
@@ -636,7 +637,7 @@ class PluginManager(Screen, DreamInfoHandler):
 			elif tag == 'Default':
 				return(( _("Default Settings"), _("View list of available default settings" ), tag, divpng ))
 			elif tag == 'SAT':
-				return(( _("Satteliteequipment"), _("View list of available Satteliteequipment extensions." ), tag, divpng ))
+				return(( _("Satellite equipment"), _("View list of available Satellite equipment extensions." ), tag, divpng ))
 			elif tag == 'Software':
 				return(( _("Software"), _("View list of available software extensions" ), tag, divpng ))
 			elif tag == 'Multimedia':
@@ -700,7 +701,7 @@ class PluginManager(Screen, DreamInfoHandler):
 			return
 		if result is False:
 			self.reloadPluginlist()
-			self.selectedFiles = None
+			self.selectedFiles = []
 			self.detailsClosed(True)
 		if result:
 			quitMainloop(3)
@@ -820,7 +821,7 @@ class PluginManagerHelp(Screen):
 			<widget source="list" render="Listbox" position="5,50" size="550,350" scrollbarMode="showOnDemand" selectionDisabled="1">
 				<convert type="TemplatedMultiContent">
 					{"template": [
-							MultiContentEntryText(pos = (50, 0), size = (150, 26), font=0, flags = RT_HALIGN_LEFT, text = 0), # index 0 is the name
+							MultiContentEntryText(pos = (50, 0), size = (540, 26), font=0, flags = RT_HALIGN_LEFT, text = 0), # index 0 is the name
 							MultiContentEntryText(pos = (50, 27), size = (540, 23), font=1, flags = RT_HALIGN_LEFT, text = 1), # index 1 is the state
 							MultiContentEntryPixmapAlphaTest(pos = (0, 1), size = (48, 48), png = 2), # index 2 is the status pixmap
 							MultiContentEntryPixmapAlphaTest(pos = (0, 48), size = (550, 2), png = 3), # index 3 is the div pixmap
@@ -1558,24 +1559,31 @@ class PacketManager(Screen):
 		pass
 
 	def IpkgList_Finished(self, result, retval, extra_args = None):
-		if len(result):
+		if result:
 			self.packetlist = []
 			for x in result.splitlines():
-				split = x.split(' - ')   #self.blacklisted_packages
-				if not any(split[0].strip().endswith(x) for x in self.unwanted_extensions):
-					self.packetlist.append([split[0].strip(), split[1].strip(),split[2].strip()])
+				tokens = x.split(' - ')   #self.blacklisted_packages
+				name = tokens[0].strip()
+				if not any(name.endswith(x) for x in self.unwanted_extensions):
+					l = len(tokens)
+					version = l > 1 and tokens[1].strip() or ""
+					descr = l > 2 and tokens[2].strip() or ""
+					self.packetlist.append([name, version, descr])
 		if not self.Console:
 			self.Console = Console()
 		cmd = "ipkg list_installed"
 		self.Console.ePopen(cmd, self.IpkgListInstalled_Finished)
 
 	def IpkgListInstalled_Finished(self, result, retval, extra_args = None):
-		if len(result):
+		if result:
 			self.installed_packetlist = {}
 			for x in result.splitlines():
-				split = x.split(' - ')
-				if not any(split[0].strip().endswith(x) for x in self.unwanted_extensions):
-					self.installed_packetlist[split[0].strip()] = split[1].strip()
+				tokens = x.split(' - ')   #self.blacklisted_packages
+				name = tokens[0].strip()
+				if not any(name.endswith(x) for x in self.unwanted_extensions):
+					l = len(tokens)
+					version = l > 1 and tokens[1].strip() or ""
+					self.installed_packetlist[name] = version
 		self.buildPacketList()
 
 	def buildEntryComponent(self, name, version, description, state):
@@ -1694,16 +1702,12 @@ def startSetup(menuid):
 		return [ ]
 	return [(_("Software management"), UpgradeMain, "software_manager", 50)]
 
-def autostart(reason, **kwargs):
-	if reason is True:
-		iSoftwareTools.startSoftwareTools()
 
 def Plugins(path, **kwargs):
 	global plugin_path
 	plugin_path = path
 	list = [
-		PluginDescriptor(where = [PluginDescriptor.WHERE_NETWORKCONFIG_READ], fnc = autostart),
-		PluginDescriptor(name=_("Software management"), description=_("Manage your receiver's software"), where = PluginDescriptor.WHERE_MENU, fnc=startSetup), 
+		PluginDescriptor(name=_("Software management"), description=_("Manage your receiver's software"), where = PluginDescriptor.WHERE_MENU, fnc=startSetup),
 		PluginDescriptor(name=_("Ipkg"), where = PluginDescriptor.WHERE_FILESCAN, fnc = filescan)
 	]
 	if config.usage.setup_level.index >= 2: # expert+