def IpkgListAvailableCB(self, result, retval, extra_args = None):
(callback) = extra_args
- if len(result):
+ if result:
if SoftwareTools.list_updating:
SoftwareTools.available_packetlist = []
for x in result.splitlines():
- split = x.split(' - ')
- name = split[0].strip()
+ tokens = x.split(' - ')
+ name = tokens[0].strip()
if not any(name.endswith(x) for x in self.unwanted_extensions):
- SoftwareTools.available_packetlist.append([name, split[1].strip(), split[2].strip()])
+ l = len(tokens)
+ version = l > 1 and tokens[1].strip() or ""
+ descr = l > 2 and tokens[2].strip() or ""
+ SoftwareTools.available_packetlist.append([name, version, descr])
if callback is None:
self.startInstallMetaPackage()
else:
def InstallMetaPackageCB(self, result, retval, extra_args = None):
(callback) = extra_args
- if len(result):
+ if result:
self.fillPackagesIndexList()
if callback is None:
self.startIpkgListInstalled()
def IpkgListInstalledCB(self, result, retval, extra_args = None):
(callback) = extra_args
- if len(result):
+ if result:
SoftwareTools.installed_packetlist = {}
for x in result.splitlines():
- split = x.split(' - ')
- name = split[0].strip()
+ tokens = x.split(' - ')
+ name = tokens[0].strip()
if not any(name.endswith(x) for x in self.unwanted_extensions):
- SoftwareTools.installed_packetlist[name] = split[1].strip()
+ l = len(tokens)
+ version = l > 1 and tokens[1].strip() or ""
+ SoftwareTools.installed_packetlist[name] = version
if callback is None:
self.countUpdates()
else:
def IpkgUpdateCB(self, result, retval, extra_args = None):
(callback) = extra_args
- if len(result):
+ if result:
if self.Console:
if len(self.Console.appContainers) == 0:
if callback is not None:
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):
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+