From 27854f2303c9302aded5fd25eb52bc849e5bfaad Mon Sep 17 00:00:00 2001 From: Timmy Welch Date: Wed, 20 Apr 2022 11:41:42 -0700 Subject: [PATCH] Partial revert of 'bd3a3a241a949833eadc90474d7c87a5c0f65c04' Changing PageType to an Enum creates too many issues --- comicapi/comicinfoxml.py | 6 +----- comicapi/genericmetadata.py | 5 ++--- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/comicapi/comicinfoxml.py b/comicapi/comicinfoxml.py index 87d75d3..0bbb893 100644 --- a/comicapi/comicinfoxml.py +++ b/comicapi/comicinfoxml.py @@ -18,7 +18,7 @@ import logging import xml.etree.ElementTree as ET from comicapi import utils -from comicapi.genericmetadata import GenericMetadata, PageType +from comicapi.genericmetadata import GenericMetadata from comicapi.issuestring import IssueString logger = logging.getLogger(__name__) @@ -171,8 +171,6 @@ class ComicInfoXml: for page_dict in md.pages: page = page_dict - if "Type" in page: - page["Type"] = page["Type"].value if "Image" in page: page["Image"] = str(page["Image"]) page_node = ET.SubElement(pages_node, "Page") @@ -256,8 +254,6 @@ class ComicInfoXml: pages_node = root.find("Pages") if pages_node is not None: for page in pages_node: - if "Type" in page.attrib: - page.attrib["Type"] = PageType(page.attrib["Type"]) if "Image" in page.attrib: page.attrib["Image"] = int(page.attrib["Image"]) md.pages.append(page.attrib) diff --git a/comicapi/genericmetadata.py b/comicapi/genericmetadata.py index 5e0a700..1053847 100644 --- a/comicapi/genericmetadata.py +++ b/comicapi/genericmetadata.py @@ -21,7 +21,6 @@ possible, however lossy it might be # limitations under the License. import logging -from enum import Enum from typing import List, TypedDict from comicapi import utils @@ -29,7 +28,7 @@ from comicapi import utils logger = logging.getLogger(__name__) -class PageType(Enum): +class PageType: """ These page info classes are exactly the same as the CIX scheme, since @@ -50,7 +49,7 @@ class PageType(Enum): class ImageMetadata(TypedDict, total=False): - Type: PageType + Type: str Bookmark: str DoublePage: bool Image: int