uniform minutes20 and inrocks

weboob/backends/inrocks/pages/article.py

@@ -1,3 +1,4 @@
+"ArticlePage object for inrocks"
 # -*- coding: utf-8 -*-
 
 # Copyright(C) 2011  Julien Hebert
@@ -15,7 +16,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-
 from weboob.tools.parsers.lxmlparser import select, SelectElementException
 from .inrocks import InrocksPage
 
@@ -26,8 +26,8 @@ def try_remove(base_element, selector):
         pass
 
 class ArticlePage(InrocksPage):
-    def set_body(self):
-        self.element_body = select(self.main_div, "div.maincol", 1)
+    "ArticlePage object for inrocks"
+    def get_body(self):
         try_remove(self.element_body, "div.sidebar")
         details = select(self.element_body, "div.details", 1)
         try_remove(details, "div.footer")
@@ -35,5 +35,8 @@ class ArticlePage(InrocksPage):
         for selector in ["h1", "div.picture", "div.date", "div.news-single-img", 
                          "div.metas_img", "strong"]:
             try_remove(header, selector)
+        
+        return self.browser.parser.tostring(self.element_body)
+
+
 
-        self.article.body = self.browser.parser.tostring(self.element_body)

weboob/backends/inrocks/pages/inrocks.py

@@ -37,32 +37,35 @@ class InrocksPage(BasePage):
     element_body = NotImplementedError
     article = Article
     element_author_selector = ValueError
+    element_title_selector  = ValueError
+    element_body_selector   = ValueError
 
-    def set_author(self):
-        try:
-            self.article.author = self.get_element_author().text_content().strip()
-        except NoAuthorElement:
+    def get_body(self):
+        return self.browser.parser.tostring(self.element_body)
+
+    def get_author(self):
+        try :
+            return select(self.main_div, self.element_author_selector, 1).text_content().strip()
+        except SelectElementException:
+            #TODO: test nombre d'element en retour
             pass
 
-    def get_element_author(self):
-        try :
-            return select(self.main_div, self.element_author_selector, 1)
-        except SelectElementException:
-            raise NoAuthorElement()
-
-    def set_body(self):
-        self.article.body = self.browser.parser.tostring(select(self.main_div,
-                                                                "div.mna-body",
-                                                                1))
-
+    def get_title(self):
+       return select(self.main_div, self.element_title_selector, 1).text_content().strip()
 
     def on_loaded(self):
         self.article = Article(self.browser, url2id(self.url) )
         self.main_div = self.document.getroot()
-        self.article.title = select(self.main_div, "h1", 1).text_content()
-        self.article.url = self.url
-        self.element_author_selector = "div.name>span"
-        self.set_author()
-        self.set_body()
+
+        self.element_author_selector    = "div.name>span"
+        self.element_title_selector     = "h1"
+        self.element_body_selector      = "div.maincol"
+
+        self.element_body = select(self.main_div, self.element_body_selector, 1)
+
+        self.article.author = self.get_author()
+        self.article.title  = self.get_title()
+        self.article.url    = self.url
+        self.article.body   = self.get_body()