Merge branch 'help-messages' into develop

.pre-commit-config.yaml

@@ -1,4 +1,4 @@
-exclude: ^scripts
+exclude: ^(scripts|comictaggerlib/graphics/resources.py)
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.6.0

comicapi/__pyinstaller/hook-comicapi.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from PyInstaller.utils.hooks import collect_data_files, collect_entry_point
 
 datas, hiddenimports = collect_entry_point("comicapi.archiver")
-mdatas, mhiddenimports = collect_entry_point("comicapi.metadata")
+mdatas, mhiddenimports = collect_entry_point("comicapi.tags")
 
 hiddenimports += mhiddenimports
 datas += mdatas

comicapi/comicarchive.py

@@ -30,97 +30,94 @@ from typing import TYPE_CHECKING
 from comicapi import utils
 from comicapi.archivers import Archiver, UnknownArchiver, ZipArchiver
 from comicapi.genericmetadata import GenericMetadata
-from comicapi.metadata import Metadata
+from comicapi.tags import Tag
 from comictaggerlib.ctversion import version
 
 if TYPE_CHECKING:
-    from importlib.machinery import ModuleSpec
     from importlib.metadata import EntryPoint
 
 logger = logging.getLogger(__name__)
 
 archivers: list[type[Archiver]] = []
-metadata_styles: dict[str, Metadata] = {}
+tags: dict[str, Tag] = {}
 
 
 def load_archive_plugins(local_plugins: Iterable[EntryPoint] = tuple()) -> None:
-    if not archivers:
-        if sys.version_info < (3, 10):
-            from importlib_metadata import entry_points
-        else:
-            from importlib.metadata import entry_points
-        builtin: list[type[Archiver]] = []
-        # A list is used first matching plugin wins
-        for ep in itertools.chain(local_plugins, entry_points(group="comicapi.archiver")):
-            try:
-                archiver: type[Archiver] = ep.load()
-                if ep.module.startswith("comicapi"):
-                    builtin.append(archiver)
-                else:
-                    archivers.append(archiver)
-            except Exception:
-                try:
-                    spec = importlib.util.find_spec(ep.module)
-                except ValueError:
-                    spec = None
-                if spec and spec.has_location:
-                    logger.exception("Failed to load archive plugin: %s from %s", ep.name, spec.origin)
-                else:
-                    logger.exception("Failed to load archive plugin: %s", ep.name)
-        archivers.extend(builtin)
+    if archivers:
+        return
+    if sys.version_info < (3, 10):
+        from importlib_metadata import entry_points
+    else:
+        from importlib.metadata import entry_points
+    builtin: list[type[Archiver]] = []
+    archive_plugins: list[type[Archiver]] = []
+    # A list is used first matching plugin wins
 
+    for ep in itertools.chain(local_plugins, entry_points(group="comicapi.archiver")):
+        try:
+            spec = importlib.util.find_spec(ep.module)
+        except ValueError:
+            spec = None
+        try:
+            archiver: type[Archiver] = ep.load()
 
-def load_metadata_plugins(version: str = f"ComicAPI/{version}", local_plugins: Iterable[EntryPoint] = tuple()) -> None:
-    if not metadata_styles:
-        if sys.version_info < (3, 10):
-            from importlib_metadata import entry_points
-        else:
-            from importlib.metadata import entry_points
-        builtin: dict[str, Metadata] = {}
-        styles: dict[str, tuple[Metadata, ModuleSpec | None]] = {}
-        # A dict is used, last plugin wins
-        for ep in itertools.chain(entry_points(group="comicapi.metadata"), local_plugins):
-            try:
-                spec = importlib.util.find_spec(ep.module)
-            except ValueError:
-                spec = None
-            try:
-                style: type[Metadata] = ep.load()
-                if style.enabled:
-                    if ep.module.startswith("comicapi"):
-                        builtin[style.short_name] = style(version)
-                    else:
-                        if style.short_name in styles:
-                            if spec and spec.has_location:
-                                logger.warning(
-                                    "Plugin %s from %s is overriding the existing metadata plugin for %s tags",
-                                    ep.module,
-                                    spec.origin,
-                                    style.short_name,
-                                )
-                            else:
-                                logger.warning(
-                                    "Plugin %s is overriding the existing metadata plugin for %s tags",
-                                    ep.module,
-                                    style.short_name,
-                                )
-                        styles[style.short_name] = (style(version), spec)
-            except Exception:
-                if spec and spec.has_location:
-                    logger.exception("Failed to load metadata plugin: %s from %s", ep.name, spec.origin)
-                else:
-                    logger.exception("Failed to load metadata plugin: %s", ep.name)
-        for style_name in set(builtin.keys()).intersection(styles):
-            spec = styles[style_name][1]
-            if spec and spec.has_location:
-                logger.warning(
-                    "Builtin metadata for %s tags are being overridden by a plugin from %s", style_name, spec.origin
-                )
+            if ep.module.startswith("comicapi"):
+                builtin.append(archiver)
             else:
-                logger.warning("Builtin metadata for %s tags are being overridden by a plugin", style_name)
-        metadata_styles.clear()
-        metadata_styles.update(builtin)
-        metadata_styles.update({s[0]: s[1][0] for s in styles.items()})
+                archive_plugins.append(archiver)
+        except Exception:
+            if spec and spec.has_location:
+                logger.exception("Failed to load archive plugin: %s from %s", ep.name, spec.origin)
+            else:
+                logger.exception("Failed to load archive plugin: %s", ep.name)
+    archivers.clear()
+    archivers.extend(archive_plugins)
+    archivers.extend(builtin)
+
+
+def load_tag_plugins(version: str = f"ComicAPI/{version}", local_plugins: Iterable[EntryPoint] = tuple()) -> None:
+    if tags:
+        return
+    if sys.version_info < (3, 10):
+        from importlib_metadata import entry_points
+    else:
+        from importlib.metadata import entry_points
+    builtin: dict[str, Tag] = {}
+    tag_plugins: dict[str, tuple[Tag, str]] = {}
+    # A dict is used, last plugin wins
+    for ep in itertools.chain(entry_points(group="comicapi.tags"), local_plugins):
+        location = "Unknown"
+        try:
+            _spec = importlib.util.find_spec(ep.module)
+            if _spec and _spec.has_location and _spec.origin:
+                location = _spec.origin
+        except ValueError:
+            location = "Unknown"
+
+        try:
+            tag: type[Tag] = ep.load()
+
+            if ep.module.startswith("comicapi"):
+                builtin[tag.id] = tag(version)
+            else:
+                if tag.id in tag_plugins:
+                    logger.warning(
+                        "Plugin %s from %s is overriding the existing plugin for %s tags",
+                        ep.module,
+                        location,
+                        tag.id,
+                    )
+                tag_plugins[tag.id] = (tag(version), location)
+        except Exception:
+            logger.exception("Failed to load tag plugin: %s from %s", ep.name, location)
+
+    for tag_id in set(builtin.keys()).intersection(tag_plugins):
+        location = tag_plugins[tag_id][1]
+        logger.warning("Builtin plugin for %s tags are being overridden by a plugin from %s", tag_id, location)
+
+    tags.clear()
+    tags.update(builtin)
+    tags.update({s[0]: s[1][0] for s in tag_plugins.items()})
 
 
 class ComicArchive:
@@ -145,7 +142,7 @@ class ComicArchive:
             self.archiver = UnknownArchiver.open(self.path)
 
         load_archive_plugins()
-        load_metadata_plugins()
+        load_tag_plugins()
         for archiver in archivers:
             if archiver.enabled and archiver.is_valid(self.path):
                 self.archiver = archiver.open(self.path)
@@ -162,15 +159,19 @@ class ComicArchive:
         self.page_list.clear()
         self.md.clear()
 
-    def load_cache(self, style_list: Iterable[str]) -> None:
-        for style in style_list:
-            if style in metadata_styles:
-                md = metadata_styles[style].get_metadata(self.archiver)
-                if not md.is_empty:
-                    self.md[style] = md
+    def load_cache(self, tag_ids: Iterable[str]) -> None:
+        for tag_id in tag_ids:
+            if tag_id not in tags:
+                continue
+            tag = tags[tag_id]
+            if not tag.enabled:
+                continue
+            md = tag.read_tags(self.archiver)
+            if not md.is_empty:
+                self.md[tag_id] = md
 
-    def get_supported_metadata(self) -> list[str]:
-        return [style[0] for style in metadata_styles.items() if style[1].supports_metadata(self.archiver)]
+    def get_supported_tags(self) -> list[str]:
+        return [tag_id for tag_id, tag in tags.items() if tag.enabled and tag.supports_tags(self.archiver)]
 
     def rename(self, path: pathlib.Path | str) -> None:
         new_path = pathlib.Path(path).absolute()
@@ -193,11 +194,6 @@ class ComicArchive:
 
         return True
 
-    def is_writable_for_style(self, style: str) -> bool:
-        if style in metadata_styles:
-            return self.archiver.is_writable() and metadata_styles[style].supports_metadata(self.archiver)
-        return False
-
     def is_zip(self) -> bool:
         return self.archiver.name() == "ZIP"
 
@@ -210,33 +206,42 @@ class ComicArchive:
     def extension(self) -> str:
         return self.archiver.extension()
 
-    def read_metadata(self, style: str) -> GenericMetadata:
-        if style in self.md:
-            return self.md[style]
+    def read_tags(self, tag_id: str) -> GenericMetadata:
+        if tag_id in self.md:
+            return self.md[tag_id]
         md = GenericMetadata()
-        if metadata_styles[style].has_metadata(self.archiver):
-            md = metadata_styles[style].get_metadata(self.archiver)
+        tag = tags[tag_id]
+        if tag.enabled and tag.has_tags(self.archiver):
+            md = tag.read_tags(self.archiver)
             md.apply_default_page_list(self.get_page_name_list())
         return md
 
-    def read_metadata_string(self, style: str) -> str:
-        return metadata_styles[style].get_metadata_string(self.archiver)
+    def read_raw_tags(self, tag_id: str) -> str:
+        if not tags[tag_id].enabled:
+            return ""
+        return tags[tag_id].read_raw_tags(self.archiver)
 
-    def write_metadata(self, metadata: GenericMetadata, style: str) -> bool:
-        if style in self.md:
-            del self.md[style]
+    def write_tags(self, metadata: GenericMetadata, tag_id: str) -> bool:
+        if tag_id in self.md:
+            del self.md[tag_id]
+        if not tags[tag_id].enabled:
+            return False
         metadata.apply_default_page_list(self.get_page_name_list())
-        return metadata_styles[style].set_metadata(metadata, self.archiver)
+        return tags[tag_id].write_tags(metadata, self.archiver)
 
-    def has_metadata(self, style: str) -> bool:
-        if style in self.md:
+    def has_tags(self, tag_id: str) -> bool:
+        if tag_id in self.md:
             return True
-        return metadata_styles[style].has_metadata(self.archiver)
+        if not tags[tag_id].enabled:
+            return False
+        return tags[tag_id].has_tags(self.archiver)
 
-    def remove_metadata(self, style: str) -> bool:
-        if style in self.md:
-            del self.md[style]
-        return metadata_styles[style].remove_metadata(self.archiver)
+    def remove_tags(self, tag_id: str) -> bool:
+        if tag_id in self.md:
+            del self.md[tag_id]
+        if not tags[tag_id].enabled:
+            return False
+        return tags[tag_id].remove_tags(self.archiver)
 
     def get_page(self, index: int) -> bytes:
         image_data = b""

comicapi/genericmetadata.py

@@ -92,7 +92,7 @@ class ComicSeries:
         return copy.deepcopy(self)
 
 
-class TagOrigin(NamedTuple):
+class MetadataOrigin(NamedTuple):
     id: str
     name: str
 
@@ -109,7 +109,7 @@ class GenericMetadata:
     translator_synonyms = ("translator", "translation")
 
     is_empty: bool = True
-    tag_origin: TagOrigin | None = None
+    data_origin: MetadataOrigin | None = None
     issue_id: str | None = None
     series_id: str | None = None
 
@@ -233,7 +233,7 @@ class GenericMetadata:
         if not new_md.is_empty:
             self.is_empty = False
 
-        self.tag_origin = assign(self.tag_origin, new_md.tag_origin)  # TODO use and purpose now?
+        self.data_origin = assign(self.data_origin, new_md.data_origin)  # TODO use and purpose now?
         self.issue_id = assign(self.issue_id, new_md.issue_id)
         self.series_id = assign(self.series_id, new_md.series_id)
 
