Convert dresdenwetter to browser2

modules/dresdenwetter/backend.py

@@ -43,7 +43,9 @@ class DresdenWetterBackend(BaseBackend, ICapGauge):
             gauge.name = u"Private Wetterstation Dresden"
             gauge.city = u"Dresden"
             gauge.object = u"Weather"
-            gauge.sensors = self.browser.get_sensors_list()
+            gauge.sensors = []
+            for sensor in self.browser.get_sensors_list():
+                gauge.sensors.append(sensor)
             yield gauge
 
     def _get_gauge_by_id(self, id):

modules/dresdenwetter/browser.py

@@ -18,27 +18,18 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 
-from weboob.tools.browser import BaseBrowser
+from weboob.tools.browser2 import PagesBrowser, URL
 from .pages import StartPage
 
 
 __all__ = ['DresdenWetterBrowser']
 
 
-class DresdenWetterBrowser(BaseBrowser):
+class DresdenWetterBrowser(PagesBrowser):
-    DOMAIN = u'www.dresden-wetter.de'
+    BASEURL = 'http://www.dresden-wetter.de'
-    ENCODING = None
-    PAGES = {'.*': StartPage}
 
-    homepage = '/Current_Vantage_Pro.htm'
+    home =  URL('/Current_Vantage_Pro.htm', StartPage)
 
-    def __init__(self, *args, **kwargs):
-        BaseBrowser.__init__(self, *args, **kwargs)
-
-    def home(self):
-        self.location(self.homepage)
 
     def get_sensors_list(self):
-        if not self.is_on_page(StartPage):
+        return self.home.stay_or_go().get_sensors_list()
-            self.home()
-        return self.page.get_sensors_list()

modules/dresdenwetter/pages.py

@@ -17,7 +17,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
-from weboob.tools.browser import BasePage
+from weboob.tools.browser2.page import HTMLPage, method, ListElement, ItemElement
+from weboob.tools.browser2.filters import CleanText, Env
 from weboob.capabilities.gauge import GaugeMeasure, GaugeSensor
 from weboob.capabilities.base import NotAvailable
 
@@ -25,43 +26,50 @@ from weboob.capabilities.base import NotAvailable
 __all__ = ['StartPage']
 
 
-class StartPage(BasePage):
+class StartPage(HTMLPage):
-    name = [u"Temperatur", u"Wind", u"Luftdruck", u"Luftfeuchtigkeit",
-            u"Niederschlag", u"Globalstrahlung"]
-    unit = [u"°C", u"km/h", u"hPa", u"%", u"mm", u"W/m²"]
 
-    def get_sensors_list(self):
+    @method
-        paraphs = self.document.xpath('//p[@align="center"]')
+    class get_sensors_list(ListElement):
-        sensors = []
+        item_xpath = '//p[@align="center"]'
-        for i in range(len(paraphs)):
+
-            sensor = GaugeSensor("dd-%s" % self.name[i].lower())
+        class item(ItemElement):
-            sensor.name = self.name[i]
+            klass = GaugeSensor
-            sensor.unit = self.unit[i]
+
-            sensor.forecast = NotAvailable
+            obj_name = Env('name')
-            sensor.history = NotAvailable
+            obj_id = Env('id')
-            sensor.gaugeid = u"wetter"
+            obj_unit = Env('unit')
-            paraph = paraphs[i]
+            obj_lastvalue = Env('lastvalue')
-            lastvalue = GaugeMeasure()
+            obj_gaugeid = u"wetter"
-            lastvalue.alarm = NotAvailable
+            obj_forecast = Env('forecast')
-            if i == 0:
+
-                text = paraph.xpath('b/span/font[@size="4"]')[1].text
+
-                lastvalue.level = float(text.split('\n')[1].split(u'°')[0])
+            def get_name(self, text):
-            if i == 1:
+                if u"Niederschlag" not in text:
-                text = paraph.xpath('b/span/font')[2].text
+                    return text.split(':')[0].strip()
-                lastvalue.level = float(text.split('\n')[1])
+                else:
-            if i == 2:
+                    return text.split()[0]
-                text = paraph.xpath('span/font/b')[0].text
+
-                lastvalue.level = float(text.split('\n')[2].split('hPa')[0])
+            def split_unit(self, text):
-            if i == 3:
+                if u"Temperatur" in text:
-                text = paraph.xpath('span/font[@size="4"]/b')[0].text
+                    value = text.split(': ')[1].split(u'°')[0]
-                lastvalue.level = float(text.split('\n')[2].split(u'%')[0]
+                    unit = u'°C'
-                        .split(':')[1])
+                else:
-            if i == 4:
+                    value = text.split(':')[-1].split()[0]
-                text = paraph.xpath('b/font[@size="4"]/span')[0].text
+                    unit = text.split(':')[-1].split()[1]
-                lastvalue.level = float(text.split('\n')[0])
+                return value, unit
-            if i == 5:
+
-                text = paraph.xpath('b/font/span')[0].text
+            def parse(self, el):
-                lastvalue.level = float(text.split('\n')[1])
+                text = CleanText(el)(self)
-            sensor.lastvalue = lastvalue
+
-            sensors.append(sensor)
+                name = self.get_name(text)
-        return sensors
+                _id = u"dd-%s" % name
+
+                self.env['name'] = name
+                self.env['id'] = _id
+
+                level, self.env['unit'] = self.split_unit(text)
+                lastvalue = GaugeMeasure()
+                lastvalue.level = float(level)
+                lastvalue.alarm = NotAvailable
+                self.env['lastvalue'] = lastvalue
+                self.env['forecast'] = NotAvailable