Merge branch 'release/0.0.6'

Author: lb803

src/db.py

@@ -6,31 +6,54 @@
 from typing import Dict, List
 
 
-class Crossref():
-    """Crossref compatibilty layer"""
-    def __init__(self, doi: str):
-        self.works = Works()
+class Db():
+    """Base Db class to derive specialised database classes from"""
+    def __init__(self, doi: str) -> None:
+        self.db = self.init_db()
         self.doi = urljoin('https://doi.org/', doi)
 
+    def init_db(self):
+        """Init database object"""
+        raise NotImplementedError
+
+    def get_book(self):
+        """Return book data"""
+        raise NotImplementedError
+
+    def get_chapters(self):
+        """Return chapters data"""
+        raise NotImplementedError
+
+
+class Crossref(Db):
+    """Crossref compatibility layer"""
+    def init_db(self):
+        """Init database object"""
+        return Works()
+
     def get_book(self) -> Dict:
-        """Return the book data associated to the supplied ISBN"""
-        query = self.works.doi(self.doi)
+        """Return book data"""
+        query = self.db.doi(self.doi)
+
+        if not query:
+            raise ValueError(f"No book data associated to the DOI {self.doi}"
+                             "found on the database Crossref")
+
         data = {"title": query.get("title")[0],
                 "doi":   query.get("DOI")}
         return data
 
     def get_chapters(self, book: Dict) -> List:
-        """Returns a chapter data related to the book"""
-        query = self.works.filter(container_title=book.get("title"),
-                                  type='book-chapter') \
-                          .select('DOI', 'license', 'author',
-                                  'title', 'type', 'page',
-                                  'publisher', 'abstract')
-
-        # Assert that at least one DOI have been discovered
+        """Return chapters data"""
+        query = self.db.filter(container_title=book.get("title"),
+                               type='book-chapter') \
+                       .select('DOI', 'license', 'author',
+                               'title', 'type', 'page',
+                               'publisher', 'abstract')
+
         if not query:
-            raise AssertionError('Couldn\'t find any chapter-level DOIs'
-                                 + ' for the supplied --isbn value')
+            raise ValueError("No chapter data associated to the DOI"
+                             f"{self.doi} found on the database Crossref")
 
         chapters = []
         for chapter in query:
@@ -57,21 +80,23 @@ def join_author_names(self, chapter_data: Dict) -> str:
         return '; '.join(author_list)
 
 
-class Thoth():
-    """Thoth compatibilty layer"""
-    def __init__(self, doi: str):
-        self.thoth = ThothClient()
-        self.doi_url = urljoin('https://doi.org/', doi)
+class Thoth(Db):
+    """Thoth compatibility layer"""
+    def init_db(self):
+        """Init database object"""
+        return ThothClient()
 
     def get_book(self) -> Dict:
-        work = self.thoth.work_by_doi(doi=self.doi_url, raw=True)
+        """Return book data"""
+        work = self.db.work_by_doi(doi=self.doi, raw=True)
         work_dict = json.loads(work)['data']['workByDoi']
 
         data = {"title": work_dict.get("fullTitle"),
-                "doi":   self.doi_url}
+                "doi":   self.doi}
         return data
 
     def get_chapters(self, book: Dict) -> List:
+        """Return chapters data"""
         # TODO replace this with a Thoth library method when available
         url = 'https://api.thoth.pub/graphql'
         query = {"query": """{ workByDoi (doi: "%s") {

src/main.py

@@ -7,6 +7,7 @@
 from pdf import Pdf
 from metadata import Metadata
 from shutil import copy2
+import re
 
 app = typer.Typer()
 
@@ -28,7 +29,7 @@ def run(input_file:    Path = typer.Option("./file.pdf",
 
         # Iterate over chapters metadata
         for chapter in metadata.get_chapters():
-            page_range = chapter.get("pages").split('-')
+            page_range = re.split('-|–', chapter.get("pages"))
             output_file_name = chapter.get("doi").split('/')[-1] + '.pdf'
 
             # Merge PDFs

src/metadata.py

@@ -52,8 +52,11 @@ class Metadata:
     def __init__(self, database="thoth", doi=None):
         if database == "thoth":
             self.db = Thoth(doi)
-        if database == "crossref":
+        elif database == "crossref":
             self.db = Crossref(doi)
+        else:
+            raise ValueError(f"Database '{database}' misspelled or not "
+                             "implemented yet.")
 
         self.book = self.fetch_book_data()
         self.chapters = self.fetch_chapter_data()
@@ -69,6 +72,9 @@ def fetch_chapter_data(self) -> List[Chapter]:
 
     def get_chapters(self) -> List[Dict]:
         """Return a list of Chapters (dictionaries)"""
+        if not self.chapters:
+            raise ValueError("No chapter data retrieved from the database.")
+
         return [chapter.to_dict() for chapter in self.chapters]
 
     @staticmethod