ScriptCollection 3.5.138__py3-none-any.whl → 3.5.140__py3-none-any.whl

ScriptCollection/Executables.py

@@ -8,6 +8,7 @@ import keyboard
 from .TasksForCommonProjectStructure import TasksForCommonProjectStructure
 from .ScriptCollectionCore import ScriptCollectionCore
 from .GeneralUtilities import GeneralUtilities
+from .ImageUpdater import ImageUpdater, VersionEcholon
 
 
 def FilenameObfuscator() -> int:
@@ -635,7 +636,7 @@ def Espoc() -> int:
     parser.add_argument('-p', '--processid', required=True)
     parser.add_argument('-f', '--file', required=True, help='Specifies the file where the process-ids of the started processes are stored (line by line). This file will be deleted when all started processes are terminated.')
     args = parser.parse_args()
-    process_id =int(args.processid)
+    process_id = int(args.processid)
     process_list_file: str = args.file
     if not os.path.isabs(process_list_file):
         process_list_file = GeneralUtilities.resolve_relative_path(process_list_file, os.getcwd())
@@ -654,10 +655,74 @@ def Espoc() -> int:
         GeneralUtilities.write_message_to_stdout(f"File '{process_list_file}' does not exist. No processes to terminate.")
     return 0
 
-def ConvertGitRepositoryToBareRepository()->int:
+
+def ConvertGitRepositoryToBareRepository() -> int:
     parser = argparse.ArgumentParser(description="Converts a local git-repository to a bare repository.")
     parser.add_argument('-f', '--folder', required=True, help='Git-repository-folder which should be converted.')
     args = parser.parse_args()
-    sc=ScriptCollectionCore()
+    sc = ScriptCollectionCore()
     sc.convert_git_repository_to_bare_repository(args.folder)
     return 0
+
+
+def OCRAnalysisOfFolder() -> int:
+    parser = argparse.ArgumentParser()
+    parser.add_argument('-s', '--serviceaddress', required=False, default=None)
+    parser.add_argument('-e', '--extensions', required=False, default=None)
+    parser.add_argument('-l', '--languages', required=False, default="en")
+    parser.add_argument('-f', '--folder', required=False, default=None)
+    args = parser.parse_args()
+    sc = ScriptCollectionCore()
+    if args.folder is None:
+        args.folder = os.getcwd()
+    extensions_value: str = None
+    if args.extensions is not None:
+        if "," in args.extensions:
+            extensions_value = args.extensions.split(",")
+        else:
+            extensions_value = [args.extensions]
+    sc.ocr_analysis_of_folder(args.folder, args.serviceaddress, extensions_value, args.languages)
+    return 0
+
+
+def OCRAnalysisOfFile() -> int:
+    parser = argparse.ArgumentParser()
+    parser.add_argument('-s', '--serviceaddress', required=False, default=None)
+    parser.add_argument('-l', '--languages', required=False, default="en")
+    parser.add_argument('-f', '--file', required=True)
+    args = parser.parse_args()
+    sc = ScriptCollectionCore()
+    sc.ocr_analysis_of_file(args.file, args.serviceaddress, args.languages)
+    return 0
+
+
+def OCRAnalysisOfRepository() -> int:
+    parser = argparse.ArgumentParser()
+    parser.add_argument('-s', '--serviceaddress', required=False, default=None)
+    parser.add_argument('-e', '--extensions', required=False, default=None)
+    parser.add_argument('-l', '--languages', required=False, default="en")
+    parser.add_argument('-f', '--folder', required=False, default=None)
+    args = parser.parse_args()
+    sc = ScriptCollectionCore()
+    if args.folder is None:
+        args.folder = os.getcwd()
+    extensions_value: str = None
+    if args.extensions is not None:
+        if "," in args.extensions:
+            extensions_value = args.extensions.split(",")
+        else:
+            extensions_value = [args.extensions]
+    sc.ocr_analysis_of_repository(args.folder, args.serviceaddress, extensions_value, args.languages)
+    return 0
+
+
+def UpdateImagesInDockerComposeFile() -> int:
+    iu: ImageUpdater = ImageUpdater()
+    parser = argparse.ArgumentParser()
+    parser.add_argument('-f', '--file', required=False, default=None)
+    # TODO add option to specify ignored services and versionecholon
+    args = parser.parse_args()
+    if args.file is None:
+        args.file = os.path.join(os.getcwd(), "docker-compose.yml")
+    iu.update_all_services_in_docker_compose_file(args.file, VersionEcholon.LatestPatch, [])
+    return 0

ScriptCollection/ImageUpdater.py

@@ -11,7 +11,7 @@ from .GeneralUtilities import GeneralUtilities
 
 
 class VersionEcholon(Enum):
-    Patch = 0
+    LatestPatch = 0
     LatestPatchOrLatestMinor = 1
     LatestPatchOrLatestMinorOrNextMajor = 2
     Newest = 3
@@ -63,8 +63,8 @@ class ImageUpdaterHelper:
 
     @staticmethod
     @GeneralUtilities.check_arguments
