nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

port to the new format API (blame cbenz who has broken three frontends once)

Browse source
This commit is contained in:
Romain Bignon 2010-06-21 11:06:34 +02:00
commit 7158d9c97b
3 changed files with 38 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

37
weboob/frontends/wetboobs/wetboobs.py
View file

@ -1,22 +1,19 @@
# -*- coding: utf-8 -*-
"""
Copyright(C) 2010 Romain Bignon
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, version 3 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
"""
# Copyright(C) 2010 Romain Bignon
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, version 3 of the License.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
import logging
@ -41,13 +38,13 @@ class WetBoobs(ConsoleApplication):
@ConsoleApplication.command('search cities')
def command_search(self, pattern):
for backend, city in self.weboob.do('iter_city_search', pattern):
self.format(city)
self.format(city, backend.name)
@ConsoleApplication.command('get current weather')
def command_current(self, city):
try:
for backend, current in self.weboob.do('get_current', city):
self.format(current)
self.format(current, backend.name)
except CallErrors, e:
for error in e:
if isinstance(error, CityNotFound):
@ -59,7 +56,7 @@ class WetBoobs(ConsoleApplication):
def command_forecasts(self, city):
try:
for backend, forecast in self.weboob.do('iter_forecast', city):
self.format(forecast)
self.format(forecast, backend.name)
except CallErrors, e:
for error in e:
if isinstance(error, CityNotFound):