ScriptCollection 4.2.75__py3-none-any.whl → 4.2.77__py3-none-any.whl

ScriptCollection/Executables.py

@@ -390,7 +390,7 @@ def GenerateARC42ReferenceTemplate() -> int:
 def CreateChangelogEntry() -> int:
     parser = argparse.ArgumentParser()
     parser.add_argument('-p', '--repositorypath', required=False, default=".")
-    parser.add_argument('-m', '--message', required=False, default="Updates.")
+    parser.add_argument('-m', '--message', required=False, default=None)
     parser.add_argument('-c', '--commit', action='store_true', required=False, default=False)
     parser.add_argument('-f', '--force', action='store_true', required=False, default=False)
     args = parser.parse_args()
@@ -910,4 +910,4 @@ def SyncXlfFiles()->int:
     languages=str(args.languages).split(",")
     folder=GeneralUtilities.resolve_relative_path(args.folder, os.getcwd())
     sc.sync_xlf2_files(args.prefix, languages, folder)
-    return 0
+    return 0

ScriptCollection/ScriptCollectionCore.py

@@ -13,6 +13,7 @@ import zipfile
 import math
 import base64
 import os
+from html.parser import HTMLParser
 from queue import Queue, Empty
 from concurrent.futures import ThreadPoolExecutor
 import xml.etree.ElementTree as ET
@@ -37,7 +38,7 @@ from .ProgramRunnerBase import ProgramRunnerBase
 from .ProgramRunnerPopen import ProgramRunnerPopen
 from .SCLog import SCLog, LogLevel
 
-version = "4.2.75"
+version = "4.2.77"
 __version__ = version
 
 class VSCodeWorkspaceShellTask:
@@ -2622,7 +2623,7 @@ TXDX
         self.run_program("docker", f"network create {network_name}")
 
     @GeneralUtilities.check_arguments
-    def format_xml_file(self, file: str) -> None:
+    def format_xml_file(self, file: str,add_xml_declaration:bool=True) -> None:
         encoding = "utf-8"
         element = ET.XML(GeneralUtilities.read_text_from_file(file, encoding))
         def trim_texts(elem: ET.Element):
@@ -2638,12 +2639,119 @@ TXDX
             file,
             ET.tostring(
                 element,
-                xml_declaration=True,
+                xml_declaration=add_xml_declaration,
                 encoding="unicode"
             ),
             encoding
         )
 
+    @GeneralUtilities.check_arguments
+    def format_html_file(self, file: str, add_html_declaration: bool = False) -> None:
+        encoding = "utf-8"
+        content = GeneralUtilities.read_text_from_file(file, encoding)
+        content=self.format_html_content(content, add_html_declaration)
+        GeneralUtilities.write_text_to_file(file, content, encoding)
+
+    @GeneralUtilities.check_arguments
+    def format_html_content(self, content: str, add_html_declaration: bool = False) -> str:
+
+        VOID_ELEMENTS = {"area", "base", "br", "col", "embed", "hr", "img", "input",
+                         "link", "meta", "param", "source", "track", "wbr"}
+
+        class _Node:
+            __slots__ = ("tag", "attrs", "children", "text", "is_void", "raw")
+            def __init__(self, tag=None, attrs=(), text=None, is_void=False, raw=None):
+                self.tag = tag
+                self.attrs = list(attrs)
+                self.children = []
+                self.text = text
+                self.is_void = is_void
+                self.raw = raw
+
+        class _Builder(HTMLParser):
+            def __init__(self):
+                super().__init__(convert_charrefs=False)
+                self.root = _Node()
+                self.stack = [self.root]
+
+            def _top(self):
+                return self.stack[-1]
+
+            def handle_starttag(self, tag, attrs):
+                raw = self.get_starttag_text()
+                raw_lower = raw.lower()
+                original_attrs = []
+                pos = 1 + len(tag)
+                for lc_name, value in attrs:
+                    idx = raw_lower.index(lc_name, pos)
+                    original_attrs.append((raw[idx:idx + len(lc_name)], value))
+                    pos = idx + len(lc_name)
+                node = _Node(tag=tag, attrs=original_attrs, is_void=tag.lower() in VOID_ELEMENTS)
+                self._top().children.append(node)
+                if not node.is_void:
+                    self.stack.append(node)
+
+            def handle_endtag(self, tag):
+                if len(self.stack) > 1 and self.stack[-1].tag == tag:
+                    self.stack.pop()
+
+            def handle_data(self, data):
+                t = " ".join(data.split())
+                if t:
+                    self._top().children.append(_Node(text=t))
+
+            def handle_entityref(self, name):
+                self._top().children.append(_Node(text=f"&{name};"))
+
+            def handle_charref(self, name):
+                self._top().children.append(_Node(text=f"&#{name};"))
+
+            def handle_comment(self, data):
+                self._top().children.append(_Node(raw=f"<!--{data}-->"))
+
+            def handle_decl(self, decl):
+                self._top().children.append(_Node(raw=f"<!{decl}>"))
+
+            def handle_pi(self, data):
+                self._top().children.append(_Node(raw=f"<?{data}>"))
+
+        builder = _Builder()
+        builder.feed(content)
+        ind = "  "
+
+        def _serialize(node: _Node, depth: int) -> list:
+            prefix = ind * depth
+            if node.raw is not None:
+                return [prefix + node.raw]
+            if node.text is not None:
+                return [node.text]
+            if node.tag is None:
+                out = []
+                for c in node.children:
+                    out.extend(_serialize(c, depth))
+                return out
+            attr_str = "".join(f" {n}" if v is None else f' {n}="{v}"' for n, v in node.attrs)
+            if node.is_void:
+                return [f"{prefix}<{node.tag}{attr_str}>"]
+            has_elem_children = any(c.tag is not None for c in node.children)
+            if not has_elem_children:
+                inner = "".join(c.text or "" for c in node.children)
+                return [f"{prefix}<{node.tag}{attr_str}>{inner}</{node.tag}>"]
+            lines = [f"{prefix}<{node.tag}{attr_str}>"]
+            for c in node.children:
+                child_lines = _serialize(c, depth + 1)
+                if c.text is not None:
+                    lines.append(ind * (depth + 1) + child_lines[0])
+                else:
+                    lines.extend(child_lines)
+            lines.append(f"{prefix}</{node.tag}>")
+            return lines
+
+        result = "\n".join(_serialize(builder.root, 0))
+        if add_html_declaration and not result.lstrip().startswith("<!DOCTYPE"):
+            result = "<!DOCTYPE html>\n" + result
+        return result
+
     @GeneralUtilities.check_arguments
     def get_pip_index_url_arguments_from_local_cache(self)->list[str]:
         arguments=[]
@@ -3264,7 +3372,9 @@ OCR-content:
         tree = ET.parse(file)
         root = tree.getroot()
 
-        for segment in root.findall(".//xliff:segment[@state='initial']", ns):
+        for segment in root.findall(".//xliff:segment", ns):
+            if segment.get("state", "initial") != "initial":
+                continue
             source_el = segment.find("xliff:source", ns)
             if source_el is None or not source_el.text:
                 continue
@@ -3337,12 +3447,14 @@ OCR-content:
     @GeneralUtilities.check_arguments
     def get_all_commits_in_git_repository(self,repository_folder:str,include_all_heads:bool=False) -> list[str]:
         """Returns a textual visualization of all commits in a git-repository."""
-        #do 'git log --reverse --all --pretty=format:"%ci | %H | %cn <%ce> | %s"'
-        args = ["log", "--reverse", "--pretty=format:%ci | %H | %cn <%ce> | %s"]
+        #do 'git log --reverse --all --pretty=format:"%ci | %H | %cn <%ce> | %d | %s"'
+        args = ["log", "--reverse", "--pretty=format:%ci | %H | %cn <%ce> | %D | %s"]
         if include_all_heads:
             args.append("--all")
         result=self.run_program_argsasarray("git", args, repository_folder, throw_exception_if_exitcode_is_not_zero=True)
-        return result[1]
+        output= result[1]
+        result=output.splitlines()
+        return result
 
     @GeneralUtilities.check_arguments
     def write_commit_list_for_repository(self,repository_folder:str,target_file:str,include_all_heads:bool=False) -> None:

