stanley-king 2 lat temu
rodzic
commit
17dbc54995
1 zmienionych plików z 11 dodań i 6 usunięć
  1. 11 6
      plot/app.py

+ 11 - 6
plot/app.py

@@ -36,24 +36,29 @@ def ch_ratio():
     try:
         logger.debug('start chratio')
         cur_time = int(time.time())
-        start_time = int(request.args.get('start_time') or (cur_time - 7200))
-        end_time = int(request.args.get('end_time') or cur_time)
 
-        stime = lambda t: time.strftime('%d-%H:%M:%S', time.localtime(start_time))
+        start_time = request.args.get('start_time')
+        start_time = cur_time - 7200 if start_time is None else int(start_time.strip())
+
+        end_time = request.args.get('end_time')
+        end_time = cur_time if end_time is None else int(end_time.strip())
+
+        stime = lambda t: time.strftime('%d-%H:%M:%S', time.localtime(t))
         logger.debug("start_time=%s end_time=%s",stime(start_time) ,stime(end_time))
 
-        chnames = request.args.get('chnames') or None
+        chnames = request.args.get('chnames')
         chnames = filter_chname(chnames)
 
-        card_types = request.args.get('card_types') or None
+        card_types = request.args.get('card_types')
         card_types = filter_cardtype(card_types)
 
-        spec = request.args.get('spec') or None
+        spec = request.args.get('spec')
         if spec is not None:
             spec = int(spec.strip())
 
         painter = ChannelPainter(start_time=start_time, end_time=end_time, chnames=chnames, card_types=card_types, spec=spec)
         buf = painter.paint()
+
         data = base64.b64encode(buf.getbuffer()).decode("ascii")
         return f"<img src='data:image/png;base64,{data}'/>"
     except Exception as ex: