finaly handle BrowserHTTPNotFound in backend browsers

modules/750g/browser.py

@@ -18,7 +18,7 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 
-from weboob.tools.browser import BaseBrowser
+from weboob.tools.browser import BaseBrowser, BrowserHTTPNotFound
 
 from .pages import RecipePage, ResultsPage
 
@@ -42,6 +42,9 @@ class SevenFiftyGramsBrowser(BaseBrowser):
         return self.page.iter_recipes()
 
     def get_recipe(self, id):
+        try:
             self.location('http://www.750g.com/fiche_de_cuisine_complete.htm?recettes_id=%s' % id)
+        except BrowserHTTPNotFound:
+            return
         if self.is_on_page(RecipePage):
             return self.page.get_recipe(id)

modules/attilasub/browser.py

@@ -48,5 +48,5 @@ class AttilasubBrowser(BaseBrowser):
             self.location('http://davidbillemont3.free.fr/%s' % url_end)
         except BrowserHTTPNotFound:
             return
-        assert self.is_on_page(SubtitlesPage)
+        if self.is_on_page(SubtitlesPage):
             return self.page.get_subtitle(id)

modules/btmon/browser.py

@@ -18,7 +18,7 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 
-from weboob.tools.browser import BaseBrowser
+from weboob.tools.browser import BaseBrowser, BrowserHTTPNotFound
 
 from .pages import TorrentsPage, TorrentPage
 
@@ -42,6 +42,9 @@ class BtmonBrowser(BaseBrowser):
         return self.page.iter_torrents()
 
     def get_torrent(self, id):
+        try:
             self.location('http://www.btmon.com/%s.html' % id)
+        except BrowserHTTPNotFound:
+            return
         if self.is_on_page(TorrentPage):
             return self.page.get_torrent()

modules/cuisineaz/browser.py

@@ -18,7 +18,7 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 
-from weboob.tools.browser import BaseBrowser
+from weboob.tools.browser import BaseBrowser, BrowserHTTPNotFound
 
 from .pages import RecipePage, ResultsPage
 
@@ -43,6 +43,9 @@ class CuisineazBrowser(BaseBrowser):
         return self.page.iter_recipes()
 
     def get_recipe(self, id):
+        try:
             self.location('http://www.cuisineaz.com/recettes/%s.aspx' % id)
+        except BrowserHTTPNotFound:
+            return
         if self.is_on_page(RecipePage):
             return self.page.get_recipe(id)

modules/isohunt/browser.py

@@ -18,7 +18,7 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 
-from weboob.tools.browser import BaseBrowser
+from weboob.tools.browser import BaseBrowser, BrowserHTTPNotFound
 
 from .pages.torrents import TorrentsPage, TorrentPage
 
@@ -45,6 +45,9 @@ class IsohuntBrowser(BaseBrowser):
         return self.page.iter_torrents()
 
     def get_torrent(self, id):
+        try:
             self.location('https://isohunt.com/torrent_details/%s/?tab=summary' % id)
+        except BrowserHTTPNotFound:
+            return
         if self.is_on_page(TorrentPage):
             return self.page.get_torrent(id)

modules/kickass/browser.py

@@ -18,7 +18,7 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 
-from weboob.tools.browser import BaseBrowser
+from weboob.tools.browser import BaseBrowser, BrowserHTTPNotFound
 
 from .pages import TorrentsPage, TorrentPage
 
@@ -45,6 +45,9 @@ class KickassBrowser(BaseBrowser):
         return self.page.iter_torrents()
 
     def get_torrent(self, id):
+        try:
             self.location('http://kat.ph/%s.html' % id)
-        assert self.is_on_page(TorrentPage)
+        except BrowserHTTPNotFound:
+            return
+        if self.is_on_page(TorrentPage):
             return self.page.get_torrent(id)

modules/marmiton/browser.py

@@ -18,7 +18,7 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 
-from weboob.tools.browser import BaseBrowser
+from weboob.tools.browser import BaseBrowser, BrowserHTTPNotFound
 
 from .pages import RecipePage, ResultsPage
 
@@ -42,6 +42,9 @@ class MarmitonBrowser(BaseBrowser):
         return self.page.iter_recipes()
 
     def get_recipe(self, id):
+        try:
             self.location('http://www.marmiton.org/recettes/recette_%s.aspx' % id)
+        except BrowserHTTPNotFound:
+            return
         if self.is_on_page(RecipePage):
             return self.page.get_recipe(id)

modules/opensubtitles/browser.py

@@ -18,7 +18,7 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 
-from weboob.tools.browser import BaseBrowser
+from weboob.tools.browser import BaseBrowser, BrowserHTTPNotFound
 from weboob.applications.suboob.suboob import LANGUAGE_CONV
 
 from .pages import SubtitlesPage, SearchPage, SubtitlePage
@@ -47,6 +47,9 @@ class OpensubtitlesBrowser(BaseBrowser):
         return self.page.iter_subtitles()
 
     def get_subtitle(self, id):
+        try:
             self.location('http://www.opensubtitles.org/subtitles/%s' % id)
-        assert self.is_on_page(SubtitlePage)
+        except BrowserHTTPNotFound:
+            return
+        if self.is_on_page(SubtitlePage):
             return self.page.get_subtitle()

modules/parolesmania/browser.py

@@ -18,7 +18,7 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 
-from weboob.tools.browser import BaseBrowser
+from weboob.tools.browser import BaseBrowser, BrowserHTTPNotFound
 
 from .pages import SongResultsPage, SonglyricsPage, ArtistResultsPage, ArtistSongsPage
 
@@ -50,6 +50,9 @@ class ParolesmaniaBrowser(BaseBrowser):
 
     def get_lyrics(self, id):
         ids = id.split('|')
