ppetru/opensprinkler-weather
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use restrict variable for weather restrictions

Browse Source 
This replaces the scale modification which messes with users using a
manual watering level
This commit is contained in:
Samer Albahra
2015-04-13 18:21:15 -05:00
parent 8a343c464a
commit 2ce7450d21
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
application.py
View File

@@ -72,7 +72,7 @@ def application(environ, start_response):
else: else:
fwv = '' fwv = ''
maxh, minh, meant, pre, pre_today, h_today, sunrise, sunset, scale, toffset = [-1, -1, -500, -1, -1, -1, -1, -1, -1, -1] restrict, maxh, minh, meant, pre, pre_today, h_today, sunrise, sunset, scale, toffset = [0, -1, -1, -500, -1, -1, -1, -1, -1, -1, -1]
eip = IP2Int(getClientAddress(environ)) eip = IP2Int(getClientAddress(environ))
@@ -237,7 +237,7 @@ def application(environ, start_response):
preTotal = pre_today + pre + pre_beforeYesterday preTotal = pre_today + pre + pre_beforeYesterday
if (preTotal > 0.01): if (preTotal > 0.01):
scale = 0 restrict = 1
except: except:
pass pass
@@ -253,9 +253,9 @@ def application(environ, start_response):
sunset = int(((sunset +delta)%86400)/60) sunset = int(((sunset +delta)%86400)/60)
if of=='json' or of=='JSON': if of=='json' or of=='JSON':
output = '{"scale":%d, "tz":%d, "sunrise":%d, "sunset":%d, "maxh":%d, "minh":%d, "meant":%d, "pre":%f, "prec":%f, "hc":%d, "eip":%d}' % (scale, toffset, sunrise, sunset, int(maxh), int(minh), int(meant), pre, pre_today, int(h_today), eip) output = '{"scale":%d, "restrict":%d, "tz":%d, "sunrise":%d, "sunset":%d, "maxh":%d, "minh":%d, "meant":%d, "pre":%f, "prec":%f, "hc":%d, "eip":%d}' % (scale, restrict, toffset, sunrise, sunset, int(maxh), int(minh), int(meant), pre, pre_today, int(h_today), eip)
else: else:
output = '&scale=%d&tz=%d&sunrise=%d&sunset=%d&maxh=%d&minh=%d&meant=%d&pre=%f&prec=%f&hc=%d&eip=%d' % (scale, toffset, sunrise, sunset, int(maxh), int(minh), int(meant), pre, pre_today, int(h_today), eip) output = '&scale=%d&restrict=%d&tz=%d&sunrise=%d&sunset=%d&maxh=%d&minh=%d&meant=%d&pre=%f&prec=%f&hc=%d&eip=%d' % (scale, restrict, toffset, sunrise, sunset, int(maxh), int(minh), int(meant), pre, pre_today, int(h_today), eip)
response_headers = [('Content-type', 'text/plain'),('Content-Length', str(len(output)))] response_headers = [('Content-type', 'text/plain'),('Content-Length', str(len(output)))]
start_response(status, response_headers) start_response(status, response_headers)