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

norm_fold out of loop for add_credit. Explicit overlay mode for CLI metadata.

Browse Source
This commit is contained in:
Mizaki 2024-04-23 01:16:44 +01:00
parent e9a592df50
commit 2faac18597
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
comicapi/genericmetadata.py
View File

@ -268,8 +268,8 @@ class GenericMetadata:
return new
# Create dict for deduplication
new_dict: dict[str, Credit] = {f"{norm_fold(n['person'])}_{n['role'].casefold()}": n for n in new}
cur_dict: dict[str, Credit] = {f"{norm_fold(c['person'])}_{c['role'].casefold()}": c for c in cur}
new_dict: dict[str, Credit] = {norm_fold(f"{n['person']}_{n['role']}"): n for n in new}
cur_dict: dict[str, Credit] = {norm_fold(f"{c['person']}_{c['role']}"): c for c in cur}
# Any duplicates use the 'new' value
cur_dict.update(new_dict)
@ -477,10 +477,13 @@ class GenericMetadata:
credit = Credit(person=person, role=role, primary=primary)
person = norm_fold(person)
role = norm_fold(role)
# look to see if it's not already there...
found = False
for c in self.credits:
if norm_fold(c["person"]) == norm_fold(person) and norm_fold(c["role"]) == norm_fold(role):
if norm_fold(c["person"]) == person and norm_fold(c["role"]) == role:
# no need to add it. just adjust the "primary" flag as needed
c["primary"] = primary
found = True

4
comictaggerlib/cli.py
View File

@ -29,7 +29,7 @@ from typing import Any, TextIO
from comicapi import utils
from comicapi.comicarchive import ComicArchive
from comicapi.comicarchive import metadata_styles as md_styles
from comicapi.genericmetadata import GenericMetadata
from comicapi.genericmetadata import GenericMetadata, OverlayMode
from comictaggerlib.cbltransformer import CBLTransformer
from comictaggerlib.ctsettings import ct_ns
from comictaggerlib.filerenamer import FileRenamer, get_rename_dir
@ -259,7 +259,7 @@ class CLI:
logger.error("Failed to load metadata for %s: %s", ca.path, e)
# finally, use explicit stuff (always 'overlay' mode)
md.overlay(self.config.Runtime_Options__metadata)
md.overlay(self.config.Runtime_Options__metadata, mode=OverlayMode.overlay)
return md