+        try:
             self.location('http://www.parolesmania.com/paroles_%s/paroles_%s.html' % (ids[0], ids[1]))
-        assert self.is_on_page(SonglyricsPage)
+        except BrowserHTTPNotFound:
+            return
+        if self.is_on_page(SonglyricsPage):
             return self.page.get_lyrics(id)

modules/parolesmusique/browser.py

@@ -18,7 +18,7 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 
-from weboob.tools.browser import BaseBrowser
+from weboob.tools.browser import BaseBrowser, BrowserHTTPNotFound
 
 from .pages import SongResultsPage, SonglyricsPage, ArtistResultsPage, ArtistSongsPage, HomePage
 
@@ -45,6 +45,9 @@ class ParolesmusiqueBrowser(BaseBrowser):
         return self.page.iter_lyrics(criteria, pattern)
 
     def get_lyrics(self, id):
+        try:
             self.location('http://www.paroles-musique.com/paroles-%s' % id)
-        assert self.is_on_page(SonglyricsPage)
+        except BrowserHTTPNotFound:
+            return
+        if self.is_on_page(SonglyricsPage):
             return self.page.get_lyrics(id)

modules/piratebay/browser.py

@@ -20,7 +20,7 @@
 
 import urllib
 
-from weboob.tools.browser import BaseBrowser
+from weboob.tools.browser import BaseBrowser, BrowserHTTPNotFound
 
 from .pages.index import IndexPage
 from .pages.torrents import TorrentsPage, TorrentPage
@@ -49,6 +49,9 @@ class PiratebayBrowser(BaseBrowser):
         return self.page.iter_torrents()
 
     def get_torrent(self, id):
+        try:
             self.location('https://thepiratebay.se/torrent/%s/' % id)
-        assert self.is_on_page(TorrentPage)
+        except BrowserHTTPNotFound:
+            return
+        if self.is_on_page(TorrentPage):
             return self.page.get_torrent(id)

modules/seeklyrics/browser.py

@@ -18,7 +18,7 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 
-from weboob.tools.browser import BaseBrowser
+from weboob.tools.browser import BaseBrowser, BrowserHTTPNotFound
 
 from .pages import SongResultsPage, SonglyricsPage, ArtistResultsPage, ArtistSongsPage
 
@@ -48,6 +48,9 @@ class SeeklyricsBrowser(BaseBrowser):
         return self.page.iter_lyrics()
 
     def get_lyrics(self, id):
+        try:
             self.location('http://www.seeklyrics.com/lyrics/%s.html' % id)
-        assert self.is_on_page(SonglyricsPage)
+        except BrowserHTTPNotFound:
+            return
+        if self.is_on_page(SonglyricsPage):
             return self.page.get_lyrics(id)

modules/tvsubtitles/browser.py

@@ -18,7 +18,7 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 
-from weboob.tools.browser import BaseBrowser
+from weboob.tools.browser import BaseBrowser, BrowserHTTPNotFound
 
 from .pages import SeriePage, SearchPage, SeasonPage, HomePage
 
@@ -48,6 +48,9 @@ class TvsubtitlesBrowser(BaseBrowser):
         return self.page.iter_subtitles(language, pattern)
 
     def get_subtitle(self, id):
+        try:
             self.location('http://www.tvsubtitles.net/subtitle-%s.html' % id)
-        assert self.is_on_page(SeasonPage)
+        except BrowserHTTPNotFound:
+            return
+        if self.is_on_page(SeasonPage):
             return self.page.get_subtitle()

weboob/applications/qcineoob/main_window.py

@@ -28,7 +28,6 @@ from weboob.capabilities.torrent import ICapTorrent
 from weboob.capabilities.subtitle import ICapSubtitle
 from weboob.tools.application.qt import QtMainWindow, QtDo
 from weboob.tools.application.qt.backendcfg import BackendCfg
-from weboob.tools.browser import BrowserHTTPNotFound, BrokenPageError
 
 from weboob.applications.suboob.suboob import LANGUAGE_CONV
 from weboob.applications.qcineoob.ui.main_window_ui import Ui_MainWindow
@@ -406,10 +405,7 @@ class MainWindow(QtMainWindow):
             backend_name = None
         for backend in self.weboob.iter_backends():
             if backend.has_caps(cap) and ((backend_name and backend.name == backend_name) or not backend_name):
-                try:
                 exec('object = backend.get_%s(id)' % (stype))
-                except (BrowserHTTPNotFound, BrokenPageError):
-                    object = None
                 if object:
                     func_display = 'self.display' + stype[0].upper() + stype[1:]
                     exec("self.doAction('Details of %s \"%%s\"' %% object.%s, %s, [object, backend])" % 

weboob/applications/qcookboob/main_window.py

@@ -26,7 +26,6 @@ from PyQt4.QtGui import QApplication, QCompleter
 from weboob.capabilities.recipe import ICapRecipe
 from weboob.tools.application.qt import QtMainWindow, QtDo
 from weboob.tools.application.qt.backendcfg import BackendCfg
-from weboob.tools.browser import BrowserHTTPNotFound, BrokenPageError
 
 from weboob.applications.qcookboob.ui.main_window_ui import Ui_MainWindow
 
@@ -202,10 +201,7 @@ class MainWindow(QtMainWindow):
             backend_name = None
         for backend in self.weboob.iter_backends():
             if (backend_name and backend.name == backend_name) or not backend_name:
-                try:
                 recipe = backend.get_recipe(id)
-                except (BrowserHTTPNotFound, BrokenPageError):
-                    recipe = None
                 if recipe:
                     self.doAction('Details of recipe "%s"' % recipe.title, self.displayRecipe, [recipe, backend])
         QApplication.restoreOverrideCursor()