ScriptCollection 3.5.155__py3-none-any.whl → 3.5.157__py3-none-any.whl

ScriptCollection/Executables.py

@@ -760,3 +760,17 @@ def UpdateTimestampInFile() -> int:
     sc = ScriptCollectionCore()
     sc.update_timestamp_in_file(args.file)
     return 0
+
+
+def LOC() -> int:
+    parser = argparse.ArgumentParser(description="Counts the lines of code in a git-repository")
+    parser.add_argument('-r', '--repository', required=True)
+    args = parser.parse_args()
+    sc = ScriptCollectionCore()
+    folder: str = None
+    if os.path.isabs(args.repository):
+        folder = args.repository
+    else:
+        folder = GeneralUtilities.resolve_relative_path(args.repository, os.getcwd())
+    GeneralUtilities.write_message_to_stdout(sc.get_lines_of_code(folder))
+    return 0

ScriptCollection/GeneralUtilities.py

@@ -367,11 +367,15 @@ class GeneralUtilities:
 
     @staticmethod
     @check_arguments
-    def datetime_to_string_for_logfile_entry(datetime_object: datetime, add_timezone_info_to_log: bool = True) -> str:
-        if add_timezone_info_to_log:
-            return datetime_object.isoformat()
+    def datetime_to_string_for_logfile_entry(datetime_object: datetime, add_milliseconds: bool = False) -> str:
+        pattern: str = None
+        if add_milliseconds:
+            pattern = "%Y-%m-%dT%H:%M:%S.%f%z"
         else:
-            return datetime_object.strftime("%Y-%m-%d %H:%M:%S")
+            pattern = "%Y-%m-%dT%H:%M:%S%z"
+        s = datetime_object.strftime(pattern)
+        s = s[:-2] + ":" + s[-2:]
+        return s
 
     @staticmethod
     @check_arguments
@@ -617,6 +621,10 @@ class GeneralUtilities:
         with open(file, "wb") as file_object:
             file_object.write(content)
 
+    @staticmethod
+    def is_binary_file(path:str):
+        return b'\x00' in GeneralUtilities.read_binary_from_file(path)
+
     @staticmethod
     @check_arguments
     def read_lines_from_file(file: str, encoding="utf-8") -> list[str]:

ScriptCollection/SCLog.py

@@ -22,6 +22,7 @@ class SCLog:
     add_overhead_to_console: bool
     add_overhead_to_logfile: bool
     print_as_color: bool
+    add_milliseconds_to_logfile_entry: bool
 
     def __init__(self, log_file: str = None, loglevel: LogLevel = None, print_as_color: bool = True):
         self.log_file = log_file
@@ -31,6 +32,7 @@ class SCLog:
             self.loglevel = loglevel
         self.add_overhead_to_console = False
         self.add_overhead_to_logfile = False
+        self.add_milliseconds_to_logfile_entry = False
         self.print_as_color = print_as_color
 
     @GeneralUtilities.check_arguments
@@ -70,7 +72,7 @@ class SCLog:
 
         moment: datetime = datetime.now(datetime.now().astimezone().tzinfo)
 
-        part1 = f"[{GeneralUtilities.datetime_to_string_for_logfile_entry(moment, True)}] ["
+        part1 = f"[{GeneralUtilities.datetime_to_string_for_logfile_entry(moment, self.add_milliseconds_to_logfile_entry)}] ["
         if loglevel == LogLevel.Information:
             part2 = f"Information"
         elif loglevel == LogLevel.Error:

ScriptCollection/ScriptCollectionCore.py

@@ -35,7 +35,7 @@ from .ProgramRunnerPopen import ProgramRunnerPopen
 from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
 from .SCLog import SCLog, LogLevel
 
-version = "3.5.155"
+version = "3.5.157"
 __version__ = version
 
 
@@ -2464,3 +2464,14 @@ OCR-content:
             return 1
         finally:
             self.log.log(f"Finished action \"{name_of_task}\".", LogLevel.Information)
+
+    def get_lines_of_code(self,repository:str)->int:
+        self.assert_is_git_repository(repository)
+        result:int=0
+        result=self.run_program("git","ls-files",repository)
+        files:list[str]=GeneralUtilities.string_to_lines(result[1])
+        for file in files:
+            full_file:str=os.path.join(repository,file)
+            if not GeneralUtilities.is_binary_file(full_file):
+                result=result+len(GeneralUtilities.read_nonempty_lines_from_file(full_file))
+        return result

ScriptCollection/TasksForCommonProjectStructure.py

@@ -2629,12 +2629,6 @@ class TasksForCommonProjectStructure:
         project_version = self.get_version_of_project(repository_folder)
 
         now = datetime.now()
