diff options
Diffstat (limited to 'glances/exports/glances_csv.py')
| -rw-r--r-- | glances/exports/glances_csv.py | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/glances/exports/glances_csv.py b/glances/exports/glances_csv.py index 2b450027..54ea65c6 100644 --- a/glances/exports/glances_csv.py +++ b/glances/exports/glances_csv.py @@ -72,27 +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 type(all_stats[i]) is list: - for item in all_stats[i]: + if isinstance(all_stats[i], list): + for stat in all_stats[i]: # First line: header if self.first_line: - fieldnames = item.keys() - 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 type(all_stats[i]) is dict: + 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: |