-    def filter_considering_echolog(newer_versions: list[Version], current_version: Version, version_echolon: VersionEcholon) -> Version:
-        if version_echolon == VersionEcholon.Patch:
+    def filter_considering_echolon(newer_versions: list[Version], current_version: Version, version_echolon: VersionEcholon) -> Version:
+        if version_echolon == VersionEcholon.LatestPatch:
             return ImageUpdaterHelper._internal_get_latest_patch_version(newer_versions, current_version)
         elif version_echolon == VersionEcholon.LatestPatchOrLatestMinor:
             return ImageUpdaterHelper._internal_get_latest_patch_or_latest_minor_version(newer_versions, current_version)
@@ -137,11 +137,14 @@ class ConcreteImageUpdaterForNginx(ConcreteImageUpdater):
 
     @GeneralUtilities.check_arguments
     def version_to_tag(self,  version: Version) -> str:
-        raise NotImplementedError
+        return f"{version.major}.{version.minor}.{version.micro}"
 
     @GeneralUtilities.check_arguments
     def get_latest_version_of_image(self,  image: str, version_echolon: VersionEcholon, current_version: Version) -> Version:
-        raise NotImplementedError
+        versions = ImageUpdaterHelper.get_versions_in_docker_hub(image, ".", "^\\d+\\.\\d+\\.\\d+$", 999)
+        newer_versions = ImageUpdaterHelper.filter_for_newer_versions(current_version, versions)
+        result = ImageUpdaterHelper.filter_considering_echolon(newer_versions, current_version, version_echolon)
+        return result
 
     @GeneralUtilities.check_arguments
     def get_supported_images(self) -> list[str]:
@@ -149,14 +152,36 @@ class ConcreteImageUpdaterForNginx(ConcreteImageUpdater):
 
     @GeneralUtilities.check_arguments
     def get_version_from_tag(self, image: str, tag: str) -> Version:
-        raise NotImplementedError
+        return ve.parse(tag)
+
+
+class ConcreteImageUpdaterForWordpress(ConcreteImageUpdater):
+
+    @GeneralUtilities.check_arguments
+    def version_to_tag(self,  version: Version) -> str:
+        return f"{version.major}.{version.minor}.{version.micro}"
+
+    @GeneralUtilities.check_arguments
+    def get_latest_version_of_image(self,  image: str, version_echolon: VersionEcholon, current_version: Version) -> Version:
+        versions = ImageUpdaterHelper.get_versions_in_docker_hub(image, ".", "^\\d+\\.\\d+\\.\\d+$", 999)
+        newer_versions = ImageUpdaterHelper.filter_for_newer_versions(current_version, versions)
+        result = ImageUpdaterHelper.filter_considering_echolon(newer_versions, current_version, version_echolon)
+        return result
+
+    @GeneralUtilities.check_arguments
+    def get_supported_images(self) -> list[str]:
+        return ["wordpress"]
+
+    @GeneralUtilities.check_arguments
+    def get_version_from_tag(self, image: str, tag: str) -> Version:
+        return ve.parse(tag)
 
 
 class ConcreteImageUpdaterForGitLab(ConcreteImageUpdater):
 
     @GeneralUtilities.check_arguments
     def version_to_tag(self,  version: Version) -> str:
-        raise NotImplementedError
+        return f"{version.major}.{version.minor}.{version.micro}-ce.0"
 
     @GeneralUtilities.check_arguments
     def get_latest_version_of_image(self,  image: str, version_echolon: VersionEcholon, current_version: Version) -> Version:
@@ -175,96 +200,111 @@ class ConcreteImageUpdaterForRegistry(ConcreteImageUpdater):
 
     @GeneralUtilities.check_arguments
     def version_to_tag(self,  version: Version) -> str:
-        raise NotImplementedError
+        return f"{version.major}.{version.minor}.{version.micro}"
 
     @GeneralUtilities.check_arguments
     def get_latest_version_of_image(self,  image: str, version_echolon: VersionEcholon, current_version: Version) -> Version:
-        raise NotImplementedError
+        versions = ImageUpdaterHelper.get_versions_in_docker_hub(image, ".", "^\\d+\\.\\d+\\.\\d+$", 999)
+        newer_versions = ImageUpdaterHelper.filter_for_newer_versions(current_version, versions)
+        result = ImageUpdaterHelper.filter_considering_echolon(newer_versions, current_version, version_echolon)
+        return result
 
     @abstractmethod
     @GeneralUtilities.check_arguments
     def get_supported_images(self) -> list[str]:
-        return []  # TODO
+        return ["registry"]
 
     @GeneralUtilities.check_arguments
     def get_version_from_tag(self, image: str, tag: str) -> Version:
-        raise NotImplementedError
+        return ve.parse(tag)
 
 
 class ConcreteImageUpdaterForPrometheus(ConcreteImageUpdater):
 
     @GeneralUtilities.check_arguments
     def version_to_tag(self,  version: Version) -> str:
-        raise NotImplementedError
+        return f"v{version.major}.{version.minor}.{version.micro}"
 
     @GeneralUtilities.check_arguments
     def get_latest_version_of_image(self,  image: str, version_echolon: VersionEcholon, current_version: Version) -> Version:
-        raise NotImplementedError
+        versions = ImageUpdaterHelper.get_versions_in_docker_hub(image, ".", "^v\\d+\\.\\d+\\.\\d+$", 999)
+        newer_versions = ImageUpdaterHelper.filter_for_newer_versions(current_version, versions)
+        result = ImageUpdaterHelper.filter_considering_echolon(newer_versions, current_version, version_echolon)
+        return result
 
     @GeneralUtilities.check_arguments
     def get_supported_images(self) -> list[str]:
-        return []  # TODO
+        return ["prom/prometheus"]
 
     @GeneralUtilities.check_arguments
     def get_version_from_tag(self, image: str, tag: str) -> Version:
-        raise NotImplementedError
+        return ve.parse(tag[1:])
 
 
 class ConcreteImageUpdaterForPrometheusBlackboxExporter(ConcreteImageUpdater):
 
     @GeneralUtilities.check_arguments
     def version_to_tag(self,  version: Version) -> str:
-        raise NotImplementedError
+        return f"v{version.major}.{version.minor}.{version.micro}"
 
     @GeneralUtilities.check_arguments
     def get_latest_version_of_image(self,  image: str, version_echolon: VersionEcholon, current_version: Version) -> Version:
-        raise NotImplementedError
+        versions = ImageUpdaterHelper.get_versions_in_docker_hub(image, ".", "^v\\d+\\.\\d+\\.\\d+$", 999)
+        newer_versions = ImageUpdaterHelper.filter_for_newer_versions(current_version, versions)
+        result = ImageUpdaterHelper.filter_considering_echolon(newer_versions, current_version, version_echolon)
+        return result
 
     @GeneralUtilities.check_arguments
     def get_supported_images(self) -> list[str]:
-        return []  # TODO
+        return ["prom/blackbox-exporter"]
 
     @GeneralUtilities.check_arguments
     def get_version_from_tag(self, image: str, tag: str) -> Version:
-        raise NotImplementedError
+        return ve.parse(tag[1:])
 
 
 class ConcreteImageUpdaterForPrometheusNginxExporter(ConcreteImageUpdater):
 
     @GeneralUtilities.check_arguments
     def version_to_tag(self,  version: Version) -> str:
-        raise NotImplementedError
+        return f"v{version.major}.{version.minor}.{version.micro}"
 
     @GeneralUtilities.check_arguments
     def get_latest_version_of_image(self,  image: str, version_echolon: VersionEcholon, current_version: Version) -> Version:
-        raise NotImplementedError
+        versions = ImageUpdaterHelper.get_versions_in_docker_hub(image, ".", "^v\\d+\\.\\d+\\.\\d+$", 999)
+        newer_versions = ImageUpdaterHelper.filter_for_newer_versions(current_version, versions)
+        result = ImageUpdaterHelper.filter_considering_echolon(newer_versions, current_version, version_echolon)
+        return result
 
     @GeneralUtilities.check_arguments
     def get_supported_images(self) -> list[str]:
-        return []  # TODO
+        return ["prom/nginx-prometheus-exporter"]
 
     @GeneralUtilities.check_arguments
     def get_version_from_tag(self, image: str, tag: str) -> Version:
-        raise NotImplementedError
+        return ve.parse(tag[1:])
 
 
 class ConcreteImageUpdaterForPrometheusNodeExporter(ConcreteImageUpdater):
 
     @GeneralUtilities.check_arguments
     def version_to_tag(self,  version: Version) -> str:
-        raise NotImplementedError
+        return f"v{version.major}.{version.minor}.{version.micro}"
 
     @GeneralUtilities.check_arguments
     def get_latest_version_of_image(self,  image: str, version_echolon: VersionEcholon, current_version: Version) -> Version:
-        raise NotImplementedError
+        versions = ImageUpdaterHelper.get_versions_in_docker_hub(image, ".", "^v\\d+\\.\\d+\\.\\d+$", 999)
+        newer_versions = ImageUpdaterHelper.filter_for_newer_versions(current_version, versions)
+        result = ImageUpdaterHelper.filter_considering_echolon(newer_versions, current_version, version_echolon)
+        return result
 
     @GeneralUtilities.check_arguments
     def get_supported_images(self) -> list[str]:
-        return []  # TODO
+        return ["prom/node-exporter"]
 
     @GeneralUtilities.check_arguments
     def get_version_from_tag(self, image: str, tag: str) -> Version:
-        raise NotImplementedError
+        return ve.parse(tag[1:])
 
 
 class ConcreteImageUpdaterForKeycloak(ConcreteImageUpdater):