@@ -471,7 +471,7 @@ class GenericMetadata:
 
 md_test: GenericMetadata = GenericMetadata(
     is_empty=False,
-    tag_origin=TagOrigin("comicvine", "Comic Vine"),
+    data_origin=MetadataOrigin("comicvine", "Comic Vine"),
     series="Cory Doctorow's Futuristic Tales of the Here and Now",
     series_id="23437",
     issue="1",
@@ -573,6 +573,6 @@ __all__ = (
     "ImageMetadata",
     "Credit",
     "ComicSeries",
-    "TagOrigin",
+    "MetadataOrigin",
     "GenericMetadata",
 )

comicapi/metadata/__init__.py

@@ -1,5 +0,0 @@
-from __future__ import annotations
-
-from comicapi.metadata.metadata import Metadata
-
-__all__ = ["Metadata"]

comicapi/tags/__init__.py

@@ -0,0 +1,5 @@
+from __future__ import annotations
+
+from comicapi.tags.tag import Tag
+
+__all__ = ["Tag"]

comicapi/tags/comet.py

@@ -25,15 +25,15 @@ from comicapi import utils
 from comicapi.archivers import Archiver
 from comicapi.comicarchive import ComicArchive
 from comicapi.genericmetadata import GenericMetadata, ImageMetadata, PageType
-from comicapi.metadata import Metadata
+from comicapi.tags import Tag
 
 logger = logging.getLogger(__name__)
 
 
-class CoMet(Metadata):
+class CoMet(Tag):
     enabled = True
 
-    short_name = "comet"
+    id = "comet"
 
     def __init__(self, version: str) -> None:
         super().__init__(version)
@@ -71,13 +71,13 @@ class CoMet(Metadata):
     def supports_credit_role(self, role: str) -> bool:
         return role.casefold() in self._get_parseable_credits()
 
-    def supports_metadata(self, archive: Archiver) -> bool:
+    def supports_tags(self, archive: Archiver) -> bool:
         return archive.supports_files()
 
-    def has_metadata(self, archive: Archiver) -> bool:
-        if not self.supports_metadata(archive):
+    def has_tags(self, archive: Archiver) -> bool:
+        if not self.supports_tags(archive):
             return False
-        has_metadata = False
+        has_tags = False
         # look at all xml files in root, and search for CoMet data, get first
         for n in archive.get_filename_list():
             if os.path.dirname(n) == "" and os.path.splitext(n)[1].casefold() == ".xml":
@@ -90,33 +90,33 @@ class CoMet(Metadata):
                 if self._validate_bytes(data):
                     # since we found it, save it!
                     self.file = n
-                    has_metadata = True
+                    has_tags = True
                     break
-        return has_metadata
+        return has_tags
 
-    def remove_metadata(self, archive: Archiver) -> bool:
-        return self.has_metadata(archive) and archive.remove_file(self.file)
+    def remove_tags(self, archive: Archiver) -> bool:
+        return self.has_tags(archive) and archive.remove_file(self.file)
 
-    def get_metadata(self, archive: Archiver) -> GenericMetadata:
-        if self.has_metadata(archive):
+    def read_tags(self, archive: Archiver) -> GenericMetadata:
+        if self.has_tags(archive):
             metadata = archive.read_file(self.file) or b""
             if self._validate_bytes(metadata):
                 return self._metadata_from_bytes(metadata, archive)
         return GenericMetadata()
 
-    def get_metadata_string(self, archive: Archiver) -> str:
-        if self.has_metadata(archive):
+    def read_raw_tags(self, archive: Archiver) -> str:
+        if self.has_tags(archive):
             return ET.tostring(ET.fromstring(archive.read_file(self.file)), encoding="unicode", xml_declaration=True)
         return ""
 
-    def set_metadata(self, metadata: GenericMetadata, archive: Archiver) -> bool:
-        if self.supports_metadata(archive):
+    def write_tags(self, metadata: GenericMetadata, archive: Archiver) -> bool:
+        if self.supports_tags(archive):
             success = True
             xml = b""
-            if self.has_metadata(archive):
+            if self.has_tags(archive):
                 xml = archive.read_file(self.file)
             if self.file != self.comet_filename:
-                success = self.remove_metadata(archive)
+                success = self.remove_tags(archive)
 
             return success and archive.write_file(self.comet_filename, self._bytes_from_metadata(metadata, xml))
         else:

comicapi/tags/comicbookinfo.py

@@ -23,7 +23,7 @@ from typing import Any, Literal, TypedDict
 from comicapi import utils
 from comicapi.archivers import Archiver
 from comicapi.genericmetadata import Credit, GenericMetadata
-from comicapi.metadata import Metadata
+from comicapi.tags import Tag
 
 logger = logging.getLogger(__name__)
 
@@ -75,10 +75,10 @@ class _ComicBookInfoJson(TypedDict, total=False):
 _CBIContainer = TypedDict("_CBIContainer", {"appID": str, "lastModified": str, "ComicBookInfo/1.0": _ComicBookInfoJson})
 
 
-class ComicBookInfo(Metadata):
+class ComicBookInfo(Tag):
     enabled = True
 
-    short_name = "cbi"
+    id = "cbi"
 
     def __init__(self, version: str) -> None:
         super().__init__(version)
@@ -108,29 +108,29 @@ class ComicBookInfo(Metadata):
     def supports_credit_role(self, role: str) -> bool:
         return True
 
-    def supports_metadata(self, archive: Archiver) -> bool:
+    def supports_tags(self, archive: Archiver) -> bool:
         return archive.supports_comment()
 
-    def has_metadata(self, archive: Archiver) -> bool:
-        return self.supports_metadata(archive) and self._validate_string(archive.get_comment())
+    def has_tags(self, archive: Archiver) -> bool:
+        return self.supports_tags(archive) and self._validate_string(archive.get_comment())
 
-    def remove_metadata(self, archive: Archiver) -> bool:
+    def remove_tags(self, archive: Archiver) -> bool:
         return archive.set_comment("")
 
-    def get_metadata(self, archive: Archiver) -> GenericMetadata:
-        if self.has_metadata(archive):
+    def read_tags(self, archive: Archiver) -> GenericMetadata:
+        if self.has_tags(archive):
             comment = archive.get_comment()
             if self._validate_string(comment):
                 return self._metadata_from_string(comment)
         return GenericMetadata()
 
-    def get_metadata_string(self, archive: Archiver) -> str:
-        if self.has_metadata(archive):
+    def read_raw_tags(self, archive: Archiver) -> str:
+        if self.has_tags(archive):
             return json.dumps(json.loads(archive.get_comment()), indent=2)
         return ""
 
-    def set_metadata(self, metadata: GenericMetadata, archive: Archiver) -> bool:
-        if self.supports_metadata(archive):
+    def write_tags(self, metadata: GenericMetadata, archive: Archiver) -> bool:
+        if self.supports_tags(archive):
             return archive.set_comment(self._string_from_metadata(metadata))
         else:
             logger.warning(f"Archive ({archive.name()}) does not support {self.name()} metadata")

comicapi/tags/comicrack.py

@@ -23,15 +23,15 @@ from typing import Any
 from comicapi import utils
 from comicapi.archivers import Archiver
 from comicapi.genericmetadata import GenericMetadata, ImageMetadata
-from comicapi.metadata import Metadata
+from comicapi.tags import Tag
 
 logger = logging.getLogger(__name__)
 
 
-class ComicRack(Metadata):
+class ComicRack(Tag):
     enabled = True
 
-    short_name = "cr"
+    id = "cr"
 
     def __init__(self, version: str) -> None:
         super().__init__(version)
@@ -84,35 +84,35 @@ class ComicRack(Metadata):
     def supports_credit_role(self, role: str) -> bool:
         return role.casefold() in self._get_parseable_credits()
 
-    def supports_metadata(self, archive: Archiver) -> bool:
+    def supports_tags(self, archive: Archiver) -> bool:
         return archive.supports_files()
 
-    def has_metadata(self, archive: Archiver) -> bool:
+    def has_tags(self, archive: Archiver) -> bool:
         return (
-            self.supports_metadata(archive)
+            self.supports_tags(archive)
             and self.file in archive.get_filename_list()
             and self._validate_bytes(archive.read_file(self.file))
         )
 
-    def remove_metadata(self, archive: Archiver) -> bool:
-        return self.has_metadata(archive) and archive.remove_file(self.file)
+    def remove_tags(self, archive: Archiver) -> bool:
+        return self.has_tags(archive) and archive.remove_file(self.file)
 
-    def get_metadata(self, archive: Archiver) -> GenericMetadata:
-        if self.has_metadata(archive):
+    def read_tags(self, archive: Archiver) -> GenericMetadata:
+        if self.has_tags(archive):
             metadata = archive.read_file(self.file) or b""
             if self._validate_bytes(metadata):
                 return self._metadata_from_bytes(metadata)
         return GenericMetadata()
 
-    def get_metadata_string(self, archive: Archiver) -> str:
-        if self.has_metadata(archive):
+    def read_raw_tags(self, archive: Archiver) -> str:
+        if self.has_tags(archive):
             return ET.tostring(ET.fromstring(archive.read_file(self.file)), encoding="unicode", xml_declaration=True)
         return ""
 
-    def set_metadata(self, metadata: GenericMetadata, archive: Archiver) -> bool:
-        if self.supports_metadata(archive):
+    def write_tags(self, metadata: GenericMetadata, archive: Archiver) -> bool:
+        if self.supports_tags(archive):
             xml = b""
-            if self.has_metadata(archive):
+            if self.has_tags(archive):
                 xml = archive.read_file(self.file)
             return archive.write_file(self.file, self._bytes_from_metadata(metadata, xml))
         else:

comicapi/tags/tag.py

@@ -4,14 +4,14 @@ from comicapi.archivers import Archiver
 from comicapi.genericmetadata import GenericMetadata
 
 
-class Metadata:
+class Tag:
     enabled: bool = False
-    short_name: str = ""
+    id: str = ""
 
     def __init__(self, version: str) -> None:
         self.version: str = version
         self.supported_attributes = {
-            "tag_origin",
+            "data_origin",
             "issue_id",
             "series_id",
             "series",
@@ -71,44 +71,44 @@ class Metadata:
     def supports_credit_role(self, role: str) -> bool:
         return False
 
-    def supports_metadata(self, archive: Archiver) -> bool:
+    def supports_tags(self, archive: Archiver) -> bool:
         """
-        Checks the given archive for the ability to save this metadata style.
+        Checks the given archive for the ability to save these tags.
         Should always return a bool. Failures should return False.
         Typically consists of a call to either `archive.supports_comment` or `archive.supports_file`
         """
         return False
 
-    def has_metadata(self, archive: Archiver) -> bool:
+    def has_tags(self, archive: Archiver) -> bool:
         """
-        Checks the given archive for metadata.
+        Checks the given archive for tags.
         Should always return a bool. Failures should return False.
         """
         return False
 
-    def remove_metadata(self, archive: Archiver) -> bool:
+    def remove_tags(self, archive: Archiver) -> bool:
         """
-        Removes the metadata from the given archive.
+        Removes the tags from the given archive.
         Should always return a bool. Failures should return False.
         """
         return False
 
-    def get_metadata(self, archive: Archiver) -> GenericMetadata:
+    def read_tags(self, archive: Archiver) -> GenericMetadata:
         """
-        Returns a GenericMetadata representing the data saved in the given archive.
+        Returns a GenericMetadata representing the tags saved in the given archive.
         Should always return a GenericMetadata. Failures should return an empty metadata object.
         """
         return GenericMetadata()
 
-    def get_metadata_string(self, archive: Archiver) -> str:
+    def read_raw_tags(self, archive: Archiver) -> str:
         """
-        Returns the raw metadata as a string.
-        If the metadata is a binary format a roughly similar text format should be used.
+        Returns the raw tags as a string.
+        If the tags are a binary format a roughly similar text format should be used.
         Should always return a string. Failures should return the empty string.
         """
         return ""
 
-    def set_metadata(self, metadata: GenericMetadata, archive: Archiver) -> bool:
+    def write_tags(self, metadata: GenericMetadata, archive: Archiver) -> bool:
         """
         Saves the given metadata to the given archive.
         Should always return a bool. Failures should return False.
@@ -117,7 +117,7 @@ class Metadata:
 
     def name(self) -> str:
         """
-        Returns the name of this metadata for display purposes eg "Comic Rack".
+        Returns the name of these tags for display purposes eg "Comic Rack".
         Should always return a string. Failures should return the empty string.
         """
         return ""

comicapi/utils.py

@@ -32,10 +32,9 @@ from comicfn2dict import comicfn2dict
 
 import comicapi.data
 from comicapi import filenamelexer, filenameparser
-
-from ._url import LocationParseError as LocationParseError  # noqa: F401
-from ._url import Url as Url
-from ._url import parse_url as parse_url
+from comicapi._url import LocationParseError as LocationParseError  # noqa: F401
+from comicapi._url import Url as Url
+from comicapi._url import parse_url as parse_url
 
 try:
     import icu

comictaggerlib/autotagmatchwindow.py

@@ -22,10 +22,11 @@ from typing import Callable
 
 from PyQt5 import QtCore, QtGui, QtWidgets, uic
 
-from comicapi.comicarchive import ComicArchive, metadata_styles
+from comicapi.comicarchive import ComicArchive, tags
 from comicapi.genericmetadata import GenericMetadata
 from comictaggerlib.coverimagewidget import CoverImageWidget
 from comictaggerlib.ctsettings import ct_ns
+from comictaggerlib.md import prepare_metadata
 from comictaggerlib.resulttypes import IssueResult, Result
 from comictaggerlib.ui import ui_path
 from comictalker.comictalker import ComicTalker, TalkerError
@@ -38,7 +39,7 @@ class AutoTagMatchWindow(QtWidgets.QDialog):
         self,
         parent: QtWidgets.QWidget,
         match_set_list: list[Result],
-        load_styles: list[str],
+        read_tags: list[str],
         fetch_func: Callable[[IssueResult], GenericMetadata],
         config: ct_ns,
         talker: ComicTalker,
@@ -77,7 +78,7 @@ class AutoTagMatchWindow(QtWidgets.QDialog):
         self.buttonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Ok).setText("Accept and Write Tags")
 
         self.match_set_list = match_set_list
-        self._styles = load_styles
+        self._tags = read_tags
         self.fetch_func = fetch_func
 
         self.current_match_set_idx = 0
@@ -225,14 +226,14 @@ class AutoTagMatchWindow(QtWidgets.QDialog):
     def save_match(self) -> None:
         match = self.current_match()
         ca = ComicArchive(self.current_match_set.original_path)
-        md, error = self.parent().overlay_ca_read_style(self._styles, ca)
+        md, error = self.parent().read_all_tags(self._tags, ca)
         if error is not None:
-            logger.error("Failed to load metadata for %s: %s", ca.path, error)
+            logger.error("Failed to load tags for %s: %s", ca.path, error)
             QtWidgets.QApplication.restoreOverrideCursor()
             QtWidgets.QMessageBox.critical(
                 self,
                 "Read Failed!",
-                f"One or more of the read styles failed to load for {ca.path}, check log for details",
+                f"One or more of the read tags failed to load for {ca.path}, check log for details",
             )
             return
 
@@ -258,15 +259,15 @@ class AutoTagMatchWindow(QtWidgets.QDialog):
             return
 
         QtWidgets.QApplication.setOverrideCursor(QtGui.QCursor(QtCore.Qt.CursorShape.WaitCursor))
-        md.overlay(ct_md, self.config.internal__source_data_overlay, self.config.internal__overlay_merge_lists)
-        for style in self._styles:
-            success = ca.write_metadata(md, style)
+        md = prepare_metadata(md, ct_md, self.config)
+        for tag_id in self._tags:
+            success = ca.write_tags(md, tag_id)
             QtWidgets.QApplication.restoreOverrideCursor()
             if not success:
                 QtWidgets.QMessageBox.warning(
                     self,
                     "Write Error",
-                    f"Saving {metadata_styles[style].name()} the tags to the archive seemed to fail!",
+                    f"Saving {tags[tag_id].name()} the tags to the archive seemed to fail!",
                 )
                 break
 

comictaggerlib/autotagstartwindow.py

@@ -46,11 +46,11 @@ class AutoTagStartWindow(QtWidgets.QDialog):
         self.leSearchString.setEnabled(False)
 
         self.cbxSaveOnLowConfidence.setChecked(self.config.Auto_Tag__save_on_low_confidence)
-        self.cbxDontUseYear.setChecked(self.config.Auto_Tag__dont_use_year_when_identifying)
+        self.cbxDontUseYear.setChecked(not self.config.Auto_Tag__use_year_when_identifying)
         self.cbxAssumeIssueOne.setChecked(self.config.Auto_Tag__assume_issue_one)
         self.cbxIgnoreLeadingDigitsInFilename.setChecked(self.config.Auto_Tag__ignore_leading_numbers_in_filename)
         self.cbxRemoveAfterSuccess.setChecked(self.config.Auto_Tag__remove_archive_after_successful_match)
-        self.cbxAutoImprint.setChecked(self.config.Issue_Identifier__auto_imprint)
+        self.cbxAutoImprint.setChecked(self.config.Auto_Tag__auto_imprint)
 
         nlmt_tip = """<html>The <b>Name Match Ratio Threshold: Auto-Identify</b> is for eliminating automatic
                 search matches that are too long compared to your series name search. The lower
@@ -95,7 +95,7 @@ class AutoTagStartWindow(QtWidgets.QDialog):
 
         # persist some settings
         self.config.Auto_Tag__save_on_low_confidence = self.auto_save_on_low
-        self.config.Auto_Tag__dont_use_year_when_identifying = self.dont_use_year
+        self.config.Auto_Tag__use_year_when_identifying = not self.dont_use_year
         self.config.Auto_Tag__assume_issue_one = self.assume_issue_one
         self.config.Auto_Tag__ignore_leading_numbers_in_filename = self.ignore_leading_digits_in_filename
         self.config.Auto_Tag__remove_archive_after_successful_match = self.remove_after_success

comictaggerlib/cbltransformer.py

@@ -30,7 +30,7 @@ class CBLTransformer:
         self.config = config
 
     def apply(self) -> GenericMetadata:
-        if self.config.Metadata_Options__cbl_assume_lone_credit_is_primary:
+        if self.config.Metadata_Options__assume_lone_credit_is_primary:
             # helper
             def set_lone_primary(role_list: list[str]) -> tuple[Credit | None, int]:
                 lone_credit: Credit | None = None
@@ -56,19 +56,19 @@ class CBLTransformer:
                     c.primary = False
                     self.metadata.add_credit(c.person, "Artist", True)
 
-        if self.config.Metadata_Options__cbl_copy_characters_to_tags:
+        if self.config.Metadata_Options__copy_characters_to_tags:
             self.metadata.tags.update(x for x in self.metadata.characters)
 
-        if self.config.Metadata_Options__cbl_copy_teams_to_tags:
+        if self.config.Metadata_Options__copy_teams_to_tags:
             self.metadata.tags.update(x for x in self.metadata.teams)
 
-        if self.config.Metadata_Options__cbl_copy_locations_to_tags:
+        if self.config.Metadata_Options__copy_locations_to_tags:
             self.metadata.tags.update(x for x in self.metadata.locations)
 
-        if self.config.Metadata_Options__cbl_copy_storyarcs_to_tags:
+        if self.config.Metadata_Options__copy_storyarcs_to_tags:
             self.metadata.tags.update(x for x in self.metadata.story_arcs)
 
-        if self.config.Metadata_Options__cbl_copy_notes_to_comments:
+        if self.config.Metadata_Options__copy_notes_to_comments:
             if self.metadata.notes is not None:
                 if self.metadata.description is None:
                     self.metadata.description = ""
@@ -77,7 +77,7 @@ class CBLTransformer:
                 if self.metadata.notes not in self.metadata.description:
                     self.metadata.description += self.metadata.notes
 
-        if self.config.Metadata_Options__cbl_copy_weblink_to_comments:
+        if self.config.Metadata_Options__copy_weblink_to_comments:
             for web_link in self.metadata.web_links:
                 temp_desc = self.metadata.description
                 if temp_desc is None:

comictaggerlib/cli.py

@@ -22,13 +22,13 @@ import json
 import logging
 import os
 import pathlib
+import re
 import sys
 from collections.abc import Collection
 from typing import Any, TextIO
 
 from comicapi import merge, utils
-from comicapi.comicarchive import ComicArchive
-from comicapi.comicarchive import metadata_styles as md_styles
+from comicapi.comicarchive import ComicArchive, tags
 from comicapi.genericmetadata import GenericMetadata
 from comictaggerlib.cbltransformer import CBLTransformer
 from comictaggerlib.ctsettings import ct_ns
@@ -113,13 +113,13 @@ class CLI:
 
         self.post_process_matches(match_results)
 
-        if self.config.Runtime_Options__online:
+        if self.config.Auto_Tag__online:
             self.output(
                 f"\nFiles tagged with metadata provided by {self.current_talker().name} {self.current_talker().website}",
             )
         return return_code
 
-    def actual_issue_data_fetch(self, issue_id: str) -> GenericMetadata:
+    def fetch_metadata(self, issue_id: str) -> GenericMetadata:
         # now get the particular issue data
         try:
             ct_md = self.current_talker().fetch_comic_data(issue_id)
@@ -127,17 +127,17 @@ class CLI:
             logger.exception(f"Error retrieving issue details. Save aborted.\n{e}")
             return GenericMetadata()
 
-        if self.config.Metadata_Options__cbl_apply_transform_on_import:
+        if self.config.Metadata_Options__apply_transform_on_import:
             ct_md = CBLTransformer(ct_md, self.config).apply()
 
         return ct_md
 
-    def actual_metadata_save(self, ca: ComicArchive, md: GenericMetadata) -> bool:
+    def write_tags(self, ca: ComicArchive, md: GenericMetadata) -> bool:
         if not self.config.Runtime_Options__dryrun:
-            for style in self.config.Runtime_Options__type_modify:
+            for tag_id in self.config.Runtime_Options__tags_write:
                 # write out the new data
-                if not ca.write_metadata(md, style):
-                    logger.error("The tag save seemed to fail for style: %s!", md_styles[style].name())
+                if not ca.write_tags(md, tag_id):
+                    logger.error("The tag save seemed to fail for: %s!", tags[tag_id].name())
                     return False
 
             self.output("Save complete.")
@@ -177,12 +177,12 @@ class CLI:
                 # save the data!
                 # we know at this point, that the file is all good to go
                 ca = ComicArchive(match_set.original_path)
-                md = self.create_local_metadata(ca)
-                ct_md = self.actual_issue_data_fetch(match_set.online_results[int(i) - 1].issue_id)
+                md, match_set.tags_read = self.create_local_metadata(ca, self.config.Runtime_Options__tags_read)
+                ct_md = self.fetch_metadata(match_set.online_results[int(i) - 1].issue_id)
 
                 match_set.md = prepare_metadata(md, ct_md, self.config)
 
-                self.actual_metadata_save(ca, match_set.md)
+                self.write_tags(ca, match_set.md)
 
     def post_process_matches(self, match_results: OnlineMatchResults) -> None:
         def print_header(header: str) -> None:
@@ -231,13 +231,15 @@ class CLI:
 
                 self.display_match_set_for_choice(label, match_set)
 
-    def create_local_metadata(self, ca: ComicArchive) -> GenericMetadata:
+    def create_local_metadata(
+        self, ca: ComicArchive, tags_to_read: list[str], /, tags_only: bool = False
+    ) -> tuple[GenericMetadata, list[str]]:
         md = GenericMetadata()
         md.apply_default_page_list(ca.get_page_name_list())
         filename_md = GenericMetadata()
 
         # now, overlay the parsed filename info
-        if self.config.Runtime_Options__parse_filename:
+        if self.config.Auto_Tag__parse_filename and not tags_only:
             filename_md = ca.metadata_from_filename(
                 self.config.Filename_Parsing__filename_parser,
                 self.config.Filename_Parsing__remove_c2c,
@@ -249,30 +251,35 @@ class CLI:
             )
 
         file_md = GenericMetadata()
-        for style in self.config.Runtime_Options__type_read:
-            if ca.has_metadata(style):
+        tags_used = []
+        for tag_id in tags_to_read:
+            if ca.has_tags(tag_id):
                 try:
-                    t_md = ca.read_metadata(style)
-                    file_md.overlay(
-                        t_md, self.config.internal__load_data_overlay, self.config.internal__overlay_merge_lists
-                    )
-                    break
+                    t_md = ca.read_tags(tag_id)
+                    if not t_md.is_empty:
+                        file_md.overlay(
+                            t_md,
+                            self.config.Metadata_Options__tag_merge,
+                            self.config.Metadata_Options__tag_merge_lists,
+                        )
+                        tags_used.append(tag_id)
                 except Exception as e:
                     logger.error("Failed to load metadata for %s: %s", ca.path, e)
 
         filename_merge = merge.Mode.ADD_MISSING
-        if self.config.Runtime_Options__prefer_filename:
+        if self.config.Auto_Tag__prefer_filename:
             filename_merge = merge.Mode.OVERLAY
 
         md.overlay(file_md, mode=merge.Mode.OVERLAY, merge_lists=False)
-        md.overlay(filename_md, mode=filename_merge, merge_lists=False)
-        # finally, use explicit stuff (always 'overlay' mode)
-        md.overlay(self.config.Runtime_Options__metadata, mode=merge.Mode.OVERLAY, merge_lists=True)
+        if not tags_only:
+            md.overlay(filename_md, mode=filename_merge, merge_lists=False)
+            # finally, use explicit stuff (always 'overlay' mode)
+            md.overlay(self.config.Auto_Tag__metadata, mode=merge.Mode.OVERLAY, merge_lists=True)
 
-        return md
+        return (md, tags_used)
 
     def print(self, ca: ComicArchive) -> Result:
-        if not self.config.Runtime_Options__type_read:
+        if not self.config.Runtime_Options__tags_read:
             page_count = ca.get_number_of_pages()
 
             brief = ""
@@ -285,8 +292,8 @@ class CLI:
             brief += f"({page_count: >3} pages)"
             brief += "  tags:[ "
 
-            metadata_styles = [md_styles[style].name() for style in md_styles if ca.has_metadata(style)]
-            brief += " ".join(metadata_styles)
+            tag_names = [tags[tag_id].name() for tag_id in tags if ca.has_tags(tag_id)]
+            brief += " ".join(tag_names)
             brief += " ]"
 
             self.output(brief)
@@ -297,105 +304,110 @@ class CLI:
         self.output()
 
         md = None
-        for style, style_obj in md_styles.items():
-            if not self.config.Runtime_Options__type_read or style in self.config.Runtime_Options__type_read:
-                if ca.has_metadata(style):
-                    self.output(f"--------- {style_obj.name()} tags ---------")
+        for tag_id, tag in tags.items():
+            if not self.config.Runtime_Options__tags_read or tag_id in self.config.Runtime_Options__tags_read:
+                if ca.has_tags(tag_id):
+                    self.output(f"--------- {tag.name()} tags ---------")
                     try:
                         if self.config.Runtime_Options__raw:
-                            self.output(ca.read_metadata_string(style))
+                            self.output(ca.read_raw_tags(tag_id))
                         else:
-                            md = ca.read_metadata(style)
+                            md = ca.read_tags(tag_id)
                             self.output(md)
                     except Exception as e:
-                        logger.error("Failed to load metadata for %s: %s", ca.path, e)
+                        logger.error("Failed to read tags from %s: %s", ca.path, e)
         return Result(Action.print, Status.success, ca.path, md=md)
 
-    def delete_style(self, ca: ComicArchive, style: str) -> Status:
-        style_name = md_styles[style].name()
+    def delete_tags(self, ca: ComicArchive, tag_id: str) -> Status:
+        tag_name = tags[tag_id].name()
 
-        if ca.has_metadata(style):
+        if ca.has_tags(tag_id):
             if not self.config.Runtime_Options__dryrun:
-                if ca.remove_metadata(style):
-                    self.output(f"{ca.path}: Removed {style_name} tags.")
+                if ca.remove_tags(tag_id):
+                    self.output(f"{ca.path}: Removed {tag_name} tags.")
                     return Status.success
                 else:
                     self.output(f"{ca.path}: Tag removal seemed to fail!")
                     return Status.write_failure
             else:
-                self.output(f"{ca.path}: dry-run. {style_name} tags not removed")
+                self.output(f"{ca.path}: dry-run. {tag_name} tags not removed")
                 return Status.success
-        self.output(f"{ca.path}: This archive doesn't have {style_name} tags to remove.")
+        self.output(f"{ca.path}: This archive doesn't have {tag_name} tags to remove.")
         return Status.success
 
     def delete(self, ca: ComicArchive) -> Result:
         res = Result(Action.delete, Status.success, ca.path)
-        for style in self.config.Runtime_Options__type_modify:
-            status = self.delete_style(ca, style)
+        for tag_id in self.config.Runtime_Options__tags_write:
+            status = self.delete_tags(ca, tag_id)
             if status == Status.success:
-                res.tags_deleted.append(style)
+                res.tags_deleted.append(tag_id)
             else:
                 res.status = status
         return res
 
-    def copy_style(self, ca: ComicArchive, md: GenericMetadata, style: str) -> Status:
-        dst_style_name = md_styles[style].name()
-        if not self.config.Runtime_Options__overwrite and ca.has_metadata(style):
-            self.output(f"{ca.path}: Already has {dst_style_name} tags. Not overwriting.")
-            return Status.existing_tags
-        if self.config.Commands__copy == style:
-            self.output(f"{ca.path}: Destination and source are same: {dst_style_name}. Nothing to do.")
+    def _copy_tags(self, ca: ComicArchive, md: GenericMetadata, source_names: str, dst_tag_id: str) -> Status:
+        dst_tag_name = tags[dst_tag_id].name()
+        if not self.config.Runtime_Options__skip_existing_tags and ca.has_tags(dst_tag_id):
+            self.output(f"{ca.path}: Already has {dst_tag_name} tags. Not overwriting.")
+            return Status.existing_tags
+
+        if len(self.config.Commands__copy) == 1 and dst_tag_id in self.config.Commands__copy:
+            self.output(f"{ca.path}: Destination and source are same: {dst_tag_name}. Nothing to do.")
             return Status.existing_tags
 
-        src_style_name = md_styles[self.config.Commands__copy].name()
         if not self.config.Runtime_Options__dryrun:
-            if self.config.Metadata_Options__cbl_apply_transform_on_bulk_operation == "cbi":
+            if self.config.Metadata_Options__apply_transform_on_bulk_operation and dst_tag_id == "cbi":
                 md = CBLTransformer(md, self.config).apply()
 
-            if ca.write_metadata(md, style):
-                self.output(f"{ca.path}: Copied {src_style_name} tags to {dst_style_name}.")
-                return Status.success
+            if ca.write_tags(md, dst_tag_id):
+                self.output(f"{ca.path}: Copied {source_names} tags to {dst_tag_name}.")
             else:
                 self.output(f"{ca.path}: Tag copy seemed to fail!")
                 return Status.write_failure
         else:
-            self.output(f"{ca.path}: dry-run.  {src_style_name} tags not copied")
-            return Status.success
-        return Status.read_failure
+            self.output(f"{ca.path}: dry-run.  {source_names} tags not copied")
+        return Status.success
 
     def copy(self, ca: ComicArchive) -> Result:
-        src_style_name = md_styles[self.config.Commands__copy].name()
         res = Result(Action.copy, Status.success, ca.path)
-        if not ca.has_metadata(self.config.Commands__copy):
-            self.output(f"{ca.path}: This archive doesn't have {src_style_name} tags to copy.")
+        src_tag_names = []
+        for src_tag_id in self.config.Commands__copy:
+            src_tag_names.append(tags[src_tag_id].name())
+            if ca.has_tags(src_tag_id):
+                res.tags_read.append(src_tag_id)
+
+        if not res.tags_read:
+            self.output(f"{ca.path}: This archive doesn't have any {', '.join(src_tag_names)} tags to copy.")
             res.status = Status.read_failure
             return res
         try:
-            res.md = ca.read_metadata(self.config.Commands__copy)
+            res.md, res.tags_read = self.create_local_metadata(ca, res.tags_read, tags_only=True)
         except Exception as e:
-            logger.error("Failed to load metadata for %s: %s", ca.path, e)
+            logger.error("Failed to read tags from %s: %s", ca.path, e)
             return res
-        for style in self.config.Runtime_Options__type_modify:
-            if style == src_style_name:
+
+        for dst_tag_id in self.config.Runtime_Options__tags_write:
+            if dst_tag_id in self.config.Commands__copy:
                 continue
-            status = self.copy_style(ca, res.md, style)
+
+            status = self._copy_tags(ca, res.md, ", ".join(src_tag_names), dst_tag_id)
             if status == Status.success:
-                res.tags_written.append(style)
+                res.tags_written.append(dst_tag_id)
             else:
                 res.status = status
         return res
 
     def save(self, ca: ComicArchive, match_results: OnlineMatchResults) -> tuple[Result, OnlineMatchResults]:
-        if not self.config.Runtime_Options__overwrite:
-            for style in self.config.Runtime_Options__type_modify:
-                if ca.has_metadata(style):
-                    self.output(f"{ca.path}: Already has {md_styles[style].name()} tags. Not overwriting.")
+        if not self.config.Runtime_Options__skip_existing_tags:
+            for tag_id in self.config.Runtime_Options__tags_write:
+                if ca.has_tags(tag_id):
+                    self.output(f"{ca.path}: Already has {tags[tag_id].name()} tags. Not overwriting.")
                     return (
                         Result(
                             Action.save,
                             original_path=ca.path,
                             status=Status.existing_tags,
-                            tags_written=self.config.Runtime_Options__type_modify,
+                            tags_written=self.config.Runtime_Options__tags_write,
                         ),
                         match_results,
                     )
@@ -403,7 +415,7 @@ class CLI:
         if self.batch_mode:
             self.output(f"Processing {utils.path_to_short_str(ca.path)}...")
 
-        md = self.create_local_metadata(ca)
+        md, tags_read = self.create_local_metadata(ca, self.config.Runtime_Options__tags_read)
         if md.issue is None or md.issue == "":
             if self.config.Auto_Tag__assume_issue_one:
                 md.issue = "1"
@@ -412,30 +424,32 @@ class CLI:
         # now, search online
 
         ct_md = GenericMetadata()
-        if self.config.Runtime_Options__online:
-            if self.config.Runtime_Options__issue_id is not None:
+        if self.config.Auto_Tag__online:
+            if self.config.Auto_Tag__issue_id is not None:
                 # we were given the actual issue ID to search with
                 try:
-                    ct_md = self.current_talker().fetch_comic_data(self.config.Runtime_Options__issue_id)
+                    ct_md = self.current_talker().fetch_comic_data(self.config.Auto_Tag__issue_id)
                 except TalkerError as e:
                     logger.exception(f"Error retrieving issue details. Save aborted.\n{e}")
                     res = Result(
                         Action.save,
                         original_path=ca.path,
                         status=Status.fetch_data_failure,
-                        tags_written=self.config.Runtime_Options__type_modify,
+                        tags_written=self.config.Runtime_Options__tags_write,
+                        tags_read=tags_read,
                     )
                     match_results.fetch_data_failures.append(res)
                     return res, match_results
 
                 if ct_md is None or ct_md.is_empty:
-                    logger.error("No match for ID %s was found.", self.config.Runtime_Options__issue_id)
+                    logger.error("No match for ID %s was found.", self.config.Auto_Tag__issue_id)
                     res = Result(
                         Action.save,
                         status=Status.match_failure,
                         original_path=ca.path,
                         match_status=MatchStatus.no_match,
-                        tags_written=self.config.Runtime_Options__type_modify,
+                        tags_written=self.config.Runtime_Options__tags_write,
+                        tags_read=tags_read,
                     )
                     match_results.no_matches.append(res)
                     return res, match_results
@@ -448,7 +462,8 @@ class CLI:
                         status=Status.match_failure,
                         original_path=ca.path,
                         match_status=MatchStatus.no_match,
-                        tags_written=self.config.Runtime_Options__type_modify,
+                        tags_written=self.config.Runtime_Options__tags_write,
+                        tags_read=tags_read,
                     )
                     match_results.no_matches.append(res)
                     return res, match_results
@@ -460,7 +475,10 @@ class CLI:
                         self.output(text)
 
                 ii.set_output_function(functools.partial(self.output, already_logged=True))
-                # use our overlaid MD to search
+                if not self.config.Auto_Tag__use_year_when_identifying:
+                    md.year = None
+                if self.config.Auto_Tag__ignore_leading_numbers_in_filename and md.series is not None:
+                    md.series = re.sub(r"^([\d.]+)(.*)", r"\2", md.series)
                 result, matches = ii.identify(ca, md)
 
                 found_match = False
@@ -491,7 +509,8 @@ class CLI:
                             original_path=ca.path,
                             online_results=matches,
                             match_status=MatchStatus.low_confidence_match,
-                            tags_written=self.config.Runtime_Options__type_modify,
+                            tags_written=self.config.Runtime_Options__tags_write,
+                            tags_read=tags_read,
                         )
                         match_results.low_confidence_matches.append(res)
                         return res, match_results
@@ -503,7 +522,8 @@ class CLI:
                         original_path=ca.path,
                         online_results=matches,
                         match_status=MatchStatus.multiple_match,
-                        tags_written=self.config.Runtime_Options__type_modify,
+                        tags_written=self.config.Runtime_Options__tags_write,
+                        tags_read=tags_read,
                     )
                     match_results.multiple_matches.append(res)
                     return res, match_results
@@ -515,7 +535,8 @@ class CLI:
                         original_path=ca.path,
                         online_results=matches,
                         match_status=MatchStatus.low_confidence_match,
-                        tags_written=self.config.Runtime_Options__type_modify,
+                        tags_written=self.config.Runtime_Options__tags_write,
+                        tags_read=tags_read,
                     )
                     match_results.low_confidence_matches.append(res)
                     return res, match_results
@@ -527,7 +548,8 @@ class CLI:
                         original_path=ca.path,
                         online_results=matches,
                         match_status=MatchStatus.no_match,
-                        tags_written=self.config.Runtime_Options__type_modify,
+                        tags_written=self.config.Runtime_Options__tags_write,
+                        tags_read=tags_read,
                     )
                     match_results.no_matches.append(res)
                     return res, match_results
@@ -535,7 +557,7 @@ class CLI:
                 # we got here, so we have a single match
 
                 # now get the particular issue data
-                ct_md = self.actual_issue_data_fetch(matches[0].issue_id)
+                ct_md = self.fetch_metadata(matches[0].issue_id)
                 if ct_md.is_empty:
                     res = Result(
                         Action.save,
@@ -543,7 +565,8 @@ class CLI:
                         original_path=ca.path,
                         online_results=matches,
                         match_status=MatchStatus.good_match,
-                        tags_written=self.config.Runtime_Options__type_modify,
+                        tags_written=self.config.Runtime_Options__tags_write,
+                        tags_read=tags_read,
                     )
                     match_results.fetch_data_failures.append(res)
                     return res, match_results
@@ -555,11 +578,12 @@ class CLI:
             online_results=matches,
             match_status=MatchStatus.good_match,
             md=prepare_metadata(md, ct_md, self.config),
-            tags_written=self.config.Runtime_Options__type_modify,
+            tags_written=self.config.Runtime_Options__tags_write,
+            tags_read=tags_read,
         )
         assert res.md
         # ok, done building our metadata. time to save
-        if self.actual_metadata_save(ca, res.md):
+        if self.write_tags(ca, res.md):
             match_results.good_matches.append(res)
         else:
             res.status = Status.write_failure
@@ -572,7 +596,7 @@ class CLI:
         if self.batch_mode:
             msg_hdr = f"{ca.path}: "
 
-        md = self.create_local_metadata(ca)
+        md, tags_read = self.create_local_metadata(ca, self.config.Runtime_Options__tags_read)
 
         if md.series is None:
             logger.error(msg_hdr + "Can't rename without series name")
@@ -584,7 +608,7 @@ class CLI:
 
         renamer = FileRenamer(
             None,
-            platform="universal" if self.config.File_Rename__strict else "auto",
+            platform="universal" if self.config.File_Rename__strict_filenames else "auto",
             replacements=self.config.File_Rename__replacements,
         )
         renamer.set_metadata(md, ca.path.name)
@@ -632,7 +656,7 @@ class CLI:
             suffix = " (dry-run, no change)"
 
         self.output(f"renamed '{original_path.name}' -> '{new_name}' {suffix}")
-        return Result(Action.rename, Status.success, original_path, md=md)
+        return Result(Action.rename, Status.success, original_path, tags_read=tags_read, md=md)
 
     def export(self, ca: ComicArchive) -> Result:
         msg_hdr = ""

comictaggerlib/coverimagewidget.py

@@ -26,7 +26,6 @@ import pathlib
 from PyQt5 import QtCore, QtGui, QtWidgets, uic
 
 from comicapi.comicarchive import ComicArchive
-from comictaggerlib.graphics import graphics_path
 from comictaggerlib.imagefetcher import ImageFetcher
 from comictaggerlib.imagepopup import ImagePopup
 from comictaggerlib.pageloader import PageLoader
@@ -103,8 +102,8 @@ class CoverImageWidget(QtWidgets.QWidget):
         self.imageCount = 1
         self.imageData = b""
 
-        self.btnLeft.setIcon(QtGui.QIcon(str(graphics_path / "left.png")))
-        self.btnRight.setIcon(QtGui.QIcon(str(graphics_path / "right.png")))
+        self.btnLeft.setIcon(QtGui.QIcon(":/graphics/left.png"))
+        self.btnRight.setIcon(QtGui.QIcon(":/graphics/right.png"))
 
         self.btnLeft.clicked.connect(self.decrement_image)
         self.btnRight.clicked.connect(self.increment_image)
@@ -265,7 +264,7 @@ class CoverImageWidget(QtWidgets.QWidget):
         self.page_loader = None
 
     def load_default(self) -> None:
-        self.current_pixmap = QtGui.QPixmap(str(graphics_path / "nocover.png"))
+        self.current_pixmap = QtGui.QPixmap(":/graphics/nocover.png")
         self.set_display_pixmap()
 
     def resizeEvent(self, resize_event: QtGui.QResizeEvent) -> None:

comictaggerlib/ctsettings/commandline.py

@@ -25,17 +25,11 @@ import subprocess
 
 import settngs
 
-from comicapi import merge, utils
-from comicapi.comicarchive import metadata_styles
-from comicapi.genericmetadata import GenericMetadata
+from comicapi import utils
+from comicapi.comicarchive import tags
 from comictaggerlib import ctversion
 from comictaggerlib.ctsettings.settngs_namespace import SettngsNS as ct_ns
