ScriptCollection 4.2.56__py3-none-any.whl → 4.2.58__py3-none-any.whl

ScriptCollection/ScriptCollectionCore.py

@@ -3,7 +3,6 @@ import json
 import binascii
 import filecmp
 import hashlib
-import logging
 import multiprocessing
 import time
 from io import BytesIO
@@ -37,7 +36,7 @@ from .ProgramRunnerBase import ProgramRunnerBase
 from .ProgramRunnerPopen import ProgramRunnerPopen
 from .SCLog import SCLog, LogLevel
 
-version = "4.2.56"
+version = "4.2.58"
 __version__ = version
 
 class VSCodeWorkspaceShellTask:
@@ -2880,7 +2879,7 @@ OCR-content:
         lines=program_result[1].split("\n")[1:]
         for line in lines:
             splitted=[item for item in line.split(' ') if GeneralUtilities.string_has_content(item)]
-            result.append(splitted[1])
+            result.append(splitted[1].replace("\n","").replace("\r","").strip())
         return result
 
     @GeneralUtilities.check_arguments
@@ -3124,6 +3123,7 @@ OCR-content:
         #sync existing files
         self.__sync_xlf2_files(base_file_xml, language_files_with_content)
             
+
     @GeneralUtilities.check_arguments
     def translate_xlf_files_in_folder(self, folder: str, base_language: str, libre_translate_api_server: str):
         """Translates all .xlf files directly in the given folder (non-recursive)."""
@@ -3185,7 +3185,7 @@ OCR-content:
             "target": target_language,
             "format": "text"
         }
-        response = requests.post(url, json=payload)
+        response = requests.post(url, json=payload, timeout=30)
         response.raise_for_status()
         return response.json()["translatedText"]
 
@@ -3194,9 +3194,28 @@ OCR-content:
         """Detects the language of the given text using the LibreTranslate API."""
         url = f"{libre_translate_api_server.rstrip('/')}/detect"
         payload = {"q": content}
-        response = requests.post(url, json=payload)
+        response = requests.post(url, json=payload, timeout=30)
         response.raise_for_status()
         results = response.json()
         if not results:
             raise ValueError("Language detection returned no results.")
         return results[0]["language"]
+
+    @GeneralUtilities.check_arguments
+    def get_all_files_in_git_repository(self,repository_folder:str,include_submodules: bool = True) -> list[str]:
+        """returns all files in a git-repository except ignored files"""
+        cmd = ["ls-files", "--cached", "--exclude-standard"]
+        if include_submodules:
+            cmd.append("--recurse-submodules")
+        output=self.run_program_argsasarray("git", cmd,repository_folder)
+        files = [ GeneralUtilities.normalize_path("./" + line) for line in output[1].splitlines()if line.strip() ]
+        return files
+
+    @GeneralUtilities.check_arguments
+    def write_file_list_for_repository(self,repository_folder:str,target_file:str="./FileList.txt") -> None:
+        if os.path.isabs(target_file):
+            target_file=GeneralUtilities.resolve_relative_path(target_file,repository_folder)
+        target_file=GeneralUtilities.normalize_path(target_file)
+        files=self.get_all_files_in_git_repository(repository_folder)
+        GeneralUtilities.ensure_file_exists(target_file)
+        GeneralUtilities.write_lines_to_file(target_file, files)

ScriptCollection/TFCPS/NodeJS/TFCPS_CodeUnitSpecific_NodeJS.py

@@ -157,7 +157,7 @@ class TFCPS_CodeUnitSpecific_NodeJS_Functions(TFCPS_CodeUnitSpecific_Base):
     @GeneralUtilities.check_arguments
     def get_available_cultures_for_angular_app(self)->None:
         return self._protected_sc.get_available_cultures_for_angular_app(self.get_codeunit_folder()+"/angular.json")
-    
+
     @GeneralUtilities.check_arguments
     def __ensure_translations_exist(self,languages:list[str])->None:
         base_file=os.path.join(self.get_codeunit_folder(),"Other","Resources","Translations",f"messages.xlf")
