Skip to content

Commit

Permalink
Restore 'prepare_data' method to weathercloud
Browse files Browse the repository at this point in the history
Signed-off-by: Jim Easterbrook <jim@jim-easterbrook.me.uk>
  • Loading branch information
jim-easterbrook committed Aug 30, 2018
1 parent 8830155 commit 2d5166d
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
4 changes: 2 additions & 2 deletions src/pywws/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
__version__ = '18.8.0'
_release = '1613'
_commit = '56ec5a2'
_release = '1614'
_commit = '8830155'
15 changes: 9 additions & 6 deletions src/pywws/service/weathercloud.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,19 +99,22 @@ def session(self):
with requests.Session() as session:
yield session

def prepare_data(self, data):
prepared_data = super(ToService, self).prepare_data(data)
for key in ('tempin', 'temp', 'chill', 'dewin', 'dew',
'heatin', 'heat', 'thw', 'wspdavg', 'wspdhi',
'bar', 'rain', 'rainrate', 'solarrad', 'uvi'):
if key in prepared_data:
prepared_data[key] = prepared_data[key].replace('.', '')
return prepared_data

def valid_data(self, data):
return any([data[x] is not None for x in (
'wind_dir', 'wind_ave', 'wind_gust', 'hum_out', 'temp_out',
'temp_in', 'hum_in', 'rel_pressure')])

def upload_data(self, session, prepared_data={}, live=False):

url = 'http://api.weathercloud.net/v01/set'
for key in ('tempin', 'temp', 'chill', 'dewin', 'dew',
'heatin', 'heat', 'thw', 'wspdavg', 'wspdhi',
'bar', 'rain', 'rainrate', 'solarrad', 'uvi'):
if key in prepared_data:
prepared_data[key] = prepared_data[key].replace('.', '')
try:
rsp = session.get(url, params=prepared_data, timeout=60)
except Exception as ex:
Expand Down

0 comments on commit 2d5166d

Please sign in to comment.