lordwelch/comicapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'removeEnum' into develop

Browse Source
This commit is contained in:
Timmy Welch 2022-04-20 11:44:42 -07:00
commit d56238663d
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
comicapi/comicinfoxml.py
View File

@ -18,7 +18,7 @@ import logging
import xml.etree.ElementTree as ET import xml.etree.ElementTree as ET
from comicapi import utils from comicapi import utils
from comicapi.genericmetadata import GenericMetadata, PageType from comicapi.genericmetadata import GenericMetadata
from comicapi.issuestring import IssueString from comicapi.issuestring import IssueString
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -171,8 +171,6 @@ class ComicInfoXml:
for page_dict in md.pages: for page_dict in md.pages:
page = page_dict page = page_dict
if "Type" in page:
page["Type"] = page["Type"].value
if "Image" in page: if "Image" in page:
page["Image"] = str(page["Image"]) page["Image"] = str(page["Image"])
page_node = ET.SubElement(pages_node, "Page") page_node = ET.SubElement(pages_node, "Page")
@ -256,8 +254,6 @@ class ComicInfoXml:
pages_node = root.find("Pages") pages_node = root.find("Pages")
if pages_node is not None: if pages_node is not None:
for page in pages_node: for page in pages_node:
if "Type" in page.attrib:
page.attrib["Type"] = PageType(page.attrib["Type"])
if "Image" in page.attrib: if "Image" in page.attrib:
page.attrib["Image"] = int(page.attrib["Image"]) page.attrib["Image"] = int(page.attrib["Image"])
md.pages.append(page.attrib) md.pages.append(page.attrib)

5
comicapi/genericmetadata.py
View File

@ -21,7 +21,6 @@ possible, however lossy it might be
# limitations under the License. # limitations under the License.
import logging import logging
from enum import Enum
from typing import List, TypedDict from typing import List, TypedDict
from comicapi import utils from comicapi import utils
@ -29,7 +28,7 @@ from comicapi import utils
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
class PageType(Enum): class PageType:
""" """
These page info classes are exactly the same as the CIX scheme, since 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): class ImageMetadata(TypedDict, total=False):
Type: PageType Type: str
Bookmark: str Bookmark: str
DoublePage: bool DoublePage: bool
Image: int Image: int