greatbody
/
glances
mirror of https://github.com/nicolargo/glances
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

exports: use comprehensions instead of map/lambda 

Use enumerate too.
pull/610/head
Alessio Sergi 2015-05-18 15:55:55 +02:00
parent 58a1361769
commit 7d28fe8020
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
glances/exports/glances_csv.py
View File

@ -72,26 +72,26 @@ class Export(GlancesExport):
plugins = stats.getAllPlugins()
# Loop over available plugin
i = 0
for plugin in plugins:
for i, plugin in enumerate(plugins):
if plugin in self.plugins_to_export():
if isinstance(all_stats[i], list):
for item in all_stats[i]:
for stat in all_stats[i]:
# First line: header
if self.first_line:
csv_header += map(lambda x: plugin + '_' + item[item['key']] + '_' + x, item)
csv_header += ('{0}_{1}_{2}'.format(
plugin, stat[stat['key']], item) for item in stat)
# Others lines: stats
fieldvalues = item.values()
fieldvalues = stat.values()
csv_data += fieldvalues
elif isinstance(all_stats[i], dict):
# First line: header
if self.first_line:
fieldnames = all_stats[i].keys()
csv_header += map(lambda x: plugin + '_' + x, fieldnames)
csv_header += ('{0}_{1}'.format(plugin, fieldname)
for fieldname in fieldnames)
# Others lines: stats
fieldvalues = all_stats[i].values()
csv_data += fieldvalues
i += 1
# Export to CSV
if self.first_line:

3
glances/exports/glances_export.py
View File

@ -87,7 +87,8 @@ class GlancesExport(object):
if isinstance(all_stats[i], list):
for item in all_stats[i]:
item.update(all_limits[i])
export_names = list(map(lambda x: item[item['key']] + '.' + x, item.keys()))
export_names = list('{0}.{1}'.format(item[item['key']], key)
for key in item.keys())
export_values = list(item.values())
self.export(plugin, export_names, export_values)
elif isinstance(all_stats[i], dict):