@@ -166,7 +166,6 @@ class TFCPS_CodeUnitSpecific_NodeJS_Functions(TFCPS_CodeUnitSpecific_Base):
             if not os.path.isfile(target_file):
                 GeneralUtilities.ensure_file_exists(target_file)
                 GeneralUtilities.write_text_to_file(target_file, GeneralUtilities.read_text_from_file(base_file))
-                
                 #set new attribute
                 tree = ET.parse(target_file)
                 root = tree.getroot()
@@ -192,17 +191,27 @@ class TFCPS_CodeUnitSpecific_NodeJS_Functions(TFCPS_CodeUnitSpecific_Base):
 
     @GeneralUtilities.check_arguments
     def organize_translations(self,languages:list[str])->None:
-        self.__ensure_translations_exist(languages)
         self._protected_sc.run_with_epew("npm","run extract-translations",self.get_codeunit_folder())
+        self.__ensure_translations_exist(languages)
         self._protected_sc.sync_xlf2_files("messages",languages,os.path.join(self.get_codeunit_folder(),"Other","Resources","Translations"))
 
     @GeneralUtilities.check_arguments
-    def translate_safe(self)->None:
-        pass#TODO if ~/.ScriptCollection/TranslationService.txt exists: use this and call translate(...)
-    
+    def translate_safe(self,base_language:str="en")->None:
+        """Translates XLF files if a translation service is configured. The translation service can be configured by creating a file at ~/.ScriptCollection/TranslationServiceProperties.txt with the content 'LibreTranslateAPI=your_api_server_url'."""
+        translationservice_file:str=self._protected_sc.get_global_cache_folder()+"/TranslationServiceProperties.txt"
+        api_server:str=None
+        if os.path.isfile(translationservice_file):
+            lines=GeneralUtilities.read_nonempty_lines_from_file(translationservice_file)
+            for line in lines:
+                if line.startswith("LibreTranslateAPI="):
+                    api_server=line.replace("LibreTranslateAPI=","").strip()
+        GeneralUtilities.assert_not_null(api_server,"No translation service configured. Please create a file at ~/.ScriptCollection/TranslationServiceProperties.txt with the content 'LibreTranslateAPI=your_api_server_url' to enable automatic translation of XLF files.")
+        self.translate(api_server,base_language)
+
     @GeneralUtilities.check_arguments
-    def translate(self,api_server:str)->None:
-        pass#TODO if Other/Resources/Translations exists: call sc.translate_messages_in_folder(...)
+    def translate(self,api_server:str,base_language:str="en")->None:
+        folder:str=os.path.join(self.get_codeunit_folder(),"Other","Resources","Translations")
+        self._protected_sc.translate_xlf_files_in_folder(folder, base_language, api_server)
 
 class TFCPS_CodeUnitSpecific_NodeJS_CLI:
 

ScriptCollection/TFCPS/TFCPS_Tools_General.py

@@ -726,7 +726,7 @@ class TFCPS_Tools_General:
         if generate_certificate:
             self.__sc.generate_certificate_authority(ca_folder, ca_name, "DE", "SubjST", "SubjL", "SubjO", "SubjOU")
         # TODO add switch to auto-install the script if desired
-        # for windows: powershell Import-Certificate -FilePath ConSurvCA_20241121000236.crt -CertStoreLocation 'Cert:\CurrentUser\Root'
+        # for windows: powershell Import-Certificate -FilePath MyProjectCA_20241121000236.crt -CertStoreLocation 'Cert:\CurrentUser\Root'
         # for linux: (TODO)
 
     @GeneralUtilities.check_arguments
@@ -1433,7 +1433,7 @@ class TFCPS_Tools_General:
     def download_file(self,source:str,target:str):
         GeneralUtilities.ensure_directory_exists(os.path.dirname(target))
         GeneralUtilities.ensure_file_exists(target)
-        response = requests.get(source)
+        response = requests.get(source, timeout=30)
         response.raise_for_status()
         with open(target, "wb") as f:
             f.write(response.content)