ScriptCollection/TFCPS/NodeJS/TFCPS_CodeUnitSpecific_NodeJS.py

@@ -24,6 +24,10 @@ class TFCPS_CodeUnitSpecific_NodeJS_Functions(TFCPS_CodeUnitSpecific_Base):
 
     @GeneralUtilities.check_arguments
     def linting(self) -> None:
+        src_folder = os.path.join(self.get_codeunit_folder(), "src")
+        for file in GeneralUtilities.get_all_files_of_folder(src_folder):
+            if file.endswith(".html"):
+                self._protected_sc.format_html_file(file, os.path.basename(file) == "index.html")
         self._protected_sc.run_with_epew("npm", "run lint", self.get_codeunit_folder(),print_live_output=self.get_verbosity()==LogLevel.Debug,encode_argument_in_base64=True)
 
     @GeneralUtilities.check_arguments

ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnits.py

@@ -1,6 +1,7 @@
 import os
 import json
 from datetime import datetime, timedelta,timezone
+import yaml
 from ..GeneralUtilities import GeneralUtilities
 from ..ScriptCollectionCore import ScriptCollectionCore
 from ..SCLog import  LogLevel
@@ -67,6 +68,7 @@ class TFCPS_CodeUnit_BuildCodeUnits:
         self.__search_for_vulnerabilities()
         self.__search_for_secrets()
         if self.is_pre_merge():
+            self.__translate()
             self.__collect_metrics()
             self.__generate_loc_diagram()
         end_time:datetime=GeneralUtilities.get_now()
@@ -97,6 +99,17 @@ class TFCPS_CodeUnit_BuildCodeUnits:
     def build_codeunits_in_container(self) -> None:
         raise ValueError("Not implemented.")
 
+    @GeneralUtilities.check_arguments
+    def __translate(self) -> None:
+        for taskfile_name in ("Taskfile.yml", "Taskfile.yaml"):
+            taskfile = os.path.join(self.repository, taskfile_name)
+            if os.path.isfile(taskfile):
+                with open(taskfile, "r", encoding="utf-8") as f:
+                    taskfile_content = yaml.safe_load(f)
+                if isinstance(taskfile_content.get("tasks"), dict) and "Translate" in taskfile_content["tasks"]:
+                    self.sc.run_program("task", "Translate", self.repository, print_live_output=self.sc.log.loglevel == LogLevel.Debug)
+                break
+
     @GeneralUtilities.check_arguments
     def __collect_metrics(self) -> None:
         project_version: str=self.tfcps_tools_general.get_version_of_project(self.repository)

ScriptCollection/TFCPS/TFCPS_Tools_General.py

@@ -437,9 +437,23 @@ class TFCPS_Tools_General:
         self.__sc.assert_is_git_repository(repositoryfolder)
         return self.__sc.get_semver_version_from_gitversion(repositoryfolder)
 
+    @GeneralUtilities.check_arguments
+    def __try_calculate_changelog_message(self, repositoryfolder: str):
+        self.__sc.assert_is_git_repository(repositoryfolder)
+        message = self.__sc.run_program("git", "log -1 --pretty=%B", repositoryfolder)[1]
+        message = message.strip()
+        if len(message) == 0:
+            raise ValueError("No commit message found.")
+        return message
+
     @GeneralUtilities.check_arguments
     def create_changelog_entry(self, repositoryfolder: str, message: str, commit: bool, force: bool):
         self.__sc.assert_is_git_repository(repositoryfolder)
+        if message is None:
+            try:
+                message=self.__try_calculate_changelog_message(repositoryfolder)
+            except:
+                message="Update."
         random_file = os.path.join(repositoryfolder, str(uuid.uuid4()))
         try:
             if force and not self.__sc.git_repository_has_uncommitted_changes(repositoryfolder):
@@ -1548,4 +1562,4 @@ class TFCPS_Tools_General:
 
 
     def update_dependent_oci_images(self,repo:str):
-        pass#TODO update all image-tags in repo/.ScriptCollection/OCIImages/ImageDefinition.csv if possible using the custom defined registries in ~/.ScriptCollection if possible.
+        pass#TODO update all image-tags in repo/.ScriptCollection/OCIImages/ImageDefinition.csv if possible using the custom defined registries in ~/.ScriptCollection if possible.