@@ -296,7 +336,7 @@ class ConcreteImageUpdaterForMariaDB(ConcreteImageUpdater):
     def get_latest_version_of_image(self,  image: str, version_echolon: VersionEcholon, current_version: Version) -> Version:
         versions = ImageUpdaterHelper.get_versions_in_docker_hub(image, ".", "^\\d+\\.\\d+\\.\\d+$", 999)
         newer_versions = ImageUpdaterHelper.filter_for_newer_versions(current_version, versions)
-        result = ImageUpdaterHelper.filter_considering_echolog(newer_versions, current_version, version_echolon)
+        result = ImageUpdaterHelper.filter_considering_echolon(newer_versions, current_version, version_echolon)
         return result
 
     @GeneralUtilities.check_arguments
@@ -312,19 +352,22 @@ class ConcreteImageUpdaterForPostgreSQL(ConcreteImageUpdater):
 
     @GeneralUtilities.check_arguments
     def version_to_tag(self,  version: Version) -> str:
-        raise NotImplementedError
+        return f"{version.major}.{version.minor}"
 
     @GeneralUtilities.check_arguments
     def get_latest_version_of_image(self,  image: str, version_echolon: VersionEcholon, current_version: Version) -> Version:
-        raise NotImplementedError
+        versions = ImageUpdaterHelper.get_versions_in_docker_hub(image, ".", "^\\d+\\.\\d+$", 999)
+        newer_versions = ImageUpdaterHelper.filter_for_newer_versions(current_version, versions)
+        result = ImageUpdaterHelper.filter_considering_echolon(newer_versions, current_version, version_echolon)
+        return result
 
     @GeneralUtilities.check_arguments
     def get_supported_images(self) -> list[str]:
-        return []  # TODO
+        return ["postgres"]
 
     @GeneralUtilities.check_arguments
     def get_version_from_tag(self, image: str, tag: str) -> Version:
-        raise NotImplementedError
+        return ve.parse(tag+".0")
 
 
 class ConcreteImageUpdaterForAdminer(ConcreteImageUpdater):
@@ -337,7 +380,7 @@ class ConcreteImageUpdaterForAdminer(ConcreteImageUpdater):
     def get_latest_version_of_image(self,  image: str, version_echolon: VersionEcholon, current_version: Version) -> Version:
         versions = ImageUpdaterHelper.get_versions_in_docker_hub(image, ".", "^\\d+\\.\\d+\\.\\d+$", 999)
         newer_versions = ImageUpdaterHelper.filter_for_newer_versions(current_version, versions)
-        result = ImageUpdaterHelper.filter_considering_echolog(newer_versions, current_version, version_echolon)
+        result = ImageUpdaterHelper.filter_considering_echolon(newer_versions, current_version, version_echolon)
         return result
 
     @GeneralUtilities.check_arguments
@@ -358,6 +401,7 @@ class ImageUpdater:
 
     def add_default_mapper(self) -> None:
         self.updater.append(ConcreteImageUpdaterForNginx())
+        self.updater.append(ConcreteImageUpdaterForWordpress())
         self.updater.append(ConcreteImageUpdaterForGitLab())
         self.updater.append(ConcreteImageUpdaterForRegistry())
         self.updater.append(ConcreteImageUpdaterForPrometheus())
@@ -415,6 +459,7 @@ class ImageUpdater:
         result = self.get_latest_version_of_image(imagename, version_echolon, existing_version)
         newest_version = result[0]
         newest_tag = result[1]
+        # TODO write info to console if there is a newwer version available if versionecoholon==latest would have been chosen
         if existing_version < newest_version:
 
             with open(dockercompose_file, 'r', encoding="utf-8") as f:

ScriptCollection/ScriptCollectionCore.py

@@ -33,7 +33,7 @@ from .ProgramRunnerPopen import ProgramRunnerPopen
 from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
 from .SCLog import SCLog, LogLevel
 
-version = "3.5.138"
+version = "3.5.140"
 __version__ = version
 
 
@@ -309,7 +309,7 @@ class ScriptCollectionCore:
 
     @GeneralUtilities.check_arguments
     def git_pull_with_retry(self, folder: str, remote: str, localbranchname: str, remotebranchname: str, force: bool = False, amount_of_attempts: int = 5) -> None:
-        GeneralUtilities.retry_action(lambda: self.git_pull_with_retry(folder, remote, localbranchname, remotebranchname), amount_of_attempts)
+        GeneralUtilities.retry_action(lambda: self.git_pull(folder, remote, localbranchname, remotebranchname), amount_of_attempts)
 
     @GeneralUtilities.check_arguments
     def git_pull(self, folder: str, remote: str, localbranchname: str, remotebranchname: str, force: bool = False) -> None:
@@ -688,7 +688,7 @@ class ScriptCollectionCore:
             raise ValueError(f"Folder '{folder}' does not exist.")
         git_folder_path = f"{folder}/.git"
         return self.is_folder(git_folder_path) or self.is_file(git_folder_path)