-from comictaggerlib.ctsettings.types import (
-    ComicTaggerPaths,
-    metadata_type,
-    metadata_type_single,
-    parse_metadata_from_string,
-)
+from comictaggerlib.ctsettings.types import ComicTaggerPaths, tag
 from comictaggerlib.resulttypes import Action
 
 logger = logging.getLogger(__name__)
@@ -46,18 +40,24 @@ def initial_commandline_parser() -> argparse.ArgumentParser:
     # Ensure this stays up to date with register_runtime
     parser.add_argument(
         "--config",
-        help="Config directory defaults to ~/.ComicTagger\non Linux/Mac and %%APPDATA%% on Windows\n",
+        help="Config directory for ComicTagger to use.\ndefault: %(default)s\n\n",
         type=ComicTaggerPaths,
         default=ComicTaggerPaths(),
     )
-    parser.add_argument("-v", "--verbose", action="count", default=0, help="Be noisy when doing what it does.")
+    parser.add_argument(
+        "-v",
+        "--verbose",
+        action="count",
+        default=0,
+        help="Be noisy when doing what it does. Use a second time to enable debug logs.\nShort option cannot be combined with other options.",
+    )
     return parser
 
 
 def register_runtime(parser: settngs.Manager) -> None:
     parser.add_setting(
         "--config",
-        help="Config directory defaults to ~/.Config/ComicTagger\non Linux, ~/Library/Application Support/ComicTagger on Mac and %%APPDATA%%\\ComicTagger on Windows\n",
+        help="Config directory for ComicTagger to use.\ndefault: %(default)s\n\n",
         type=ComicTaggerPaths,
         default=ComicTaggerPaths(),
         file=False,
@@ -67,55 +67,21 @@ def register_runtime(parser: settngs.Manager) -> None:
         "--verbose",
         action="count",
         default=0,
-        help="Be noisy when doing what it does.",
+        help="Be noisy when doing what it does. Use a second time to enable debug logs.\nShort option cannot be combined with other options.",
         file=False,
     )
+    parser.add_setting("-q", "--quiet", action="store_true", help="Don't say much (for print mode).", file=False)
     parser.add_setting(
-        "--abort-on-conflict",
+        "-j",
+        "--json",
         action="store_true",
-        help="""Don't export to zip if intended new filename\nexists (otherwise, creates a new unique filename).\n\n""",
+        help="Output json on stdout. Ignored in interactive mode.\n\n",
         file=False,
     )
     parser.add_setting(
-        "--delete-original",
+        "--raw",
         action="store_true",
-        help="""Delete original archive after successful\nexport to Zip. (only relevant for -e)""",
-        file=False,
-    )
-    parser.add_setting(
-        "-f",
-        "--parse-filename",
-        "--parsefilename",
-        action="store_true",
-        help="""Parse the filename to get some info,\nspecifically series name, issue number,\nvolume, and publication year.\n\n""",
-        file=False,
-    )
-    parser.add_setting(
-        "--prefer-filename",
-        action="store_true",
-        help="""Prefer metadata parsed from the filename. CLI only.\n\n""",
-        file=False,
-    )
-    parser.add_setting(
-        "--id",
-        dest="issue_id",
-        type=str,
-        help="""Use the issue ID when searching online.\nOverrides all other metadata.\n\n""",
-        file=False,
-    )
-    parser.add_setting(
-        "-o",
-        "--online",
-        action="store_true",
-        help="""Search online and attempt to identify file\nusing existing metadata and images in archive.\nMay be used in conjunction with -f and -m.\n\n""",
-        file=False,
-    )
-    parser.add_setting(
-        "-m",
-        "--metadata",
-        default=GenericMetadata(),
-        type=parse_metadata_from_string,
-        help="""Explicitly define some tags to be used in YAML syntax.  Use @file.yaml to read from a file.  e.g.:\n"series: Plastic Man, publisher: Quality Comics, year: "\n"series: 'Kickers, Inc.', issue: '1', year: 1986"\nIf you want to erase a tag leave the value blank.\nSome names that can be used: series, issue, issue_count, year,\npublisher, title\n\n""",
+        help="""With -p, will print out the raw tag block(s) from the file.""",
         file=False,
     )
     parser.add_setting(
@@ -130,27 +96,7 @@ def register_runtime(parser: settngs.Manager) -> None:
         dest="abort_on_low_confidence",
         action=argparse.BooleanOptionalAction,
         default=True,
-        help="""Abort save operation when online match\nis of low confidence.\n\n""",
-        file=False,
-    )
-    parser.add_setting(
-        "--summary",
-        default=True,
-        action=argparse.BooleanOptionalAction,
-        help="Show the summary after a save operation.\n\n",
-        file=False,
-    )
-    parser.add_setting(
-        "--raw",
-        action="store_true",
-        help="""With -p, will print out the raw tag block(s)\nfrom the file.\n""",
-        file=False,
-    )
-    parser.add_setting(
-        "-R",
-        "--recursive",
-        action="store_true",
-        help="Recursively include files in sub-folders.",
+        help="""Abort save operation when online match is of low confidence.\ndefault: %(default)s""",
         file=False,
     )
     parser.add_setting(
@@ -160,58 +106,60 @@ def register_runtime(parser: settngs.Manager) -> None:
         help="Don't actually modify file (only relevant for -d, -s, or -r).\n\n",
         file=False,
     )
-    parser.add_setting("--darkmode", action="store_true", help="Windows only. Force a dark pallet", file=False)
-    parser.add_setting("-g", "--glob", action="store_true", help="Windows only. Enable globbing", file=False)
-    parser.add_setting("--quiet", "-q", action="store_true", help="Don't say much (for print mode).", file=False)
     parser.add_setting(
-        "--json", "-j", action="store_true", help="Output json on stdout. Ignored in interactive mode.", file=False
+        "--summary",
+        default=True,
+        action=argparse.BooleanOptionalAction,
+        help="Show the summary after a save operation.\ndefault: %(default)s",
+        file=False,
     )
     parser.add_setting(
-        "--type-modify",
-        metavar=f"{{{','.join(metadata_styles).upper()}}}",
-        default=[],
-        type=metadata_type,
-        help="""Specify the type of tags to write.\nUse commas for multiple types.\nRead types will be used if unspecified\nSee --list-plugins for the available types.\n\n""",
+        "-R",
+        "--recursive",
+        action="store_true",
+        help="Recursively include files in sub-folders.",
+        file=False,
+    )
+    parser.add_setting("-g", "--glob", action="store_true", help="Windows only. Enable globbing", file=False)
+    parser.add_setting("--darkmode", action="store_true", help="Windows only. Force a dark pallet", file=False)
+    parser.add_setting("--no-gui", action="store_true", help="Do not open the GUI, force the commandline", file=False)
+
+    parser.add_setting(
+        "--abort-on-conflict",
+        action="store_true",
+        help="""Don't export to zip if intended new filename exists\n(otherwise, creates a new unique filename).\n\n""",
+        file=False,
+    )
+    parser.add_setting(
+        "--delete-original",
+        action="store_true",
+        help="""Delete original archive after successful export to Zip.\n(only relevant for -e)\n\n""",
         file=False,
     )
     parser.add_setting(
         "-t",
-        "--type-read",
-        metavar=f"{{{','.join(metadata_styles).upper()}}}",
+        "--tags-read",
+        metavar=f"{{{','.join(tags).upper()}}}",
         default=[],
-        type=metadata_type,
-        help="""Specify the type of tags to read.\nUse commas for multiple types.\nSee --list-plugins for the available types.\nThe tag use will be 'overlayed' in order:\ne.g. '-t cbl,cr' with no CBL tags, CR will be used if they exist and CR will overwrite any shared CBL tags.\n\n""",
+        type=tag,
+        help="""Specify the tags to read.\nUse commas for multiple tags.\nSee --list-plugins for the available tags.\nThe tags used will be 'overlaid' in order:\ne.g. '-t cbl,cr' with no CBL tags, CR will be used if they exist and CR will overwrite any shared CBL tags.\n\n""",
         file=False,
     )
     parser.add_setting(
-        "--read-style-overlay",
-        type=merge.Mode,
-        default=merge.Mode.OVERLAY,
-        help="How to overlay new metadata on the current for enabled read styles (CR, CBL, etc.)",
+        "--tags-write",
+        metavar=f"{{{','.join(tags).upper()}}}",
+        default=[],
+        type=tag,
+        help="""Specify the tags to write.\nUse commas for multiple tags.\nRead tags will be used if unspecified\nSee --list-plugins for the available tags.\n\n""",
         file=False,
     )
     parser.add_setting(
-        "--source-overlay",
-        type=merge.Mode,
-        default=merge.Mode.OVERLAY,
-        help="How to overlay new metadata from a data source (CV, Metron, GCD, etc.) on to the current",
-        file=False,
-    )
-    parser.add_setting(
-        "--overlay-merge-lists",
+        "--skip-existing-tags",
         action=argparse.BooleanOptionalAction,
         default=True,
-        help="When overlaying, merge or replace lists (genres, characters, etc.)",
+        help="""Skip archives that already have tags specified with -t,\notherwise merges new tags with existing tags (relevant for -s or -c).\ndefault: %(default)s""",
         file=False,
     )
-    parser.add_setting(
-        "--overwrite",
-        action=argparse.BooleanOptionalAction,
-        default=True,
-        help="""Apply metadata to already tagged archives, otherwise skips archives with existing metadata (relevant for -s or -c).""",
-        file=False,
-    )
-    parser.add_setting("--no-gui", action="store_true", help="Do not open the GUI, force the commandline", file=False)
     parser.add_setting("files", nargs="*", default=[], file=False)
 
 
@@ -225,7 +173,7 @@ def register_commands(parser: settngs.Manager) -> None:
         action="store_const",
         const=Action.print,
         default=Action.gui,
