fix for mypy

ping · May 2, 2024 · 98d689d · 98d689d
1 parent 33f7f54
commit 98d689d
Showing 1 changed file with 20 additions and 24 deletions.
diff --git a/odmpy/processing/ebook.py b/odmpy/processing/ebook.py
@@ -421,18 +421,15 @@ def process_ebook_loan(
             json.dump(openbook, f, indent=2)
 
     # old rosters: {"group": "title-content", "entries": [{"url": "http://..."}]}
-    # now just generate title_contents from openbook
-    title_contents = {
-        "group": "title-content",
-        "entries": [
-            {
-                "url": openbook["download_base"] + item["path"],
-                "mediaType": item["media-type"],
-                "spinePosition": item["-odread-spine-position"],
-            }
-            for item in openbook["spine"]
-        ],
-    }
+    # now just generate title_content entries from openbook
+    title_contents = [
+        {
+            "url": openbook["download_base"] + item["path"],
+            "mediaType": item["media-type"],
+            "spinePosition": item["-odread-spine-position"],
+        }
+        for item in openbook["spine"]
+    ]
 
     headers = libby_client.default_headers()
     headers["Accept"] = "*/*"
@@ -470,12 +467,11 @@ def process_ebook_loan(
     title_content_entries = list(
         filter(
             lambda e: _filter_content(e, media_info, toc_pages),
-            title_contents["entries"],
+            title_contents,
         )
     )
-    # Ignoring mypy error below because of https://github.com/python/mypy/issues/9372
     title_content_entries = sorted(
-        title_content_entries, key=cmp_to_key(_sort_title_contents)  # type: ignore[misc]
+        title_content_entries, key=cmp_to_key(_sort_title_contents)
     )
     progress_bar = tqdm(title_content_entries, disable=args.hide_progress)
     has_ncx = False
@@ -652,17 +648,17 @@ def process_ebook_loan(
         # download image to asset dir from decoded HTML
         # e.g. '<img src="***_003_r1.jpg" alt="003" class="imgepub" data-loc="60">'
         if soup:
-            image_url = soup.find("img", attrs={"src": True})
-            if image_url:
-                image_url = urljoin(parsed_entry_url.geturl(), image_url["src"])
-                image_url = urlparse(image_url)
-                image_url = image_url.geturl()
-                # ready to download
-                image_file_name = os.path.basename(image_url)
+            image_tag = soup.find("img", attrs={"src": True})
+            if image_tag and isinstance(image_tag, Tag):
+                image_url = urlparse(
+                    urljoin(parsed_entry_url.geturl(), image_tag["src"])
+                )
+                download_url = image_url.geturl()
+                image_file_name = os.path.basename(download_url)
                 image_file_path = asset_folder.joinpath(image_file_name)
                 if not image_file_path.exists():
-                    logger.info(f"Downloading {image_url} to {image_file_path}")
-                    res = libby_client.make_request(image_url, return_res=True)
+                    logger.info(f"Downloading {download_url} to {image_file_path}")
+                    res = libby_client.make_request(download_url, return_res=True)
                     with open(image_file_path, "wb") as f_out:
                         f_out.write(res.content)