-    
+
     @GeneralUtilities.check_arguments
     def is_bare_git_repository(self, folder: str) -> bool:
         """This function works platform-independent also for non-local-executions if the ScriptCollection commandline-commands are available as global command on the target-system."""
@@ -697,26 +697,25 @@ class ScriptCollectionCore:
         if not self.is_folder(folder):
             raise ValueError(f"Folder '{folder}' does not exist.")
         return folder.endswith(".git")
-    
+
     @GeneralUtilities.check_arguments
     def is_git_or_bare_git_repository(self, folder: str) -> bool:
         """This function works platform-independent also for non-local-executions if the ScriptCollection commandline-commands are available as global command on the target-system."""
-        return self.is_git_repository(folder) or self.is_bare_git_repository(folder) 
+        return self.is_git_repository(folder) or self.is_bare_git_repository(folder)
 
     @GeneralUtilities.check_arguments
     def assert_is_git_repository(self, folder: str) -> str:
         """This function works platform-independent also for non-local-executions if the ScriptCollection commandline-commands are available as global command on the target-system."""
         GeneralUtilities.assert_condition(self.is_git_repository(folder), f"'{folder}' is not a git-repository.")
 
-
     @GeneralUtilities.check_arguments
-    def convert_git_repository_to_bare_repository(self,repository_folder:str):
-        repository_folder=repository_folder.replace("\\", "/")
+    def convert_git_repository_to_bare_repository(self, repository_folder: str):
+        repository_folder = repository_folder.replace("\\", "/")
         self.assert_is_git_repository(repository_folder)
-        git_folder=repository_folder+ "/.git"
+        git_folder = repository_folder + "/.git"
         if not self.is_folder(git_folder):
             raise ValueError(f"Converting '{repository_folder}' to a bare repository not possible. The folder '{git_folder}' does not exist. Converting is currently only supported when the git-folder is a direct folder in a repository and not a reference to another location.")
-        target_folder:str = repository_folder + ".git"
+        target_folder: str = repository_folder + ".git"
         GeneralUtilities.ensure_directory_exists(target_folder)
         GeneralUtilities.move_content_of_folder(git_folder, target_folder)
         GeneralUtilities.ensure_directory_does_not_exist(repository_folder)
@@ -2336,3 +2335,82 @@ TXDX
     @GeneralUtilities.check_arguments
     def install_requirementstxt_file(self, requirements_txt_file: str, folder: str, verbosity: int):
         self.run_program_argsasarray("pip", ["install", "-r", requirements_txt_file], folder, verbosity=verbosity)
