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

fix when lefigaro's feed is wrong

Browse source
This commit is contained in:
Romain Bignon 2011-05-11 16:50:07 +02:00
commit c6443b9725
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
weboob/backends/lefigaro/browser.py
View file

@ -20,8 +20,10 @@
from .pages.article import ArticlePage from .pages.article import ArticlePage
from .pages.flashactu import FlashActuPage from .pages.flashactu import FlashActuPage
from weboob.tools.browser import BaseBrowser from weboob.tools.browser import BaseBrowser, BasePage
class IndexPage(BasePage):
pass
class NewspaperFigaroBrowser(BaseBrowser): class NewspaperFigaroBrowser(BaseBrowser):
@ -30,6 +32,7 @@ class NewspaperFigaroBrowser(BaseBrowser):
"http://www.lefigaro.fr/flash-.*/(\d{4})/(\d{2})/(\d{2})/(.*$)": FlashActuPage, "http://www.lefigaro.fr/flash-.*/(\d{4})/(\d{2})/(\d{2})/(.*$)": FlashActuPage,
"http://www.lefigaro.fr/bd/(\d{4})/(\d{2})/(\d{2})/(.*$)": FlashActuPage, "http://www.lefigaro.fr/bd/(\d{4})/(\d{2})/(\d{2})/(.*$)": FlashActuPage,
"http://www.lefigaro.fr/(?!flash-|bd).+/(\d{4})/(\d{2})/(\d{2})/(.*$)": ArticlePage, "http://www.lefigaro.fr/(?!flash-|bd).+/(\d{4})/(\d{2})/(\d{2})/(.*$)": ArticlePage,
"http://www.lefigaro.fr/": IndexPage,
} }
def is_logged(self): def is_logged(self):
@ -44,4 +47,6 @@ class NewspaperFigaroBrowser(BaseBrowser):
def get_content(self, _id): def get_content(self, _id):
"return page article content" "return page article content"
self.location(_id) self.location(_id)
if self.is_on_page(IndexPage):
return None
return self.page.get_article(_id) return self.page.get_article(_id)

6
weboob/tools/capabilities/messages/GenericBackend.py
View file

@ -44,6 +44,9 @@ class GenericNewspaperBackend(BaseBackend, ICapMessages):
with self.browser: with self.browser:
content = self.browser.get_content(_id) content = self.browser.get_content(_id)
if content is None:
return None
if not thread: if not thread:
thread = Thread(_id) thread = Thread(_id)
@ -77,7 +80,8 @@ class GenericNewspaperBackend(BaseBackend, ICapMessages):
def fill_thread(self, thread, fields): def fill_thread(self, thread, fields):
"fill the thread" "fill the thread"
return self.get_thread(thread) t = self.get_thread(thread)
return t or thread
def iter_unread_messages(self, thread=None): def iter_unread_messages(self, thread=None):
for thread in self.iter_threads(): for thread in self.iter_threads():