annotate web/templog.py @ 109:315850d48eec avr-http

Remove previous avrusbmodem import
author Matt Johnston <matt@ucc.asn.au>
date Sat, 15 Sep 2012 21:44:37 +0800
parents ef59da811986
children 3b4277aaed3c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1 #!/usr/bin/env python2.7
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
2
28
Matt Johnston <matt@ucc.asn.au>
parents: 27
diff changeset
3 import binascii
Matt Johnston <matt@ucc.asn.au>
parents: 27
diff changeset
4 import hmac
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
5 import zlib
69
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
6 from datetime import datetime, timedelta
31
5e75e08d20ac - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 30
diff changeset
7 import time
69
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
8 import urllib
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
9 import sys
28
Matt Johnston <matt@ucc.asn.au>
parents: 27
diff changeset
10
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
11 import bottle
31
5e75e08d20ac - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 30
diff changeset
12 from bottle import route, request, response
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
13
28
Matt Johnston <matt@ucc.asn.au>
parents: 27
diff changeset
14 import config
Matt Johnston <matt@ucc.asn.au>
parents: 27
diff changeset
15 import log
Matt Johnston <matt@ucc.asn.au>
parents: 27
diff changeset
16
69
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
17 DATE_FORMAT = '%Y%m%d-%H.%M'
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
18 ZOOM_SCALE = 2.0
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
19
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
20 @route('/update', method='post')
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
21 def update():
28
Matt Johnston <matt@ucc.asn.au>
parents: 27
diff changeset
22 enc_lines = request.forms.lines
Matt Johnston <matt@ucc.asn.au>
parents: 27
diff changeset
23 mac = request.forms.hmac
Matt Johnston <matt@ucc.asn.au>
parents: 27
diff changeset
24
Matt Johnston <matt@ucc.asn.au>
parents: 27
diff changeset
25 if hmac.new(config.HMAC_KEY, enc_lines).hexdigest() != mac:
85
3cd1ca6d0489 - Fix HTTPError
Matt Johnston <matt@ucc.asn.au>
parents: 77
diff changeset
26 raise bottle.HTTPError(code = 403, output = "Bad key")
28
Matt Johnston <matt@ucc.asn.au>
parents: 27
diff changeset
27
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
28 lines = zlib.decompress(binascii.a2b_base64(enc_lines)).split('\n')
28
Matt Johnston <matt@ucc.asn.au>
parents: 27
diff changeset
29
Matt Johnston <matt@ucc.asn.au>
parents: 27
diff changeset
30 log.parse(lines)
Matt Johnston <matt@ucc.asn.au>
parents: 27
diff changeset
31
Matt Johnston <matt@ucc.asn.au>
parents: 27
diff changeset
32 return "OK"
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
33
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
34 @route('/graph.png')
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
35 def graph():
69
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
36 length_minutes = int(request.query.length)
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
37 end = datetime.strptime(request.query.end, DATE_FORMAT)
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
38 start = end - timedelta(minutes=length_minutes)
30
13fcf497f8b7 parse the arguments for start/length
Matt Johnston <matt@ucc.asn.au>
parents: 29
diff changeset
39
13fcf497f8b7 parse the arguments for start/length
Matt Johnston <matt@ucc.asn.au>
parents: 29
diff changeset
40 response.set_header('Content-Type', 'image/png')
69
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
41 start_epoch = time.mktime(start.timetuple())
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
42 return log.graph_png(start_epoch, length_minutes * 60)
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
43
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
44 @route('/')
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
45 def top():
69
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
46
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
47 minutes = int(request.query.get('length', 26*60))
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
48
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
49 if 'end' in request.query:
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
50 end = datetime.strptime(request.query.end, DATE_FORMAT)
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
51 else:
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
52 end = datetime.now()
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
53
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
54 if 'zoom' in request.query:
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
55 orig_start = end - timedelta(minutes=minutes)
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
56 orig_end = end
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
57 xpos = int(request.query.x)
77
959e88c0bdfa ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 69
diff changeset
58 xpos -= config.GRAPH_LEFT_MARGIN * config.ZOOM
69
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
59
77
959e88c0bdfa ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 69
diff changeset
60 if xpos >= 0 and xpos < config.GRAPH_WIDTH * config.ZOOM:
69
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
61 click_time = orig_start \
77
959e88c0bdfa ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 69
diff changeset
62 + timedelta(minutes=(float(xpos) / (config.GRAPH_WIDTH * config.ZOOM)) * minutes)
69
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
63 minutes = int(minutes / ZOOM_SCALE)
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
64
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
65 end = click_time + timedelta(minutes=minutes/2)
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
66 else:
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
67 # zoom out
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
68 minutes = int(minutes*ZOOM_SCALE)
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
69 end += timedelta(minutes=minutes/2)
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
70
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
71 if end > datetime.now():
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
72 end = datetime.now()
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
73
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
74 request.query.replace('length', minutes)
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
75 request.query.replace('end', end.strftime(DATE_FORMAT))
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
76
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
77 urlparams = urllib.urlencode(request.query)
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
78 return bottle.template('top', urlparams=urlparams,
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
79 end = end.strftime(DATE_FORMAT),
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
80 length = minutes)
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
81
103
ef59da811986 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 85
diff changeset
82 @route('/debug')
ef59da811986 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 85
diff changeset
83 def debuglog():
ef59da811986 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 85
diff changeset
84 response.set_header('Content-Type', 'text/plain')
ef59da811986 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 85
diff changeset
85 return log.tail_debug_log()
37
8da0fdadc8d7 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
86
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
87 def main():
61
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
88 #bottle.debug(True)
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
89 #bottle.run(reloader=True)
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
90 bottle.run(server='cgi', reloader=True)
40
9b5b202129c3 main.c:
Matt Johnston <matt@ucc.asn.au>
parents: 37
diff changeset
91 #bottle.run(port=9999, reloader=True)
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
92
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
93 if __name__ == '__main__':
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
94 main()
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
95
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
96