-        if not self.__suport_information_exists(repository_folder, project_version):
-            support_time = timedelta(days=365*2+30*3+1)  # TODO make this configurable
-            until = now + support_time
-            until_day = datetime(until.year, until.month, until.day, 0, 0, 0)
-            from_day = datetime(now.year, now.month, now.day, 0, 0, 0)
-            self.mark_current_version_as_supported(repository_folder, project_version, from_day, until_day)
 
         project_resources_folder = os.path.join(repository_folder, "Other", "Scripts")
         PrepareBuildCodeunits_script_name = "PrepareBuildCodeunits.py"
@@ -2649,7 +2643,23 @@ class TasksForCommonProjectStructure:
                 raise ValueError(f"PrepareBuildCodeunits.py resulted in exitcode {result[0]}.")
 
         self.__do_repository_checks(repository_folder, project_version)
+        if not self.__suport_information_exists(repository_folder, project_version):
+            support_time = timedelta(days=365*2+30*3+1)  # TODO make this configurable
+            until = now + support_time
+            until_day = datetime(until.year, until.month, until.day, 0, 0, 0)
+            from_day = datetime(now.year, now.month, now.day, 0, 0, 0)
+            self.mark_current_version_as_supported(repository_folder, project_version, from_day, until_day)
         self.build_specific_codeunits(repository_folder, codeunits, verbosity, target_environmenttype, additional_arguments_file, is_pre_merge, export_target_directory, False, commandline_arguments, do_git_clean_when_no_changes, note)
+        self.__save_lines_of_code(repository_folder)
+
+    @GeneralUtilities.check_arguments
+    def __save_lines_of_code(self, repository_folder: str) -> None:
+        loc = self.__sc.get_lines_of_code(repository_folder)
+        loc_metric_folder = os.path.join(repository_folder, "Other", "Metrics")
+        GeneralUtilities.ensure_directory_exists(loc_metric_folder)
+        loc_metric_file = os.path.join(loc_metric_folder, "LinesOfCode.txt")
+        GeneralUtilities.ensure_file_exists(loc_metric_file)
+        GeneralUtilities.write_text_to_file(loc_metric_file, str(loc))
 
     @GeneralUtilities.check_arguments
     def build_specific_codeunits(self, repository_folder: str, codeunits: list[str], verbosity: int = 1, target_environmenttype: str = "QualityCheck", additional_arguments_file: str = None, is_pre_merge: bool = False, export_target_directory: str = None, assume_dependent_codeunits_are_already_built: bool = True, commandline_arguments: list[str] = [], do_git_clean_when_no_changes: bool = False, note: str = None, check_for_new_files: bool = True) -> None:

