From 02116ee1e181855007fffcc0ac05737a0e7d1b4d Mon Sep 17 00:00:00 2001 From: Myned Date: Tue, 12 Nov 2019 14:10:53 -0500 Subject: [PATCH] Fix extraneous errors messing up fallbacks --- src/utils/scraper.py | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/src/utils/scraper.py b/src/utils/scraper.py index cb9decf..50224e6 100644 --- a/src/utils/scraper.py +++ b/src/utils/scraper.py @@ -41,9 +41,10 @@ from utils import utils as u async def query_kheina(url): - content = await u.fetch('https://kheina.com', params={'url': url}, text=True) + try: + content = await u.fetch('https://kheina.com', params={'url': url}, text=True) - for e in ('"', '''): + for e in ('"', '''): content = content.replace(e, '') content = re.sub('', '', content) @@ -74,13 +75,17 @@ async def query_kheina(url): 'database': 'Kheina' } - return result + return result + + except Exception: + return False async def query_saucenao(url): - content = await u.fetch( - 'https://saucenao.com/search.php', - params={'url': url, 'api_key': u.config['saucenao_api'], 'output_type': 2}, + try: + content = await u.fetch( + 'https://saucenao.com/search.php', + params={'url': url, 'api_key': u.config['saucenao_api'], 'output_type': 2}, json=True) if content['header'].get('message', '') in ( @@ -119,7 +124,10 @@ async def query_saucenao(url): 'database': 'SauceNAO' } - return result + return result + + except Exception: + return False async def get_post(url):