ScriptCollection 3.5.158__py3-none-any.whl → 3.5.160__py3-none-any.whl

ScriptCollection/ScriptCollectionCore.py

@@ -36,7 +36,7 @@ from .ProgramRunnerPopen import ProgramRunnerPopen
 from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
 from .SCLog import SCLog, LogLevel
 
-version = "3.5.158"
+version = "3.5.160"
 __version__ = version
 
 
@@ -2469,7 +2469,7 @@ OCR-content:
     def get_lines_of_code_with_default_excluded_patterns(self, repository: str) -> int:
         return self.get_lines_of_code(repository, self.default_excluded_patterns_for_loc, False)
 
-    default_excluded_patterns_for_loc: list[str] = [".txt", ".md",".vscode", "Resources", "Reference", ".gitignore", ".gitattributes", "Other/Metrics"]
+    default_excluded_patterns_for_loc: list[str] = [".txt", ".md", ".vscode", "Resources", "Reference", ".gitignore", ".gitattributes", "Other/Metrics"]
 
     def get_lines_of_code(self, repository: str, excluded_pattern: list[str], verbose: bool) -> int:
         self.assert_is_git_repository(repository)
@@ -2482,19 +2482,23 @@ OCR-content:
         if very_verbose:
             verbose = True
         for file in files:
-            if self.__is_excluded_by_glob_pattern(file, excluded_pattern):
-                if very_verbose:
-                    GeneralUtilities.write_message_to_stdout(f"File '{file}' is ignored because it matches an excluded pattern.")
-            else:
-                full_file: str = os.path.join(repository, file)
-                if GeneralUtilities.is_binary_file(full_file):
+            if os.path.isfile(os.path.join(repository, file)):
+                if self.__is_excluded_by_glob_pattern(file, excluded_pattern):
                     if very_verbose:
-                        GeneralUtilities.write_message_to_stdout(f"File '{file}' is ignored because it is a binary-file.")
+                        GeneralUtilities.write_message_to_stdout(f"File '{file}' is ignored because it matches an excluded pattern.")
                 else:
-                    if verbose:
-                        GeneralUtilities.write_message_to_stdout(f"Count lines of file '{file}'.")
-                    length = len(GeneralUtilities.read_nonempty_lines_from_file(full_file))
-                    result = result+length
+                    full_file: str = os.path.join(repository, file)
+                    if GeneralUtilities.is_binary_file(full_file):
+                        if very_verbose:
+                            GeneralUtilities.write_message_to_stdout(f"File '{file}' is ignored because it is a binary-file.")
+                    else:
+                        if verbose:
+                            GeneralUtilities.write_message_to_stdout(f"Count lines of file '{file}'.")
+                        length = len(GeneralUtilities.read_nonempty_lines_from_file(full_file))
+                        result = result+length
+            else:
+                if verbose:
+                    GeneralUtilities.write_message_to_stdout(f"File '{file}' is ignored because it does not exist.")
         return result
 
     def __is_excluded_by_glob_pattern(self, file: str, excluded_patterns: list[str]) -> bool:

ScriptCollection/TasksForCommonProjectStructure.py

@@ -1827,15 +1827,60 @@ class TasksForCommonProjectStructure:
         coverage_file_relative = f"{test_coverage_folder_relative}/TestCoverage.xml"
         coverage_file = GeneralUtilities.resolve_relative_path(coverage_file_relative, codeunit_folder)
         self.run_with_epew("lcov_cobertura", f"coverage/lcov.info --base-dir . --excludes test --output ../{coverage_file_relative} --demangle", src_folder, verbosity)
+
+        # format correctly
         content = GeneralUtilities.read_text_from_file(coverage_file)
         content = re.sub('<![^<]+>', '', content)
         content = re.sub('\\\\', '/', content)
         content = re.sub('\\ name=\\"lib\\"', '', content)
-        content = re.sub('<package ', f'<package name="{codeunit_name}" ', content)
         content = re.sub('\\ filename=\\"lib/', f' filename="{package_name}/lib/', content)
         GeneralUtilities.write_text_to_file(coverage_file, content)
+        self.__testcoverage_for_flutter_project_merge_packages(coverage_file)
+        self.__testcoverage_for_flutter_project_calculate_line_rate(coverage_file)
+
         self.run_testcases_common_post_task(repository_folder, codeunit_name, verbosity, generate_badges, build_environment_target_type, args)
 
