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

ScriptCollection/ScriptCollectionCore.py

@@ -33,7 +33,7 @@ from .ProgramRunnerPopen import ProgramRunnerPopen
 from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
 from .SCLog import SCLog, LogLevel
 
-version = "3.5.139"
+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:
@@ -2380,10 +2380,18 @@ OCR-content:
     @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:
-            result = ""  # TODO call local executable
+            program_result = self.run_program_argsasarray("simpleocr", ["--File", file, "--Languages", "+".join(languages)] + languages)
+            result = program_result[1]
         else:
-            result = ""  # TODO call remote service
+            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

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)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ScriptCollection
-Version: 3.5.139
+Version: 3.5.140
 Summary: The ScriptCollection is the place for reusable scripts.
 Home-page: https://github.com/anionDev/ScriptCollection
 Author: Marius Göcke
@@ -37,7 +37,7 @@ 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

{scriptcollection-3.5.139.dist-info → scriptcollection-3.5.140.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=Dd2P8vH2PA830wAv6bchlMHHdGE_7At-F4WQY5w4XdA,4016
-ScriptCollection/ScriptCollectionCore.py,sha256=rX1wjbWTYkTVGaVzvgDYlCxSVhxfyoIr7Yn4oTJ8qy4,135815
-ScriptCollection/TasksForCommonProjectStructure.py,sha256=boOF-cOYdfUPRf5DOgL1yfeO7GYxAn6-W3fdUV84clE,235903
+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.139.dist-info/METADATA,sha256=9OcBLfJLHZo4Vtr9udrIBQSbqI50JA9oVS0DkjXUCdQ,7694
-scriptcollection-3.5.139.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-scriptcollection-3.5.139.dist-info/entry_points.txt,sha256=AvmVO9iyWImExpvzL3YYQ9AOEiUIN9guPRRG_W_VNWY,4116
-scriptcollection-3.5.139.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-scriptcollection-3.5.139.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,,