{scriptcollection-4.2.56.dist-info → scriptcollection-4.2.58.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ScriptCollection
-Version: 4.2.56
+Version: 4.2.58
 Summary: The ScriptCollection is the place for reusable scripts.
 Home-page: https://github.com/anionDev/ScriptCollection
 Author: Marius Göcke
@@ -33,7 +33,7 @@ Requires-Dist: ntplib>=0.4.0
 Requires-Dist: Pillow>=11.3.0
 Requires-Dist: psutil>=7.2.2
 Requires-Dist: pycdlib>=1.14.0
-Requires-Dist: Pygments>=2.19.2
+Requires-Dist: Pygments>=2.20.0
 Requires-Dist: pylint>=4.0.5
 Requires-Dist: pyOpenSSL>=25.3.0
 Requires-Dist: PyPDF>=6.9.2

{scriptcollection-4.2.56.dist-info → scriptcollection-4.2.58.dist-info}/RECORD

@@ -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=YE4yV9Vxy3RrC_Fpr0QC3tyI_OYiBAOxwZqsmGXMxU8,173731
+ScriptCollection/ScriptCollectionCore.py,sha256=c-wSuEa8_T_-GC-iE3fNO7Yr7gB92b4R1zAwQN2-QSM,174896
 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
@@ -30,7 +30,7 @@ ScriptCollection/TFCPS/TFCPS_Generic.py,sha256=O-0guM_LJCcZmPZJhMgTvXD2RXUJEBWWv
 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=s4DPntMzNe-hEEYeR_PAtzxb2eJM0Fp4LhK5rV_NVuE,93928
+ScriptCollection/TFCPS/TFCPS_Tools_General.py,sha256=WV67pHLrhD_qEjUqM-8tUpEdhQ4brwVentfIf7AMOP4,93942
 ScriptCollection/TFCPS/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ScriptCollection/TFCPS/Docker/TFCPS_CodeUnitSpecific_Docker.py,sha256=BPJkoy2KVgB_38cAk5qjM4s4FpJvOkTp467nrvANIIU,10606
 ScriptCollection/TFCPS/Docker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -43,12 +43,12 @@ ScriptCollection/TFCPS/Flutter/TFCPS_CodeUnitSpecific_Flutter.py,sha256=U8oBAOLR
 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=BBWrFaAUVdmjl8qPq231aYlAENnjF1BOWXQQmOrQdxE,11816
+ScriptCollection/TFCPS/NodeJS/TFCPS_CodeUnitSpecific_NodeJS.py,sha256=kL37qJNwH6E-CAJqcHbdnc0K0uGjHQ8XD1RXZOdcw1M,12850
 ScriptCollection/TFCPS/NodeJS/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ScriptCollection/TFCPS/Python/TFCPS_CodeUnitSpecific_Python.py,sha256=nLw_eSUd_56jjgfcAvtUyzecSZ14mYmNJl0iu-1YNVk,13496
 ScriptCollection/TFCPS/Python/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-scriptcollection-4.2.56.dist-info/METADATA,sha256=Zmiu4fHdrglsMZrShG8yxyKzwqsi5RqKsW4EXESthCw,7690
-scriptcollection-4.2.56.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-scriptcollection-4.2.56.dist-info/entry_points.txt,sha256=27XwAJEcaMEc1be0Ec1vKHCbiU4Ziu8jKL-SqsrYOIQ,4680
-scriptcollection-4.2.56.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-scriptcollection-4.2.56.dist-info/RECORD,,
+scriptcollection-4.2.58.dist-info/METADATA,sha256=Lm4CyXwLiuq4Qr6srolxs5gr6CRuojWuzOeD9x0qonY,7690
+scriptcollection-4.2.58.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+scriptcollection-4.2.58.dist-info/entry_points.txt,sha256=27XwAJEcaMEc1be0Ec1vKHCbiU4Ziu8jKL-SqsrYOIQ,4680
+scriptcollection-4.2.58.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+scriptcollection-4.2.58.dist-info/RECORD,,