refact wcat and goob providers (issue #23)

xlcnd · Apr 21, 2015 · 4f32f90 · 4f32f90
1 parent e50a70c
commit 4f32f90
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 25 deletions.
diff --git a/isbnlib/_goob.py b/isbnlib/_goob.py
@@ -4,7 +4,7 @@
 import logging
 
 from .dev import stdmeta
-from .dev._exceptions import (DataWrongShapeError, ISBNNotConsistentError,
+from .dev._exceptions import (ISBNNotConsistentError,
                               NoDataForSelectorError, RecordMappingError)
 from .dev.bouth23 import u
 from .dev.webquery import query as wquery
@@ -40,25 +40,20 @@ def _mapper(isbn, records):
 
 def _records(isbn, data):
     """Classify (canonically) the parsed data."""
+    # put the selected data in records
     try:
-        # put the selected data in records
-        records = data['items'][0]['volumeInfo']
-        # consistency check (isbn request = isbn response)
-        ids = records.get('industryIdentifiers', '')
+        recs = data['items'][0]['volumeInfo']
+    except:  # pragma: no cover
+        LOGGER.debug('NoDataForSelectorError for %s', isbn)
+        raise NoDataForSelectorError(isbn)
+    # consistency check (isbn request = isbn response)
+    if recs:
+        ids = recs.get('industryIdentifiers', '')
         if isbn not in repr(ids):   # pragma: no cover
             LOGGER.debug('Not consistent data for %s (%s)', isbn, repr(ids))
             raise ISBNNotConsistentError(isbn)
-    except:                         # pragma: no cover
-        try:
-            extra = data['stat']
-            LOGGER.debug('DataWrongShapeError for %s with data %s',
-                         isbn, extra)
-        except:
-            raise DataWrongShapeError(isbn)
-        raise NoDataForSelectorError(isbn)
-
     # map canonical <- records
-    return _mapper(isbn, records)
+    return _mapper(isbn, recs)
 
 
 def query(isbn):

diff --git a/isbnlib/_wcat.py b/isbnlib/_wcat.py
@@ -4,8 +4,8 @@
 import logging
 
 from .dev import stdmeta
-from .dev._exceptions import (DataWrongShapeError, NoDataForSelectorError,
-                              RecordMappingError)
+from .dev._exceptions import (DataWrongShapeError, ISBNNotConsistentError,
+                              NoDataForSelectorError, RecordMappingError)
 from .dev.bouth23 import u
 from .dev.webquery import query as wquery
 
@@ -36,18 +36,27 @@ def _mapper(isbn, records):
 
 def _records(isbn, data):
     """Classify (canonically) the parsed data."""
+    # check status
+    try:
+        status = data['stat']
+        if status != 'ok':
+            raise
+    except:
+        LOGGER.debug('DataWrongShapeError for %s with status %s',
+                     isbn, status)
+        raise DataWrongShapeError(isbn)
+    # put the selected data in records
     try:
-        # put the selected data in records
         recs = data['list'][0]
     except:  # pragma: no cover
-        try:
-            extra = data['stat']
-            LOGGER.debug('DataWrongShapeError for %s with data %s',
-                         isbn, extra)
-        except:
-            raise DataWrongShapeError(isbn)
+        LOGGER.debug('NoDataForSelectorError for %s', isbn)
         raise NoDataForSelectorError(isbn)
-
+    # consistency check (isbn request = isbn response)
+    if recs:
+        ids = recs.get('isbn', '')
+        if isbn not in repr(ids):   # pragma: no cover
+            LOGGER.debug('Not consistent data for %s (%s)', isbn, repr(ids))
+            raise ISBNNotConsistentError(isbn)
     # map canonical <- records
     return _mapper(isbn, recs)