From bb7f4cf74e86b163546c7dc819b67c99b1d1e682 Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Sat, 29 Jan 2022 21:02:56 +0100 Subject: [PATCH] Added optional requirements for metadata amazon Better logging of errors in metadata source files --- cps/metadata_provider/amazon.py | 2 +- cps/search_metadata.py | 4 ++-- optional-requirements.txt | 8 +++++--- setup.cfg | 5 +++++ 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/cps/metadata_provider/amazon.py b/cps/metadata_provider/amazon.py index af926dbf..558edebc 100644 --- a/cps/metadata_provider/amazon.py +++ b/cps/metadata_provider/amazon.py @@ -19,7 +19,7 @@ import concurrent.futures import requests from bs4 import BeautifulSoup as BS # requirement -# import lxml #requirement for better speed + try: import cchardet #optional for better speed except ImportError: diff --git a/cps/search_metadata.py b/cps/search_metadata.py index 4b57bf9e..d72273f6 100644 --- a/cps/search_metadata.py +++ b/cps/search_metadata.py @@ -49,8 +49,8 @@ for f in modules: try: importlib.import_module("cps.metadata_provider." + a) new_list.append(a) - except ImportError: - log.error("Import error for metadata source: {}".format(a)) + except ImportError as e: + log.error("Import error for metadata source: {} - {}".format(a, e)) pass diff --git a/optional-requirements.txt b/optional-requirements.txt index 20996c8a..e13f32f5 100644 --- a/optional-requirements.txt +++ b/optional-requirements.txt @@ -31,9 +31,11 @@ SQLAlchemy-Utils>=0.33.5,<0.39.0 # metadata extraction rarfile>=2.7 scholarly>=1.2.0,<1.6 -markdown2==2.4.2 -html2text==2020.1.16 -python-dateutil==2.8.2 +markdown2>=2.0.0,<2.5.0 +html2text>=2020.1.16,<2022.1.1 +python-dateutil>=2.1,<2.9.0 +beautifulsoup4>=4.0.1,<4.2.0 +cchardet>=2.0.0,<2.2.0 # Comics natsort>=2.2.0,<8.1.0 diff --git a/setup.cfg b/setup.cfg index db2fd3e6..e6b61e9d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -86,6 +86,11 @@ oauth = metadata = rarfile>=2.7 scholarly>=1.2.0,<1.6 + markdown2>=2.0.0,<2.5.0 + html2text>=2020.1.16,<2022.1.1 + python-dateutil>=2.1,<2.9.0 + beautifulsoup4>=4.0.1,<4.2.0 + cchardet>=2.0.0,<2.2.0 comics = natsort>=2.2.0,<8.1.0 comicapi>=2.2.0,<2.3.0