+
+    @GeneralUtilities.check_arguments
+    def ocr_analysis_of_folder(self, folder: str, serviceaddress: str, extensions: list[str], languages: list[str]) -> list[str]:  # Returns a list of changed files due to ocr-analysis.
+        GeneralUtilities.write_message_to_stdout("Starting OCR analysis of folder " + folder)
+        supported_extensions = ['png', 'jpg', 'jpeg', 'tiff', 'bmp', 'gif', 'pdf', 'docx', 'doc', 'xlsx', 'xls', 'pptx', 'ppt']
+        changes_files: list[str] = []
+        if extensions is None:
+            extensions = supported_extensions
+        for file in GeneralUtilities.get_direct_files_of_folder(folder):
+            file_lower = file.lower()
+            for extension in extensions:
+                if file_lower.endswith("."+extension):
+                    if self.ocr_analysis_of_file(file, serviceaddress, languages):
+                        changes_files.append(file)
+                    break
+        for subfolder in GeneralUtilities.get_direct_folders_of_folder(folder):
+            for file in self.ocr_analysis_of_folder(subfolder, serviceaddress, extensions, languages):
+                changes_files.append(file)
+        return changes_files
+
+    @GeneralUtilities.check_arguments
+    def ocr_analysis_of_file(self, file: str, serviceaddress: str, languages: list[str]) -> bool:  # Returns true if the ocr-file was generated or updated. Returns false if the existing ocr-file was not changed.
+        GeneralUtilities.write_message_to_stdout("Do OCR analysis of file " + file)
+        supported_extensions = ['png', 'jpg', 'jpeg', 'tiff', 'bmp', 'webp', 'gif', 'pdf', 'rtf', 'docx', 'doc', 'odt', 'xlsx', 'xls', 'ods', 'pptx', 'ppt', 'odp']
+        for extension in supported_extensions:
+            if file.lower().endswith("."+extension):
+                raise ValueError(f"Extension '{extension}' is not supported. Supported extensions are: {', '.join(supported_extensions)}")
+        target_file = file+".ocr.txt"
+        hash_of_current_file: str = GeneralUtilities. get_sha256_of_file(file)
+        if os.path.isfile(target_file):
+            lines = GeneralUtilities.read_lines_from_file(target_file)
+            previous_hash_of_current_file: str = lines[1].split(":")[1].strip()
+            if hash_of_current_file == previous_hash_of_current_file:
+                return False
+        ocr_content = self.get_ocr_content_of_file(file, serviceaddress, languages)
+        GeneralUtilities.ensure_file_exists(target_file)
+        GeneralUtilities.write_text_to_file(file, f"""Name of file: \"{os.path.basename(file)}\""
+Hash of file: {hash_of_current_file}
+OCR-content:
+\"{ocr_content}\"""")
+        return True
+
+    @GeneralUtilities.check_arguments
+    def get_ocr_content_of_file(self, file: str, serviceaddress: str, languages: list[str]) -> str:  # serviceaddress = None means local executable
+        result: str = None
+        extension = Path(file).suffix
+        if serviceaddress is None:
+            program_result = self.run_program_argsasarray("simpleocr", ["--File", file, "--Languages", "+".join(languages)] + languages)
+            result = program_result[1]
+        else:
+            languages_for_url = '%2B'.join(languages)
+            package_url: str = f"https://{serviceaddress}/GetOCRContent?languages={languages_for_url}&fileType={extension}"
+            headers = {'Cache-Control': 'no-cache'}
+            r = requests.put(package_url, timeout=5, headers=headers, data=GeneralUtilities.read_binary_from_file(file))
+            if r.status_code != 200:
+                raise ValueError(f"Checking for latest tor package resulted in HTTP-response-code {r.status_code}.")
+            result = GeneralUtilities.bytes_to_string(r.content)
+        return result
+
+    @GeneralUtilities.check_arguments
+    def ocr_analysis_of_repository(self, folder: str, serviceaddress: str, extensions: list[str], languages: list[str]) -> None:
+        self.assert_is_git_repository(folder)
+        changed_files = self.ocr_analysis_of_folder(folder, serviceaddress, extensions, languages)
+        for changed_ocr_file in changed_files:
+            GeneralUtilities.assert_condition(changed_ocr_file.endswith(".ocr.txt"), f"File '{changed_ocr_file}' is not an OCR-file. It should end with '.ocr.txt'.")
+            base_file = changed_ocr_file[:-len(".ocr.txt")]
+            GeneralUtilities.assert_condition(os.path.isfile(base_file), f"Base file '{base_file}' does not exist. The OCR-file '{changed_ocr_file}' is not valid.")
+            base_file_relative_path = os.path.relpath(base_file, folder)
+            base_file_diff_program_result = self.run_program("git", f"diff --quiet -- \"{base_file_relative_path}\"", folder, throw_exception_if_exitcode_is_not_zero=False)
+            has_staged_changes: bool = None
+            if base_file_diff_program_result[0] == 0:
+                has_staged_changes = False
+            elif base_file_diff_program_result[0] == 1:
+                has_staged_changes = True
+            else:
+                raise RuntimeError(f"Unexpected exit code {base_file_diff_program_result[0]} when checking for staged changes of file '{base_file_relative_path}'.")
+            if has_staged_changes:
+                changed_ocr_file_relative_path = os.path.relpath(changed_ocr_file, folder)
+                self.run_program_argsasarray("git", ["add", changed_ocr_file_relative_path], folder)

ScriptCollection/TasksForCommonProjectStructure.py

@@ -2360,6 +2360,7 @@ class TasksForCommonProjectStructure:
         tasks.sort(key=lambda x: x["label"].split("/")[-1], reverse=False)  # sort by the label of the task
         for task in tasks:
             if task["type"] == "shell":
+
                 description: str = task["label"]
                 name: str = GeneralUtilities.to_pascal_case(description)
                 command = task["command"]
@@ -2381,11 +2382,18 @@ class TasksForCommonProjectStructure:
                     if len(args) > 1:
                         command_with_args = f"{command_with_args} {' '.join(args)}"
 
+                if "description" in task:
+                    additional_description = task["description"]
+                    description = f"{description} ({additional_description})"
+
                 if append_cli_args_at_end:
                     command_with_args = f"{command_with_args} {{{{.CLI_ARGS}}}}"
-                cwd_literal = cwd.replace("\\", "\\\\")
+
+                cwd_literal = cwd.replace("\\", "\\\\").replace('"', '\\"')  # escape backslashes and double quotes for YAML
+                description_literal = description.replace("\\", "\\\\").replace('"', '\\"')  # escape backslashes and double quotes for YAML
+
                 lines.append(f"  {name}:")
-                lines.append(f'    desc: "{description}"')
+                lines.append(f'    desc: "{description_literal}"')
                 lines.append('    silent: true')
                 lines.append(f'    dir: "{cwd_literal}"')
                 lines.append("    cmds:")
@@ -2397,6 +2405,7 @@ class TasksForCommonProjectStructure:
                     for alias in aliases:
                         lines.append(f'      - {alias}')
                 lines.append(GeneralUtilities.empty_string)
+
         GeneralUtilities.write_lines_to_file(task_file, lines)
 
     @GeneralUtilities.check_arguments
@@ -2560,6 +2569,14 @@ class TasksForCommonProjectStructure:
             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)
 