{scriptcollection-4.2.75.dist-info → scriptcollection-4.2.77.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ScriptCollection
-Version: 4.2.75
+Version: 4.2.77
 Summary: The ScriptCollection is the place for reusable scripts.
 Home-page: https://github.com/anionDev/ScriptCollection
 Author: Marius Göcke

{scriptcollection-4.2.75.dist-info → scriptcollection-4.2.77.dist-info}/RECORD

@@ -1,6 +1,6 @@
 ScriptCollection/AnionBuildPlatform.py,sha256=K-PHarX802A0PU8uRu0GNcEZiXujFoXHACe-X9YJsAQ,11711
 ScriptCollection/CertificateUpdater.py,sha256=Pa6eyjQSx7IIvj4PQVMI0IwMs01KQrNSB7Qa-7lRfBs,9375
-ScriptCollection/Executables.py,sha256=SsA3zeDL8QEsh7GxjDjatv5P4eFeDBPqB0F8pNXoYzA,44234
+ScriptCollection/Executables.py,sha256=Y1nzSLWjU7wQxh7BR8RKQM51pauhIeXJawC6SM5uWcw,44229
 ScriptCollection/GeneralUtilities.py,sha256=3Fgp0fAXF-rfcohy6k1RsRcMXEVRF15fHl8QJnViKIg,65497
 ScriptCollection/HTTPMaintenanceOverheadHelper.py,sha256=TToNtyO1XzsMbBsTBf3o0xgOK0v4Jf03qw2Z0xb2nCk,2007
 ScriptCollection/ProcessesRunner.py,sha256=o5raxIt3lknNPoPrjNzJ2bprRPJ3SnL0rrR7crraD7E,1523
@@ -9,7 +9,7 @@ ScriptCollection/ProgramRunnerMock.py,sha256=uTu-aFle1W_oKjeQEmuPsFPQpvo0kRf2FrR
 ScriptCollection/ProgramRunnerPopen.py,sha256=BPY7-ZMIlqT7JOKz8qlB5c0laF2Js-ijzqk09GxZC48,3821
 ScriptCollection/ProgramRunnerSudo.py,sha256=_khC3xuTdrPoLluBJZWfldltmmuKltABJPcbjZSFW-4,4835
 ScriptCollection/SCLog.py,sha256=8TRy1LeYMsPOIuWUcnUNNbO5pd-cNBS-3cn-kdzP8FU,4768
-ScriptCollection/ScriptCollectionCore.py,sha256=zymaRBLpPzYa3RJpmT5_VM4sMgtHwMftUjTrI62AbfI,182101
+ScriptCollection/ScriptCollectionCore.py,sha256=bZ8OSO0sYRrPO2Jq11AROlh0c8Y2f7C-5r8I4vMmoWg,186755
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ScriptCollection/OCIImages/AbstractImageHandler.py,sha256=83qDMILwxhH9DbC0sb358Vu8PXEysmJJyap_6gECZqs,1627
 ScriptCollection/OCIImages/OCIImageManager.py,sha256=aBogkSXNDyi8NO11N-s03nuFJEv7PyJ-wjHuYYeZfvs,6662
@@ -24,13 +24,13 @@ ScriptCollection/Resources/CultureChooser/index.html,sha256=gxQzbrSp4WU52TqN-gcB
 ScriptCollection/Resources/MaintenanceSite/MaintenanceSite.html,sha256=CX9S1bdOz6xU2aGfr03tJRGczQrlpn-IeODc15d5kc0,232
 ScriptCollection/TFCPS/TFCPS_CodeUnitSpecific_Base.py,sha256=EMNDgkUem87aH1csz7eoSBBEKkiZMLZqZhnxKSPQWe0,27845
 ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnit.py,sha256=MieeAAKm1y58qXp1cCUN5mj5vwpq4Pc1uusUjPQzpvc,8237
-ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnits.py,sha256=3Mo8XrTDD1Z7_K1PLxSPYA-fePQ95sIAeNKGj0matiw,15109
+ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnits.py,sha256=2CNCmngOgygvhJrBdMbrq5W6LZ-xxchlxeThaDQZ-TA,15792
 ScriptCollection/TFCPS/TFCPS_CreateRelease.py,sha256=yqGstRjRfVVGbqrcBgtYStqth2x2SvBb3y2Ht8GsuMQ,6554
 ScriptCollection/TFCPS/TFCPS_Generic.py,sha256=Tpzgiz6m3-cYCkObZOG5Uu7oM-EMoWFzzRpLl3Lblqo,2023
 ScriptCollection/TFCPS/TFCPS_MergeToMain.py,sha256=-Ev9D3bZDlUk2WFQhcmvzQ3FCS97OdsVUd0koAdmpZc,7474
 ScriptCollection/TFCPS/TFCPS_MergeToStable.py,sha256=Ajfy2pLajTuU6UpwItHt4C2a-gLF3gPc4z6BktL3Cio,22163
 ScriptCollection/TFCPS/TFCPS_PreBuildCodeunitsScript.py,sha256=f0Uq1cA_4LvmL72cal0crrbKF6PcxL13D9wBKuQ1YBw,2328
-ScriptCollection/TFCPS/TFCPS_Tools_General.py,sha256=H8qve4dwY6XjLAKrh8jAJohk8DGdtnqa_-frkrME8pU,100769
+ScriptCollection/TFCPS/TFCPS_Tools_General.py,sha256=VbS3qdpCc4ZgbwlwxHdLB_ras8dDmJDBklRrWIrhbDQ,101356
 ScriptCollection/TFCPS/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ScriptCollection/TFCPS/Docker/TFCPS_CodeUnitSpecific_Docker.py,sha256=sPO4Gf6oRbGH9QRA3p2nmTAeHtkyYr31ucLbJP09JeY,12139
 ScriptCollection/TFCPS/Docker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -43,12 +43,12 @@ ScriptCollection/TFCPS/Flutter/TFCPS_CodeUnitSpecific_Flutter.py,sha256=KAjyFyEj
 ScriptCollection/TFCPS/Flutter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ScriptCollection/TFCPS/Go/TFCPS_CodeUnitSpecific_Go.py,sha256=kyx26AnT1-LySFA46wfJ9yZUKYdMWTD0U2XZfSQbuB0,3497
 ScriptCollection/TFCPS/Go/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ScriptCollection/TFCPS/NodeJS/TFCPS_CodeUnitSpecific_NodeJS.py,sha256=GQLE6FeR-XNRlLDwionndM-oGLPIbgNhSAx5rc3nnDY,12900
+ScriptCollection/TFCPS/NodeJS/TFCPS_CodeUnitSpecific_NodeJS.py,sha256=57I7xbLtCtH-Edt1QKCSXF7wnGyAhbGMdghD_VFZIIY,13184
 ScriptCollection/TFCPS/NodeJS/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ScriptCollection/TFCPS/Python/TFCPS_CodeUnitSpecific_Python.py,sha256=9XK7XnbeOnq_4siVoWovogStoKFiZLhGh3C_f2YaznI,13621
 ScriptCollection/TFCPS/Python/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-scriptcollection-4.2.75.dist-info/METADATA,sha256=uAmn_kWmbQn8rdmRBj3VatLg0j8LNhwY62kOrS-i7nQ,7691
-scriptcollection-4.2.75.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-scriptcollection-4.2.75.dist-info/entry_points.txt,sha256=27XwAJEcaMEc1be0Ec1vKHCbiU4Ziu8jKL-SqsrYOIQ,4680
-scriptcollection-4.2.75.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-scriptcollection-4.2.75.dist-info/RECORD,,
+scriptcollection-4.2.77.dist-info/METADATA,sha256=LBW1YBdUMBmRbKX0zeYVI6g6IOxw7bH93ojqb7mInqU,7691
+scriptcollection-4.2.77.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+scriptcollection-4.2.77.dist-info/entry_points.txt,sha256=27XwAJEcaMEc1be0Ec1vKHCbiU4Ziu8jKL-SqsrYOIQ,4680
+scriptcollection-4.2.77.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+scriptcollection-4.2.77.dist-info/RECORD,,