Snapshot

Author: tomschr

src/docbuild/cli/cmd_metadata/metaprocess.py

@@ -16,7 +16,7 @@
 from ...constants import DEFAULT_DELIVERABLES
 from ...models.deliverable import Deliverable
 from ...models.doctype import Doctype
-from ...models.manifest import Description, Document, Manifest
+from ...models.manifest import Category, Description, Document, Manifest
 from ...utils.contextmgr import PersistentOnErrorTemporaryDirectory, edit_json
 from ...utils.git import ManagedGitRepo
 from ..context import DocBuildContext
@@ -347,19 +347,21 @@ def store_productdocset_json(
         docsetxpath = f"./{doctype.docset_xpath_segment(docset)}"
         docsetnode = productnode.find(docsetxpath)
         descriptions = list(Description.from_xml_node(productnode))
+        categories = Category.from_xml_node(productnode)
 
         manifest = Manifest(
             productname=productnode.find("name").text,
             acronym=product,
             version=docset,
             lifecycle=docsetnode.attrib.get("lifecycle") or "",
             descriptions=descriptions,
+            categories=categories,
             # * hide-productname is False by default in the Manifest model
             # * archives are empty lists by default
         )
 
         for f in files:
-            stdout.print(f" {f}")
+            stdout.print(f.stem)
             try:
                 with (meta_cache_dir / f).open(encoding="utf-8") as fh:
                     loaded_doc_data = json.load(fh)
@@ -393,6 +395,7 @@ def store_productdocset_json(
         log.info(
             "Wrote merged metadata JSON for %s/%s => %s", product, docset, jsonfile
         )
+        stdout.print(f" > Result: {jsonfile}")
 
 
 async def process(

src/docbuild/models/manifest.py

@@ -59,7 +59,7 @@ class CategoryTranslation(BaseModel):
     """Represents a translation for a category title."""
 
     lang: LanguageCode
-    default: bool
+    default: bool = Field(default=False)
     title: str
 
     @field_serializer("lang")
@@ -71,9 +71,18 @@ def serialize_lang(self: Self, value: LanguageCode, info: SerializationInfo) ->
 class Category(BaseModel):
     """Represents a category for a product/docset."""
 
-    id: str = Field(alias="categoryId")
+    id: str = Field(serialization_alias="categoryId")
     translations: list[CategoryTranslation] = Field(default_factory=list)
 
+    @classmethod
+    def from_xml_node(
+        cls: type[Self], node: etree._Element
+    ) -> Generator[Self, None, None]:
+        """Extract categories from a parent XML node."""
+        for cat in node.xpath("category|categories/category"):
+
+            yield cls(id=cat.attrib.get("categoryid", ""), translations=[])
+
 
 class Archive(BaseModel):
     """Represents an archive (e.g., a ZIP file) for a product/docset."""