-        help="""Print out tag info from file. Specify type\n(via --type-read) to get only info of that tag type.\n\n""",
+        help="""Print out tag info from file. Specify via -t to only print specific tags.\n\n""",
         file=False,
     )
     parser.add_setting(
@@ -234,16 +182,16 @@ def register_commands(parser: settngs.Manager) -> None:
         dest="command",
         action="store_const",
         const=Action.delete,
-        help="Deletes the tag block of specified type (via --type-modify).\n",
+        help="Deletes the tags specified via -t.",
         file=False,
     )
     parser.add_setting(
         "-c",
         "--copy",
-        type=metadata_type_single,
+        type=tag,
         default=[],
-        metavar=f"{{{','.join(metadata_styles).upper()}}}",
-        help="Copy the specified source tag block to\ndestination style specified via --type-modify\n(potentially lossy operation).\n\n",
+        metavar=f"{{{','.join(tags).upper()}}}",
+        help="Copy the specified source tags to\ndestination tags specified via --tags-write\n(potentially lossy operation).\n\n",
         file=False,
     )
     parser.add_setting(
@@ -252,7 +200,7 @@ def register_commands(parser: settngs.Manager) -> None:
         dest="command",
         action="store_const",
         const=Action.save,
-        help="Save out tags as specified type (via --type-modify).\nMust specify also at least -o, -f, or -m.\n\n",
+        help="Save out tags as specified tags (via --tags-write).\nMust specify also at least -o, -f, or -m.\n\n",
         file=False,
     )
     parser.add_setting(
@@ -261,7 +209,7 @@ def register_commands(parser: settngs.Manager) -> None:
         dest="command",
         action="store_const",
         const=Action.rename,
-        help="Rename the file based on specified tag style.",
+        help="Rename the file based on specified tags.",
         file=False,
     )
     parser.add_setting(
@@ -270,7 +218,7 @@ def register_commands(parser: settngs.Manager) -> None:
         dest="command",
         action="store_const",
         const=Action.export,
-        help="Export RAR archive to Zip format.",
+        help="Export archive to Zip format.",
         file=False,
     )
     parser.add_setting(
@@ -321,8 +269,8 @@ def validate_commandline_settings(config: settngs.Config[ct_ns], parser: settngs
     if config[0].Runtime_Options__json and config[0].Runtime_Options__interactive:
         config[0].Runtime_Options__json = False
 
-    if config[0].Runtime_Options__type_read and not config[0].Runtime_Options__type_modify:
-        config[0].Runtime_Options__type_modify = config[0].Runtime_Options__type_read
+    if config[0].Runtime_Options__tags_read and not config[0].Runtime_Options__tags_write:
+        config[0].Runtime_Options__tags_write = config[0].Runtime_Options__tags_read
 
     if (
         config[0].Commands__command not in (Action.save_config, Action.list_plugins)
@@ -331,16 +279,16 @@ def validate_commandline_settings(config: settngs.Config[ct_ns], parser: settngs
     ):
         parser.exit(message="Command requires at least one filename!\n", status=1)
 
-    if config[0].Commands__command == Action.delete and not config[0].Runtime_Options__type_modify:
-        parser.exit(message="Please specify the type to delete with --type-modify\n", status=1)
+    if config[0].Commands__command == Action.delete and not config[0].Runtime_Options__tags_write:
+        parser.exit(message="Please specify the tags to delete with --tags-write\n", status=1)
 
-    if config[0].Commands__command == Action.save and not config[0].Runtime_Options__type_modify:
-        parser.exit(message="Please specify the type to save with --type-modify\n", status=1)
+    if config[0].Commands__command == Action.save and not config[0].Runtime_Options__tags_write:
+        parser.exit(message="Please specify the tags to save with --tags-write\n", status=1)
 
     if config[0].Commands__copy:
         config[0].Commands__command = Action.copy
-        if not config[0].Runtime_Options__type_modify:
-            parser.exit(message="Please specify the type to copy to with --type-modify\n", status=1)
+        if not config[0].Runtime_Options__tags_write:
+            parser.exit(message="Please specify the tags to copy to with --tags-write\n", status=1)
 
     if config[0].Runtime_Options__recursive:
         config[0].Runtime_Options__files = utils.get_recursive_filelist(config[0].Runtime_Options__files)

comictaggerlib/ctsettings/file.py

@@ -6,7 +6,9 @@ import uuid
 import settngs
 
 from comicapi import merge, utils
+from comicapi.genericmetadata import GenericMetadata
 from comictaggerlib.ctsettings.settngs_namespace import SettngsNS as ct_ns
+from comictaggerlib.ctsettings.types import parse_metadata_from_string
 from comictaggerlib.defaults import DEFAULT_REPLACEMENTS, Replacement, Replacements
 
 
@@ -18,18 +20,15 @@ def general(parser: settngs.Manager) -> None:
         "--prompt-on-save",
         default=True,
         action=argparse.BooleanOptionalAction,
-        help="Prompts the user to confirm saving tags when using the GUI.",
+        help="Prompts the user to confirm saving tags when using the GUI.\ndefault: %(default)s",
     )
 
 
 def internal(parser: settngs.Manager) -> None:
     # automatic settings
     parser.add_setting("install_id", default=uuid.uuid4().hex, cmdline=False)
-    parser.add_setting("save_data_style", default=["cbi"], cmdline=False)
-    parser.add_setting("load_data_style", default=["cbi"], cmdline=False)
-    parser.add_setting("load_data_overlay", default=merge.Mode.OVERLAY, cmdline=False, type=merge.Mode)
-    parser.add_setting("source_data_overlay", default=merge.Mode.OVERLAY, cmdline=False, type=merge.Mode)
-    parser.add_setting("overlay_merge_lists", default=True, cmdline=False, action=argparse.BooleanOptionalAction)
+    parser.add_setting("write_tags", default=["cbi"], cmdline=False)
+    parser.add_setting("read_tags", default=["cbi"], cmdline=False)
     parser.add_setting("last_opened_folder", default="", cmdline=False)
     parser.add_setting("window_width", default=0, cmdline=False)
     parser.add_setting("window_height", default=0, cmdline=False)
@@ -39,132 +38,116 @@ def internal(parser: settngs.Manager) -> None:
     parser.add_setting("list_width", default=-1, cmdline=False)
     parser.add_setting("sort_column", default=-1, cmdline=False)
     parser.add_setting("sort_direction", default=0, cmdline=False)
+    parser.add_setting("remove_archive_after_successful_match", default=False, cmdline=False)
 
 
 def identifier(parser: settngs.Manager) -> None:
-    # identifier settings
-    parser.add_setting("--series-match-identify-thresh", default=91, type=int, help="")
+    parser.add_setting(
+        "--series-match-identify-thresh",
+        default=91,
+        type=int,
+        help="The minimum Series name similarity needed to auto-identify an issue default: %(default)s",
+    )
+    parser.add_setting(
+        "--series-match-search-thresh",
+        default=90,
+        type=int,
+        help="The minimum Series name similarity to return from a search result default: %(default)s",
+    )
     parser.add_setting(
         "-b",
         "--border-crop-percent",
         default=10,
         type=int,
-        help="ComicTagger will automatically add an additional cover that has any black borders cropped. If the difference in height is less than %(default)s%% the cover will not be cropped.",
-    )
-    parser.add_setting(
-        "--publisher-filter",
-        default=["Panini Comics", "Abril", "Planeta DeAgostini", "Editorial Televisa", "Dino Comics"],
-        action="extend",
-        nargs="+",
-        help="When enabled, filters the listed publishers from all search results. Ending a publisher with a '-' removes a publisher from this list",
-    )
-    parser.add_setting("--series-match-search-thresh", default=90, type=int)
-    parser.add_setting(
-        "--clear-metadata",
-        default=False,
-        help="Clears all existing metadata during import, default is to merge metadata.\nMay be used in conjunction with -o, -f and -m.\n\n",
-        action=argparse.BooleanOptionalAction,
-    )
-    parser.add_setting(
-        "-a",
-        "--auto-imprint",
-        action=argparse.BooleanOptionalAction,
-        default=False,
-        help="Enables the auto imprint functionality.\ne.g. if the publisher is set to 'vertigo' it\nwill be updated to 'DC Comics' and the imprint\nproperty will be set to 'Vertigo'.\n\n",
+        help="ComicTagger will automatically add an additional cover that has any black borders cropped.\nIf the difference in height is less than %(default)s%% the cover will not be cropped.\ndefault: %(default)s\n\n",
     )
 
     parser.add_setting(
-        "--sort-series-by-year", default=True, action=argparse.BooleanOptionalAction, help="Sorts series by year"
+        "--sort-series-by-year",
+        default=True,
+        action=argparse.BooleanOptionalAction,
+        help="Sorts series by year default: %(default)s",
     )
     parser.add_setting(
         "--exact-series-matches-first",
         default=True,
         action=argparse.BooleanOptionalAction,
-        help="Puts series that are an exact match at the top of the list",
-    )
-    parser.add_setting(
-        "--always-use-publisher-filter",
-        default=False,
-        action=argparse.BooleanOptionalAction,
-        help="Enables the publisher filter",
+        help="Puts series that are an exact match at the top of the list default: %(default)s",
     )
 
 
 def dialog(parser: settngs.Manager) -> None:
-    # Show/ask dialog flags
     parser.add_setting("show_disclaimer", default=True, cmdline=False)
     parser.add_setting("dont_notify_about_this_version", default="", cmdline=False)
     parser.add_setting("ask_about_usage_stats", default=True, cmdline=False)
 
 
 def filename(parser: settngs.Manager) -> None:
-    # filename parsing settings
     parser.add_setting(
         "--filename-parser",
         default=utils.Parser.ORIGINAL,
         metavar=f"{{{','.join(utils.Parser)}}}",
         type=utils.Parser,
-        choices=[p.value for p in utils.Parser],
-        help="Select the filename parser, defaults to original",
+        choices=utils.Parser,
+        help="Select the filename parser.\ndefault: %(default)s",
     )
     parser.add_setting(
         "--remove-c2c",
         default=False,
         action=argparse.BooleanOptionalAction,
-        help="Removes c2c from filenames. Requires --complicated-parser",
+        help="Removes c2c from filenames.\nRequires --complicated-parser\ndefault: %(default)s\n\n",
     )
     parser.add_setting(
         "--remove-fcbd",
         default=False,
         action=argparse.BooleanOptionalAction,
-        help="Removes FCBD/free comic book day from filenames. Requires --complicated-parser",
+        help="Removes FCBD/free comic book day from filenames.\nRequires --complicated-parser\ndefault: %(default)s\n\n",
     )
     parser.add_setting(
         "--remove-publisher",
         default=False,
         action=argparse.BooleanOptionalAction,
-        help="Attempts to remove publisher names from filenames, currently limited to Marvel and DC. Requires --complicated-parser",
+        help="Attempts to remove publisher names from filenames, currently limited to Marvel and DC.\nRequires --complicated-parser\ndefault: %(default)s\n\n",
     )
     parser.add_setting(
         "--split-words",
         action="store_true",
-        help="""Splits words before parsing the filename.\ne.g. 'judgedredd' to 'judge dredd'\n\n""",
+        help="""Splits words before parsing the filename.\ne.g. 'judgedredd' to 'judge dredd'\ndefault: %(default)s\n\n""",
         file=False,
     )
     parser.add_setting(
         "--protofolius-issue-number-scheme",
         default=False,
         action=argparse.BooleanOptionalAction,
-        help="Use an issue number scheme devised by protofolius for encoding format informatino as a letter in front of an issue number. Implies --allow-issue-start-with-letter.  Requires --complicated-parser",
+        help="Use an issue number scheme devised by protofolius for encoding format information as a letter in front of an issue number.\nImplies --allow-issue-start-with-letter.  Requires --complicated-parser\ndefault: %(default)s\n\n",
     )
     parser.add_setting(
         "--allow-issue-start-with-letter",
         default=False,
         action=argparse.BooleanOptionalAction,
-        help="Allows an issue number to start with a single letter (e.g. '#X01'). Requires --complicated-parser",
+        help="Allows an issue number to start with a single letter (e.g. '#X01').\nRequires --complicated-parser\ndefault: %(default)s\n\n",
     )
 
 
 def talker(parser: settngs.Manager) -> None:
-    # General settings for talkers
     parser.add_setting(
         "--source",
         default="comicvine",
-        help="Use a specified source by source ID (use --list-plugins to list all sources)",
+        help="Use a specified source by source ID (use --list-plugins to list all sources).\ndefault: %(default)s",
     )
 
 
 def md_options(parser: settngs.Manager) -> None:
     # CBL Transform settings
-    parser.add_setting("--cbl-assume-lone-credit-is-primary", default=False, action=argparse.BooleanOptionalAction)
-    parser.add_setting("--cbl-copy-characters-to-tags", default=False, action=argparse.BooleanOptionalAction)
-    parser.add_setting("--cbl-copy-teams-to-tags", default=False, action=argparse.BooleanOptionalAction)
-    parser.add_setting("--cbl-copy-locations-to-tags", default=False, action=argparse.BooleanOptionalAction)
-    parser.add_setting("--cbl-copy-storyarcs-to-tags", default=False, action=argparse.BooleanOptionalAction)
-    parser.add_setting("--cbl-copy-notes-to-comments", default=False, action=argparse.BooleanOptionalAction)
-    parser.add_setting("--cbl-copy-weblink-to-comments", default=False, action=argparse.BooleanOptionalAction)
-    parser.add_setting("--cbl-apply-transform-on-import", default=False, action=argparse.BooleanOptionalAction)
-    parser.add_setting("--cbl-apply-transform-on-bulk-operation", default=False, action=argparse.BooleanOptionalAction)
+    parser.add_setting("--assume-lone-credit-is-primary", default=False, action=argparse.BooleanOptionalAction)
+    parser.add_setting("--copy-characters-to-tags", default=False, action=argparse.BooleanOptionalAction)
+    parser.add_setting("--copy-teams-to-tags", default=False, action=argparse.BooleanOptionalAction)
+    parser.add_setting("--copy-locations-to-tags", default=False, action=argparse.BooleanOptionalAction)
+    parser.add_setting("--copy-storyarcs-to-tags", default=False, action=argparse.BooleanOptionalAction)
+    parser.add_setting("--copy-notes-to-comments", default=False, action=argparse.BooleanOptionalAction)
+    parser.add_setting("--copy-weblink-to-comments", default=False, action=argparse.BooleanOptionalAction)
+    parser.add_setting("--apply-transform-on-import", default=False, action=argparse.BooleanOptionalAction)
+    parser.add_setting("--apply-transform-on-bulk-operation", default=False, action=argparse.BooleanOptionalAction)
 
     parser.add_setting(
         "--remove-html-tables",
@@ -173,93 +156,176 @@ def md_options(parser: settngs.Manager) -> None:
         display_name="Remove HTML tables",
         help="Removes html tables instead of converting them to text",
     )
-
-    parser.add_setting("use_short_metadata_names", default=False, action=argparse.BooleanOptionalAction, cmdline=False)
+    parser.add_setting("use_short_tag_names", default=False, action=argparse.BooleanOptionalAction, cmdline=False)
     parser.add_setting(
-        "--disable-cr",
-        default=False,
+        "--cr",
+        default=True,
         action=argparse.BooleanOptionalAction,
-        help="Disable the ComicRack metadata type",
+        help="Enable ComicRack tags. Turn off to only use CIX tags.\ndefault: %(default)s",
+    )
+    parser.add_setting(
+        "--tag-merge",
+        metavar=f"{{{','.join(merge.Mode)}}}",
+        default=merge.Mode.OVERLAY,
+        choices=merge.Mode,
+        type=merge.Mode,
+        help="How to merge fields when reading enabled tags (CR, CBL, etc.) See -t, --tags-read default: %(default)s",
+    )
+    parser.add_setting(
+        "--metadata-merge",
+        metavar=f"{{{','.join(merge.Mode)}}}",
+        default=merge.Mode.OVERLAY,
+        choices=merge.Mode,
+        type=merge.Mode,
+        help="How to merge fields when downloading new metadata (CV, Metron, GCD, etc.) default: %(default)s",
+    )
+    parser.add_setting(
+        "--tag-merge-lists",
+        action=argparse.BooleanOptionalAction,
+        default=True,
+        help="Merge lists when reading enabled tags (genres, characters, etc.) default: %(default)s",
+    )
+    parser.add_setting(
+        "--metadata-merge-lists",
+        action=argparse.BooleanOptionalAction,
+        default=True,
+        help="Merge lists when downloading new metadata (genres, characters, etc.) default: %(default)s",
     )
 
 
 def rename(parser: settngs.Manager) -> None:
-    # Rename settings
-    parser.add_setting("--template", default="{series} #{issue} ({year})", help="The teplate to use when renaming")
+    parser.add_setting(
+        "--template",
+        default="{series} #{issue} ({year})",
+        help="The teplate to use when renaming.\ndefault: %(default)s",
+    )
     parser.add_setting(
         "--issue-number-padding",
         default=3,
         type=int,
-        help="The minimum number of digits to use for the issue number when renaming",
+        help="The minimum number of digits to use for the issue number when renaming.\ndefault: %(default)s",
     )
     parser.add_setting(
         "--use-smart-string-cleanup",
         default=True,
         action=argparse.BooleanOptionalAction,
-        help="Attempts to intelligently cleanup whitespace when renaming",
+        help="Attempts to intelligently cleanup whitespace when renaming.\ndefault: %(default)s",
     )
     parser.add_setting(
         "--auto-extension",
         default=True,
         action=argparse.BooleanOptionalAction,
-        help="Automatically sets the extension based on the archive type e.g. cbr for rar, cbz for zip",
+        help="Automatically sets the extension based on the archive type e.g. cbr for rar, cbz for zip.\ndefault: %(default)s",
     )
-    parser.add_setting("--dir", default="", help="The directory to move renamed files to")
+    parser.add_setting("--dir", default="", help="The directory to move renamed files to.")
     parser.add_setting(
         "--move",
         default=False,
         action=argparse.BooleanOptionalAction,
-        help="Enables moving renamed files to a separate directory",
+        help="Enables moving renamed files to a separate directory.\ndefault: %(default)s",
     )
     parser.add_setting(
         "--only-move",
         default=False,
         action=argparse.BooleanOptionalAction,
-        help="Ignores the filename when moving renamed files to a separate directory",
+        help="Ignores the filename when moving renamed files to a separate directory.\ndefault: %(default)s",
     )
     parser.add_setting(
-        "--strict",
+        "--strict-filenames",
         default=False,
         action=argparse.BooleanOptionalAction,
-        help="Ensures that filenames are valid for all OSs",
+        help="Ensures that filenames are valid for all OSs.\ndefault: %(default)s",
     )
     parser.add_setting("replacements", default=DEFAULT_REPLACEMENTS, cmdline=False)
 
 
 def autotag(parser: settngs.Manager) -> None:
-    # Auto-tag stickies
+    parser.add_setting(
+        "-o",
+        "--online",
+        action="store_true",
+        help="""Search online and attempt to identify file\nusing existing tags and images in archive.\nMay be used in conjunction with -f and -m.\n\n""",
+        file=False,
+    )
     parser.add_setting(
         "--save-on-low-confidence",
         default=False,
         action=argparse.BooleanOptionalAction,
-        help="Automatically save metadata on low-confidence matches",
+        help="Automatically save tags on low-confidence matches.\ndefault: %(default)s",
+        cmdline=False,
     )
     parser.add_setting(
-        "--dont-use-year-when-identifying",
-        default=False,
+        "--use-year-when-identifying",
+        default=True,
         action=argparse.BooleanOptionalAction,
-        help="Ignore the year metadata attribute when identifying a comic",
+        help="Use the year metadata attribute when auto-tagging a comic.\ndefault: %(default)s",
     )
     parser.add_setting(
         "-1",
         "--assume-issue-one",
         action=argparse.BooleanOptionalAction,
-        help="Assume issue number is 1 if not found (relevant for -s).\n\n",
+        help="Assume issue number is 1 if not found (relevant for -s).\ndefault: %(default)s\n\n",
         default=False,
     )
     parser.add_setting(
         "--ignore-leading-numbers-in-filename",
         default=False,
         action=argparse.BooleanOptionalAction,
-        help="When searching ignore leading numbers in the filename",
+        help="When searching ignore leading numbers in the filename.\ndefault: %(default)s",
+    )
+    parser.add_setting(
+        "--prefer-filename",
+        action="store_true",
+        help="""Prefer metadata parsed from the filename. CLI only.\n\n""",
+        file=False,
+    )
+    parser.add_setting(
+        "--id",
+        dest="issue_id",
+        type=str,
+        help="""Use the issue ID when searching online.\nOverrides all other metadata.\n\n""",
+        file=False,
+    )
+    parser.add_setting(
+        "-m",
+        "--metadata",
+        default=GenericMetadata(),
+        type=parse_metadata_from_string,
+        help="""Explicitly define some metadata to be used in YAML syntax.  Use @file.yaml to read from a file.  e.g.:\n"series: Plastic Man, publisher: Quality Comics, year: "\n"series: 'Kickers, Inc.', issue: '1', year: 1986"\nIf you want to erase a tag leave the value blank.\nSome names that can be used: series, issue, issue_count, year,\npublisher, title\n\n""",
+        file=False,
+    )
+    parser.add_setting(
+        "--clear-tags",
+        default=False,
+        action=argparse.BooleanOptionalAction,
+        help="Clears all existing tags during import, default is to merge tags.\nMay be used in conjunction with -o, -f and -m.\ndefault: %(default)s\n\n",
+    )
+    parser.add_setting(
+        "--publisher-filter",
+        default=["Panini Comics", "Abril", "Planeta DeAgostini", "Editorial Televisa", "Dino Comics"],
+        action="extend",
+        nargs="+",
+        help="When enabled, filters the listed publishers from all search results.\nEnding a publisher with a '-' removes a publisher from this list\ndefault: %(default)s\n\n",
+    )
+    parser.add_setting(
+        "--use-publisher-filter",
+        default=False,
+        action=argparse.BooleanOptionalAction,
+        help="Enables the publisher filter.\ndefault: %(default)s",
+    )
+    parser.add_setting(
+        "-a",
+        "--auto-imprint",
+        default=False,
+        action=argparse.BooleanOptionalAction,
+        help="Enables the auto imprint functionality.\ne.g. if the publisher is set to 'vertigo' it\nwill be updated to 'DC Comics' and the imprint\nproperty will be set to 'Vertigo'.\ndefault: %(default)s\n\n",
     )
-    parser.add_setting("remove_archive_after_successful_match", default=False, cmdline=False)
 
 
 def parse_filter(config: settngs.Config[ct_ns]) -> settngs.Config[ct_ns]:
     new_filter = []
     remove = []
-    for x in config[0].Issue_Identifier__publisher_filter:
+    for x in config[0].Auto_Tag__publisher_filter:
         x = x.strip()
         if x:  # ignore empty arguments
             if x[-1] == "-":  # this publisher needs to be removed. We remove after all publishers have been enumerated
@@ -270,29 +336,29 @@ def parse_filter(config: settngs.Config[ct_ns]) -> settngs.Config[ct_ns]:
     for x in remove:  # remove publishers
         if x in new_filter:
             new_filter.remove(x)
-    config[0].Issue_Identifier__publisher_filter = new_filter
+    config[0].Auto_Tag__publisher_filter = new_filter
     return config
 
 
 def migrate_settings(config: settngs.Config[ct_ns]) -> settngs.Config[ct_ns]:
     original_types = ("cbi", "cr", "comet")
-    save_style = config[0].internal__save_data_style
-    if not isinstance(save_style, list):
-        if isinstance(save_style, int) and save_style in (0, 1, 2):
-            config[0].internal__save_data_style = [original_types[save_style]]
-        elif isinstance(save_style, str):
-            config[0].internal__save_data_style = [save_style]
+    write_Tags = config[0].internal__write_tags
+    if not isinstance(write_Tags, list):
+        if isinstance(write_Tags, int) and write_Tags in (0, 1, 2):
+            config[0].internal__write_tags = [original_types[write_Tags]]
+        elif isinstance(write_Tags, str):
+            config[0].internal__write_tags = [write_Tags]
         else:
-            config[0].internal__save_data_style = ["cbi"]
+            config[0].internal__write_tags = ["cbi"]
 
-    load_style = config[0].internal__load_data_style
-    if not isinstance(load_style, list):
-        if isinstance(load_style, int) and load_style in (0, 1, 2):
-            config[0].internal__load_data_style = [original_types[load_style]]
-        elif isinstance(load_style, str):
-            config[0].internal__load_data_style = [load_style]
+    read_tags = config[0].internal__read_tags
+    if not isinstance(read_tags, list):
+        if isinstance(read_tags, int) and read_tags in (0, 1, 2):
+            config[0].internal__read_tags = [original_types[read_tags]]
+        elif isinstance(read_tags, str):
+            config[0].internal__read_tags = [read_tags]
         else:
-            config[0].internal__load_data_style = ["cbi"]
+            config[0].internal__read_tags = ["cbi"]
 
     return config
 

comictaggerlib/ctsettings/plugin.py

@@ -32,7 +32,7 @@ def archiver(manager: settngs.Manager) -> None:
             manager.add_setting(
                 f"--{settngs.sanitize_name(archiver.exe)}",
                 default=archiver.exe,
-                help="Path to the %(default)s executable\n\n",
+                help="Path to the %(default)s executable",
             )
 
 

comictaggerlib/ctsettings/plugin_finder.py

@@ -15,7 +15,7 @@ from typing import Any, NamedTuple
 logger = logging.getLogger(__name__)
 
 NORMALIZE_PACKAGE_NAME_RE = re.compile(r"[-_.]+")
-PLUGIN_GROUPS = frozenset(("comictagger.talker", "comicapi.archiver", "comicapi.metadata"))
+PLUGIN_GROUPS = frozenset(("comictagger.talker", "comicapi.archiver", "comicapi.tags"))
 
 
 class FailedToLoadPlugin(Exception):
@@ -72,13 +72,13 @@ class Plugins(NamedTuple):
     """Classified plugins."""
 
     archivers: list[Plugin]
-    metadata: list[Plugin]
+    tags: list[Plugin]
     talkers: list[Plugin]
 
     def all_plugins(self) -> Generator[Plugin, None, None]:
         """Return an iterator over all :class:`LoadedPlugin`s."""
         yield from self.archivers
-        yield from self.metadata
+        yield from self.tags
         yield from self.talkers
 
     def versions_str(self) -> str:
@@ -133,21 +133,21 @@ def find_plugins(plugin_folder: pathlib.Path) -> Plugins:
 
 def _classify_plugins(plugins: list[Plugin]) -> Plugins:
     archivers = []
-    metadata = []
+    tags = []
     talkers = []
 
     for p in plugins:
         if p.entry_point.group == "comictagger.talker":
             talkers.append(p)
-        elif p.entry_point.group == "comicapi.metadata":
-            metadata.append(p)
+        elif p.entry_point.group == "comicapi.tags":
+            tags.append(p)
         elif p.entry_point.group == "comicapi.archiver":
             archivers.append(p)
         else:
             logger.warning(NotImplementedError(f"what plugin type? {p}"))
 
     return Plugins(
-        metadata=metadata,
+        tags=tags,
         archivers=archivers,
         talkers=talkers,
     )

comictaggerlib/ctsettings/settngs_namespace.py

@@ -15,42 +15,31 @@ import comictaggerlib.resulttypes
 class SettngsNS(settngs.TypedNS):
     Commands__version: bool
     Commands__command: comictaggerlib.resulttypes.Action
-    Commands__copy: str
+    Commands__copy: list[str]
 
     Runtime_Options__config: comictaggerlib.ctsettings.types.ComicTaggerPaths
     Runtime_Options__verbose: int
-    Runtime_Options__abort_on_conflict: bool
-    Runtime_Options__delete_original: bool
-    Runtime_Options__parse_filename: bool
-    Runtime_Options__prefer_filename: bool
-    Runtime_Options__issue_id: str | None
-    Runtime_Options__online: bool
-    Runtime_Options__metadata: comicapi.genericmetadata.GenericMetadata
-    Runtime_Options__interactive: bool
-    Runtime_Options__abort_on_low_confidence: bool
-    Runtime_Options__summary: bool
-    Runtime_Options__raw: bool
-    Runtime_Options__recursive: bool
-    Runtime_Options__dryrun: bool
-    Runtime_Options__darkmode: bool
-    Runtime_Options__glob: bool
     Runtime_Options__quiet: bool
     Runtime_Options__json: bool
-    Runtime_Options__type_modify: list[str]
-    Runtime_Options__type_read: list[str]
-    Runtime_Options__read_style_overlay: comicapi.merge.Mode
-    Runtime_Options__source_overlay: comicapi.merge.Mode
-    Runtime_Options__overlay_merge_lists: bool
-    Runtime_Options__overwrite: bool
+    Runtime_Options__raw: bool
+    Runtime_Options__interactive: bool
+    Runtime_Options__abort_on_low_confidence: bool
+    Runtime_Options__dryrun: bool
+    Runtime_Options__summary: bool
+    Runtime_Options__recursive: bool
+    Runtime_Options__glob: bool
+    Runtime_Options__darkmode: bool
     Runtime_Options__no_gui: bool
+    Runtime_Options__abort_on_conflict: bool
+    Runtime_Options__delete_original: bool
+    Runtime_Options__tags_read: list[str]
+    Runtime_Options__tags_write: list[str]
+    Runtime_Options__skip_existing_tags: bool
     Runtime_Options__files: list[str]
 
     internal__install_id: str
-    internal__save_data_style: list[str]
-    internal__load_data_style: list[str]
-    internal__load_data_overlay: comicapi.merge.Mode
-    internal__source_data_overlay: comicapi.merge.Mode
-    internal__overlay_merge_lists: bool
+    internal__write_tags: list[str]
+    internal__read_tags: list[str]
     internal__last_opened_folder: str
     internal__window_width: int
     internal__window_height: int
@@ -60,16 +49,13 @@ class SettngsNS(settngs.TypedNS):
     internal__list_width: int
     internal__sort_column: int
     internal__sort_direction: int
+    internal__remove_archive_after_successful_match: bool
 
     Issue_Identifier__series_match_identify_thresh: int
-    Issue_Identifier__border_crop_percent: int
-    Issue_Identifier__publisher_filter: list[str]
     Issue_Identifier__series_match_search_thresh: int
-    Issue_Identifier__clear_metadata: bool
-    Issue_Identifier__auto_imprint: bool
+    Issue_Identifier__border_crop_percent: int
     Issue_Identifier__sort_series_by_year: bool
     Issue_Identifier__exact_series_matches_first: bool
-    Issue_Identifier__always_use_publisher_filter: bool
 
     Filename_Parsing__filename_parser: comicapi.utils.Parser
     Filename_Parsing__remove_c2c: bool
@@ -81,18 +67,22 @@ class SettngsNS(settngs.TypedNS):
 
     Sources__source: str
 
-    Metadata_Options__cbl_assume_lone_credit_is_primary: bool
-    Metadata_Options__cbl_copy_characters_to_tags: bool
-    Metadata_Options__cbl_copy_teams_to_tags: bool
-    Metadata_Options__cbl_copy_locations_to_tags: bool
-    Metadata_Options__cbl_copy_storyarcs_to_tags: bool
-    Metadata_Options__cbl_copy_notes_to_comments: bool
-    Metadata_Options__cbl_copy_weblink_to_comments: bool
-    Metadata_Options__cbl_apply_transform_on_import: bool
-    Metadata_Options__cbl_apply_transform_on_bulk_operation: bool
+    Metadata_Options__assume_lone_credit_is_primary: bool
+    Metadata_Options__copy_characters_to_tags: bool
+    Metadata_Options__copy_teams_to_tags: bool
+    Metadata_Options__copy_locations_to_tags: bool
+    Metadata_Options__copy_storyarcs_to_tags: bool
+    Metadata_Options__copy_notes_to_comments: bool
+    Metadata_Options__copy_weblink_to_comments: bool
+    Metadata_Options__apply_transform_on_import: bool
+    Metadata_Options__apply_transform_on_bulk_operation: bool
     Metadata_Options__remove_html_tables: bool
-    Metadata_Options__use_short_metadata_names: bool
-    Metadata_Options__disable_cr: bool
+    Metadata_Options__use_short_tag_names: bool
+    Metadata_Options__cr: bool
+    Metadata_Options__tag_merge: comicapi.merge.Mode
+    Metadata_Options__metadata_merge: comicapi.merge.Mode
+    Metadata_Options__tag_merge_lists: bool
+    Metadata_Options__metadata_merge_lists: bool
 
     File_Rename__template: str
     File_Rename__issue_number_padding: int
@@ -101,14 +91,21 @@ class SettngsNS(settngs.TypedNS):
     File_Rename__dir: str
     File_Rename__move: bool
     File_Rename__only_move: bool
-    File_Rename__strict: bool
+    File_Rename__strict_filenames: bool
     File_Rename__replacements: comictaggerlib.defaults.Replacements
 
+    Auto_Tag__online: bool
     Auto_Tag__save_on_low_confidence: bool
-    Auto_Tag__dont_use_year_when_identifying: bool
+    Auto_Tag__use_year_when_identifying: bool
     Auto_Tag__assume_issue_one: bool
     Auto_Tag__ignore_leading_numbers_in_filename: bool
-    Auto_Tag__remove_archive_after_successful_match: bool
+    Auto_Tag__prefer_filename: bool
+    Auto_Tag__issue_id: str | None
+    Auto_Tag__metadata: comicapi.genericmetadata.GenericMetadata
+    Auto_Tag__clear_tags: bool
+    Auto_Tag__publisher_filter: list[str]
+    Auto_Tag__use_publisher_filter: bool
+    Auto_Tag__auto_imprint: bool
 
     General__check_for_new_version: bool
     General__blur: bool
@@ -128,46 +125,35 @@ class SettngsNS(settngs.TypedNS):
 class Commands(typing.TypedDict):
     version: bool
     command: comictaggerlib.resulttypes.Action
-    copy: str
+    copy: list[str]
 
 
 class Runtime_Options(typing.TypedDict):
     config: comictaggerlib.ctsettings.types.ComicTaggerPaths
     verbose: int
-    abort_on_conflict: bool
-    delete_original: bool
-    parse_filename: bool
-    prefer_filename: bool
-    issue_id: str | None
-    online: bool
-    metadata: comicapi.genericmetadata.GenericMetadata
-    interactive: bool
-    abort_on_low_confidence: bool
-    summary: bool
-    raw: bool
-    recursive: bool
-    dryrun: bool
-    darkmode: bool
-    glob: bool
     quiet: bool
     json: bool
-    type_modify: list[str]
-    type_read: list[str]
-    read_style_overlay: comicapi.merge.Mode
-    source_overlay: comicapi.merge.Mode
-    overlay_merge_lists: bool
-    overwrite: bool
+    raw: bool
+    interactive: bool
+    abort_on_low_confidence: bool
+    dryrun: bool
+    summary: bool
+    recursive: bool
+    glob: bool
+    darkmode: bool
     no_gui: bool
+    abort_on_conflict: bool
+    delete_original: bool
+    tags_read: list[str]
+    tags_write: list[str]
+    skip_existing_tags: bool
     files: list[str]
 
 
 class internal(typing.TypedDict):
     install_id: str
-    save_data_style: list[str]
-    load_data_style: list[str]
-    load_data_overlay: comicapi.merge.Mode
-    source_data_overlay: comicapi.merge.Mode
-    overlay_merge_lists: bool
+    write_tags: list[str]
+    read_tags: list[str]
     last_opened_folder: str
     window_width: int
     window_height: int
@@ -177,18 +163,15 @@ class internal(typing.TypedDict):
     list_width: int
     sort_column: int
     sort_direction: int
+    remove_archive_after_successful_match: bool
 
 
 class Issue_Identifier(typing.TypedDict):
     series_match_identify_thresh: int
-    border_crop_percent: int
-    publisher_filter: list[str]
     series_match_search_thresh: int
-    clear_metadata: bool
-    auto_imprint: bool
+    border_crop_percent: int
     sort_series_by_year: bool
     exact_series_matches_first: bool
-    always_use_publisher_filter: bool
 
 
 class Filename_Parsing(typing.TypedDict):
@@ -206,18 +189,22 @@ class Sources(typing.TypedDict):
 
 
 class Metadata_Options(typing.TypedDict):
-    cbl_assume_lone_credit_is_primary: bool
-    cbl_copy_characters_to_tags: bool
-    cbl_copy_teams_to_tags: bool
-    cbl_copy_locations_to_tags: bool
-    cbl_copy_storyarcs_to_tags: bool
-    cbl_copy_notes_to_comments: bool
-    cbl_copy_weblink_to_comments: bool
-    cbl_apply_transform_on_import: bool
-    cbl_apply_transform_on_bulk_operation: bool
+    assume_lone_credit_is_primary: bool
+    copy_characters_to_tags: bool
+    copy_teams_to_tags: bool
+    copy_locations_to_tags: bool
+    copy_storyarcs_to_tags: bool
+    copy_notes_to_comments: bool
+    copy_weblink_to_comments: bool
+    apply_transform_on_import: bool
+    apply_transform_on_bulk_operation: bool
     remove_html_tables: bool
-    use_short_metadata_names: bool
-    disable_cr: bool
+    use_short_tag_names: bool
+    cr: bool
+    tag_merge: comicapi.merge.Mode
+    metadata_merge: comicapi.merge.Mode
+    tag_merge_lists: bool
+    metadata_merge_lists: bool
 
 
 class File_Rename(typing.TypedDict):
@@ -228,16 +215,23 @@ class File_Rename(typing.TypedDict):
     dir: str
     move: bool
     only_move: bool
-    strict: bool
+    strict_filenames: bool
     replacements: comictaggerlib.defaults.Replacements
 
 
 class Auto_Tag(typing.TypedDict):
+    online: bool
     save_on_low_confidence: bool
-    dont_use_year_when_identifying: bool
+    use_year_when_identifying: bool
     assume_issue_one: bool
     ignore_leading_numbers_in_filename: bool
-    remove_archive_after_successful_match: bool
+    prefer_filename: bool
+    issue_id: str | None
+    metadata: comicapi.genericmetadata.GenericMetadata
+    clear_tags: bool
+    publisher_filter: list[str]
+    use_publisher_filter: bool
+    auto_imprint: bool
 
 
 class General(typing.TypedDict):

comictaggerlib/ctsettings/types.py

@@ -12,7 +12,7 @@ import yaml
 from appdirs import AppDirs
 
 from comicapi import utils
-from comicapi.comicarchive import metadata_styles
+from comicapi.comicarchive import tags
 from comicapi.genericmetadata import REMOVE, GenericMetadata
 
 if sys.version_info < (3, 10):
@@ -147,22 +147,18 @@ class ComicTaggerPaths(AppDirs):
     def site_config_dir(self) -> pathlib.Path:
         return pathlib.Path(super().site_config_dir)
 
-
-def metadata_type_single(types: str) -> str:
-    result = metadata_type(types)
-    if len(result) > 1:
-        raise argparse.ArgumentTypeError(f"invalid choice: {result} (only one metadata style allowed)")
-    return result[0]
+    def __str__(self) -> str:
+        return f"logs: {self.user_log_dir}, config: {self.user_config_dir}, cache: {self.user_cache_dir}"
 
 
-def metadata_type(types: str) -> list[str]:
+def tag(types: str) -> list[str]:
     result = []
     types = types.casefold()
     for typ in utils.split(types, ","):
-        if typ not in metadata_styles:
-            choices = ", ".join(metadata_styles)
+        if typ not in tags:
+            choices = ", ".join(tags)
             raise argparse.ArgumentTypeError(f"invalid choice: {typ} (choose from {choices.upper()})")
-        result.append(metadata_styles[typ].short_name)
+        result.append(tags[typ].id)
     return result
 
 

comictaggerlib/fileselectionlist.py

@@ -69,7 +69,7 @@ class FileSelectionList(QtWidgets.QWidget):
         self.separator.setSeparator(True)
 
         select_all_action.setShortcut("Ctrl+A")
-        remove_action.setShortcut("Ctrl+X")
+        remove_action.setShortcut("Backspace" if platform.system() == "Darwin" else "Delete")
 
         select_all_action.triggered.connect(self.select_all)
         remove_action.triggered.connect(self.remove_selection)
@@ -244,7 +244,7 @@ class FileSelectionList(QtWidgets.QWidget):
                 self,
                 "RAR Files are Read-Only",
                 "It looks like you have opened a RAR/CBR archive,\n"
-                "however ComicTagger cannot currently write to them without the rar program and are marked read only!\n\n"
+                "however ComicTagger cannot write to them without the rar program and are marked read only!\n\n"
                 f"{rar_help}",
             )
             self.rar_ro_shown = True
@@ -324,8 +324,7 @@ class FileSelectionList(QtWidgets.QWidget):
             type_item.setText(item_text)
             type_item.setData(QtCore.Qt.ItemDataRole.ToolTipRole, item_text)
 
-            styles = ", ".join(x for x in ca.get_supported_metadata() if ca.has_metadata(x))
-            md_item.setText(styles)
+            md_item.setText(", ".join(x for x in ca.get_supported_tags() if ca.has_tags(x)))
 
             if not ca.is_writable():
                 readonly_item.setCheckState(QtCore.Qt.CheckState.Checked)

comictaggerlib/graphics/graphics.qrc

@@ -0,0 +1,24 @@
+<RCC>
+  <qresource prefix="graphics">
+    <file>about.png</file>
+    <file>app.png</file>
+    <file>auto.png</file>
+    <file>autotag.png</file>
+    <file>browse.png</file>
+    <file>clear.png</file>
+    <file>down.png</file>
+    <file>eye.svg</file>
+    <file>hidden.svg</file>
+    <file>left.png</file>
+    <file>longbox.png</file>
+    <file>nocover.png</file>
+    <file>open.png</file>
+    <file>parse.png</file>
+    <file>popup_bg.png</file>
+    <file>right.png</file>
+    <file>save.png</file>
+    <file>search.png</file>
+    <file>tags.png</file>
+    <file>up.png</file>
+  </qresource>
+</RCC>

comictaggerlib/gui.py

@@ -111,10 +111,8 @@ def open_tagger_window(
 
     # needed to catch initial open file events (macOS)
     app.openFileRequest.connect(lambda x: config[0].Runtime_Options__files.append(x.toLocalFile()))
-
-    if platform.system() == "Darwin":
-        # Set the MacOS dock icon
-        app.setWindowIcon(QtGui.QIcon(str(graphics_path / "app.png")))
+    # The window Icon needs to be set here. It's also set in taggerwindow.ui but it doesn't seem to matter
+    app.setWindowIcon(QtGui.QIcon(":/graphics/app.png"))
 
     if platform.system() == "Windows":
         # For pure python, tell windows that we're not python,
@@ -139,7 +137,6 @@ def open_tagger_window(
 
     try:
         tagger_window = TaggerWindow(config[0].Runtime_Options__files, config, talkers)
-        tagger_window.setWindowIcon(QtGui.QIcon(str(graphics_path / "app.png")))
         tagger_window.show()
 
         # Catch open file events (macOS)

comictaggerlib/imagepopup.py

@@ -21,7 +21,6 @@ import platform
 
 from PyQt5 import QtCore, QtGui, QtWidgets, sip, uic
 
-from comictaggerlib.graphics import graphics_path
 from comictaggerlib.ui import ui_path
 
 logger = logging.getLogger(__name__)
@@ -78,7 +77,7 @@ class ImagePopup(QtWidgets.QDialog):
             # translucent screen over it.  Probably can do it better by setting opacity of a widget
             # TODO: macOS denies this
             self.desktopBg = screen.grabWindow(sip.voidptr(0), 0, 0, screen_size.width(), screen_size.height())
-            bg = QtGui.QPixmap(str(graphics_path / "popup_bg.png"))
+            bg = QtGui.QPixmap(":/graphics/popup_bg.png")
             self.clientBgPixmap = bg.scaled(
                 screen_size.width(),
                 screen_size.height(),

comictaggerlib/issueidentifier.py

@@ -111,7 +111,7 @@ class IssueIdentifier:
         self.series_match_thresh = config.Issue_Identifier__series_match_identify_thresh
 
         # used to eliminate unlikely publishers
-        self.publisher_filter = [s.strip().casefold() for s in config.Issue_Identifier__publisher_filter]
+        self.publisher_filter = [s.strip().casefold() for s in config.Auto_Tag__publisher_filter]
 
         self.additional_metadata = GenericMetadata()
         self.output_function: Callable[[str], None] = print

comictaggerlib/main.py

@@ -127,8 +127,8 @@ class App:
         self._extend_plugin_paths(local_plugins)
 
         comicapi.comicarchive.load_archive_plugins(local_plugins=[p.entry_point for p in local_plugins.archivers])
-        comicapi.comicarchive.load_metadata_plugins(
-            version=version, local_plugins=[p.entry_point for p in local_plugins.metadata]
+        comicapi.comicarchive.load_tag_plugins(
+            version=version, local_plugins=[p.entry_point for p in local_plugins.tags]
         )
         self.talkers = comictalker.get_talkers(
             version, opts.config.user_cache_dir, local_plugins=[p.entry_point for p in local_plugins.talkers]
@@ -141,7 +141,7 @@ class App:
         self,
         talkers: Collection[comictalker.ComicTalker],
         archivers: Collection[type[comicapi.comicarchive.Archiver]],
-        metadata_styles: Collection[comicapi.comicarchive.Metadata],
+        tags: Collection[comicapi.comicarchive.Tag],
     ) -> None:
         if self.config[0].Runtime_Options__json:
             for talker in talkers:
@@ -183,14 +183,14 @@ class App:
                         )
                     )
 
-            for style in metadata_styles:
+            for tag in tags:
                 print(  # noqa: T201
                     json.dumps(
                         {
-                            "type": "metadata",
-                            "enabled": style.enabled,
-                            "name": style.name(),
-                            "short_name": style.short_name,
+                            "type": "tag",
+                            "enabled": tag.enabled,
+                            "name": tag.name(),
+                            "id": tag.id,
                         }
                     )
                 )
@@ -199,14 +199,14 @@ class App:
             for talker in talkers:
                 print(f"{talker.id:<10}: {talker.name:<21}, {talker.website}")  # noqa: T201
 
-            print("\nComic Archive: (Name: extension, exe)")  # noqa: T201
+            print("\nComic Archive: (Enabled, Name: extension, exe)")  # noqa: T201
             for archiver in archivers:
                 a = archiver()
-                print(f"{a.name():<10}: {a.extension():<5}, {a.exe}")  # noqa: T201
+                print(f"{a.enabled!s:<5}, {a.name():<10}: {a.extension():<5}, {a.exe}")  # noqa: T201
 
-            print("\nMetadata Style: (Short Name: Name)")  # noqa: T201
-            for style in metadata_styles:
-                print(f"{style.short_name:<10}: {style.name()}")  # noqa: T201
+            print("\nTags: (Enabled, ID: Name)")  # noqa: T201
+            for tag in tags:
+                print(f"{tag.enabled!s:<5}, {tag.id:<10}: {tag.name()}")  # noqa: T201
 
     def initialize(self) -> argparse.Namespace:
         conf, _ = self.initial_arg_parser.parse_known_intermixed_args()
@@ -252,9 +252,12 @@ class App:
         # config already loaded
         error = None
 
-        if self.config[0].Metadata_Options__disable_cr:
-            if "cr" in comicapi.comicarchive.metadata_styles:
-                del comicapi.comicarchive.metadata_styles["cr"]
+        if (
+            not self.config[0].Metadata_Options__cr
+            and "cr" in comicapi.comicarchive.tags
+            and comicapi.comicarchive.tags["cr"].enabled
+        ):
+            comicapi.comicarchive.tags["cr"].enabled = False
 
         if len(self.talkers) < 1:
             error = error = (
@@ -277,7 +280,7 @@ class App:
             self.list_plugins(
                 list(self.talkers.values()),
                 comicapi.comicarchive.archivers,
-                comicapi.comicarchive.metadata_styles.values(),
+                comicapi.comicarchive.tags.values(),
             )
             return
 

comictaggerlib/md.py

@@ -10,32 +10,30 @@ from comictaggerlib.ctsettings.settngs_namespace import SettngsNS
 from comictalker.talker_utils import cleanup_html
 
 
-def prepare_metadata(md: GenericMetadata, new_md: GenericMetadata, opts: SettngsNS) -> GenericMetadata:
-    if opts.Metadata_Options__cbl_apply_transform_on_import:
-        new_md = CBLTransformer(new_md, opts).apply()
+def prepare_metadata(md: GenericMetadata, new_md: GenericMetadata, config: SettngsNS) -> GenericMetadata:
+    if config.Metadata_Options__apply_transform_on_import:
+        new_md = CBLTransformer(new_md, config).apply()
 
     final_md = md.copy()
-    if opts.Issue_Identifier__clear_metadata:
+    if config.Auto_Tag__clear_tags:
         final_md = GenericMetadata()
 
-    final_md.overlay(new_md)
-    if final_md.tag_origin is not None:
-        notes = (
-            f"Tagged with ComicTagger {ctversion.version} using info from {final_md.tag_origin.name} on"
-            + f" {datetime.now():%Y-%m-%d %H:%M:%S}. [Issue ID {final_md.issue_id}]"
-        )
-    else:
-        notes = (
-            f"Tagged with ComicTagger {ctversion.version} on"
-            + f" {datetime.now():%Y-%m-%d %H:%M:%S}. "
-            + (f"[Issue ID {final_md.issue_id}]" if final_md.issue_id else "")
-        )
+    final_md.overlay(new_md, config.Metadata_Options__metadata_merge, config.Metadata_Options__metadata_merge_lists)
 
-    if opts.Issue_Identifier__auto_imprint:
+    issue_id = ""
+    if final_md.issue_id:
+        issue_id = f" [Issue ID {final_md.issue_id}]"
+
+    origin = ""
+    if final_md.data_origin is not None:
+        origin = f" using info from {final_md.data_origin.name}"
+    notes = f"Tagged with ComicTagger {ctversion.version}{origin} on {datetime.now():%Y-%m-%d %H:%M:%S}.{issue_id}"
+
+    if config.Auto_Tag__auto_imprint:
         final_md.fix_publisher()
 
     return final_md.replace(
         is_empty=False,
         notes=utils.combine_notes(final_md.notes, notes, "Tagged with ComicTagger"),
-        description=cleanup_html(final_md.description, opts.Metadata_Options__remove_html_tables) or None,
+        description=cleanup_html(final_md.description, config.Metadata_Options__remove_html_tables) or None,
     )

comictaggerlib/pagebrowser.py

@@ -17,14 +17,12 @@
 from __future__ import annotations
 
 import logging
-import platform
 
 from PyQt5 import QtCore, QtGui, QtWidgets, uic
 
 from comicapi.comicarchive import ComicArchive
 from comicapi.genericmetadata import GenericMetadata
 from comictaggerlib.coverimagewidget import CoverImageWidget
-from comictaggerlib.graphics import graphics_path
 from comictaggerlib.ui import ui_path
 
 logger = logging.getLogger(__name__)
@@ -57,12 +55,8 @@ class PageBrowserWindow(QtWidgets.QDialog):
         self.metadata = metadata
 
         self.buttonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Close).setDefault(True)
-        if platform.system() == "Darwin":
-            self.btnPrev.setText("<<")
-            self.btnNext.setText(">>")
-        else:
-            self.btnPrev.setIcon(QtGui.QIcon(str(graphics_path / "left.png")))
-            self.btnNext.setIcon(QtGui.QIcon(str(graphics_path / "right.png")))
+        self.btnPrev.setIcon(QtGui.QIcon(":/graphics/left.png"))
+        self.btnNext.setIcon(QtGui.QIcon(":/graphics/right.png"))
 
         self.btnNext.clicked.connect(self.next_page)
         self.btnPrev.clicked.connect(self.prev_page)

comictaggerlib/pagelisteditor.py

@@ -20,7 +20,7 @@ import logging
 
 from PyQt5 import QtCore, QtWidgets, uic
 
-from comicapi.comicarchive import ComicArchive, metadata_styles
+from comicapi.comicarchive import ComicArchive, tags
 from comicapi.genericmetadata import ImageMetadata, PageType
 from comictaggerlib.coverimagewidget import CoverImageWidget
 from comictaggerlib.ui import ui_path
@@ -118,7 +118,7 @@ class PageListEditor(QtWidgets.QWidget):
 
         self.comic_archive: ComicArchive | None = None
         self.pages_list: list[ImageMetadata] = []
-        self.data_styles: list[str] = []
+        self.tag_ids: list[str] = []
 
     def set_blur(self, blur: bool) -> None:
         self.pageWidget.blur = self.blur = blur
@@ -359,7 +359,7 @@ class PageListEditor(QtWidgets.QWidget):
         self.comic_archive = comic_archive
         self.pages_list = pages_list
         if pages_list:
-            self.set_metadata_style(self.data_styles)
+            self.select_read_tags(self.tag_ids)
         else:
             self.cbPageType.setEnabled(False)
             self.chkDoublePage.setEnabled(False)
@@ -402,15 +402,16 @@ class PageListEditor(QtWidgets.QWidget):
             self.first_front_page = self.get_first_front_cover()
             self.firstFrontCoverChanged.emit(self.first_front_page)
 
-    def set_metadata_style(self, data_styles: list[str]) -> None:
-        # depending on the current data style, certain fields are disabled
-        if data_styles:
-            styles = [metadata_styles[style] for style in data_styles]
-            enabled_widgets = set()
-            for style in styles:
-                enabled_widgets.update(style.supported_attributes)
+    def select_read_tags(self, tag_ids: list[str]) -> None:
+        # depending on the current tags, certain fields are disabled
+        if not tag_ids:
+            return
 
-            self.data_styles = data_styles
+        enabled_widgets = set()
+        for tag_id in tag_ids:
+            enabled_widgets.update(tags[tag_id].supported_attributes)
 
-            for metadata, widget in self.md_attributes.items():
-                enable_widget(widget, metadata in enabled_widgets)
+        self.tag_ids = tag_ids
+
+        for md_field, widget in self.md_attributes.items():
+            enable_widget(widget, md_field in enabled_widgets)

comictaggerlib/renamewindow.py

@@ -22,7 +22,7 @@ import settngs
 from PyQt5 import QtCore, QtWidgets, uic
 
 from comicapi import utils
-from comicapi.comicarchive import ComicArchive, metadata_styles
+from comicapi.comicarchive import ComicArchive, tags
 from comicapi.genericmetadata import GenericMetadata
 from comictaggerlib.ctsettings import ct_ns
 from comictaggerlib.filerenamer import FileRenamer, get_rename_dir
@@ -39,7 +39,7 @@ class RenameWindow(QtWidgets.QDialog):
         self,
         parent: QtWidgets.QWidget,
         comic_archive_list: list[ComicArchive],
-        load_data_styles: list[str],
+        read_tag_ids: list[str],
         config: settngs.Config[ct_ns],
         talkers: dict[str, ComicTalker],
     ) -> None:
@@ -48,9 +48,7 @@ class RenameWindow(QtWidgets.QDialog):
         with (ui_path / "renamewindow.ui").open(encoding="utf-8") as uifile:
             uic.loadUi(uifile, self)
 
-        self.label.setText(
-            f"Preview (based on {', '.join(metadata_styles[style].name() for style in load_data_styles)} tags):"
-        )
+        self.label.setText(f"Preview (based on {', '.join(tags[tag].name() for tag in read_tag_ids)} tags):")
 
         self.setWindowFlags(
             QtCore.Qt.WindowType(
@@ -63,11 +61,11 @@ class RenameWindow(QtWidgets.QDialog):
         self.config = config
         self.talkers = talkers
         self.comic_archive_list = comic_archive_list
-        self.load_data_styles = load_data_styles
+        self.read_tag_ids = read_tag_ids
         self.rename_list: list[str] = []
 
         self.btnSettings.clicked.connect(self.modify_settings)
-        platform = "universal" if self.config[0].File_Rename__strict else "auto"
+        platform = "universal" if self.config[0].File_Rename__strict_filenames else "auto"
         self.renamer = FileRenamer(None, platform=platform, replacements=self.config[0].File_Rename__replacements)
 
         self.do_preview()
@@ -84,13 +82,13 @@ class RenameWindow(QtWidgets.QDialog):
             new_ext = ca.extension()
 
         if md is None or md.is_empty:
-            md, error = self.parent().overlay_ca_read_style(self.load_data_styles, ca)
+            md, error = self.parent().read_all_tags(self.read_tag_ids, ca)
             if error is not None:
-                logger.error("Failed to load metadata for %s: %s", ca.path, error)
+                logger.error("Failed to load tags from %s: %s", ca.path, error)
                 QtWidgets.QMessageBox.warning(
                     self,
                     "Read Failed!",
-                    f"One or more of the read styles failed to load for {ca.path}, check log for details",
+                    f"One or more of the read tags failed to load for {ca.path}, check log for details",
                 )
 
             if md.is_empty:

comictaggerlib/resulttypes.py

@@ -82,6 +82,7 @@ class Result:
 
     md: GenericMetadata | None = None
 
+    tags_read: list[str] = dataclasses.field(default_factory=list)
     tags_deleted: list[str] = dataclasses.field(default_factory=list)
     tags_written: list[str] = dataclasses.field(default_factory=list)
 

comictaggerlib/seriesselectionwindow.py

@@ -156,7 +156,7 @@ class SeriesSelectionWindow(QtWidgets.QDialog):
         self.progdialog: QtWidgets.QProgressDialog | None = None
         self.search_thread: SearchThread | None = None
 
-        self.use_filter = self.config.Issue_Identifier__always_use_publisher_filter
+        self.use_filter = self.config.Auto_Tag__use_publisher_filter
 
         # Load to retrieve settings
         self.talker = talker
@@ -403,7 +403,7 @@ class SeriesSelectionWindow(QtWidgets.QDialog):
         # filter the publishers if enabled set
         if self.use_filter:
             try:
-                publisher_filter = {s.strip().casefold() for s in self.config.Issue_Identifier__publisher_filter}
+                publisher_filter = {s.strip().casefold() for s in self.config.Auto_Tag__publisher_filter}
                 # use '' as publisher name if None
                 self.series_list = dict(
                     filter(

comictaggerlib/settingswindow.py

@@ -71,7 +71,7 @@ template_tooltip = """
 The template for the new filename. Uses python format strings https://docs.python.org/3/library/string.html#format-string-syntax
 Accepts the following variables:
 {is_empty}         (boolean)
-{tag_origin}       (string)
+{data_origin}       (string)
 {series}           (string)
 {issue}            (string)
 {title}            (string)
@@ -195,8 +195,8 @@ class SettingsWindow(QtWidgets.QDialog):
         self.cbFilenameParser.clear()
         self.cbFilenameParser.addItems(utils.Parser)
         for mode in merge.Mode:
-            self.cbxOverlayReadStyle.addItem(mode.name.capitalize().replace("_", " "), mode.value)
-            self.cbxOverlaySource.addItem(mode.name.capitalize().replace("_", " "), mode.value)
+            self.cbTagsMergeMode.addItem(mode.name.capitalize().replace("_", " "), mode)
+            self.cbDownloadMergeMode.addItem(mode.name.capitalize().replace("_", " "), mode)
         self.connect_signals()
         self.settings_to_form()
         self.rename_test()
@@ -337,9 +337,9 @@ class SettingsWindow(QtWidgets.QDialog):
         table.setItem(row, 1, QtWidgets.QTableWidgetItem(replace))
         tmp = QtWidgets.QTableWidgetItem()
         if strict_only:
-            tmp.setCheckState(QtCore.Qt.Checked)
+            tmp.setCheckState(QtCore.Qt.CheckState.Checked)
         else:
-            tmp.setCheckState(QtCore.Qt.Unchecked)
+            tmp.setCheckState(QtCore.Qt.CheckState.Unchecked)
         table.setItem(row, 2, tmp)
 
     def rename_test(self, *args: Any, **kwargs: Any) -> None:
@@ -412,9 +412,10 @@ class SettingsWindow(QtWidgets.QDialog):
             self.leRarExePath.setEnabled(False)
         self.sbNameMatchIdentifyThresh.setValue(self.config[0].Issue_Identifier__series_match_identify_thresh)
         self.sbNameMatchSearchThresh.setValue(self.config[0].Issue_Identifier__series_match_search_thresh)
-        self.tePublisherFilter.setPlainText("\n".join(self.config[0].Issue_Identifier__publisher_filter))
+        self.tePublisherFilter.setPlainText("\n".join(self.config[0].Auto_Tag__publisher_filter))
 
         self.cbxCheckForNewVersion.setChecked(self.config[0].General__check_for_new_version)
+        self.cbxPromptOnSave.setChecked(self.config[0].General__prompt_on_save)
 
         self.cbFilenameParser.setCurrentText(self.config[0].Filename_Parsing__filename_parser)
         self.cbxRemoveC2C.setChecked(self.config[0].Filename_Parsing__remove_c2c)
@@ -427,32 +428,32 @@ class SettingsWindow(QtWidgets.QDialog):
 
         self.switch_parser()
 
-        self.cbxUseFilter.setChecked(self.config[0].Issue_Identifier__always_use_publisher_filter)
+        self.cbxUseFilter.setChecked(self.config[0].Auto_Tag__use_publisher_filter)
         self.cbxSortByYear.setChecked(self.config[0].Issue_Identifier__sort_series_by_year)
         self.cbxExactMatches.setChecked(self.config[0].Issue_Identifier__exact_series_matches_first)
-        self.cbxClearFormBeforePopulating.setChecked(self.config[0].Issue_Identifier__clear_metadata)
+        self.cbxClearFormBeforePopulating.setChecked(self.config[0].Auto_Tag__clear_tags)
 
-        self.cbxAssumeLoneCreditIsPrimary.setChecked(self.config[0].Metadata_Options__cbl_assume_lone_credit_is_primary)
-        self.cbxCopyCharactersToTags.setChecked(self.config[0].Metadata_Options__cbl_copy_characters_to_tags)
-        self.cbxCopyTeamsToTags.setChecked(self.config[0].Metadata_Options__cbl_copy_teams_to_tags)
-        self.cbxCopyLocationsToTags.setChecked(self.config[0].Metadata_Options__cbl_copy_locations_to_tags)
-        self.cbxCopyStoryArcsToTags.setChecked(self.config[0].Metadata_Options__cbl_copy_storyarcs_to_tags)
-        self.cbxCopyNotesToComments.setChecked(self.config[0].Metadata_Options__cbl_copy_notes_to_comments)
-        self.cbxCopyWebLinkToComments.setChecked(self.config[0].Metadata_Options__cbl_copy_weblink_to_comments)
-        self.cbxApplyCBLTransformOnCVIMport.setChecked(self.config[0].Metadata_Options__cbl_apply_transform_on_import)
+        self.cbxAssumeLoneCreditIsPrimary.setChecked(self.config[0].Metadata_Options__assume_lone_credit_is_primary)
+        self.cbxCopyCharactersToTags.setChecked(self.config[0].Metadata_Options__copy_characters_to_tags)
+        self.cbxCopyTeamsToTags.setChecked(self.config[0].Metadata_Options__copy_teams_to_tags)
+        self.cbxCopyLocationsToTags.setChecked(self.config[0].Metadata_Options__copy_locations_to_tags)
+        self.cbxCopyStoryArcsToTags.setChecked(self.config[0].Metadata_Options__copy_storyarcs_to_tags)
+        self.cbxCopyNotesToComments.setChecked(self.config[0].Metadata_Options__copy_notes_to_comments)
+        self.cbxCopyWebLinkToComments.setChecked(self.config[0].Metadata_Options__copy_weblink_to_comments)
+        self.cbxApplyCBLTransformOnCVIMport.setChecked(self.config[0].Metadata_Options__apply_transform_on_import)
         self.cbxApplyCBLTransformOnBatchOperation.setChecked(
-            self.config[0].Metadata_Options__cbl_apply_transform_on_bulk_operation
+            self.config[0].Metadata_Options__apply_transform_on_bulk_operation
         )
         self.cbxRemoveHtmlTables.setChecked(self.config[0].Metadata_Options__remove_html_tables)
-        self.cbxOverlayReadStyle.setCurrentIndex(
-            self.cbxOverlayReadStyle.findData(self.config[0].internal__load_data_overlay.value)
+
+        self.cbTagsMergeMode.setCurrentIndex(self.cbTagsMergeMode.findData(self.config[0].Metadata_Options__tag_merge))
+        self.cbDownloadMergeMode.setCurrentIndex(
+            self.cbDownloadMergeMode.findData(self.config[0].Metadata_Options__metadata_merge)
         )
-        self.cbxOverlaySource.setCurrentIndex(
-            self.cbxOverlaySource.findData(self.config[0].internal__source_data_overlay.value)
-        )
-        self.cbxOverlayMergeLists.setChecked(self.config[0].internal__overlay_merge_lists)
-        self.cbxShortMetadataNames.setChecked(self.config[0].Metadata_Options__use_short_metadata_names)
-        self.cbxDisableCR.setChecked(self.config[0].Metadata_Options__disable_cr)
+        self.cbxTagsMergeLists.setChecked(self.config[0].Metadata_Options__tag_merge_lists)
+        self.cbxMergeListsMetadata.setChecked(self.config[0].Metadata_Options__metadata_merge_lists)
+        self.cbxShortTagNames.setChecked(self.config[0].Metadata_Options__use_short_tag_names)
+        self.cbxEnableCR.setChecked(self.config[0].Metadata_Options__cr)
 
         self.leRenameTemplate.setText(self.config[0].File_Rename__template)
         self.leIssueNumPadding.setText(str(self.config[0].File_Rename__issue_number_padding))
@@ -461,7 +462,7 @@ class SettingsWindow(QtWidgets.QDialog):
         self.cbxMoveFiles.setChecked(self.config[0].File_Rename__move)
         self.cbxMoveOnly.setChecked(self.config[0].File_Rename__only_move)
         self.leDirectory.setText(self.config[0].File_Rename__dir)
-        self.cbxRenameStrict.setChecked(self.config[0].File_Rename__strict)
+        self.cbxRenameStrict.setChecked(self.config[0].File_Rename__strict_filenames)
 
         for table, replacments in zip(
             (self.twLiteralReplacements, self.twValueReplacements), self.config[0].File_Rename__replacements
@@ -486,7 +487,7 @@ class SettingsWindow(QtWidgets.QDialog):
                     Replacement(
                         self.twLiteralReplacements.item(row, 0).text(),
                         self.twLiteralReplacements.item(row, 1).text(),
-                        self.twLiteralReplacements.item(row, 2).checkState() == QtCore.Qt.Checked,
+                        self.twLiteralReplacements.item(row, 2).checkState() == QtCore.Qt.CheckState.Checked,
                     )
                 )
         for row in range(self.twValueReplacements.rowCount()):
@@ -495,7 +496,7 @@ class SettingsWindow(QtWidgets.QDialog):
                     Replacement(
                         self.twValueReplacements.item(row, 0).text(),
                         self.twValueReplacements.item(row, 1).text(),
-                        self.twValueReplacements.item(row, 2).checkState() == QtCore.Qt.Checked,
+                        self.twValueReplacements.item(row, 2).checkState() == QtCore.Qt.CheckState.Checked,
                     )
                 )
         return Replacements(literal_replacements, value_replacements)
@@ -543,10 +544,11 @@ class SettingsWindow(QtWidgets.QDialog):
             self.leIssueNumPadding.setText("0")
 
         self.config[0].General__check_for_new_version = self.cbxCheckForNewVersion.isChecked()
+        self.config[0].General__prompt_on_save = self.cbxPromptOnSave.isChecked()
 
         self.config[0].Issue_Identifier__series_match_identify_thresh = self.sbNameMatchIdentifyThresh.value()
         self.config[0].Issue_Identifier__series_match_search_thresh = self.sbNameMatchSearchThresh.value()
-        self.config[0].Issue_Identifier__publisher_filter = utils.split(self.tePublisherFilter.toPlainText(), "\n")
+        self.config[0].Auto_Tag__publisher_filter = utils.split(self.tePublisherFilter.toPlainText(), "\n")
 
         self.config[0].Filename_Parsing__filename_parser = utils.Parser(self.cbFilenameParser.currentText())
         self.config[0].Filename_Parsing__remove_c2c = self.cbxRemoveC2C.isChecked()
@@ -557,34 +559,35 @@ class SettingsWindow(QtWidgets.QDialog):
             self.cbxProtofoliusIssueNumberScheme.isChecked()
         )
 
-        self.config[0].Issue_Identifier__always_use_publisher_filter = self.cbxUseFilter.isChecked()
+        self.config[0].Auto_Tag__use_publisher_filter = self.cbxUseFilter.isChecked()
         self.config[0].Issue_Identifier__sort_series_by_year = self.cbxSortByYear.isChecked()
         self.config[0].Issue_Identifier__exact_series_matches_first = self.cbxExactMatches.isChecked()
-        self.config[0].Issue_Identifier__clear_metadata = self.cbxClearFormBeforePopulating.isChecked()
+        self.config[0].Auto_Tag__clear_tags = self.cbxClearFormBeforePopulating.isChecked()
 
-        self.config[0].Metadata_Options__cbl_assume_lone_credit_is_primary = (
-            self.cbxAssumeLoneCreditIsPrimary.isChecked()
-        )
-        self.config[0].Metadata_Options__cbl_copy_characters_to_tags = self.cbxCopyCharactersToTags.isChecked()
-        self.config[0].Metadata_Options__cbl_copy_teams_to_tags = self.cbxCopyTeamsToTags.isChecked()
-        self.config[0].Metadata_Options__cbl_copy_locations_to_tags = self.cbxCopyLocationsToTags.isChecked()
-        self.config[0].Metadata_Options__cbl_copy_storyarcs_to_tags = self.cbxCopyStoryArcsToTags.isChecked()
-        self.config[0].Metadata_Options__cbl_copy_notes_to_comments = self.cbxCopyNotesToComments.isChecked()
-        self.config[0].Metadata_Options__cbl_copy_weblink_to_comments = self.cbxCopyWebLinkToComments.isChecked()
-        self.config[0].Metadata_Options__cbl_apply_transform_on_import = self.cbxApplyCBLTransformOnCVIMport.isChecked()
-        self.config.values.Metadata_Options__cbl_apply_transform_on_bulk_operation = (
+        self.config[0].Metadata_Options__assume_lone_credit_is_primary = self.cbxAssumeLoneCreditIsPrimary.isChecked()
+        self.config[0].Metadata_Options__copy_characters_to_tags = self.cbxCopyCharactersToTags.isChecked()
+        self.config[0].Metadata_Options__copy_teams_to_tags = self.cbxCopyTeamsToTags.isChecked()
+        self.config[0].Metadata_Options__copy_locations_to_tags = self.cbxCopyLocationsToTags.isChecked()
+        self.config[0].Metadata_Options__copy_storyarcs_to_tags = self.cbxCopyStoryArcsToTags.isChecked()
+        self.config[0].Metadata_Options__copy_notes_to_comments = self.cbxCopyNotesToComments.isChecked()
+        self.config[0].Metadata_Options__copy_weblink_to_comments = self.cbxCopyWebLinkToComments.isChecked()
+        self.config[0].Metadata_Options__apply_transform_on_import = self.cbxApplyCBLTransformOnCVIMport.isChecked()
+        self.config.values.Metadata_Options__apply_transform_on_bulk_operation = (
             self.cbxApplyCBLTransformOnBatchOperation.isChecked()
         )
         self.config[0].Metadata_Options__remove_html_tables = self.cbxRemoveHtmlTables.isChecked()
-        self.config[0].internal__load_data_overlay = merge.Mode[self.cbxOverlayReadStyle.currentData().upper()]
-        self.config[0].internal__source_data_overlay = merge.Mode[self.cbxOverlaySource.currentData().upper()]
-        self.config[0].internal__overlay_merge_lists = self.cbxOverlayMergeLists.isChecked()
-        self.config[0].Metadata_Options__disable_cr = self.cbxDisableCR.isChecked()
-        # Update metadata style names if required
-        if self.config[0].Metadata_Options__use_short_metadata_names != self.cbxShortMetadataNames.isChecked():
-            self.config[0].Metadata_Options__use_short_metadata_names = self.cbxShortMetadataNames.isChecked()
-            self.parent().populate_style_names()
-            self.parent().adjust_save_style_combo()
+
+        self.config[0].Metadata_Options__tag_merge = merge.Mode(self.cbTagsMergeMode.currentData())
+        self.config[0].Metadata_Options__metadata_merge = merge.Mode(self.cbDownloadMergeMode.currentData())
+        self.config[0].Metadata_Options__tag_merge_lists = self.cbxTagsMergeLists.isChecked()
+        self.config[0].Metadata_Options__metadata_merge_lists = self.cbxMergeListsMetadata.isChecked()
+        self.config[0].Metadata_Options__cr = self.cbxEnableCR.isChecked()
+
+        # Update tag names if required
+        if self.config[0].Metadata_Options__use_short_tag_names != self.cbxShortTagNames.isChecked():
+            self.config[0].Metadata_Options__use_short_tag_names = self.cbxShortTagNames.isChecked()
+            self.parent().populate_tag_names()
+            self.parent().adjust_tags_combo()
 
         self.config[0].File_Rename__template = str(self.leRenameTemplate.text())
         self.config[0].File_Rename__issue_number_padding = int(self.leIssueNumPadding.text())
@@ -594,7 +597,7 @@ class SettingsWindow(QtWidgets.QDialog):
         self.config[0].File_Rename__only_move = self.cbxMoveOnly.isChecked()
         self.config[0].File_Rename__dir = self.leDirectory.text()
 
-        self.config[0].File_Rename__strict = self.cbxRenameStrict.isChecked()
+        self.config[0].File_Rename__strict_filenames = self.cbxRenameStrict.isChecked()
         self.config[0].File_Rename__replacements = self.get_replacements()
 
         # Read settings from talker tabs

comictaggerlib/taggerwindow.py

@@ -32,9 +32,10 @@ import settngs
 from PyQt5 import QtCore, QtGui, QtNetwork, QtWidgets, uic
 
 import comicapi.merge
+import comictaggerlib.graphics.resources
 import comictaggerlib.ui
 from comicapi import utils
-from comicapi.comicarchive import ComicArchive, metadata_styles
+from comicapi.comicarchive import ComicArchive, tags
 from comicapi.filenameparser import FileNameParser
 from comicapi.genericmetadata import GenericMetadata
 from comicapi.issuestring import IssueString
@@ -89,7 +90,7 @@ class TaggerWindow(QtWidgets.QMainWindow):
             uic.loadUi(uifile, self)
 
         self.md_attributes = {
-            "tag_origin": None,
+            "data_origin": None,
             "issue_id": None,
             "series": self.leSeries,
             "issue": self.leIssueNum,
@@ -212,28 +213,23 @@ class TaggerWindow(QtWidgets.QMainWindow):
 
         self.setWindowIcon(QtGui.QIcon(str(graphics_path / "app.png")))
 
-        # respect the command line option tag type
-        if config[0].Runtime_Options__type_modify:
-            config[0].internal__save_data_style = config[0].Runtime_Options__type_modify
-        if config[0].Runtime_Options__type_read:
-            config[0].internal__load_data_style = config[0].Runtime_Options__type_read
+        # respect the command line selected tags
+        if config[0].Runtime_Options__tags_write:
+            config[0].internal__write_tags = config[0].Runtime_Options__tags_write
 
-        # Respect command line overlay settings
-        if config[0].Runtime_Options__read_style_overlay:
-            config[0].internal__load_data_overlay = config[0].Runtime_Options__read_style_overlay
-        if config[0].Runtime_Options__source_overlay:
-            config[0].internal__source_data_overlay = config[0].Runtime_Options__source_overlay
-        if isinstance(config[0].Runtime_Options__overlay_merge_lists, bool):
-            config[0].internal__overlay_merge_lists = config[0].Runtime_Options__overlay_merge_lists
+        if config[0].Runtime_Options__tags_read:
+            config[0].internal__read_tags = config[0].Runtime_Options__tags_read
 
-        for style in config[0].internal__save_data_style:
-            if style not in metadata_styles:
-                config[0].internal__save_data_style.remove(style)
-        for style in config[0].internal__load_data_style:
-            if style not in metadata_styles:
-                config[0].internal__load_data_style.remove(style)
-        self.save_data_styles: list[str] = config[0].internal__save_data_style
-        self.load_data_styles: list[str] = config[0].internal__load_data_style
+        for tag_id in config[0].internal__write_tags:
+            if tag_id not in tags:
+                config[0].internal__write_tags.remove(tag_id)
+
+        for tag_id in config[0].internal__read_tags:
+            if tag_id not in tags:
+                config[0].internal__read_tags.remove(tag_id)
+
+        self.selected_write_tags: list[str] = config[0].internal__write_tags
+        self.selected_read_tags: list[str] = config[0].internal__read_tags
 
         self.setAcceptDrops(True)
         self.view_tag_actions, self.remove_tag_actions = self.tag_actions()
@@ -274,9 +270,9 @@ class TaggerWindow(QtWidgets.QMainWindow):
         self.cbMaturityRating.lineEdit().setAcceptDrops(False)
 
         # hook up the callbacks
-        self.cbLoadDataStyle.dropdownClosed.connect(self.set_load_data_style)
-        self.cbSaveDataStyle.itemChecked.connect(self.set_save_data_style)
-        self.cbx_sources.currentIndexChanged.connect(self.set_source)
+        self.cbSelectedReadTags.dropdownClosed.connect(self.select_read_tags)
+        self.cbSelectedWriteTags.itemChecked.connect(self.select_write_tags)
+        self.cbx_sources.currentIndexChanged.connect(self.select_source)
         self.btnEditCredit.clicked.connect(self.edit_credit)
         self.btnAddCredit.clicked.connect(self.add_credit)
         self.btnRemoveCredit.clicked.connect(self.remove_credit)
@@ -295,7 +291,7 @@ class TaggerWindow(QtWidgets.QMainWindow):
 
         self.page_list_editor.cbxBlur.clicked.connect(_sync_blur)
 
-        self.update_metadata_style_tweaks()
+        self.update_tag_tweaks()
 
         self.show()
         self.set_app_position()
@@ -344,14 +340,14 @@ class TaggerWindow(QtWidgets.QMainWindow):
     def tag_actions(self) -> tuple[dict[str, QtGui.QAction], dict[str, QtGui.QAction]]:
         view_raw_tags = {}
         remove_raw_tags = {}
-        for style in metadata_styles.values():
-            view_raw_tags[style.short_name] = self.menuViewRawTags.addAction(f"View Raw {style.name()} Tags")
-            view_raw_tags[style.short_name].setStatusTip(f"View raw {style.name()} tag block from file")
-            view_raw_tags[style.short_name].triggered.connect(functools.partial(self.view_raw_tags, style.short_name))
+        for tag in tags.values():
+            view_raw_tags[tag.id] = self.menuViewRawTags.addAction(f"View Raw {tag.name()} Tags")
+            view_raw_tags[tag.id].setStatusTip(f"View raw {tag.name()} tag block from file")
+            view_raw_tags[tag.id].triggered.connect(functools.partial(self.view_raw_tags, tag.id))
 
-            remove_raw_tags[style.short_name] = self.menuRemove.addAction(f"Remove Raw {style.name()} Tags")
-            remove_raw_tags[style.short_name].setStatusTip(f"Remove {style.name()} tags from comic archive")
-            remove_raw_tags[style.short_name].triggered.connect(functools.partial(self.remove_tags, [style.short_name]))
+            remove_raw_tags[tag.id] = self.menuRemove.addAction(f"Remove Raw {tag.name()} Tags")
+            remove_raw_tags[tag.id].setStatusTip(f"Remove {tag.name()} tags from comic archive")
+            remove_raw_tags[tag.id].triggered.connect(functools.partial(self.remove_tags, [tag.id]))
 
         return view_raw_tags, remove_raw_tags
 
@@ -418,134 +414,42 @@ class TaggerWindow(QtWidgets.QMainWindow):
 
     def config_menus(self) -> None:
         # File Menu
-        self.actionExit.setShortcut("Ctrl+Q")
-        self.actionExit.setStatusTip("Exit application")
-        self.actionExit.triggered.connect(self.close)
-
-        self.actionLoad.setShortcut("Ctrl+O")
-        self.actionLoad.setStatusTip("Load comic archive")
-        self.actionLoad.triggered.connect(self.select_file)
-
-        self.actionLoadFolder.setShortcut("Ctrl+Shift+O")
-        self.actionLoadFolder.setStatusTip("Load folder with comic archives")
-        self.actionLoadFolder.triggered.connect(self.select_folder)
-
-        self.actionOpenFolderAsComic.setShortcut("Ctrl+Shift+Alt+O")
-        self.actionOpenFolderAsComic.setStatusTip("Load folder as a comic archives")
-        self.actionOpenFolderAsComic.triggered.connect(self.select_folder_archive)
-
-        self.actionWrite_Tags.setShortcut("Ctrl+S")
-        self.actionWrite_Tags.setStatusTip("Save tags to comic archive")
-        self.actionWrite_Tags.triggered.connect(self.commit_metadata)
-
-        self.actionAutoTag.setShortcut("Ctrl+T")
-        self.actionAutoTag.setStatusTip("Auto-tag multiple archives")
         self.actionAutoTag.triggered.connect(self.auto_tag)
-
-        self.actionCopyTags.setShortcut("Ctrl+C")
-        self.actionCopyTags.setStatusTip("Copy one tag style tags to enabled modify style(s)")
         self.actionCopyTags.triggered.connect(self.copy_tags)
-
-        self.actionRemoveAuto.setShortcut("Ctrl+D")
-        self.actionRemoveAuto.setStatusTip("Remove currently selected modify tag style(s) from the archive")
+        self.actionExit.triggered.connect(self.close)
+        self.actionLoad.triggered.connect(self.select_file)
+        self.actionLoadFolder.triggered.connect(self.select_folder)
+        self.actionOpenFolderAsComic.triggered.connect(self.select_folder_archive)
         self.actionRemoveAuto.triggered.connect(self.remove_auto)
-
-        self.actionRepackage.setShortcut("Ctrl+E")
-        self.actionRepackage.setStatusTip("Re-create archive as CBZ")
-        self.actionRepackage.triggered.connect(self.repackage_archive)
-
-        self.actionRename.setShortcut("Ctrl+N")
-        self.actionRename.setStatusTip("Rename archive based on tags")
         self.actionRename.triggered.connect(self.rename_archive)
-
-        self.actionSettings.setShortcut("Ctrl+Shift+S")
-        self.actionSettings.setStatusTip("Configure ComicTagger")
+        self.actionRepackage.triggered.connect(self.repackage_archive)
         self.actionSettings.triggered.connect(self.show_settings)
-
+        self.actionWrite_Tags.triggered.connect(self.write_tags)
         # Tag Menu
-        self.actionParse_Filename.setShortcut("Ctrl+F")
-        self.actionParse_Filename.setStatusTip("Try to extract tags from filename")
-        self.actionParse_Filename.triggered.connect(self.use_filename)
-
-        self.actionParse_Filename_split_words.setShortcut("Ctrl+Shift+F")
-        self.actionParse_Filename_split_words.setStatusTip("Try to extract tags from filename and split words")
-        self.actionParse_Filename_split_words.triggered.connect(self.use_filename_split)
-
-        self.actionSearchOnline.setShortcut("Ctrl+W")
-        self.actionSearchOnline.setStatusTip("Search online for tags")
-        self.actionSearchOnline.triggered.connect(self.query_online)
-
-        self.actionAutoImprint.triggered.connect(self.auto_imprint)
-
-        self.actionAutoIdentify.setShortcut("Ctrl+I")
-        self.actionAutoIdentify.triggered.connect(self.auto_identify_search)
-
-        self.actionLiteralSearch.triggered.connect(self.literal_search)
-
-        self.actionApplyCBLTransform.setShortcut("Ctrl+L")
-        self.actionApplyCBLTransform.setStatusTip("Modify tags specifically for CBL format")
         self.actionApplyCBLTransform.triggered.connect(self.apply_cbl_transform)
-
-        self.actionReCalcPageDims.setShortcut("Ctrl+R")
-        self.actionReCalcPageDims.setStatusTip(
-            "Trigger re-calculating image size, height and width for all pages on the next save"
-        )
-        self.actionReCalcPageDims.triggered.connect(self.recalc_page_dimensions)
-
-        self.actionClearEntryForm.setShortcut("Ctrl+Shift+C")
-        self.actionClearEntryForm.setStatusTip("Clear all the data on the screen")
+        self.actionAutoIdentify.triggered.connect(self.auto_identify_search)
+        self.actionAutoImprint.triggered.connect(self.auto_imprint)
         self.actionClearEntryForm.triggered.connect(self.clear_form)
-
+        self.actionLiteralSearch.triggered.connect(self.literal_search)
+        self.actionParse_Filename.triggered.connect(self.use_filename)
+        self.actionParse_Filename_split_words.triggered.connect(self.use_filename_split)
+        self.actionReCalcPageDims.triggered.connect(self.recalc_page_dimensions)
+        self.actionSearchOnline.triggered.connect(self.query_online)
         # Window Menu
-        self.actionPageBrowser.setShortcut("Ctrl+P")
-        self.actionPageBrowser.setStatusTip("Show the page browser")
-        self.actionPageBrowser.triggered.connect(self.show_page_browser)
-        self.actionLogWindow.setShortcut("Ctrl+Shift+L")
-        self.actionLogWindow.setStatusTip("Show the log window")
         self.actionLogWindow.triggered.connect(self.log_window.show)
-
+        self.actionPageBrowser.triggered.connect(self.show_page_browser)
         # Help Menu
-        self.actionAbout.setStatusTip("Show the " + self.appName + " info")
         self.actionAbout.triggered.connect(self.about_app)
-        self.actionWiki.triggered.connect(self.show_wiki)
-        self.actionReportBug.triggered.connect(self.report_bug)
         self.actionComicTaggerForum.triggered.connect(self.show_forum)
-
-        # Notes Menu
-        self.btnOpenWebLink.setIcon(QtGui.QIcon(str(graphics_path / "open.png")))
-
-        # ToolBar
-        self.actionLoad.setIcon(QtGui.QIcon(str(graphics_path / "open.png")))
-        self.actionLoadFolder.setIcon(QtGui.QIcon(str(graphics_path / "longbox.png")))
-        self.actionOpenFolderAsComic.setIcon(QtGui.QIcon(str(graphics_path / "open.png")))
-        self.actionWrite_Tags.setIcon(QtGui.QIcon(str(graphics_path / "save.png")))
-        self.actionParse_Filename.setIcon(QtGui.QIcon(str(graphics_path / "parse.png")))
-        self.actionParse_Filename_split_words.setIcon(QtGui.QIcon(str(graphics_path / "parse.png")))
-        self.actionSearchOnline.setIcon(QtGui.QIcon(str(graphics_path / "search.png")))
-        self.actionLiteralSearch.setIcon(QtGui.QIcon(str(graphics_path / "search.png")))
-        self.actionAutoIdentify.setIcon(QtGui.QIcon(str(graphics_path / "auto.png")))
-        self.actionAutoTag.setIcon(QtGui.QIcon(str(graphics_path / "autotag.png")))
-        self.actionAutoImprint.setIcon(QtGui.QIcon(str(graphics_path / "autotag.png")))
-        self.actionClearEntryForm.setIcon(QtGui.QIcon(str(graphics_path / "clear.png")))
-        self.actionPageBrowser.setIcon(QtGui.QIcon(str(graphics_path / "browse.png")))
-
-        self.toolBar.addAction(self.actionLoad)
-        self.toolBar.addAction(self.actionLoadFolder)
-        self.toolBar.addAction(self.actionWrite_Tags)
-        self.toolBar.addAction(self.actionSearchOnline)
-        self.toolBar.addAction(self.actionLiteralSearch)
-        self.toolBar.addAction(self.actionAutoIdentify)
-        self.toolBar.addAction(self.actionAutoTag)
-        self.toolBar.addAction(self.actionClearEntryForm)
-        self.toolBar.addAction(self.actionPageBrowser)
-        self.toolBar.addAction(self.actionAutoImprint)
-
-        self.leWebLink.addAction(self.actionAddWebLink)
-        self.leWebLink.addAction(self.actionRemoveWebLink)
+        self.actionReportBug.triggered.connect(self.report_bug)
+        self.actionWiki.triggered.connect(self.show_wiki)
 
         self.actionAddWebLink.triggered.connect(self.add_weblink_item)
         self.actionRemoveWebLink.triggered.connect(self.remove_weblink_item)
 
+        self.leWebLink.addAction(self.actionAddWebLink)
+        self.leWebLink.addAction(self.actionRemoveWebLink)
+
     def add_weblink_item(self, url: str = "") -> None:
         item = ""
         if isinstance(url, str):
@@ -684,7 +588,7 @@ class TaggerWindow(QtWidgets.QMainWindow):
         msg_box = QtWidgets.QMessageBox()
         msg_box.setWindowTitle("About " + self.appName)
         msg_box.setTextFormat(QtCore.Qt.TextFormat.RichText)
-        msg_box.setIconPixmap(QtGui.QPixmap(str(graphics_path / "about.png")))
+        msg_box.setIconPixmap(QtGui.QPixmap(":/graphics/about.png"))
         msg_box.setText(
             "<br><br><br>"
             + self.appName
@@ -757,9 +661,9 @@ class TaggerWindow(QtWidgets.QMainWindow):
         self.menuRemove.setEnabled(enabled)
         self.menuViewRawTags.setEnabled(enabled)
         if self.comic_archive is not None:
-            for style in metadata_styles:
-                self.view_tag_actions[style].setEnabled(self.comic_archive.has_metadata(style))
-                self.remove_tag_actions[style].setEnabled(self.comic_archive.has_metadata(style))
+            for tag_id in tags:
+                self.view_tag_actions[tag_id].setEnabled(self.comic_archive.has_tags(tag_id))
+                self.remove_tag_actions[tag_id].setEnabled(self.comic_archive.has_tags(tag_id))
 
         self.actionWrite_Tags.setEnabled(writeable)
 
@@ -784,11 +688,11 @@ class TaggerWindow(QtWidgets.QMainWindow):
         page_count = f" ({ca.get_number_of_pages()} pages)"
         self.lblPageCount.setText(page_count)
 
-        supported_md = ca.get_supported_metadata()
+        supported_md = ca.get_supported_tags()
         tag_info = ""
         for md in supported_md:
-            if ca.has_metadata(md):
-                tag_info += "• " + metadata_styles[md].name() + "\n"
+            if ca.has_tags(md):
+                tag_info += "• " + tags[md].name() + "\n"
 
         self.lblTagList.setText(tag_info)
 
@@ -947,7 +851,7 @@ class TaggerWindow(QtWidgets.QMainWindow):
                 self.add_new_credit_entry(row, credit.role.title(), credit.person, credit.primary)
 
         self.twCredits.setSortingEnabled(True)
-        self.update_metadata_credit_colors()
+        self.update_credit_colors()
 
     def add_new_credit_entry(self, row: int, role: str, name: str, primary_flag: bool = False) -> None:
         self.twCredits.insertRow(row)
@@ -1170,13 +1074,13 @@ class TaggerWindow(QtWidgets.QMainWindow):
             # Now push the new combined data into the edit controls
             self.metadata_to_form()
 
-    def commit_metadata(self) -> None:
+    def write_tags(self) -> None:
         if self.metadata is not None and self.comic_archive is not None:
             if self.config[0].General__prompt_on_save:
                 reply = QtWidgets.QMessageBox.question(
                     self,
                     "Save Tags",
-                    f"Are you sure you wish to save {', '.join([metadata_styles[style].name() for style in self.save_data_styles])} tags to this archive?",
+                    f"Are you sure you wish to save {', '.join([tags[tag_id].name() for tag_id in self.selected_write_tags])} tags to this archive?",
                     QtWidgets.QMessageBox.StandardButton.Yes,
                     QtWidgets.QMessageBox.StandardButton.No,
                 )
@@ -1188,22 +1092,22 @@ class TaggerWindow(QtWidgets.QMainWindow):
             QtWidgets.QApplication.setOverrideCursor(QtGui.QCursor(QtCore.Qt.CursorShape.WaitCursor))
             self.form_to_metadata()
 
-            failed_style: str = ""
-            # Save each style
-            for style in self.save_data_styles:
-                success = self.comic_archive.write_metadata(self.metadata, style)
+            failed_tag: str = ""
+            # Save each tag
+            for tag_id in self.selected_write_tags:
+                success = self.comic_archive.write_tags(self.metadata, tag_id)
                 if not success:
-                    failed_style = metadata_styles[style].name()
+                    failed_tag = tags[tag_id].name()
                     break
 
-            self.comic_archive.load_cache(set(metadata_styles))
+            self.comic_archive.load_cache(set(tags))
             QtWidgets.QApplication.restoreOverrideCursor()
 
-            if failed_style:
+            if failed_tag:
                 QtWidgets.QMessageBox.warning(
                     self,
                     "Save failed",
-                    f"The tag save operation seemed to fail for: {failed_style}",
+                    f"The tag save operation seemed to fail for: {failed_tag}",
                 )
             else:
                 self.clear_dirty_flag()
@@ -1211,56 +1115,56 @@ class TaggerWindow(QtWidgets.QMainWindow):
                 self.update_menus()
 
                 # Only try to read if write was successful
-                self.metadata, error = self.overlay_ca_read_style(self.load_data_styles, self.comic_archive)
+                self.metadata, error = self.read_selected_tags(self.selected_read_tags, self.comic_archive)
                 if error is not None:
                     QtWidgets.QMessageBox.warning(
                         self,
                         "Read Failed!",
-                        f"One or more of the read styles failed to load for {self.comic_archive.path}, check log for details",
+                        f"One or more of the selected read tags failed to load for {self.comic_archive.path}, check log for details",
                     )
                     logger.error("Failed to load metadata for %s: %s", self.ca.path, error)
 
             self.fileSelectionList.update_current_row()
             self.update_ui_for_archive()
         else:
-            QtWidgets.QMessageBox.information(self, "Whoops!", "No data to commit!")
+            QtWidgets.QMessageBox.information(self, "Whoops!", "No data to write!")
 
-    def set_load_data_style(self, load_data_styles: list[str]) -> None:
+    def select_read_tags(self, tag_ids: list[str]) -> None:
         """Should only be called from the combobox signal"""
         if self.dirty_flag_verification(
-            "Change Tag Read Style",
-            "If you change read tag style(s) now, data in the form will be lost.  Are you sure?",
+            "Change Read Tags",
+            "If you change read tag(s) now, data in the form will be lost.  Are you sure?",
         ):
-            self.load_data_styles = list(reversed(load_data_styles))
-            self.config[0].internal__load_data_style = self.load_data_styles
+            self.selected_read_tags = list(reversed(tag_ids))
+            self.config[0].internal__read_tags = self.selected_read_tags
             self.update_menus()
             if self.comic_archive is not None:
                 self.load_archive(self.comic_archive)
         else:
-            self.cbLoadDataStyle.itemChanged.disconnect()
-            self.adjust_load_style_combo()
-            self.cbLoadDataStyle.itemChanged.connect(self.set_load_data_style)
+            self.cbSelectedReadTags.itemChanged.disconnect()
+            self.adjust_tags_combo()
+            self.cbSelectedReadTags.itemChanged.connect(self.select_read_tags)
 
-    def set_save_data_style(self) -> None:
-        self.save_data_styles = self.cbSaveDataStyle.currentData()
-        self.config[0].internal__save_data_style = self.save_data_styles
-        self.update_metadata_style_tweaks()
+    def select_write_tags(self) -> None:
+        self.selected_write_tags = self.cbSelectedWriteTags.currentData()
+        self.config[0].internal__write_tags = self.selected_write_tags
+        self.update_tag_tweaks()
         self.update_menus()
 
-    def set_source(self, s: int) -> None:
+    def select_source(self, s: int) -> None:
         self.config[0].Sources__source = self.cbx_sources.itemData(s)
 
-    def update_metadata_credit_colors(self) -> None:
-        styles = [metadata_styles[style] for style in self.save_data_styles]
+    def update_credit_colors(self) -> None:
+        selected_tags = [tags[tag_id] for tag_id in self.selected_write_tags]
         enabled = set()
-        for style in styles:
-            enabled.update(style.supported_attributes)
+        for tag in selected_tags:
+            enabled.update(tag.supported_attributes)
 
         credit_attributes = [x for x in self.md_attributes.items() if "credits." in x[0]]
 
         for r in range(self.twCredits.rowCount()):
             w = self.twCredits.item(r, 1)
-            supports_role = any(style.supports_credit_role(str(w.text())) for style in styles)
+            supports_role = any(tag.supports_credit_role(str(w.text())) for tag in selected_tags)
             for credit in credit_attributes:
                 widget_enabled = credit[0] in enabled
                 widget = self.twCredits.item(r, credit[1])
@@ -1268,18 +1172,18 @@ class TaggerWindow(QtWidgets.QMainWindow):
                     widget_enabled = widget_enabled and supports_role
                 enable_widget(widget, widget_enabled)
 
-    def update_metadata_style_tweaks(self) -> None:
-        # depending on the current data style, certain fields are disabled
+    def update_tag_tweaks(self) -> None:
+        # depending on the current data tag, certain fields are disabled
         enabled_widgets = set()
-        for style in self.save_data_styles:
-            enabled_widgets.update(metadata_styles[style].supported_attributes)
+        for tag_id in self.selected_write_tags:
+            enabled_widgets.update(tags[tag_id].supported_attributes)
 
-        for metadata, widget in self.md_attributes.items():
+        for md_field, widget in self.md_attributes.items():
             if widget is not None and not isinstance(widget, (int)):
-                enable_widget(widget, metadata in enabled_widgets)
+                enable_widget(widget, md_field in enabled_widgets)
 
-        self.update_metadata_credit_colors()
-        self.page_list_editor.set_metadata_style(self.save_data_styles)
+        self.update_credit_colors()
+        self.page_list_editor.select_read_tags(self.selected_write_tags)
 
     def cell_double_clicked(self, r: int, c: int) -> None:
         self.edit_credit()
@@ -1369,7 +1273,7 @@ class TaggerWindow(QtWidgets.QMainWindow):
                     row = self.twCredits.rowCount()
                     self.add_new_credit_entry(row, new_role, new_name, new_primary)
 
-            self.update_metadata_credit_colors()
+            self.update_credit_colors()
             self.set_dirty_flag()
 
     def remove_credit(self) -> None:
@@ -1410,45 +1314,43 @@ class TaggerWindow(QtWidgets.QMainWindow):
     def adjust_source_combo(self) -> None:
         self.cbx_sources.setCurrentIndex(self.cbx_sources.findData(self.config[0].Sources__source))
 
-    def adjust_load_style_combo(self) -> None:
-        """Select the enabled styles. Since metadata is merged in an overlay fashion the last item in the list takes priority. We reverse the order for display to the user"""
-        unchecked = set(metadata_styles.keys()) - set(self.load_data_styles)
-        for i, style in enumerate(reversed(self.load_data_styles)):
-            item_idx = self.cbLoadDataStyle.findData(style)
-            self.cbLoadDataStyle.setItemChecked(item_idx, True)
+    def adjust_tags_combo(self) -> None:
+        """Select the enabled tags. Since tags are merged in an overlay fashion the last item in the list takes priority. We reverse the order for display to the user"""
+        unchecked = set(tags.keys()) - set(self.selected_read_tags)
+        for i, tag_id in enumerate(reversed(self.selected_read_tags)):
+            item_idx = self.cbSelectedReadTags.findData(tag_id)
+            self.cbSelectedReadTags.setItemChecked(item_idx, True)
             # Order matters, move items to list order
             if item_idx != i:
-                self.cbLoadDataStyle.moveItem(item_idx, row=i)
-        for style in unchecked:
-            self.cbLoadDataStyle.setItemChecked(self.cbLoadDataStyle.findData(style), False)
+                self.cbSelectedReadTags.moveItem(item_idx, row=i)
+        for tag_id in unchecked:
+            self.cbSelectedReadTags.setItemChecked(self.cbSelectedReadTags.findData(tag_id), False)
 
-    def adjust_save_style_combo(self) -> None:
-        # select the current style
-        unchecked = set(metadata_styles.keys()) - set(self.save_data_styles)
-        for style in self.save_data_styles:
-            self.cbSaveDataStyle.setItemChecked(self.cbSaveDataStyle.findData(style), True)
-        for style in unchecked:
-            self.cbSaveDataStyle.setItemChecked(self.cbSaveDataStyle.findData(style), False)
-        self.update_metadata_style_tweaks()
+        # select the current tag_id
+        unchecked = set(tags.keys()) - set(self.selected_write_tags)
+        for tag_id in self.selected_write_tags:
+            self.cbSelectedWriteTags.setItemChecked(self.cbSelectedWriteTags.findData(tag_id), True)
+        for tag_id in unchecked:
+            self.cbSelectedWriteTags.setItemChecked(self.cbSelectedWriteTags.findData(tag_id), False)
+        self.update_tag_tweaks()
 
-    def populate_style_names(self) -> None:
+    def populate_tag_names(self) -> None:
         # First clear all entries (called from settingswindow.py)
-        self.cbSaveDataStyle.clear()
-        self.cbLoadDataStyle.clear()
-        # Add the entries to the tag style combobox
-        for style in metadata_styles.values():
-            if self.config[0].Metadata_Options__use_short_metadata_names:
-                self.cbSaveDataStyle.addItem(style.short_name.upper(), style.short_name)
-                self.cbLoadDataStyle.addItem(style.short_name.upper(), style.short_name)
+        self.cbSelectedWriteTags.clear()
+        self.cbSelectedReadTags.clear()
+        # Add the entries to the tag comboboxes
+        for tag in tags.values():
+            if self.config[0].Metadata_Options__use_short_tag_names:
+                self.cbSelectedWriteTags.addItem(tag.id.upper(), tag.id)
+                self.cbSelectedReadTags.addItem(tag.id.upper(), tag.id)
             else:
-                self.cbSaveDataStyle.addItem(style.name(), style.short_name)
-                self.cbLoadDataStyle.addItem(style.name(), style.short_name)
+                self.cbSelectedWriteTags.addItem(tag.name(), tag.id)
+                self.cbSelectedReadTags.addItem(tag.name(), tag.id)
 
     def populate_combo_boxes(self) -> None:
-        self.populate_style_names()
+        self.populate_tag_names()
 
-        self.adjust_load_style_combo()
-        self.adjust_save_style_combo()
+        self.adjust_tags_combo()
 
         # Add talker entries
         for t_id, talker in self.talkers.items():
@@ -1546,26 +1448,26 @@ class TaggerWindow(QtWidgets.QMainWindow):
         self.cbFormat.addItem("Year One")
 
     def remove_auto(self) -> None:
-        self.remove_tags(self.save_data_styles)
+        self.remove_tags(self.selected_write_tags)
 
-    def remove_tags(self, styles: list[str]) -> None:
-        # remove the indicated tags from the archive
+    def remove_tags(self, tag_ids: list[str]) -> None:
+        # remove the indicated tag_ids from the archive
         ca_list = self.fileSelectionList.get_selected_archive_list()
         has_md_count = 0
         file_md_count = {}
-        for style in styles:
-            file_md_count[style] = 0
+        for tag_id in tag_ids:
+            file_md_count[tag_id] = 0
         for ca in ca_list:
-            for style in styles:
-                if ca.has_metadata(style):
+            for tag_id in tag_ids:
+                if ca.has_tags(tag_id):
                     has_md_count += 1
-                    file_md_count[style] += 1
+                    file_md_count[tag_id] += 1
 
         if has_md_count == 0:
             QtWidgets.QMessageBox.information(
                 self,
                 "Remove Tags",
-                f"No archives with {', '.join([metadata_styles[style].name() for style in styles])} tags selected!",
+                f"No archives with {', '.join([tags[tag_id].name() for tag_id in tag_ids])} tags selected!",
             )
             return
 
@@ -1578,7 +1480,7 @@ class TaggerWindow(QtWidgets.QMainWindow):
             reply = QtWidgets.QMessageBox.question(
                 self,
                 "Remove Tags",
-                f"Are you sure you wish to remove {', '.join([f'{metadata_styles[style].name()} tags from {count} files' for style, count in file_md_count.items()])} removing a total of {has_md_count} tag(s)?",
+                f"Are you sure you wish to remove {', '.join([f'{tags[tag_id].name()} tags from {count} files' for tag_id, count in file_md_count.items()])} removing a total of {has_md_count} tag(s)?",
                 QtWidgets.QMessageBox.StandardButton.Yes,
                 QtWidgets.QMessageBox.StandardButton.No,
             )
@@ -1600,16 +1502,16 @@ class TaggerWindow(QtWidgets.QMainWindow):
                     progdialog.setValue(prog_idx)
                     progdialog.setLabelText(str(ca.path))
                     QtCore.QCoreApplication.processEvents()
-                    for style in styles:
-                        if ca.has_metadata(style) and ca.is_writable():
-                            if ca.remove_metadata(style):
+                    for tag_id in tag_ids:
+                        if ca.has_tags(tag_id) and ca.is_writable():
+                            if ca.remove_tags(tag_id):
                                 success_count += 1
                             else:
                                 failed_list.append(ca.path)
                                 # Abandon any further tag removals to prevent any greater damage to archive
                                 break
                     ca.reset_cache()
-                    ca.load_cache(set(metadata_styles))
+                    ca.load_cache(set(tags))
 
                 progdialog.hide()
                 QtCore.QCoreApplication.processEvents()
@@ -1633,22 +1535,22 @@ class TaggerWindow(QtWidgets.QMainWindow):
         ca_list = self.fileSelectionList.get_selected_archive_list()
         has_src_count = 0
 
-        src_styles: list[str] = self.load_data_styles
-        dest_styles: list[str] = self.save_data_styles
+        src_tag_ids: list[str] = self.selected_read_tags
+        dest_tag_ids: list[str] = self.selected_write_tags
 
-        if len(src_styles) == 1 and src_styles[0] in dest_styles:
-            # Remove the read style from the write style
-            dest_styles.remove(src_styles[0])
+        if len(src_tag_ids) == 1 and src_tag_ids[0] in dest_tag_ids:
+            # Remove the read tag from the write tag
+            dest_tag_ids.remove(src_tag_ids[0])
 
-        if not dest_styles:
+        if not dest_tag_ids:
             QtWidgets.QMessageBox.information(
-                self, "Copy Tags", "Can't copy tag style onto itself.  Read style and modify style must be different."
+                self, "Copy Tags", "Can't copy tag tag onto itself.  Read tag and modify tag must be different."
             )
             return
 
         for ca in ca_list:
-            for style in src_styles:
-                if ca.has_metadata(style):
+            for tag_id in src_tag_ids:
+                if ca.has_tags(tag_id):
                     has_src_count += 1
                     continue
 
@@ -1656,7 +1558,7 @@ class TaggerWindow(QtWidgets.QMainWindow):
             QtWidgets.QMessageBox.information(
                 self,
                 "Copy Tags",
-                f"No archives with {', '.join([metadata_styles[style].name() for style in src_styles])} tags selected!",
+                f"No archives with {', '.join([tags[tag_id].name() for tag_id in src_tag_ids])} tags selected!",
             )
             return
 
@@ -1670,8 +1572,8 @@ class TaggerWindow(QtWidgets.QMainWindow):
                 self,
                 "Copy Tags",
                 f"Are you sure you wish to copy the combined (with overlay order) tags of "
-                f"{', '.join([metadata_styles[style].name() for style in src_styles])} "
-                f"to {', '.join([metadata_styles[style].name() for style in dest_styles])} tags in "
+                f"{', '.join([tags[tag_id].name() for tag_id in src_tag_ids])} "
+                f"to {', '.join([tags[tag_id].name() for tag_id in dest_tag_ids])} tags in "
                 f"{has_src_count} archive(s)?",
                 QtWidgets.QMessageBox.StandardButton.Yes,
                 QtWidgets.QMessageBox.StandardButton.No,
@@ -1689,15 +1591,15 @@ class TaggerWindow(QtWidgets.QMainWindow):
                 success_count = 0
                 for prog_idx, ca in enumerate(ca_list, 1):
                     ca_saved = False
-                    md, error = self.overlay_ca_read_style(src_styles, ca)
+                    md, error = self.read_selected_tags(src_tag_ids, ca)
                     if error is not None:
                         failed_list.append(ca.path)
                         continue
                     if md.is_empty:
                         continue
 
-                    for style in dest_styles:
-                        if ca.has_metadata(style):
+                    for tag_id in dest_tag_ids:
+                        if ca.has_tags(tag_id):
                             QtCore.QCoreApplication.processEvents()
                             if prog_dialog.wasCanceled():
                                 break
@@ -1707,10 +1609,10 @@ class TaggerWindow(QtWidgets.QMainWindow):
                             center_window_on_parent(prog_dialog)
                             QtCore.QCoreApplication.processEvents()
 
-                        if style == "cbi" and self.config[0].Metadata_Options__cbl_apply_transform_on_bulk_operation:
+                        if tag_id == "cbi" and self.config[0].Metadata_Options__apply_transform_on_bulk_operation:
                             md = CBLTransformer(md, self.config[0]).apply()
 
-                        if ca.write_metadata(md, style):
+                        if ca.write_tags(md, tag_id):
                             if not ca_saved:
                                 success_count += 1
                                 ca_saved = True
@@ -1718,7 +1620,7 @@ class TaggerWindow(QtWidgets.QMainWindow):
                             failed_list.append(ca.path)
 
                     ca.reset_cache()
-                    ca.load_cache({*self.load_data_styles, *self.save_data_styles})
+                    ca.load_cache({*self.selected_read_tags, *self.selected_write_tags})
 
                 prog_dialog.hide()
                 QtCore.QCoreApplication.processEvents()
@@ -1748,28 +1650,19 @@ class TaggerWindow(QtWidgets.QMainWindow):
     def identify_and_tag_single_archive(
         self, ca: ComicArchive, match_results: OnlineMatchResults, dlg: AutoTagStartWindow
     ) -> tuple[bool, OnlineMatchResults]:
-        def metadata_save() -> bool:
-            for style in self.save_data_styles:
-                # write out the new data
-                if not ca.write_metadata(md, style):
-                    self.auto_tag_log(
-                        f"{metadata_styles[style].name()} save failed! Aborting any additional style saves.\n"
-                    )
-                    return False
-            return True
 
         success = False
         ii = IssueIdentifier(ca, self.config[0], self.current_talker())
 
-        # read in metadata, and parse file name if not there
-        md, error = self.overlay_ca_read_style(self.load_data_styles, ca)
+        # read in tags, and parse file name if not there
+        md, error = self.read_selected_tags(self.selected_read_tags, ca)
         if error is not None:
             QtWidgets.QMessageBox.warning(
                 self,
                 "Aborting...",
-                f"One or more of the read styles failed to load for {ca.path}. Aborting to prevent any possible further damage. Check log for details.",
+                f"One or more of the read tags failed to load for {ca.path}. Aborting to prevent any possible further damage. Check log for details.",
             )
-            logger.error("Failed to load metadata for %s: %s", self.ca.path, error)
+            logger.error("Failed to load tags from %s: %s", self.ca.path, error)
             return False, match_results
 
         if md.is_empty:
@@ -1784,7 +1677,7 @@ class TaggerWindow(QtWidgets.QMainWindow):
             )
             if dlg.ignore_leading_digits_in_filename and md.series is not None:
                 # remove all leading numbers
-                md.series = re.sub(r"([\d.]*)(.*)", r"\2", md.series)
+                md.series = re.sub(r"(^[\d.]*)(.*)", r"\2", md.series)
 
         # use the dialog specified search string
         if dlg.search_string:
@@ -1903,8 +1796,8 @@ class TaggerWindow(QtWidgets.QMainWindow):
 
             if ct_md is not None:
                 temp_opts = cast(ct_ns, settngs.get_namespace(self.config, True, True, True, False)[0])
-                if dlg.cbxRemoveMetadata.isChecked():
-                    temp_opts.Issue_Identifier__clear_metadata
+                if dlg.cbxClearMetadata.isChecked():
+                    temp_opts.Auto_Tag__clear_tags
 
                 md = prepare_metadata(md, ct_md, temp_opts)
 
@@ -1915,11 +1808,21 @@ class TaggerWindow(QtWidgets.QMainWindow):
                     online_results=matches,
                     match_status=MatchStatus.good_match,
                     md=md,
-                    tags_written=self.save_data_styles,
+                    tags_written=self.selected_write_tags,
                 )
 
-                # Save styles
-                if metadata_save():
+                def write_Tags() -> bool:
+                    for tag_id in self.selected_write_tags:
+                        # write out the new data
+                        if not ca.write_tags(md, tag_id):
+                            self.auto_tag_log(
+                                f"{tags[tag_id].name()} save failed! Aborting any additional tag saves.\n"
+                            )
+                            return False
+                    return True
+
+                # Save tags
+                if write_Tags():
                     match_results.good_matches.append(res)
                     success = True
                     self.auto_tag_log("Save complete!\n")
@@ -1928,13 +1831,13 @@ class TaggerWindow(QtWidgets.QMainWindow):
                     match_results.write_failures.append(res)
 
                 ca.reset_cache()
-                ca.load_cache({*self.load_data_styles, *self.save_data_styles})
+                ca.load_cache({*self.selected_read_tags, *self.selected_write_tags})
 
         return success, match_results
 
     def auto_tag(self) -> None:
         ca_list = self.fileSelectionList.get_selected_archive_list()
-        styles = self.save_data_styles
+        tag_names = ", ".join([tags[tag_id].name() for tag_id in self.selected_write_tags])
 
         if len(ca_list) == 0:
             QtWidgets.QMessageBox.information(self, "Auto-Tag", "No archives selected!")
@@ -1950,8 +1853,7 @@ class TaggerWindow(QtWidgets.QMainWindow):
             self.config[0],
             (
                 f"You have selected {len(ca_list)} archive(s) to automatically identify and write "
-                + ", ".join([metadata_styles[style].name() for style in styles])
-                + " tags to.\n\nPlease choose config below, and select OK to Auto-Tag."
+                + f"{tag_names} tags to.\n\nPlease choose config below, and select OK to Auto-Tag."
             ),
         )
 
@@ -1977,7 +1879,7 @@ class TaggerWindow(QtWidgets.QMainWindow):
             self.auto_tag_log(f"Auto-Tagging {prog_idx} of {len(ca_list)}\n")
             self.auto_tag_log(f"{ca.path}\n")
             try:
-                cover_idx = ca.read_metadata(self.load_data_styles[0]).get_cover_page_index_list()[0]
+                cover_idx = ca.read_tags(self.selected_read_tags[0]).get_cover_page_index_list()[0]
             except Exception as e:
                 cover_idx = 0
                 logger.error("Failed to load metadata for %s: %s", ca.path, e)
@@ -2011,7 +1913,7 @@ class TaggerWindow(QtWidgets.QMainWindow):
         self.atprogdialog = None
 
         summary = ""
-        summary += f"Successfully added {', '.join([metadata_styles[style].name() for style in self.save_data_styles])} tags to {len(match_results.good_matches)} archive(s)\n"
+        summary += f"Successfully added {tag_names} tags to {len(match_results.good_matches)} archive(s)\n"
 
         if len(match_results.multiple_matches) > 0:
             summary += f"Archives with multiple matches: {len(match_results.multiple_matches)}\n"
@@ -2047,7 +1949,7 @@ class TaggerWindow(QtWidgets.QMainWindow):
                 matchdlg = AutoTagMatchWindow(
                     self,
                     match_results.multiple_matches,
-                    styles,
+                    self.selected_write_tags,
                     lambda match: self.current_talker().fetch_comic_data(match.issue_id),
                     self.config[0],
                     self.current_talker(),
@@ -2085,7 +1987,7 @@ class TaggerWindow(QtWidgets.QMainWindow):
             if reply == QtWidgets.QMessageBox.StandardButton.Discard:
                 return True
             if reply == QtWidgets.QMessageBox.StandardButton.Save:
-                self.commit_metadata()
+                self.write_tags()
                 return True
             return False
         return True
@@ -2121,12 +2023,12 @@ class TaggerWindow(QtWidgets.QMainWindow):
     def page_browser_closed(self) -> None:
         self.page_browser = None
 
-    def view_raw_tags(self, style: str) -> None:
-        if self.comic_archive is not None and self.comic_archive.has_metadata(style):
-            md_style = metadata_styles[style]
+    def view_raw_tags(self, tag_id: str) -> None:
+        tag = tags[tag_id]
+        if self.comic_archive is not None and self.comic_archive.has_tags(tag.id):
             dlg = LogWindow(self)
-            dlg.set_text(self.comic_archive.read_metadata_string(style))
-            dlg.setWindowTitle(f"Raw {md_style.name()} Tag View")
+            dlg.set_text(self.comic_archive.read_raw_tags(tag.id))
+            dlg.setWindowTitle(f"Raw {tag.name()} Tag View")
             dlg.exec()
 
     def show_wiki(self) -> None:
@@ -2172,7 +2074,7 @@ class TaggerWindow(QtWidgets.QMainWindow):
         if self.dirty_flag_verification(
             "File Rename", "If you rename files now, unsaved data in the form will be lost.  Are you sure?"
         ):
-            dlg = RenameWindow(self, ca_list, self.load_data_styles, self.config, self.talkers)
+            dlg = RenameWindow(self, ca_list, self.selected_write_tags, self.config, self.talkers)
             dlg.setModal(True)
             if dlg.exec() and self.comic_archive is not None:
                 self.fileSelectionList.update_selected_rows()
@@ -2192,25 +2094,23 @@ class TaggerWindow(QtWidgets.QMainWindow):
         self.config[0].internal__last_opened_folder = os.path.abspath(os.path.split(comic_archive.path)[0])
         self.comic_archive = comic_archive
 
-        self.metadata, error = self.overlay_ca_read_style(self.load_data_styles, self.comic_archive)
+        self.metadata, error = self.read_selected_tags(self.selected_write_tags, self.comic_archive)
         if error is not None:
-            logger.error("Failed to load metadata for %s: %s", self.comic_archive.path, error)
-            self.exception(f"Failed to load metadata for {self.comic_archive.path}, see log for details\n\n")
+            logger.error("Failed to load tags from %s: %s", self.comic_archive.path, error)
+            self.exception(f"Failed to load tags from {self.comic_archive.path}, see log for details\n\n")
 
         self.update_ui_for_archive()
 
-    def overlay_ca_read_style(
-        self, load_data_styles: list[str], ca: ComicArchive
-    ) -> tuple[GenericMetadata, Exception | None]:
+    def read_selected_tags(self, tag_ids: list[str], ca: ComicArchive) -> tuple[GenericMetadata, Exception | None]:
         md = GenericMetadata()
         error = None
         try:
-            for style in load_data_styles:
-                metadata = ca.read_metadata(style)
+            for tag_id in tag_ids:
+                metadata = ca.read_tags(tag_id)
                 md.overlay(
                     metadata,
-                    mode=self.config[0].internal__load_data_overlay,
-                    merge_lists=self.config[0].internal__overlay_merge_lists,
+                    mode=self.config[0].Metadata_Options__tag_merge,
+                    merge_lists=self.config[0].Metadata_Options__tag_merge_lists,
                 )
         except Exception as e:
             error = e

comictaggerlib/ui/autotagstartwindow.ui

@@ -78,12 +78,12 @@
       </widget>
      </item>
      <item row="6" column="0">
-      <widget class="QCheckBox" name="cbxRemoveMetadata">
+      <widget class="QCheckBox" name="cbxClearMetadata">
        <property name="toolTip">
-        <string>Removes existing metadata before applying retrieved metadata</string>
+        <string>Removes existing tags before applying downloaded metadata</string>
        </property>
        <property name="text">
-        <string>Overwrite metadata</string>
+        <string>Clear Existing tags when downloading metadata</string>
        </property>
       </widget>
      </item>
@@ -129,7 +129,7 @@
         </sizepolicy>
        </property>
        <property name="text">
-        <string>Specify series search string for all selected archives:</string>
+        <string>Specify series search for all selected archives:</string>
        </property>
       </widget>
      </item>

comictaggerlib/ui/customwidgets.py

@@ -10,7 +10,6 @@ from PyQt5 import QtGui, QtWidgets
 from PyQt5.QtCore import QEvent, QModelIndex, QPoint, QRect, QSize, Qt, pyqtSignal
 
 from comicapi.utils import StrEnum
-from comictaggerlib.graphics import graphics_path
 
 
 class ClickedButtonEnum(StrEnum):
@@ -74,7 +73,7 @@ class CheckableComboBox(QtWidgets.QComboBox):
     def addItem(self, text: str, data: Any = None) -> None:
         super().addItem(text, data)
         # Need to enable the checkboxes and require one checked item
-        # Expected that state of *all* checkboxes will be set ('adjust_save_style_combo' in taggerwindow.py)
+        # Expected that state of *all* checkboxes will be set ('adjust_tags_combo' in taggerwindow.py)
         if self.count() == 1:
             self.model().item(0).setCheckState(Qt.CheckState.Checked)
 
@@ -133,8 +132,8 @@ class ReadStyleItemDelegate(QtWidgets.QStyledItemDelegate):
         super().__init__()
         self.combobox = parent
 
-        self.down_icon = QtGui.QImage(str(graphics_path / "down.png"))
-        self.up_icon = QtGui.QImage(str(graphics_path / "up.png"))
+        self.down_icon = QtGui.QImage(":/graphics/down.png")
+        self.up_icon = QtGui.QImage(":/graphics/up.png")
 
         self.button_width = self.down_icon.width()
         self.button_padding = 5
@@ -277,7 +276,7 @@ class CheckableOrderComboBox(QtWidgets.QComboBox):
         super().__init__(*args, **kwargs)
         itemDelegate = ReadStyleItemDelegate(self)
         itemDelegate.setToolTip(
-            "Select which read style(s) to use", "Move item up in priority", "Move item down in priority"
+            "Select which read tag(s) to use", "Move item up in priority", "Move item down in priority"
         )
         self.setItemDelegate(itemDelegate)
 
@@ -345,7 +344,7 @@ class CheckableOrderComboBox(QtWidgets.QComboBox):
     def addItem(self, text: str, data: Any = None) -> None:
         super().addItem(text, data)
         # Need to enable the checkboxes and require one checked item
-        # Expected that state of *all* checkboxes will be set ('adjust_save_style_combo' in taggerwindow.py)
+        # Expected that state of *all* checkboxes will be set ('adjust_tags_combo' in taggerwindow.py)
         if self.count() == 1:
             self.model().item(0).setCheckState(Qt.CheckState.Checked)
 

comictaggerlib/ui/fileselectionlist.ui

@@ -50,10 +50,10 @@
      </column>
      <column>
       <property name="text">
-       <string>MD</string>
+       <string>Tags</string>
       </property>
       <property name="toolTip">
-       <string>Metadata</string>
+       <string>Tags</string>
       </property>
       <property name="textAlignment">
        <set>AlignCenter</set>

comictaggerlib/ui/pagelisteditor.ui

@@ -99,6 +99,9 @@
          <property name="alignment">
           <set>Qt::AlignRight</set>
          </property>
+         <property name="buddy">
+          <cstring>cbPageType</cstring>
+         </property>
         </widget>
        </item>
        <item row="1" column="1">

comictaggerlib/ui/qtutils.py

@@ -11,8 +11,6 @@ from collections.abc import Sequence
 from PyQt5.QtCore import QUrl
 from PyQt5.QtWidgets import QWidget
 
-from comictaggerlib.graphics import graphics_path
-
 logger = logging.getLogger(__name__)
 
 try:
@@ -137,7 +135,7 @@ if qt_available:
                 pass
         # if still nothing, go with default image
         if not success:
-            img.load(str(graphics_path / "nocover.png"))
+            img.load(":/graphics/nocover.png")
         return img
 
     def qt_error(msg: str, e: Exception | None = None) -> None:

comictaggerlib/ui/settingswindow.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>703</width>
-    <height>597</height>
+    <width>1095</width>
+    <height>642</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -89,7 +89,7 @@
             <item row="1" column="0">
              <widget class="QCheckBox" name="cbxPromptOnSave">
               <property name="text">
-               <string>Prompts the user to confirm saving tags</string>
+               <string>Prompt to confirm saving tags</string>
               </property>
              </widget>
             </item>
@@ -190,7 +190,7 @@
            <item row="2" column="0">
             <widget class="QLabel" name="label_9">
              <property name="text">
-              <string>Always use Publisher Filter on &quot;manual&quot; searches:</string>
+              <string>Enable the publisher filter:</string>
              </property>
              <property name="buddy">
               <cstring>cbxUseFilter</cstring>
@@ -210,7 +210,11 @@
            <item row="3" column="0">
             <widget class="QLabel" name="label_4">
              <property name="text">
-              <string>Publisher Filter:</string>
+              <string>Publisher Filter:
+1 Publisher per line</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
              </property>
              <property name="buddy">
               <cstring>tePublisherFilter</cstring>
@@ -270,7 +274,8 @@
          <item row="4" column="0">
           <widget class="QLabel" name="label_5">
            <property name="text">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;These settings are for the automatic issue identifier which searches online for matches. &lt;/p&gt;&lt;p&gt;Hover the mouse over an entry field for more info.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            <string>These settings are for the automatic issue identifier which searches online for matches.
+Hover the mouse over an option for more info.</string>
            </property>
            <property name="wordWrap">
             <bool>true</bool>
@@ -298,13 +303,6 @@
            </property>
           </widget>
          </item>
-         <item row="2" column="0">
-          <widget class="QCheckBox" name="cbxClearFormBeforePopulating">
-           <property name="text">
-            <string>Clear all existing metadata during import, default is to merge metadata.</string>
-           </property>
-          </widget>
-         </item>
         </layout>
        </widget>
        <widget class="QWidget" name="tFilenameParser">
@@ -413,7 +411,7 @@
        </widget>
        <widget class="QWidget" name="tComicTalkers">
         <attribute name="title">
-         <string>Metadata Sources</string>
+         <string>Metadata Download</string>
         </attribute>
         <layout class="QVBoxLayout" name="verticalLayout_4"/>
        </widget>
@@ -456,7 +454,7 @@
              <number>6</number>
             </property>
             <item row="0" column="0">
-             <widget class="QCheckBox" name="cbxShortMetadataNames">
+             <widget class="QCheckBox" name="cbxShortTagNames">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
                 <horstretch>0</horstretch>
@@ -464,20 +462,30 @@
                </sizepolicy>
               </property>
               <property name="toolTip">
-               <string>Use the short name for the metadata styles (CBI, CR, etc.)</string>
+               <string>Use the short name for tags (CBI, CR, etc.)</string>
               </property>
               <property name="text">
-               <string>Use &quot;short&quot; names for metadata styles</string>
+               <string>Use &quot;short&quot; names for tags</string>
               </property>
              </widget>
             </item>
             <item row="0" column="1">
-             <widget class="QCheckBox" name="cbxDisableCR">
+             <widget class="QCheckBox" name="cbxEnableCR">
               <property name="toolTip">
-               <string>Useful if you use the CIX metadata type</string>
+               <string>Turn off to only use the CIX tags</string>
               </property>
               <property name="text">
-               <string>Disable ComicRack Metadata Type</string>
+               <string>Enable the ComicRack metadata tags (needs a restart)</string>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="0">
+             <widget class="QCheckBox" name="cbxClearFormBeforePopulating">
+              <property name="toolTip">
+               <string>Default is to merge downloaded metadata with existing tags</string>
+              </property>
+              <property name="text">
+               <string>Clear all existing tags during metadata download</string>
               </property>
              </widget>
             </item>
@@ -526,15 +534,18 @@
             </property>
             <item>
              <widget class="QCheckBox" name="cbxApplyCBLTransformOnCVIMport">
+              <property name="toolTip">
+               <string>Applies to all tags, not just CBL tags</string>
+              </property>
               <property name="text">
-               <string>Apply CBL Transforms on ComicVine Import</string>
+               <string>Apply CBL Transforms on metadata download</string>
               </property>
              </widget>
             </item>
             <item>
              <widget class="QCheckBox" name="cbxApplyCBLTransformOnBatchOperation">
               <property name="text">
-               <string>Apply CBL Transforms on Batch Copy Operations to CBL Tags</string>
+               <string>Apply CBL Transforms when Copying to CBL Tags</string>
               </property>
              </widget>
             </item>
@@ -622,14 +633,8 @@
          </item>
          <item row="4" column="0">
           <widget class="QGroupBox" name="groupBox_6">
-           <property name="minimumSize">
-            <size>
-             <width>0</width>
-             <height>165</height>
-            </size>
-           </property>
            <property name="title">
-            <string>Overlay</string>
+            <string>Merge Modes</string>
            </property>
            <layout class="QGridLayout" name="gridLayout_10">
             <property name="leftMargin">
@@ -647,58 +652,112 @@
             <property name="spacing">
              <number>6</number>
             </property>
-            <item row="1" column="0">
-             <widget class="QLabel" name="lblOverlaySource">
-              <property name="toolTip">
-               <string>The operation to perform when overlaying source data (Comic Vine, Metron, GCD, etc.)</string>
-              </property>
-              <property name="text">
-               <string>Data Source</string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-              </property>
-              <property name="margin">
-               <number>6</number>
-              </property>
-             </widget>
-            </item>
             <item row="0" column="0">
-             <widget class="QLabel" name="lblOverlayReadStyle">
+             <widget class="QGroupBox" name="groupBox_7">
               <property name="toolTip">
-               <string>The operation to perform when overlaying read styles (ComicRack, ComicBookInfo, etc.)</string>
+               <string>The merge mode to use when reading multiple tags from a single comic book archive. ComicRack, ComicBookInfo, etc...</string>
               </property>
-              <property name="text">
-               <string>Read Style</string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-              </property>
-              <property name="margin">
-               <number>6</number>
+              <property name="title">
+               <string>Tags Merge</string>
               </property>
+              <layout class="QFormLayout" name="formLayout">
+               <item row="0" column="0">
+                <widget class="QLabel" name="lblTagsMergeMode">
+                 <property name="toolTip">
+                  <string>The merge mode to use when reading multiple tags from a single comic book archive. ComicRack, ComicBookInfo, etc...</string>
+                 </property>
+                 <property name="text">
+                  <string>Merge Mode:</string>
+                 </property>
+                 <property name="margin">
+                  <number>6</number>
+                 </property>
+                 <property name="buddy">
+                  <cstring>cbTagsMergeMode</cstring>
+                 </property>
+                </widget>
+               </item>
+               <item row="0" column="1">
+                <widget class="QComboBox" name="cbTagsMergeMode">
+                 <property name="enabled">
+                  <bool>true</bool>
+                 </property>
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                 <property name="toolTip">
+                  <string>The merge mode to use when reading multiple metadata types from a single comic book archive. ComicRack, ComicBookInfo, etc...</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="1">
+                <widget class="QCheckBox" name="cbxTagsMergeLists">
+                 <property name="toolTip">
+                  <string>Merge lists (characters, tags, locations, etc.) together or follow the Merge Mode</string>
+                 </property>
+                 <property name="text">
+                  <string>Merge Lists</string>
+                 </property>
+                </widget>
+               </item>
+              </layout>
              </widget>
             </item>
-            <item row="1" column="1">
-             <widget class="QComboBox" name="cbxOverlaySource">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="maximumSize">
-               <size>
-                <width>16777215</width>
-                <height>16777215</height>
-               </size>
-              </property>
+            <item row="1" column="0">
+             <widget class="QGroupBox" name="groupBox_8">
               <property name="toolTip">
-               <string>The operation to perform when overlaying source data (Comic Vine, Metron, GCD, etc.)</string>
+               <string>The merge mode to use when downloading metadata from Comic Vine, Metron, GCD, etc...</string>
               </property>
+              <property name="title">
+               <string>Download Merge</string>
+              </property>
+              <layout class="QFormLayout" name="formLayout_4">
+               <item row="0" column="0">
+                <widget class="QLabel" name="lblDownloadMergeMode">
+                 <property name="toolTip">
+                  <string>The merge mode to use when downloading metadata from Comic Vine, Metron, GCD, etc...</string>
+                 </property>
+                 <property name="text">
+                  <string>Merge Mode:</string>
+                 </property>
+                 <property name="margin">
+                  <number>6</number>
+                 </property>
+                 <property name="buddy">
+                  <cstring>cbDownloadMergeMode</cstring>
+                 </property>
+                </widget>
+               </item>
+               <item row="0" column="1">
+                <widget class="QComboBox" name="cbDownloadMergeMode">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                 <property name="toolTip">
+                  <string>The merge mode to use when downloading metadata from Comic Vine, Metron, GCD, etc...</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="1">
+                <widget class="QCheckBox" name="cbxMergeListsMetadata">
+                 <property name="toolTip">
+                  <string>Merge lists (characters, tags, locations, etc.) together or follow the Merge Mode</string>
+                 </property>
+                 <property name="text">
+                  <string>Merge Lists</string>
+                 </property>
+                </widget>
+               </item>
+              </layout>
              </widget>
             </item>
-            <item row="0" column="2" rowspan="3">
+            <item row="0" column="2" rowspan="2">
              <widget class="QTabWidget" name="tabWidgetOverlay">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Expanding" vsizetype="Maximum">
@@ -706,24 +765,18 @@
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
+              <property name="minimumSize">
+               <size>
+                <width>0</width>
+                <height>150</height>
+               </size>
+              </property>
               <property name="maximumSize">
                <size>
                 <width>16777215</width>
                 <height>200</height>
                </size>
               </property>
-              <property name="tabPosition">
-               <enum>QTabWidget::North</enum>
-              </property>
-              <property name="currentIndex">
-               <number>0</number>
-              </property>
-              <property name="documentMode">
-               <bool>true</bool>
-              </property>
-              <property name="tabBarAutoHide">
-               <bool>false</bool>
-              </property>
               <widget class="QWidget" name="tOverlay">
                <property name="maximumSize">
                 <size>
@@ -762,11 +815,14 @@
                    <bool>false</bool>
                   </property>
                   <property name="plainText">
-                   <string>Overlays all the (non-list) non-empty values of the new metadata (e.g. Comic Vine) on top of the current metadata.
+                   <string>Overlays all non-empty values of the new metadata (e.g. Comic Vine) on top of the existing metadata.
+
+See the Lists tab for controlling how lists are handled.
 
 Example:
-(Series=batman, Issue=1, Tags=[batman,joker,robin])
-+ (Series=Batman, Publisher=DC Comics, Tags=[mystery,action])
+existing(Series=the batman, Issue=1, Tags=[batman,joker,robin])
++ new(Series=Batman, Publisher=DC Comics, Tags=[mystery,action])
+
 = (Series=Batman, Issue=1, Publisher=DC Comics, Tags=[mystery,action])</string>
                   </property>
                   <property name="textInteractionFlags">
@@ -799,12 +855,15 @@ Example:
                 <item>
                  <widget class="QPlainTextEdit" name="addTextEdit">
                   <property name="plainText">
-                   <string>Adds any (non-list) metadata that is present in the new metadata (e.g. Comic Vine) but is missing in the current metadata.
+                   <string>Adds any metadata that is is missing in the existing metadata but present in the new metadata.
+
+See the Lists tab for controlling how lists are handled.
 
 Example:
-(Series=batman, Issue=1)
-+ (Series=Superman, Issue=10, Publisher=DC Comics)
-= (Series=batman, Issue=1, Publisher=DC Comics)</string>
+existing(Series=batman, Issue=1, Tags=[batman,joker,robin])
++ new(Series=Superman, Issue=10, Publisher=DC Comics, Tags=[mystery,action])
+
+= (Series=batman, Issue=1, Tags=[batman,joker,robin], Publisher=DC Comics)</string>
                   </property>
                   <property name="textInteractionFlags">
                    <set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
@@ -836,17 +895,13 @@ Example:
                 <item>
                  <widget class="QPlainTextEdit" name="combineTextEdit">
                   <property name="plainText">
-                   <string>All lists (tags, characters, genres, credits, etc.) are merged or replaced via the &quot;Merge Lists&quot; check box. Merge will replace duplicates within the list with the &quot;new&quot; data.
+                   <string>Checking the &quot;Merge Lists&quot; check box will enable merging of list items, otherwise it will follow the merge mode, see the 'Overlay' and 'Add Missing' tabs.
 
 Example Merge:
 (Tags=[batman,joker,robin])
 + (Tags=[mystery,action])
-= (Tags=[batman,joker,robin,mystery,action])
 
-Example Replace:
-(Tags=[batman,joker,robin])
-+ (Tags=[mystery,action])
-= (Tags=[mystery,action])</string>
+= (Tags=[batman,joker,robin,mystery,action])</string>
                   </property>
                   <property name="textInteractionFlags">
                    <set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
@@ -857,38 +912,6 @@ Example Replace:
               </widget>
              </widget>
             </item>
-            <item row="0" column="1">
-             <widget class="QComboBox" name="cbxOverlayReadStyle">
-              <property name="enabled">
-               <bool>true</bool>
-              </property>
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="maximumSize">
-               <size>
-                <width>16777215</width>
-                <height>16777215</height>
-               </size>
-              </property>
-              <property name="toolTip">
-               <string>The operation to perform when overlaying read styles (ComicRack, ComicBookInfo, etc.)</string>
-              </property>
-             </widget>
-            </item>
-            <item row="2" column="0" colspan="2">
-             <widget class="QCheckBox" name="cbxOverlayMergeLists">
-              <property name="toolTip">
-               <string>Merge lists (characters, tags, locations, etc.) together or the &quot;new&quot; list replaces the old</string>
-              </property>
-              <property name="text">
-               <string>Merge Lists</string>
-              </property>
-             </widget>
-            </item>
            </layout>
           </widget>
          </item>
@@ -999,7 +1022,7 @@ Example Replace:
               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;&amp;quot;Smart Text Cleanup&amp;quot; &lt;/span&gt;will attempt to clean up the new filename if there are missing fields from the template.  For example, removing empty braces, repeated spaces and dashes, and more.  Experimental feature.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
              </property>
              <property name="text">
-              <string>Use Smart Text Cleanup (Experimental)</string>
+              <string>Use Smart Text Cleanup</string>
              </property>
             </widget>
            </item>

comictaggerlib/ui/talkeruigenerator.py

@@ -10,7 +10,6 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 
 from comictaggerlib.coverimagewidget import CoverImageWidget
 from comictaggerlib.ctsettings import ct_ns, group_for_plugin
-from comictaggerlib.graphics import graphics_path
 from comictalker.comictalker import ComicTalker
 
 logger = logging.getLogger(__name__)
@@ -37,8 +36,8 @@ class PasswordEdit(QtWidgets.QLineEdit):
     def __init__(self, show_visibility: bool = True, *args: Any, **kwargs: Any) -> None:
         super().__init__(*args, **kwargs)
 
-        self.visibleIcon = QtGui.QIcon(str(graphics_path / "eye.svg"))
-        self.hiddenIcon = QtGui.QIcon(str(graphics_path / "hidden.svg"))
+        self.visibleIcon = QtGui.QIcon(":/graphics/eye.svg")
+        self.hiddenIcon = QtGui.QIcon(":/graphics/hidden.svg")
 
         self.setEchoMode(QtWidgets.QLineEdit.Password)
 

comictalker/talkers/comicvine.py

@@ -30,7 +30,7 @@ from pyrate_limiter import Limiter, RequestRate
 from typing_extensions import Required, TypedDict
 
 from comicapi import utils
-from comicapi.genericmetadata import ComicSeries, GenericMetadata, TagOrigin
+from comicapi.genericmetadata import ComicSeries, GenericMetadata, MetadataOrigin
 from comicapi.issuestring import IssueString
 from comicapi.utils import LocationParseError, parse_url
 from comictalker import talker_utils
@@ -636,7 +636,7 @@ class ComicVineTalker(ComicTalker):
 
     def _map_comic_issue_to_metadata(self, issue: CVIssue, series: ComicSeries) -> GenericMetadata:
         md = GenericMetadata(
-            tag_origin=TagOrigin(self.id, self.name),
+            data_origin=MetadataOrigin(self.id, self.name),
             issue_id=utils.xlate(issue.get("id")),
             series_id=series.id,
             title_aliases=set(utils.split(issue.get("aliases"), "\n")),

pyproject.toml

@@ -1,10 +1,11 @@
 [tool.black]
 line-length = 120
 force-exclude = "scripts"
+extend-exclude = "comictaggerlib/graphics/resources.py"
 
 [tool.isort]
 line_length = 120
-extend_skip = ["scripts"]
+extend_skip = ["scripts", "comictaggerlib/graphics/resources.py"]
 profile = "black"
 
 [build-system]

setup.cfg

@@ -64,10 +64,10 @@ comicapi.archiver =
     sevenzip = comicapi.archivers.sevenzip:SevenZipArchiver
     rar = comicapi.archivers.rar:RarArchiver
     folder = comicapi.archivers.folder:FolderArchiver
-comicapi.metadata =
-    cr = comicapi.metadata.comicrack:ComicRack
-    cbi = comicapi.metadata.comicbookinfo:ComicBookInfo
-    comet = comicapi.metadata.comet:CoMet
+comicapi.tags =
+    cr = comicapi.tags.comicrack:ComicRack
+    cbi = comicapi.tags.comicbookinfo:ComicBookInfo
+    comet = comicapi.tags.comet:CoMet
 comictagger.talker =
     comicvine = comictalker.talkers.comicvine:ComicVineTalker
 pyinstaller40 =
@@ -242,6 +242,7 @@ deps =
 extras =
     all
 commands =
+    pyrcc5 comictaggerlib/graphics/graphics.qrc -o comictaggerlib/graphics/resources.py
     pyinstaller -y build-tools/comictagger.spec
     python -c 'import importlib,platform; importlib.import_module("icu") if platform.system() != "Windows" else ...' # Sanity check for icu
 
@@ -312,6 +313,7 @@ per-file-ignores =
     tests/*: L
 
 [mypy]
+exclude = comictaggerlib/graphics/resources.py
 check_untyped_defs = true
 disallow_any_generics = true
 disallow_incomplete_defs = true
@@ -329,3 +331,6 @@ check_untyped_defs = false
 disallow_untyped_defs = false
 disallow_incomplete_defs = false
 check_untyped_defs = false
+
+[mypy-comictaggerlib.graphics.resources]
+ignore_errors = True

testing/comicdata.py

@@ -271,13 +271,13 @@ metadata_prepared = (
     (
         (
             comicapi.genericmetadata.GenericMetadata(
-                issue_id="123", tag_origin=comicapi.genericmetadata.TagOrigin("SOURCE", "Source")
+                issue_id="123", data_origin=comicapi.genericmetadata.MetadataOrigin("SOURCE", "Source")
             ),
             comicapi.genericmetadata.GenericMetadata(),
         ),
         comicapi.genericmetadata.GenericMetadata(
             issue_id="123",
-            tag_origin=comicapi.genericmetadata.TagOrigin("SOURCE", "Source"),
+            data_origin=comicapi.genericmetadata.MetadataOrigin("SOURCE", "Source"),
             notes="Tagged with ComicTagger 1.3.2a5 using info from Source on 2022-04-16 15:52:26. [Issue ID 123]",
         ),
     ),

testing/comicvine.py

@@ -170,7 +170,7 @@ comic_series_result = comicapi.genericmetadata.ComicSeries(
 )
 date = utils.parse_date_str(cv_issue_result["results"]["cover_date"])
 comic_issue_result = comicapi.genericmetadata.GenericMetadata(
-    tag_origin=comicapi.genericmetadata.TagOrigin("comicvine", "Comic Vine"),
+    data_origin=comicapi.genericmetadata.MetadataOrigin("comicvine", "Comic Vine"),
     title_aliases=set(),
     month=date[1],
     year=date[2],
@@ -190,7 +190,7 @@ comic_issue_result = comicapi.genericmetadata.GenericMetadata(
 
 cv_md = comicapi.genericmetadata.GenericMetadata(
     is_empty=False,
-    tag_origin=comicapi.genericmetadata.TagOrigin("comicvine", "Comic Vine"),
+    data_origin=comicapi.genericmetadata.MetadataOrigin("comicvine", "Comic Vine"),
     issue_id=str(cv_issue_result["results"]["id"]),
     series=cv_issue_result["results"]["volume"]["name"],
     series_id=str(cv_issue_result["results"]["volume"]["id"]),

tests/comicarchive_test.py

@@ -32,32 +32,32 @@ def test_getPageNameList():
 
 
 def test_page_type_read(cbz):
-    md = cbz.read_metadata("cr")
+    md = cbz.read_tags("cr")
 
     assert isinstance(md.pages[0]["type"], str)
 
 
-def test_metadata_read(cbz, md_saved):
-    md = cbz.read_metadata("cr")
+def test_read_tags(cbz, md_saved):
+    md = cbz.read_tags("cr")
     assert md == md_saved
 
 
-def test_save_cr(tmp_comic):
-    md = tmp_comic.read_metadata("cr")
+def test_write_cr(tmp_comic):
+    md = tmp_comic.read_tags("cr")
     md.apply_default_page_list(tmp_comic.get_page_name_list())
 
-    assert tmp_comic.write_metadata(md, "cr")
+    assert tmp_comic.write_tags(md, "cr")
 
-    md = tmp_comic.read_metadata("cr")
+    md = tmp_comic.read_tags("cr")
 
 
-def test_save_cbi(tmp_comic):
-    md = tmp_comic.read_metadata("cr")
+def test_write_cbi(tmp_comic):
+    md = tmp_comic.read_tags("cr")
     md.apply_default_page_list(tmp_comic.get_page_name_list())
 
-    assert tmp_comic.write_metadata(md, "cbi")
+    assert tmp_comic.write_tags(md, "cbi")
 
-    md = tmp_comic.read_metadata("cbi")
+    md = tmp_comic.read_tags("cbi")
 
 
 @pytest.mark.xfail(not (comicapi.archivers.rar.rar_support and shutil.which("rar")), reason="rar support")
@@ -67,9 +67,9 @@ def test_save_cr_rar(tmp_path, md_saved):
 
     tmp_comic = comicapi.comicarchive.ComicArchive(tmp_path / cbr_path.name)
     assert tmp_comic.seems_to_be_a_comic_archive()
-    assert tmp_comic.write_metadata(comicapi.genericmetadata.md_test, "cr")
+    assert tmp_comic.write_tags(comicapi.genericmetadata.md_test, "cr")
 
-    md = tmp_comic.read_metadata("cr")
+    md = tmp_comic.read_tags("cr")
 
     # This is a fake CBR we don't need to care about the pages for this test
     md.pages = []
@@ -84,28 +84,28 @@ def test_save_cbi_rar(tmp_path, md_saved):
 
     tmp_comic = comicapi.comicarchive.ComicArchive(tmp_path / cbr_path.name)
     assert tmp_comic.seems_to_be_a_comic_archive()
-    assert tmp_comic.write_metadata(comicapi.genericmetadata.md_test, "cbi")
+    assert tmp_comic.write_tags(comicapi.genericmetadata.md_test, "cbi")
 
-    md = tmp_comic.read_metadata("cbi")
-    supported_attributes = comicapi.comicarchive.metadata_styles["cbi"].supported_attributes
+    md = tmp_comic.read_tags("cbi")
+    supported_attributes = comicapi.comicarchive.tags["cbi"].supported_attributes
     assert md.get_clean_metadata(*supported_attributes) == md_saved.get_clean_metadata(*supported_attributes)
 
 
-def test_page_type_save(tmp_comic):
-    md = tmp_comic.read_metadata("cr")
+def test_page_type_write(tmp_comic):
+    md = tmp_comic.read_tags("cr")
     t = md.pages[0]
     t["type"] = ""
 
-    assert tmp_comic.write_metadata(md, "cr")
+    assert tmp_comic.write_tags(md, "cr")
 
-    md = tmp_comic.read_metadata("cr")
+    md = tmp_comic.read_tags("cr")
 
 
 def test_invalid_zip(tmp_comic):
     with open(tmp_comic.path, mode="b+r") as f:
         f.write(b"PK\000\000")
 
-    result = tmp_comic.write_metadata(comicapi.genericmetadata.md_test, "cr")
+    result = tmp_comic.write_tags(comicapi.genericmetadata.md_test, "cr")
     assert not result
 
 
@@ -135,7 +135,7 @@ def test_copy_from_archive(archiver, tmp_path, cbz, md_saved):
     assert comic_archive.seems_to_be_a_comic_archive()
     assert set(cbz.archiver.get_filename_list()) == set(comic_archive.archiver.get_filename_list())
 
-    md = comic_archive.read_metadata("cr")
+    md = comic_archive.read_tags("cr")
     assert md == md_saved
 
 

tests/conftest.py

@@ -172,7 +172,7 @@ def md():
 
 @pytest.fixture
 def md_saved():
-    yield comicapi.genericmetadata.md_test.replace(tag_origin=None, issue_id=None, series_id=None)
+    yield comicapi.genericmetadata.md_test.replace(data_origin=None, issue_id=None, series_id=None)
 
 
 # manually seeds publishers

tests/integration_test.py

@@ -18,14 +18,14 @@ def test_save(
     mock_now,
 ) -> None:
     # Overwrite the series so it has definitely changed
-    tmp_comic.write_metadata(md_saved.replace(series="nothing"), "cr")
+    tmp_comic.write_tags(md_saved.replace(series="nothing"), "cr")
 
-    md = tmp_comic.read_metadata("cr")
+    md = tmp_comic.read_tags("cr")
 
     # Check that it changed
     assert md != md_saved
 
-    # Clear the cached metadata
+    # Clear the cached tags
     tmp_comic.reset_cache()
 
     # Setup the app
@@ -36,19 +36,19 @@ def test_save(
     config[0].Commands__command = comictaggerlib.resulttypes.Action.save
 
     # Check online, should be intercepted by comicvine_api
-    config[0].Runtime_Options__online = True
+    config[0].Auto_Tag__online = True
     # Use the temporary comic we created
     config[0].Runtime_Options__files = [tmp_comic.path]
     # Read and save ComicRack tags
-    config[0].Runtime_Options__type_read = ["cr"]
-    config[0].Runtime_Options__type_modify = ["cr"]
+    config[0].Runtime_Options__tags_read = ["cr"]
+    config[0].Runtime_Options__tags_write = ["cr"]
     # Search using the correct series since we just put the wrong series name in the CBZ
-    config[0].Runtime_Options__metadata = comicapi.genericmetadata.GenericMetadata(series=md_saved.series)
+    config[0].Auto_Tag__metadata = comicapi.genericmetadata.GenericMetadata(series=md_saved.series)
     # Run ComicTagger
     CLI(config[0], talkers).run()
 
     # Read the CBZ
-    md = tmp_comic.read_metadata("cr")
+    md = tmp_comic.read_tags("cr")
 
     # This is inserted here because otherwise several other tests
     # unrelated to comicvine need to be re-worked
@@ -72,7 +72,7 @@ def test_delete(
     md_saved,
     mock_now,
 ) -> None:
-    md = tmp_comic.read_metadata("cr")
+    md = tmp_comic.read_tags("cr")
 
     # Check that the metadata starts correct
     assert md == md_saved
@@ -90,14 +90,14 @@ def test_delete(
     # Use the temporary comic we created
     config[0].Runtime_Options__files = [tmp_comic.path]
     # Delete ComicRack tags
-    config[0].Runtime_Options__type_modify = ["cr"]
+    config[0].Runtime_Options__tags_write = ["cr"]
     # Run ComicTagger
     CLI(config[0], talkers).run()
 
     # Read the CBZ
-    md = tmp_comic.read_metadata("cr")
+    md = tmp_comic.read_tags("cr")
 
-    # The default page list is set on load if the comic has the requested metadata style
+    # The default page list is set on load if the comic has the requested tags
     empty_md = comicapi.genericmetadata.GenericMetadata()
 
     # Validate that we got an empty metadata back
@@ -111,7 +111,7 @@ def test_rename(
     md_saved,
     mock_now,
 ) -> None:
-    md = tmp_comic.read_metadata("cr")
+    md = tmp_comic.read_tags("cr")
 
     # Check that the metadata starts correct
     assert md == md_saved
@@ -140,7 +140,7 @@ def test_rename(
     tmp_comic.path = tmp_comic.path.parent / (md.series + ".cbz")
 
     # Read the CBZ
-    md = tmp_comic.read_metadata("cr")
+    md = tmp_comic.read_tags("cr")
 
     # Validate that we got the correct metadata back
     assert md == md_saved

tests/issueidentifier_test.py

@@ -57,7 +57,7 @@ def test_get_issue_cover_match_score(cbz, config, comicvine_api):
 def test_search(cbz, config, comicvine_api):
     config, definitions = config
     ii = comictaggerlib.issueidentifier.IssueIdentifier(cbz, config, comicvine_api)
-    result, issues = ii.identify(cbz, cbz.read_metadata("cr"))
+    result, issues = ii.identify(cbz, cbz.read_tags("cr"))
     cv_expected = IssueResult(
         series=f"{testing.comicvine.cv_volume_result['results']['name']} ({testing.comicvine.cv_volume_result['results']['start_year']})",
         distance=0,

tests/tags_test.py

@@ -7,27 +7,25 @@ import comicapi.genericmetadata
 import testing.comicdata
 from comictaggerlib.md import prepare_metadata
 
-metadata_styles = []
+tags = []
 
-for x in entry_points(group="comicapi.metadata"):
-    meetadata = x.load()
-    supported = meetadata.enabled
+for x in entry_points(group="comicapi.tag"):
+    tag = x.load()
+    supported = tag.enabled
     exe_found = True
-    metadata_styles.append(
-        pytest.param(meetadata, marks=pytest.mark.xfail(not supported, reason="metadata not enabled"))
-    )
+    tags.append(pytest.param(tag, marks=pytest.mark.xfail(not supported, reason="tags not enabled")))
 
 
-@pytest.mark.parametrize("metadata", metadata_styles)
-def test_metadata(mock_version, tmp_comic, md_saved, metadata):
-    md_style = metadata(mock_version[0])
-    supported_attributes = md_style.supported_attributes
-    md_style.set_metadata(comicapi.genericmetadata.md_test, tmp_comic.archiver)
-    written_metadata = md_style.get_metadata(tmp_comic.archiver)
+@pytest.mark.parametrize("tag_type", tags)
+def test_metadata(mock_version, tmp_comic, md_saved, tag_type):
+    tag = tag_type(mock_version[0])
+    supported_attributes = tag.supported_attributes
+    tag.write_tags(comicapi.genericmetadata.md_test, tmp_comic.archiver)
+    written_metadata = tag.read_tags(tmp_comic.archiver)
     md = md_saved.get_clean_metadata(*supported_attributes)
 
     # Hack back in the pages variable because CoMet supports identifying the cover by the filename
-    if md_style.short_name == "comet":
+    if tag.id == "comet":
         md.pages = [
             comicapi.genericmetadata.ImageMetadata(
                 image_index=0, filename="!cover.jpg", type=comicapi.genericmetadata.PageType.FrontCover