Convert poivy to Browser2

modules/poivy/browser.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright(C) 2013  Fourcot Florent
+# Copyright(C) 2013-2014  Fourcot Florent
 #
 # This file is part of weboob.
 #
@@ -18,75 +18,55 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 
-from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword, BrowserBanned
+from weboob.tools.browser2 import LoginBrowser, URL, need_login
 from .pages import HomePage, LoginPage, HistoryPage, BillsPage, ErrorPage
 
 __all__ = ['PoivyBrowser']
 
 
-class PoivyBrowser(BaseBrowser):
-    DOMAIN = 'www.poivy.com'
-    PROTOCOL = 'https'
-    ENCODING = None  # refer to the HTML encoding
-    PAGES = {'.*login':                 LoginPage,
-             '.*buy_credit.*':            HomePage,
-             '.*/recent_calls':         HistoryPage,
-             '.*purchases':             BillsPage,
-             '.*warning.*':             ErrorPage
-             }
+class PoivyBrowser(LoginBrowser):
+    BASEURL = 'https://www.poivy.com'
 
-    def __init__(self, *args, **kwargs):
-        BaseBrowser.__init__(self, *args, **kwargs)
+    login = URL('/login', LoginPage)
+    homepage = URL('/buy_credit.*', HomePage)
+    history = URL('/recent_calls', HistoryPage)
+    bills = URL('/purchases', BillsPage)
+    warning = URL('/warning.*', ErrorPage)
 
-    def home(self):
-        self.location('/login')
-
-    def is_logged(self):
-        return not self.is_on_page(LoginPage)
-
-    def login(self):
+    def do_login(self):
         assert isinstance(self.username, basestring)
         assert isinstance(self.password, basestring)
 
-        if not self.is_on_page(LoginPage):
-            self.location('/login')
+        self.login.stay_or_go()
 
         if not self.page.login(self.username, self.password):
             raise BrowserBanned('Too many connections from you IP address: captcha enabled')
 
-        if self.is_on_page(LoginPage) or self.is_on_page(ErrorPage):
+        if self.login.is_here() or self.warning.is_here():
             raise BrowserIncorrectPassword()
 
+    @need_login
     def get_subscription_list(self):
-        if not self.is_on_page(HomePage):
-            self.location('/buy_credit')
+        return self.homepage.stay_or_go().get_list()
 
-        return self.page.get_list()
-
-    def get_subscription(self, id):
-        assert isinstance(id, basestring)
-
-        l = self.get_subscription_list()
-        for a in l:
-            if a.id == id:
+    def _find_id_list(self, mylist, _id):
+        for a in mylist:
+            if a.id == _id:
                 return a
-
         return None
 
+    @need_login
+    def get_subscription(self, _id):
+        return self._find_id_list(self.get_subscription_list(), _id)
+
+    @need_login
     def get_history(self):
-        if not self.is_on_page(HistoryPage):
-            self.location('/recent_calls')
-        return self.page.get_calls()
+        return self.history.stay_or_go().get_calls()
 
+    @need_login
     def iter_bills(self, parentid):
-        if not self.is_on_page(BillsPage):
-            self.location('/purchases')
-        return self.page.date_bills()
+        return self.bills.stay_or_go().get_bills()
 
+    @need_login
     def get_bill(self, id):
-        assert isinstance(id, basestring)
-
-        l = self.iter_bills(id)
-        for a in l:
-            if a.id == id:
-                return a
+        return self._find_id_list(self.iter_bills(), _id)