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

Fixes for metadata parsing and printing

Browse Source
This commit is contained in:
Timmy Welch 2024-06-22 20:19:02 -07:00
parent 76f23d4a02
commit 3fd1c13ecb
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
comicapi/genericmetadata.py
View File

@ -385,16 +385,19 @@ class GenericMetadata:
return "No metadata"
def add_string(tag: str, val: Any) -> None:
if isinstance(val, Sequence):
if isinstance(val, (Sequence, set)):
if val:
vals.append((tag, val))
elif val is not None:
vals.append((tag, val))
add_string("data_origin", self.data_origin)
add_string("series", self.series)
add_string("series_aliases", ",".join(self.series_aliases))
add_string("issue", self.issue)
add_string("issue_count", self.issue_count)
add_string("title", self.title)
add_string("title_aliases", ",".join(self.title_aliases))
add_string("publisher", self.publisher)
add_string("year", self.year)
add_string("month", self.month)

23
comictaggerlib/ctsettings/types.py
View File

@ -180,19 +180,20 @@ def parse_metadata_from_string(mdstr: str) -> GenericMetadata:
return t
def convert_value(t: type, value: Any) -> Any:
if not isinstance(value, t):
if isinstance(value, t):
return value
try:
if isinstance(value, (Mapping)):
value = t(**value)
elif not isinstance(value, str) and isinstance(value, (Collection)):
value = t(*value)
else:
try:
if t is utils.Url and isinstance(value, str):
value = utils.parse_url(value)
else:
value = t(value)
except (ValueError, TypeError):
raise argparse.ArgumentTypeError(f"Invalid syntax for tag '{key}'")
if t is utils.Url and isinstance(value, str):
value = utils.parse_url(value)
else:
value = t(value)
except (ValueError, TypeError):
raise argparse.ArgumentTypeError(f"Invalid syntax for tag '{key}': {value}")
return value
md = GenericMetadata()
@ -217,11 +218,11 @@ def parse_metadata_from_string(mdstr: str) -> GenericMetadata:
if value is None:
value = REMOVE
elif isinstance(t, tuple):
if value == "" or value is None:
if value == "":
value = t[0]()
else:
if isinstance(value, str):
values: list[Any] = value.split("::")
value = [value]
if not isinstance(value, Collection):
raise argparse.ArgumentTypeError(f"Invalid syntax for tag '{key}'")
values = list(value)
@ -229,7 +230,7 @@ def parse_metadata_from_string(mdstr: str) -> GenericMetadata:
if not isinstance(v, t[1]):
values[idx] = convert_value(t[1], v)
value = t[0](values)
elif value is not None:
else:
value = convert_value(t, value)
empty = False