dominic
/
weewx-netatmo
mirror of https://github.com/bricebou/weewx-netatmo
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

First attempt of refactoring to Python 3

Browse Source
master
Brice Boucard 4 years ago
parent f79ebe01f5
commit 005b6ee943
2 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File

52
bin/user/netatmo.py
Unescape View File

@ -25,16 +25,16 @@ As of april 2016 that means the base station, 'outside' T/H, additional T/H,
rain, and wind. rain, and wind.
""" """
from __future__ import with_statement
import Queue import queue
import json import json
import re import re
import socket import socket
import syslog import syslog
import threading import threading
import time import time
from urllib import urlencode from urllib.parse import urlencode
import urllib2 import urllib.request, urllib.error, urllib.parse
import weewx.drivers import weewx.drivers
import weewx.engine import weewx.engine
@ -98,16 +98,16 @@ class NetatmoConfEditor(weewx.drivers.AbstractConfEditor):
def prompt_for_settings(self): def prompt_for_settings(self):
settings = dict() settings = dict()
print "Specify the mode for obtaining data, either 'cloud' or 'sniff'" print("Specify the mode for obtaining data, either 'cloud' or 'sniff'")
settings['mode'] = self._prompt('mode', 'cloud', ['cloud', 'sniff']) settings['mode'] = self._prompt('mode', 'cloud', ['cloud', 'sniff'])
if settings['mode'] == 'cloud': if settings['mode'] == 'cloud':
print "Specify the username for netatmo.com" print("Specify the username for netatmo.com")
self._prompt('username') self._prompt('username')
print "Specify the password for netatmo.com" print("Specify the password for netatmo.com")
self._prompt('password') self._prompt('password')
print "Specify the client_id from dev.netatmo.com" print("Specify the client_id from dev.netatmo.com")
self._prompt('client_id') self._prompt('client_id')
print "Specify the client_secret from dev.netatmo.com" print("Specify the client_secret from dev.netatmo.com")
self._prompt('client_secret') self._prompt('client_secret')
return settings return settings
@ -192,7 +192,7 @@ class NetatmoDriver(weewx.drivers.AbstractDevice):
logdbg('packet: %s' % pkt) logdbg('packet: %s' % pkt)
if pkt: if pkt:
yield pkt yield pkt
except Queue.Empty: except queue.Empty:
pass pass
def data_to_packet(self, data): def data_to_packet(self, data):
@ -201,7 +201,7 @@ class NetatmoDriver(weewx.drivers.AbstractDevice):
packet['dateTime'] = int(time.time() + 0.5) packet['dateTime'] = int(time.time() + 0.5)
packet['usUnits'] = weewx.METRIC packet['usUnits'] = weewx.METRIC
for n in self.sensor_map: for n in self.sensor_map:
label = self._find_match(self.sensor_map[n], data.keys()) label = self._find_match(self.sensor_map[n], list(data.keys()))
if label: if label:
packet[n] = data.get(label) packet[n] = data.get(label)
return packet return packet
@ -231,7 +231,7 @@ class NetatmoDriver(weewx.drivers.AbstractDevice):
class Collector(object): class Collector(object):
queue = Queue.Queue() queue = queue.Queue()
def startup(self): def startup(self):
pass pass
@ -318,13 +318,13 @@ class CloudClient(Collector):
try: try:
CloudClient.get_data(self._sd, self._device_id) CloudClient.get_data(self._sd, self._device_id)
break break
except (socket.error, socket.timeout, urllib2.HTTPError, urllib2.URLError), e: except (socket.error, socket.timeout, urllib.error.HTTPError, urllib.error.URLError) as e:
logerr("failed attempt %s of %s to get data: %s" % logerr("failed attempt %s of %s to get data: %s" %
(tries + 1, self._max_tries, e)) (tries + 1, self._max_tries, e))
logdbg("waiting %s seconds before retry" % logdbg("waiting %s seconds before retry" %
self._retry_wait) self._retry_wait)
time.sleep(self._retry_wait) time.sleep(self._retry_wait)
except Exception, e: except Exception as e:
logerr("exception in netatmo-client: %s" % e) logerr("exception in netatmo-client: %s" % e)
weeutil.weeutil.log_traceback('*** ', syslog.LOG_DEBUG) weeutil.weeutil.log_traceback('*** ', syslog.LOG_DEBUG)
else: else:
@ -378,7 +378,7 @@ class CloudClient(Collector):
try: try:
func = CloudClient.CONVERSIONS.get(n) func = CloudClient.CONVERSIONS.get(n)
data[n] = getattr(CloudClient, func)(data[n], units_dict) data[n] = getattr(CloudClient, func)(data[n], units_dict)
except ValueError, e: except ValueError as e:
logerr("unit conversion failed for %s: %s" % (data[n], e)) logerr("unit conversion failed for %s: %s" % (data[n], e))
data[n] = None data[n] = None
return data return data
@ -522,8 +522,8 @@ class CloudClient(Collector):
headers = { headers = {
"Content-Type": "application/x-www-form-urlencoded;charset=utf-8"} "Content-Type": "application/x-www-form-urlencoded;charset=utf-8"}
logdbg("url: %s data: %s hdr: %s" % (url, params, headers)) logdbg("url: %s data: %s hdr: %s" % (url, params, headers))
req = urllib2.Request(url=url, data=params, headers=headers) req = urllib.request.Request(url=url, data=params, headers=headers)
resp = urllib2.urlopen(req).read(65535) resp = urllib.request.urlopen(req).read(65535)
resp_obj = json.loads(resp) resp_obj = json.loads(resp)
logdbg("resp_obj: %s" % resp_obj) logdbg("resp_obj: %s" % resp_obj)
return resp_obj return resp_obj
@ -623,7 +623,7 @@ if __name__ == "__main__":
import weeutil.weeutil import weeutil.weeutil
driver = NetatmoDriver({'mode': 'sniff'}) driver = NetatmoDriver({'mode': 'sniff'})
for pkt in driver.genLoopPackets(): for pkt in driver.genLoopPackets():
print weeutil.weeutil.timestamp_to_string(pkt['dateTime']), pkt print(weeutil.weeutil.timestamp_to_string(pkt['dateTime']), pkt)
def run_cloud_driver(username, password, c_id, c_secret): def run_cloud_driver(username, password, c_id, c_secret):
import weeutil.weeutil import weeutil.weeutil
@ -633,7 +633,7 @@ if __name__ == "__main__":
username=username, password=password, username=username, password=password,
client_id=c_id, client_secret=c_secret) client_id=c_id, client_secret=c_secret)
for pkt in driver.genLoopPackets(): for pkt in driver.genLoopPackets():
print weeutil.weeutil.timestamp_to_string(pkt['dateTime']), pkt print(weeutil.weeutil.timestamp_to_string(pkt['dateTime']), pkt)
except KeyboardInterrupt: except KeyboardInterrupt:
driver.closePort() driver.closePort()
@ -646,28 +646,28 @@ if __name__ == "__main__":
auth = CloudClient.ClientAuth(username, password, c_id, c_secret) auth = CloudClient.ClientAuth(username, password, c_id, c_secret)
params = {'access_token': auth.access_token, 'app_type': 'app_station'} params = {'access_token': auth.access_token, 'app_type': 'app_station'}
reply = CloudClient.post_request(CloudClient.DATA_URL, params) reply = CloudClient.post_request(CloudClient.DATA_URL, params)
print json.dumps(reply, sort_keys=True, indent=2) print(json.dumps(reply, sort_keys=True, indent=2))
def test_parse(filename): def test_parse(filename):
lines = [] lines = []
with open(filename, "r") as f: with open(filename, "r") as f:
while f: while f:
lines.append(f.readline()) lines.append(f.readline())
print PacketSniffer.Packet.lines2packets(''.join(lines)) print(PacketSniffer.Packet.lines2packets(''.join(lines)))
def ppv(label, x, level=0): def ppv(label, x, level=0):
"""pretty-print a variable, recursing if it is a dict""" """pretty-print a variable, recursing if it is a dict"""
indent = ' ' indent = ' '
if type(x) is dict: if type(x) is dict:
print "%s%s" % (indent * level, label) print("%s%s" % (indent * level, label))
for n in x: for n in x:
ppv(n, x[n], level=level+1) ppv(n, x[n], level=level+1)
elif type(x) is list: elif type(x) is list:
print "%s[" % (indent * level) print("%s[" % (indent * level))
for i, y in enumerate(x): for i, y in enumerate(x):
ppv("%s %s" % (label, i), y, level=level+1) ppv("%s %s" % (label, i), y, level=level+1)
print "%s]" % (indent * level) print("%s]" % (indent * level))
else: else:
print "%s%s=%s" % (indent * level, label, x) print("%s%s=%s" % (indent * level, label, x))
main() main()

