support login on dlfp

dlfp/browser.py

@@ -27,6 +27,7 @@ import time
 from logging import warning, error
 from copy import copy
 
+from dlfp.pages.login import IndexPage, LoginPage
 from dlfp.exceptions import DLFPIncorrectPassword, DLFPUnavailable, DLFPRetry
 from dlfp.firefox_cookies import FirefoxCookieJar
 
@@ -39,10 +40,13 @@ class NoHistory:
 
 class DLFP(Browser):
 
-    pages = {'http://linuxfr.org/': IndexPage
+    pages = {'https://linuxfr.org/': IndexPage,
+             'https://linuxfr.org/pub/': IndexPage,
+             'https://linuxfr.org/my/': IndexPage,
+             'https://linuxfr.org/login.html': LoginPage,
             }
 
-    def __init__(self, login, password=None, firefox_cookies=None):
+    def __init__(self, username, password=None, firefox_cookies=None):
         Browser.__init__(self, history=NoHistory())
         self.addheaders = [
                 ['User-agent', 'Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.0.4) Gecko/2008111318 Ubuntu/8.10 (intrepid) Firefox/3.0.3']
@@ -59,7 +63,7 @@ class DLFP(Browser):
         self.__parser = html5lib.HTMLParser(tree=treebuilders.getTreeBuilder("dom"))
         self.__page = None
         self.__last_update = 0.0
-        self.login = login
+        self.username = username
         self.password = password
         if self.password:
             try:
@@ -71,11 +75,11 @@ class DLFP(Browser):
         return self.__page
 
     def home(self):
-        return self.location('http://linuxfr.org')
+        return self.location('https://linuxfr.org')
 
     def pageaccess(func):
         def inner(self, *args, **kwargs):
-            if not self.__page or self.isOnPage(LoginPage) and self.password:
+            if not self.__page or not self.__page.isLogged() and self.password:
                 self.home()
 
             return func(self, *args, **kwargs)
@@ -85,6 +89,9 @@ class DLFP(Browser):
     def keepalive(self):
         self.home()
 
+    def login(self):
+        self.location('/login.html', 'login=%s&passwd=%s&isauto=1' % (self.username, self.password))
+
     def openurl(self, *args, **kwargs):
         try:
             return Browser.open(self, *args, **kwargs)
@@ -149,15 +156,15 @@ class DLFP(Browser):
 
         # Not found
         if not pageCls:
-            warning('Ho my fucking god, there isn\'t any page named %s' % result.geturl())
             self.__page = None
             r = result.read()
             if isinstance(r, unicode):
                 r = r.encode('iso-8859-15', 'replace')
             print r
+            warning('Ho my fucking god, there isn\'t any page named %s' % result.geturl())
             return
 
-        print '[%s] Gone on %s' % (self.login, result.geturl())
+        print '[%s] Gone on %s' % (self.username, result.geturl())
         self.__last_update = time.time()
 
         document = self.__parser.parse(result, encoding='iso-8859-1')
@@ -165,12 +172,14 @@ class DLFP(Browser):
         self.__page.loaded()
 
         # Special pages
-        if isinstance(self.__page, LoginPage) and self.password:
-            print '!! Relogin !!'
-            self.__page.login(self.login, self.password)
-            raise DLFPRetry()
-        if isinstance(self.__page, ErrPage):
+        if isinstance(self.__page, LoginPage):
+            if self.__page.hasError():
                 raise DLFPIncorrectPassword()
+            raise DLFPRetry()
+        if not self.__page.isLogged() and self.password:
+            print '!! Relogin !!'
+            self.login()
+            return
 
         if self.__cookie:
             self.__cookie.save()

dlfp/pages/base.py

@@ -18,8 +18,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 """
 
-class PageBase:
+from mechanize import FormNotFoundError
 
+class BasePage:
     def __init__(self, dlfp, document, url=''):
         self.dlfp = dlfp
         self.document = document
@@ -27,3 +28,11 @@ class PageBase:
 
     def loaded(self):
         pass
+
+    def isLogged(self):
+        forms = self.document.getElementsByTagName('form')
+        for form in forms:
+            if form.getAttribute('id') == 'formulaire':
+                return False
+
+        return True

dlfp/pages/login.py

@@ -0,0 +1,33 @@
+# -*- 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.
+
+"""
+
+from dlfp.pages.base import BasePage
+
+class IndexPage(BasePage):
+    pass
+
+class LoginPage(BasePage):
+    def hasError(self):
+        plist = self.document.getElementsByTagName('p')
+        for p in plist:
+            p = p.childNodes[0]
+            if hasattr(p, 'data') and p.data.startswith(u'Vous avez rentré un mauvais mot de passe'):
+                return True
+        return False