{scriptcollection-3.5.155.dist-info → scriptcollection-3.5.157.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ScriptCollection
-Version: 3.5.155
+Version: 3.5.157
 Summary: The ScriptCollection is the place for reusable scripts.
 Home-page: https://github.com/anionDev/ScriptCollection
 Author: Marius Göcke
@@ -23,8 +23,8 @@ Classifier: Topic :: Utilities
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: build>=1.3.0
-Requires-Dist: coverage>=7.10.5
-Requires-Dist: cyclonedx-bom>=7.0.0
+Requires-Dist: coverage>=7.10.6
+Requires-Dist: cyclonedx-bom>=7.1.0
 Requires-Dist: defusedxml>=0.7.1
 Requires-Dist: keyboard>=0.13.5
 Requires-Dist: lcov-cobertura>=2.1.1
@@ -37,11 +37,11 @@ Requires-Dist: Pygments>=2.19.2
 Requires-Dist: pylint>=3.3.8
 Requires-Dist: pyOpenSSL>=25.1.0
 Requires-Dist: PyPDF>=6.0.0
-Requires-Dist: pytest>=8.4.1
+Requires-Dist: pytest>=8.4.2
 Requires-Dist: PyYAML>=6.0.2
 Requires-Dist: qrcode>=8.2
 Requires-Dist: send2trash>=1.8.3
-Requires-Dist: twine>=6.1.0
+Requires-Dist: twine>=6.2.0
 Requires-Dist: xmlschema>=4.1.0
 
 # ScriptCollection

scriptcollection-3.5.157.dist-info/RECORD

@@ -0,0 +1,17 @@
+ScriptCollection/CertificateUpdater.py,sha256=OAxrG21k_o3W3niOOGNSZzUPJlvolOWc1lRB2dMhc3g,9212
+ScriptCollection/Executables.py,sha256=jfg8X22SxE2WkLhLHrB1ny4u32udEV8ORcw9b2aICcY,37570
+ScriptCollection/GeneralUtilities.py,sha256=l2uEoh73ZGAx_0OTT7zr2FjqCuL3SEBVakq_FTj95zw,48183
+ScriptCollection/ImageUpdater.py,sha256=qTe3yoqzQJY7LZdXBbjbWvrsSQaeHy1VwmOxaRzU2ig,29305
+ScriptCollection/ProcessesRunner.py,sha256=3mu4ZxzZleQo0Op6o9EYTCFiJfb6kx5ov2YfZfT89mU,1395
+ScriptCollection/ProgramRunnerBase.py,sha256=2kMIAqdc65UjBAddOZkzy_aFx9h5roZ5a4bQNM6RV6Y,2480
+ScriptCollection/ProgramRunnerEpew.py,sha256=4pjEd0r9Fcz3TTDv0MdTSd5KkigYXcWUVI1X43regfU,6477
+ScriptCollection/ProgramRunnerPopen.py,sha256=BPY7-ZMIlqT7JOKz8qlB5c0laF2Js-ijzqk09GxZC48,3821
+ScriptCollection/SCLog.py,sha256=rMdrEzBKQZBdObPJ9nZ5XCEXRoIFqPh8fAoiX6ZOVuw,4493
+ScriptCollection/ScriptCollectionCore.py,sha256=m0r_oEirO8wmimxVwq5r-jvAyuaI7PPFap24AWv2Pxw,139775
+ScriptCollection/TasksForCommonProjectStructure.py,sha256=TjGG7ZfP5TXXerx2Zc21cKT2zIbuE0MLub8YntGb1yo,247844
+ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+scriptcollection-3.5.157.dist-info/METADATA,sha256=93r89YmBKkaLd_J5cFRDocPZ56HH0ff6sQbVhZFmgds,7689
+scriptcollection-3.5.157.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+scriptcollection-3.5.157.dist-info/entry_points.txt,sha256=EBRDrnGDURysHNyK0Z0fPCnL7uCCO_Mxc6WYJ47KxAI,4234
+scriptcollection-3.5.157.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+scriptcollection-3.5.157.dist-info/RECORD,,

{scriptcollection-3.5.155.dist-info → scriptcollection-3.5.157.dist-info}/entry_points.txt

@@ -32,6 +32,7 @@ scgeneratethumbnail = ScriptCollection.Executables:GenerateThumbnail
 schealthcheck = ScriptCollection.Executables:Healthcheck
 sckeyboarddiagnosis = ScriptCollection.Executables:KeyboardDiagnosis
 sclistfoldercontent = ScriptCollection.Executables:ListFolderContent
+scloc = ScriptCollection.Executables:LOC
 scmergepdfs = ScriptCollection.Executables:MergePDFs
 scnpmi = ScriptCollection.Executables:NpmI
 scobfuscatefilesfolder = ScriptCollection.Executables:ObfuscateFilesFolder

scriptcollection-3.5.155.dist-info/RECORD

@@ -1,17 +0,0 @@
-ScriptCollection/CertificateUpdater.py,sha256=OAxrG21k_o3W3niOOGNSZzUPJlvolOWc1lRB2dMhc3g,9212
-ScriptCollection/Executables.py,sha256=BojgHGBYn5QqpsdIgn8r8raxb8bE_BUyb-fZ_rCEN0A,37050
-ScriptCollection/GeneralUtilities.py,sha256=E1Jjgf_Vdc8G4KhCSg7FnyP6R3jRNPpsUiZnjSQ-2zk,47962
-ScriptCollection/ImageUpdater.py,sha256=qTe3yoqzQJY7LZdXBbjbWvrsSQaeHy1VwmOxaRzU2ig,29305
-ScriptCollection/ProcessesRunner.py,sha256=3mu4ZxzZleQo0Op6o9EYTCFiJfb6kx5ov2YfZfT89mU,1395
-ScriptCollection/ProgramRunnerBase.py,sha256=2kMIAqdc65UjBAddOZkzy_aFx9h5roZ5a4bQNM6RV6Y,2480
-ScriptCollection/ProgramRunnerEpew.py,sha256=4pjEd0r9Fcz3TTDv0MdTSd5KkigYXcWUVI1X43regfU,6477
-ScriptCollection/ProgramRunnerPopen.py,sha256=BPY7-ZMIlqT7JOKz8qlB5c0laF2Js-ijzqk09GxZC48,3821
-ScriptCollection/SCLog.py,sha256=49NlLEmK_f-icw_uEPq9U3qv-oBTMRcIqSg3jaO8VsA,4360
-ScriptCollection/ScriptCollectionCore.py,sha256=yLDK7zuBIW0K3y9tK53Bjt2zjEkLgEyKnDq4v0eo78k,139260
-ScriptCollection/TasksForCommonProjectStructure.py,sha256=BGmhrkHPbSxo9CQYo1URbERROiDnJSEt5V-b1emX-wQ,247266
-ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-scriptcollection-3.5.155.dist-info/METADATA,sha256=Y0a-2LHPG_-uCQpwJgXZjMu5rJczHCqu_IXRpLhguxU,7689
-scriptcollection-3.5.155.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-scriptcollection-3.5.155.dist-info/entry_points.txt,sha256=yZlEK0r5Ie7xrSLdlWZgFqzLZiIctsIAUJvDCgrYBRo,4193
-scriptcollection-3.5.155.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-scriptcollection-3.5.155.dist-info/RECORD,,