+    def __testcoverage_for_flutter_project_merge_packages(self, coverage_file: str):
+        tree = etree.parse(coverage_file)
+        root = tree.getroot()
+
+        packages = root.findall("./packages/package")
+
+        all_classes = []
+        for pkg in packages:
+            classes = pkg.find("classes")
+            if classes is not None:
+                all_classes.extend(classes.findall("class"))
+        new_package = etree.Element("package", name="Malno")
+        new_classes = etree.SubElement(new_package, "classes")
+        for cls in all_classes:
+            new_classes.append(cls)
+        packages_node = root.find("./packages")
+        packages_node.clear()
+        packages_node.append(new_package)
+        tree.write(coverage_file, pretty_print=True, xml_declaration=True, encoding="UTF-8")
+
+    def __testcoverage_for_flutter_project_calculate_line_rate(self, coverage_file: str):
+        tree = etree.parse(coverage_file)
+        root = tree.getroot()
+        package = root.find("./packages/package")
+        if package is None:
+            raise RuntimeError("No <package>-Element found")
+
+        line_elements = package.findall(".//line")
+
+        amount_of_lines = 0
+        amount_of_hited_lines = 0
+
+        for line in line_elements:
+            amount_of_lines += 1
+            hits = int(line.get("hits", "0"))
+            if hits > 0:
+                amount_of_hited_lines += 1
+        line_rate = amount_of_hited_lines / amount_of_lines if amount_of_lines > 0 else 0.0
+        package.set("line-rate", str(line_rate))
+        tree.write(coverage_file, pretty_print=True, xml_declaration=True, encoding="UTF-8")
+
     @GeneralUtilities.check_arguments
     def standardized_tasks_run_testcases_for_angular_codeunit(self, runtestcases_script_file: str, build_environment_target_type: str, generate_badges: bool, verbosity: int, commandline_arguments: list[str]) -> None:
         # prepare

{scriptcollection-3.5.158.dist-info → scriptcollection-3.5.160.dist-info}/METADATA

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

{scriptcollection-3.5.158.dist-info → scriptcollection-3.5.160.dist-info}/RECORD

@@ -7,11 +7,11 @@ ScriptCollection/ProgramRunnerBase.py,sha256=2kMIAqdc65UjBAddOZkzy_aFx9h5roZ5a4b
 ScriptCollection/ProgramRunnerEpew.py,sha256=4pjEd0r9Fcz3TTDv0MdTSd5KkigYXcWUVI1X43regfU,6477
 ScriptCollection/ProgramRunnerPopen.py,sha256=BPY7-ZMIlqT7JOKz8qlB5c0laF2Js-ijzqk09GxZC48,3821
 ScriptCollection/SCLog.py,sha256=rMdrEzBKQZBdObPJ9nZ5XCEXRoIFqPh8fAoiX6ZOVuw,4493
-ScriptCollection/ScriptCollectionCore.py,sha256=zm3KiuLoFiz99JZkqUkPhnKVhKD24bDqxpUiAplON24,141383
-ScriptCollection/TasksForCommonProjectStructure.py,sha256=nXhwH6rfA-XXdQVXYQoxXUQ5sA82d1bDF2EVKdZIfo8,248595
+ScriptCollection/ScriptCollectionCore.py,sha256=vFP4e2ksl982hDKgQuC5udmBIG6Wu7m6MHG5PFa3_k8,141662
+ScriptCollection/TasksForCommonProjectStructure.py,sha256=6Id8KRtSIuUnbPakmyNutnpF5kHwaAFkzPpxD5csYs0,250347
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-scriptcollection-3.5.158.dist-info/METADATA,sha256=RLxzi_qgfzjf-_uC_-neTKRG22TJhJK5VKyDRg2SplU,7689
-scriptcollection-3.5.158.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-scriptcollection-3.5.158.dist-info/entry_points.txt,sha256=EBRDrnGDURysHNyK0Z0fPCnL7uCCO_Mxc6WYJ47KxAI,4234
-scriptcollection-3.5.158.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-scriptcollection-3.5.158.dist-info/RECORD,,
+scriptcollection-3.5.160.dist-info/METADATA,sha256=ZIoWVimoMYzMsReojXoop-Wao1qioWzZwe6w6yM06xE,7689
+scriptcollection-3.5.160.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+scriptcollection-3.5.160.dist-info/entry_points.txt,sha256=EBRDrnGDURysHNyK0Z0fPCnL7uCCO_Mxc6WYJ47KxAI,4234
+scriptcollection-3.5.160.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+scriptcollection-3.5.160.dist-info/RECORD,,