diff --git a/almir/lib/bconsole.py b/almir/lib/bconsole.py
index 3f0123a..e737b38 100644
--- a/almir/lib/bconsole.py
+++ b/almir/lib/bconsole.py
@@ -134,21 +134,13 @@ def get_upcoming_jobs(self, days=1):
unparsed_jobs = stdout.split('===================================================================================\n')[1].split('====\n')[0]
except IndexError:
return []
-
+ fields = ('level', 'type', 'priority', 'date', 'time', 'name', 'volume')
jobs = []
for line in unparsed_jobs.split('\n'):
if not line.strip():
continue
- jobs.append({
- 'level': line[:14].strip(),
- 'type': line[14:23].strip(),
- 'priority': line[23:28].strip(),
- 'date': line[28:38].strip(),
- 'time': line[38:44].strip(),
- 'name': line[47:67].strip(),
- 'volume': line[67:].strip(),
- })
+ jobs.append(dict(zip(fields, line.split())))
return jobs
diff --git a/almir/templates/macros.jinja2 b/almir/templates/macros.jinja2
index e2e0374..f391536 100644
--- a/almir/templates/macros.jinja2
+++ b/almir/templates/macros.jinja2
@@ -35,7 +35,7 @@
{{ job.type }} |
{{ job.level }} |
{{ job.priority }} |
- {{ job.date }} {{ job.time }} |
+ {{ job.date.decode('utf-8') }} {{ job.time }} |
{{ job.volume }} |
{% endfor %}
diff --git a/almir/tests/test_bconsole.py b/almir/tests/test_bconsole.py
index 60223a3..dce1af9 100644
--- a/almir/tests/test_bconsole.py
+++ b/almir/tests/test_bconsole.py
@@ -61,6 +61,7 @@ def test_get_upcoming_jobs(self):
Scheduled Jobs:
Level Type Pri Scheduled Name Volume
===================================================================================
+Incremental Backup 10 07-aoû2013 00:12 srv-prdadm-21_BOS DISK_sem-0004
Admin 8 18-Apr-12 20:30 UpdateSlots
Differential Backup 10 18-Mar-12 23:05 BackupClient1 *unknown*
Full Backup 11 18-Mar-12 23:10 BackupCatalog *unknown*
@@ -68,7 +69,14 @@ def test_get_upcoming_jobs(self):
""", '')
jobs = b.get_upcoming_jobs()
- self.assertEqual(jobs, [{'date': '18-Apr-12',
+ self.assertEqual(jobs, [{'date': '07-aoû2013',
+ 'level': 'Incremental',
+ 'name': 'srv-prdadm-21_BOS',
+ 'time': '00:12',
+ 'priority': '10',
+ 'type': 'Backup',
+ 'volume': 'DISK_sem-0004'},
+ {'date': '18-Apr-12',
'level': '',
'name': 'UpdateSlots',
'time': '20:30',