Browse Source

lastseen: fix display of actual delta values

Helge Jung 9 years ago
parent
commit
539f5d4e86
1 changed files with 11 additions and 5 deletions
  1. 11 5
      modules/ffpb_nodeinfo.py

+ 11 - 5
modules/ffpb_nodeinfo.py

@@ -111,18 +111,24 @@ def ffpb_lastseen(bot, trigger):
         return
 
     last_seen = ffpb_get_batcave_nodefield(node['node_id'], '__UPDATED__')
-    a = int(time.time() - int(last_seen['alfred'])) if (not last_seen is None) and 'alfred' in last_seen else None
-    b = int(time.time() - int(last_seen['batadv'])) if (not last_seen is None) and 'batadv' in last_seen else None
+    a_value = int(last_seen['alfred']) if (not last_seen is None) and 'alfred' in last_seen else None
+    a_delta = time.time() - a_value if not a_value is None else None
+    b_value = int(last_seen['batadv']) if (not last_seen is None) and 'batadv' in last_seen else None
+    b_delta = time.time() - b_value if not b_value is None else None
 
-    if a is None and b is None:
+    if a_value is None and b_value is None:
         bot.say('{0} wurde offenbar noch gar nicht gesehen?'.format(node['hostname']))
         return
 
-    if a < 30 and b < 30:
+    if a_delta < 30 and b_delta < 30:
         bot.say('{0} wurde gerade eben gesehen.'.format(node['hostname']))
         return
 
-    bot.say('{0} wurde zuletzt gesehen: {1} (ALFRED,) bzw. {2} (BATMAN)'.format(node['hostname'], pretty_date(a), pretty_date(b)))
+    bot.say('{0} wurde zuletzt gesehen: {1} (ALFRED,) bzw. {2} (BATMAN)'.format(
+        node['hostname'],
+        pretty_date(a_value) if not a_value is None else "nie",
+        pretty_date(b_value) if not b_value is None else "nie"
+    ))
 
 @willie.module.commands('uptime')
 def ffpb_peeruptime(bot, trigger):