+        package_json_file = os.path.join(repository_folder, "package.json")
+        if os.path.isfile(package_json_file):
+            with open(package_json_file, "r", encoding="utf-8") as f1:
+                package_json_data = json.load(f1)
+                package_json_data["version"] = project_version
+                with open(package_json_file, "w", encoding="utf-8") as f2:
+                    json.dump(package_json_data, f2, indent=2)
+
         project_resources_folder = os.path.join(repository_folder, "Other", "Scripts")
         PrepareBuildCodeunits_script_name = "PrepareBuildCodeunits.py"
         prepare_build_codeunits_scripts = os.path.join(project_resources_folder, PrepareBuildCodeunits_script_name)
@@ -3115,7 +3132,7 @@ class TasksForCommonProjectStructure:
         # TODO validate artifactsinformation_file against xsd
         GeneralUtilities.write_message_to_stdout(f"Finished building codeunit {codeunit_name} without errors.")
 
-    def __add_changelog_file(self, repository_folder: str, version_of_project: str):
+    def __ensure_changelog_file_is_added(self, repository_folder: str, version_of_project: str):
         changelog_file = os.path.join(repository_folder, "Other", "Resources", "Changelog", f"v{version_of_project}.md")
         if not os.path.isfile(changelog_file):
             GeneralUtilities.ensure_file_exists(changelog_file)
@@ -3136,16 +3153,16 @@ class TasksForCommonProjectStructure:
         target_environmenttype = "QualityCheck"
         project_name: str = os.path.basename(repository_folder)
         GeneralUtilities.assert_condition(not self.__sc.git_repository_has_uncommitted_changes(repository_folder), "There are uncommitted changes in the repository.")
+        self.build_codeunits(repository_folder, target_environmenttype=target_environmenttype, do_git_clean_when_no_changes=True, note="Prepare dependency-update")  # Required because update dependencies is not always possible for not-buildet codeunits (depends on the programming language or package manager)
 
         # update dependencies of resources
         global_scripts_folder = os.path.join(repository_folder, "Other", "Scripts")
         if os.path.isfile(os.path.join(global_scripts_folder, update_dependencies_script_filename)):
-            self.build_codeunits(repository_folder, target_environmenttype=target_environmenttype, do_git_clean_when_no_changes=True, note="Prepare dependency-update")  # Required because update dependencies is not always possible for not-buildet codeunits (depends on the programming language or package manager)
             self.__sc.run_program("python", update_dependencies_script_filename, global_scripts_folder, print_live_output=True)
             version_of_project = self.get_version_of_project(repository_folder)
-            self.__add_changelog_file(repository_folder, version_of_project)
+            self.__ensure_changelog_file_is_added(repository_folder, version_of_project)
             GeneralUtilities.write_message_to_stdout(f"Updated global dependencies of {project_name}.")
-            self.build_codeunits(repository_folder, verbosity, "QualityCheck", None, False, None, [], False, "Build codeunits due to updated dependencies")
+            self.build_codeunits(repository_folder, verbosity, "QualityCheck", None, False, None, [], False, "Build codeunits due to updated product-wide dependencies")
 
         # update dependencies of codeunits
         for codeunit in codeunits:
@@ -3160,10 +3177,10 @@ class TasksForCommonProjectStructure:
                 self.__sc.run_program("python", update_dependencies_script_filename, update_dependencies_script_folder, verbosity, print_live_output=True)
                 if self.__sc.git_repository_has_uncommitted_changes(repository_folder):
                     version_of_project = self.get_version_of_project(repository_folder)
-                    self.__add_changelog_file(repository_folder, version_of_project)
+                    self.__ensure_changelog_file_is_added(repository_folder, version_of_project)
                     GeneralUtilities.write_message_to_stdout(f"Updated dependencies in codeunit {codeunit}.")
 
-        self.build_codeunits(repository_folder, verbosity, "QualityCheck", None, False, None, [], False, "Build codeunits due to updated dependencies")
+        self.build_codeunits(repository_folder, verbosity, "QualityCheck", None, False, None, [], False, "Build all codeunits due to updated dependencies")
         self.__sc.git_commit(repository_folder, "Updated dependencies")
 
     class GenericPrepareNewReleaseArguments:

{scriptcollection-3.5.138.dist-info → scriptcollection-3.5.140.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ScriptCollection
-Version: 3.5.138
+Version: 3.5.140
 Summary: The ScriptCollection is the place for reusable scripts.
 Home-page: https://github.com/anionDev/ScriptCollection
 Author: Marius Göcke
@@ -23,7 +23,7 @@ Classifier: Topic :: Utilities
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: build>=1.2.2.post1
-Requires-Dist: coverage>=7.8.2
+Requires-Dist: coverage>=7.9.1
 Requires-Dist: cyclonedx-bom>=6.1.1
 Requires-Dist: defusedxml>=0.7.1
 Requires-Dist: keyboard>=0.13.5
@@ -37,12 +37,12 @@ Requires-Dist: Pygments>=2.19.1
 Requires-Dist: pylint>=3.3.7
 Requires-Dist: pyOpenSSL>=25.1.0
 Requires-Dist: PyPDF>=5.6.0
-Requires-Dist: pytest>=8.4.0
+Requires-Dist: pytest>=8.4.1
 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: xmlschema>=4.0.1
+Requires-Dist: xmlschema>=4.1.0
 