11
readme
Unescape View File

@ -20,14 +20,17 @@ obtained via the dev.netatmo.com web site. Using these 4 things, the driver
automatically obtains and updates the tokens needed to get data from the automatically obtains and updates the tokens needed to get data from the
server. server.
[bricebou]
This fork aims to be compatible with weewx 4.* and has been "rewritten" in Python 3 thanks to the `2to3` tool.
[/bricebou]
=============================================================================== ===============================================================================
Installation instructions: Installation instructions:
1) download the driver: 1) download the driver:
wget -O weewx-netatmo.zip https://github.com/matthewwall/weewx-netatmo/archive/master.zip wget -O weewx-netatmo.zip https://github.com/bricebou/weewx-netatmo/archive/master.zip
2) install the driver: 2) install the driver:
sudo wee_extension --install weewx-netatmo.zip sudo wee_extension --install weewx-netatmo.zip
@ -36,6 +39,10 @@ sudo wee_extension --install weewx-netatmo.zip
sudo wee_config --reconfigure sudo wee_config --reconfigure
[bricebou]
It seems that the configuration isn't written so you have to manually edit the ``/etc/weewx/weewx.conf` file.
[/bricebou]
4) start weewx: 4) start weewx:
sudo /etc/init.d/weewx start sudo /etc/init.d/weewx start

Write Preview
Loading…
Cancel
Save