From f837728261e895c805beac7e15e9e4129499add1 Mon Sep 17 00:00:00 2001
From: Valentin Boettcher <valentin@boettcher.cf>
Date: Sun, 18 Feb 2018 22:37:29 +0100
Subject: [PATCH] formating

---
 parseLogs.py | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/parseLogs.py b/parseLogs.py
index f5f46d0..7d3f6b5 100755
--- a/parseLogs.py
+++ b/parseLogs.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 import sys
-import datetime
+import time
 import argparse
 import logParser
 import dateparser
@@ -13,10 +13,12 @@ argparser.add_argument('--list', '-l', help='List all Heaters in the Database.',
 argparser.add_argument('--heatAmmount', help='Sum of the actuator value times a time slice.', nargs=1, metavar='HEATER')
 argparser.add_argument('--allHeatAmmount', help='Get the heat ammount from all known heaters.', action='store_true')
 argparser.add_argument('--timeSpan', help='The time span for the heatAmmount calculation. Either t1/t2 or both may be supplied.', nargs=1, metavar='t1..t2 | t1 | ..t2')
+argparser.add_argument('--verbose', '-v', help='Output more information about the query.', action='store_true')
+
 
 # Parse args. Set name to default.
 args = argparser.parse_args()
-mintime, maxtime = 0, inf
+mintime, maxtime = 0, time.time()
 if args.timeSpan:
         times = args.timeSpan[0].split('..')
 
@@ -25,16 +27,14 @@ if args.timeSpan:
             print('Invalid Timespan!')
             exit(1)
         elif len(times) == 2:
-            try:
-                times[0] = dateparser.parse(times[0]).timestamp()
-                times[1] = dateparser.parse(times[1]).timestamp()
-            except:
-                pass
+            times[0] = dateparser.parse(times[0]).timestamp()
+            times[1] = dateparser.parse(times[1]).timestamp()
 
             if times[0] == '':
                 maxtime = int(times[1])
             else:
                 mintime, maxtime = times
+
         else:
             mintime = int(times[0])
 
@@ -44,6 +44,16 @@ if not args.parse is None:
 elif not args.list is False:
     print('\n'.join(logParser.getHeaterList()))
 elif not args.heatAmmount is None:
-    print(logParser.getHeaterSum(args.heatAmmount[0], mintime, maxtime))
+        heat = args.heatAmmount[0], logParser.getHeaterSum(args.heatAmmount[0], mintime, maxtime)
+        if args.verbose:
+           print(', '.join([heat[0], str(heat[1]), str(int(mintime)), str(int(maxtime))]))
+        else:
+          print(heat[1])
 elif not args.allHeatAmmount is None:
-    print(logParser.getAllHeaterSums(mintime, maxtime))
+        allheaters = logParser.getAllHeaterSums(mintime, maxtime)
+
+        for heater in allheaters:
+          if args.verbose:
+            print(', '.join([heater, str(allheaters[heater]), str(int(mintime)), str(int(maxtime))]))
+          else:
+            print(', '.join([heater, str(allheaters[heater])]))