Images to attachments

.github/workflows/build-test-publish.yml

@@ -21,9 +21,6 @@ jobs:
           - "3.10"
           - "3.11"
           - "3.12"
-        include:
-          - os: windows-latest
-            python_version: "3.12"
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python ${{matrix.python_version}}

capella2polarion/__main__.py

@@ -4,7 +4,6 @@
 from __future__ import annotations
 
 import logging
-import pathlib
 import typing
 
 import capellambse
@@ -35,18 +34,6 @@
 )
 @click.option("--polarion-pat", envvar="POLARION_PAT", type=str)
 @click.option("--polarion-delete-work-items", is_flag=True, default=False)
-@click.option(
-    "--capella-diagram-cache-folder-path",
-    type=click.Path(
-        exists=True,
-        file_okay=False,
-        dir_okay=True,
-        readable=True,
-        resolve_path=True,
-        path_type=pathlib.Path,
-    ),
-    default=None,
-)
 @click.option("--capella-model", type=cli_helpers.ModelCLI(), default=None)
 @click.option(
     "--synchronize-config",
@@ -62,18 +49,19 @@ def cli(
     polarion_url: str,
     polarion_pat: str,
     polarion_delete_work_items: bool,
-    capella_diagram_cache_folder_path: pathlib.Path,
     capella_model: capellambse.MelodyModel,
     synchronize_config: typing.TextIO,
 ) -> None:
     """Synchronise data from Capella to Polarion."""
+    if capella_model.diagram_cache is None:
+        logger.warning("It's highly recommended to define a diagram cache!")
+
     capella2polarion_cli = Capella2PolarionCli(
         debug,
         polarion_project_id,
         polarion_url,
         polarion_pat,
         polarion_delete_work_items,
-        capella_diagram_cache_folder_path,
         capella_model,
         synchronize_config,
         force_update,
@@ -96,28 +84,17 @@ def synchronize(ctx: click.core.Context) -> None:
     """Synchronise model elements."""
     capella_to_polarion_cli: Capella2PolarionCli = ctx.obj
     logger.info(
-        "Synchronising diagrams from diagram cache at "
-        "%s to Polarion project with id %s...",
-        str(capella_to_polarion_cli.capella_diagram_cache_folder_path),
+        "Synchronising model elements to Polarion project with id %s...",
         capella_to_polarion_cli.polarion_params.project_id,
     )
     capella_to_polarion_cli.load_synchronize_config()
-    capella_to_polarion_cli.load_capella_diagram_cache_index()
-
-    assert (
-        capella_to_polarion_cli.capella_diagram_cache_index_content is not None
-    )
 
     converter = model_converter.ModelConverter(
         capella_to_polarion_cli.capella_model,
-        capella_to_polarion_cli.capella_diagram_cache_folder_path,
         capella_to_polarion_cli.polarion_params.project_id,
     )
 
-    converter.read_model(
-        capella_to_polarion_cli.config,
-        capella_to_polarion_cli.capella_diagram_cache_index_content,
-    )
+    converter.read_model(capella_to_polarion_cli.config)
 
     polarion_worker = pw.CapellaPolarionWorker(
         capella_to_polarion_cli.polarion_params,
@@ -133,7 +110,11 @@ def synchronize(ctx: click.core.Context) -> None:
     polarion_worker.post_work_items(converter.converter_session)
 
     # Create missing links for new work items
-    converter.generate_work_items(polarion_worker.polarion_data_repo, True)
+    converter.generate_work_items(
+        polarion_worker.polarion_data_repo,
+        generate_links=True,
+        generate_attachments=True,
+    )
 
     polarion_worker.patch_work_items(converter.converter_session)
 

capella2polarion/cli.py

@@ -3,7 +3,6 @@
 """Tool for CLI work."""
 from __future__ import annotations
 
-import json
 import logging
 import pathlib
 import typing
@@ -27,7 +26,6 @@ def __init__(
         polarion_url: str,
         polarion_pat: str,
         polarion_delete_work_items: bool,
-        capella_diagram_cache_folder_path: pathlib.Path | None,
         capella_model: capellambse.MelodyModel,
         synchronize_config_io: typing.TextIO,
         force_update: bool = False,
@@ -39,22 +37,9 @@ def __init__(
             polarion_pat,
             polarion_delete_work_items,
         )
-        if capella_diagram_cache_folder_path is None:
-            raise ValueError("CapellaDiagramCacheFolderPath not filled")
 
-        self.capella_diagram_cache_folder_path = (
-            capella_diagram_cache_folder_path
-        )
-        self.capella_diagram_cache_index_file_path = (
-            self.capella_diagram_cache_folder_path / "index.json"
-        )
-        self.capella_diagram_cache_index_content: list[
-            dict[str, typing.Any]
-        ] = []
         self.capella_model: capellambse.MelodyModel = capella_model
         self.synchronize_config_io: typing.TextIO = synchronize_config_io
-        self.synchronize_config_content: dict[str, typing.Any] = {}
-        self.synchronize_config_roles: dict[str, list[str]] | None = None
         self.config = converter_config.ConverterConfig()
         self.force_update = force_update
 
@@ -99,10 +84,6 @@ def _value(value):
                 string_value = self._none_save_value_string(string_value)
                 click.echo(f"{lighted_member_var}: '{string_value}'")
 
-        echo = ("NO", "YES")[
-            self.capella_diagram_cache_index_file_path.is_file()
-        ]
-        click.echo(f"""Capella Diagram Cache Index-File exists: {echo}""")
         echo = ("YES", "NO")[self.synchronize_config_io.closed]
         click.echo(f"""Synchronize Config-IO is open: {echo}""")
 
@@ -133,15 +114,3 @@ def load_synchronize_config(self) -> None:
         if not self.synchronize_config_io.readable():
             raise RuntimeError("synchronize config io stream is not readable")
         self.config.read_config_file(self.synchronize_config_io)
-
-    def load_capella_diagram_cache_index(self) -> None:
-        """Load Capella Diagram Cache index file content."""
-        if not self.capella_diagram_cache_index_file_path.is_file():
-            raise ValueError(
-                "capella diagramm cache index.json file does not exist"
-            )
-
-        l_text_content = self.capella_diagram_cache_index_file_path.read_text(
-            encoding="utf8"
-        )
-        self.capella_diagram_cache_index_content = json.loads(l_text_content)