 # ScriptCollection
 

{scriptcollection-3.5.138.dist-info → scriptcollection-3.5.140.dist-info}/RECORD

@@ -1,17 +1,17 @@
 ScriptCollection/CertificateUpdater.py,sha256=OAxrG21k_o3W3niOOGNSZzUPJlvolOWc1lRB2dMhc3g,9212
-ScriptCollection/Executables.py,sha256=Sbi0cuHnd8PYROA9HcHQ00KJV805LtFhyiEl5PgHoIQ,32672
+ScriptCollection/Executables.py,sha256=d9QkQuaS0nxTwNUGxtqKUk9dJqT5gS670LNuCz2YMw0,35349
 ScriptCollection/GeneralUtilities.py,sha256=PKdzq382RYVSWeSG_6z6FiHu-SiTOi2BavJKvP-0slU,47308
-ScriptCollection/ImageUpdater.py,sha256=lel1nevTN7fgdoCDE6Xg8YY6XPsZaOQiCIyWXbmVnh0,20882
+ScriptCollection/ImageUpdater.py,sha256=3B5pgAMnyne3ZogWz-suqglZGIB9FAKyWn31P9E1ST0,24491
 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=Dd2P8vH2PA830wAv6bchlMHHdGE_7At-F4WQY5w4XdA,4016
-ScriptCollection/ScriptCollectionCore.py,sha256=pzQFBJgNTZ9a_2Qqt2AoyTEbYkH61HwsPFvgBezOaMc,131120
-ScriptCollection/TasksForCommonProjectStructure.py,sha256=b3bb3kSHSce3HgaitDyuZdQ82KroU1HFryANBycKo0I,235854
+ScriptCollection/ScriptCollectionCore.py,sha256=RRwHiyjOKelBW0a52t4goDjm0Nm5yOz-r3grzkEPZRc,136482
+ScriptCollection/TasksForCommonProjectStructure.py,sha256=Aln85JyVrspQmluNyNSFT4gPycVt42W_4dM21qys13c,236756
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-scriptcollection-3.5.138.dist-info/METADATA,sha256=hlsJXzIOxELAE14nqRobP7vzTmVQeRqWmBOC6U2y5q4,7694
-scriptcollection-3.5.138.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-scriptcollection-3.5.138.dist-info/entry_points.txt,sha256=AhXNaa8RMBRFO_4TzKi9jc32C-ZNIiU12mRGu6wEpBk,3796
-scriptcollection-3.5.138.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-scriptcollection-3.5.138.dist-info/RECORD,,
+scriptcollection-3.5.140.dist-info/METADATA,sha256=h47YkJZXJr_B_LQt2qF2bEJnHxtoc6Us-cKkxiVxBts,7694
+scriptcollection-3.5.140.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+scriptcollection-3.5.140.dist-info/entry_points.txt,sha256=AvmVO9iyWImExpvzL3YYQ9AOEiUIN9guPRRG_W_VNWY,4116
+scriptcollection-3.5.140.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+scriptcollection-3.5.140.dist-info/RECORD,,

{scriptcollection-3.5.138.dist-info → scriptcollection-3.5.140.dist-info}/entry_points.txt

@@ -35,6 +35,9 @@ sclistfoldercontent = ScriptCollection.Executables:ListFolderContent
 scmergepdfs = ScriptCollection.Executables:MergePDFs
 scnpmi = ScriptCollection.Executables:NpmI
 scobfuscatefilesfolder = ScriptCollection.Executables:ObfuscateFilesFolder
+scocranalysisoffile = ScriptCollection.Executables:OCRAnalysisOfFile
+scocranalysisoffolder = ScriptCollection.Executables:OCRAnalysisOfFolder
+scocranalysisofrepository = ScriptCollection.Executables:OCRAnalysisOfRepository
 scorganizelinesinfile = ScriptCollection.Executables:OrganizeLinesInFile
 scpdftoimage = ScriptCollection.Executables:PDFToImage
 scprintcurrentworkingdirectory = ScriptCollection.Executables:PrintCurrecntWorkingDirectory
@@ -51,5 +54,6 @@ scsetcontentoffile = ScriptCollection.Executables:SetContentOfFile
 scshow2faasqrcode = ScriptCollection.Executables:Show2FAAsQRCode
 scshowmissingfiles = ScriptCollection.Executables:ShowMissingFiles
 scsigncertificate = ScriptCollection.Executables:SignCertificate
+scupdateimagesindockercomposefile = ScriptCollection.Executables:UpdateImagesInDockerComposeFile
 scupdatenugetpackagesincsharpproject = ScriptCollection.Executables:UpdateNugetpackagesInCsharpProject
 scuploadfile = ScriptCollection.Executables:UploadFile