ScriptCollection 4.0.44__py3-none-any.whl → 4.0.46__py3-none-any.whl

ScriptCollection/Executables.py

@@ -862,3 +862,7 @@ def CreateRelease()->int:
     sc.run_program("python", arguments, scripts_folder,print_live_output=True)
 
     return 0
+
+def CleanToolsCache()->int:
+    GeneralUtilities.ensure_folder_exists_and_is_empty(TFCPS_Tools_General(ScriptCollectionCore()).get_global_cache_folder())
+    return 0

ScriptCollection/ScriptCollectionCore.py

@@ -37,7 +37,7 @@ from .ProgramRunnerPopen import ProgramRunnerPopen
 from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
 from .SCLog import SCLog, LogLevel
 
-version = "4.0.44"
+version = "4.0.46"
 __version__ = version
 
 

ScriptCollection/TFCPS/TFCPS_Tools_General.py

@@ -88,7 +88,7 @@ class TFCPS_Tools_General:
                                 sys.stdout.write(f"\rDownload: {percent:.2f}%")
                                 sys.stdout.flush()
             self.__sc.log.log(f"Downloaded \"{url}\".", LogLevel.Diagnostic)
-            GeneralUtilities.assert_file_exists(file)
+        GeneralUtilities.assert_file_exists(file)
         return file
 
     def __add_github_api_key_if_available(self, headers: dict):
@@ -983,8 +983,7 @@ class TFCPS_Tools_General:
     @GeneralUtilities.check_arguments
     def generate_api_client_from_dependent_codeunit_for_angular(self, codeunit_folder:str, name_of_api_providing_codeunit: str, generated_program_part_name: str,language:str,use_cache:bool) -> None:
         target_subfolder_in_codeunit = f"src/app/generated/{generated_program_part_name}"
-        self.ensure_openapigenerator_is_available(codeunit_folder,use_cache)
-        openapigenerator_jar_file = os.path.join(codeunit_folder, "Other", "Resources", "OpenAPIGenerator", "open-api-generator.jar")
+        openapigenerator_jar_file = self.ensure_openapigenerator_is_available(use_cache)
         openapi_spec_file = os.path.join(codeunit_folder, "Other", "Resources", "DependentCodeUnits", name_of_api_providing_codeunit, "APISpecification", f"{name_of_api_providing_codeunit}.latest.api.json")
         target_folder = os.path.join(codeunit_folder, target_subfolder_in_codeunit)
         GeneralUtilities.ensure_folder_exists_and_is_empty(target_folder)
@@ -1000,21 +999,21 @@ class TFCPS_Tools_General:
             json.dump(data, f, indent=2)
 
     @GeneralUtilities.check_arguments
-    def ensure_openapigenerator_is_available(self, codeunit_folder: str,use_cache:bool) -> None:
-        self.assert_is_codeunit_folder(codeunit_folder)
-        openapigenerator_folder = os.path.join(codeunit_folder, "Other", "Resources", "OpenAPIGenerator")
+    def ensure_openapigenerator_is_available(self,use_cache:bool) -> None:
+        openapigenerator_folder = os.path.join(self.get_global_cache_folder(), "Tools", "OpenAPIGenerator")
         filename = "open-api-generator.jar"
         jar_file = f"{openapigenerator_folder}/{filename}"
         jar_file_exists = os.path.isfile(jar_file)
         update:bool=not jar_file_exists or not use_cache
         if update:
             self.__sc.log.log("Download OpenAPIGeneratorCLI...",LogLevel.Debug)
-            version_file = os.path.join(codeunit_folder, "Other", "Resources", "Dependencies", "OpenAPIGenerator", "Version.txt")
-            used_version = GeneralUtilities.read_text_from_file(version_file)
+            used_version ="7.16.0"#TODO retrieve latest version
             download_link = f"https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/{used_version}/openapi-generator-cli-{used_version}.jar"
             GeneralUtilities.ensure_directory_does_not_exist(openapigenerator_folder)
             GeneralUtilities.ensure_directory_exists(openapigenerator_folder)
             urllib.request.urlretrieve(download_link, jar_file)
+        GeneralUtilities.assert_file_exists(jar_file)
+        return jar_file
 
     @GeneralUtilities.check_arguments
     def standardized_tasks_update_version_in_docker_examples(self, codeunit_folder:str, codeunit_version:str) -> None:

{scriptcollection-4.0.44.dist-info → scriptcollection-4.0.46.dist-info}/METADATA

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

{scriptcollection-4.0.44.dist-info → scriptcollection-4.0.46.dist-info}/RECORD

@@ -1,6 +1,6 @@
 ScriptCollection/AnionBuildPlatform.py,sha256=57bEfg-AKkSzdZ81JyAJZ48dw4nhZioCqGrFMkp_fWk,12501
 ScriptCollection/CertificateUpdater.py,sha256=GXPxmYaW-ufOqsiP9kUYdtI6eNg1-GzrrCqsZdwW_HY,9199
-ScriptCollection/Executables.py,sha256=31RgdqQDRBpY955m9NSBms5M15jwHAMQFBBtUwKbSME,41891
+ScriptCollection/Executables.py,sha256=7SXsAA2UxtAMQ8d7agexYtGiXdjF3JE_TVJOF_KJNJs,42059
 ScriptCollection/GeneralUtilities.py,sha256=9Xd9aKPj3TkpVtdHXzFMILrRoXAfJCph69XRTstdsBo,49280
 ScriptCollection/ImageUpdater.py,sha256=qTe3yoqzQJY7LZdXBbjbWvrsSQaeHy1VwmOxaRzU2ig,29305
 ScriptCollection/ProcessesRunner.py,sha256=3mu4ZxzZleQo0Op6o9EYTCFiJfb6kx5ov2YfZfT89mU,1395
@@ -9,7 +9,7 @@ ScriptCollection/ProgramRunnerEpew.py,sha256=TJdDx9zIMSiCaXh8X-ekrMlbXfGtmd0Mmyx
 ScriptCollection/ProgramRunnerMock.py,sha256=uTu-aFle1W_oKjeQEmuPsFPQpvo0kRf2FrRjAPIwT5Y,37
 ScriptCollection/ProgramRunnerPopen.py,sha256=BPY7-ZMIlqT7JOKz8qlB5c0laF2Js-ijzqk09GxZC48,3821
 ScriptCollection/SCLog.py,sha256=dxGOI4E9lG5v9jk_LajXCkM5nghliCDV8YB8Ihn160s,4541
-ScriptCollection/ScriptCollectionCore.py,sha256=XzWxKdyl8w0b5_7dBpu2Wiv52siu_jNjvRfWClQ2Rls,142113
+ScriptCollection/ScriptCollectionCore.py,sha256=ezkO1GA4Ed3QJ4R7y6fZwB4KlFc6sX1KK_kTpdejxy8,142113
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ScriptCollection/TFCPS/TFCPS_CodeUnitSpecific_Base.py,sha256=2Ng-GyKWQ6FfTUmogd7g-xF6_XeTMxvkeJddagxFR5o,25853
 ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnit.py,sha256=4rYKgTAga11NiDx8YUqz3K_Q4eX_n3kC6lvNdXEa24s,7389
@@ -20,7 +20,7 @@ ScriptCollection/TFCPS/TFCPS_MergeToMain.py,sha256=41g219jaBRZ2VQCrWM4-Trvervrt8
 ScriptCollection/TFCPS/TFCPS_MergeToStable.py,sha256=ifB1K6A903vvfH0LvtiFbZgYSgR94thfEI-jjf40LpU,21653
 ScriptCollection/TFCPS/TFCPS_PreBuildCodeunitsScript.py,sha256=CxdwUklhZVuJGp0vcokoH_KMXFzmlUlZwj77xFYijho,2242
 ScriptCollection/TFCPS/TFCPS_Tools_Dependencies.py,sha256=o7HI3ki3WWqlAiUsrh3Lky_w6UhYh9hdjYPGOhubQGA,414
-ScriptCollection/TFCPS/TFCPS_Tools_General.py,sha256=ONdapcG29BCh1CwJR_8jHzll0W5QuyZ-EPJrxMcMIqU,76441
+ScriptCollection/TFCPS/TFCPS_Tools_General.py,sha256=dDpu6NJlSk4xi2FfJ1Bcwl-ZG1g3xfq4cE0IP4PT8NY,76173
 ScriptCollection/TFCPS/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ScriptCollection/TFCPS/Docker/TFCPS_CodeUnitSpecific_Docker.py,sha256=-g8h2gCf9rh0KJXUBeQD5d0qLJgBU3Q8DNZXM1UXC04,5259
 ScriptCollection/TFCPS/Docker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -35,8 +35,8 @@ ScriptCollection/TFCPS/NodeJS/TFCPS_CodeUnitSpecific_NodeJS.py,sha256=dnuDlQXThF
 ScriptCollection/TFCPS/NodeJS/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ScriptCollection/TFCPS/Python/TFCPS_CodeUnitSpecific_Python.py,sha256=q7msAxCb5VIZ-xhFg1MfzUvWomQRKYldqmW42KFhyMU,6868
 ScriptCollection/TFCPS/Python/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-scriptcollection-4.0.44.dist-info/METADATA,sha256=DaIE8QIbw3p85KpjMgddKuS4AgEynTUTTauJD5LL8lo,7688
-scriptcollection-4.0.44.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-scriptcollection-4.0.44.dist-info/entry_points.txt,sha256=RhfJxpWvSMIkdQ_1Pan1uXPTgYCTD1EcP0ZshkA2vtA,4366
-scriptcollection-4.0.44.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-scriptcollection-4.0.44.dist-info/RECORD,,
+scriptcollection-4.0.46.dist-info/METADATA,sha256=FIM4IegIbWXIMCm_7GC1RDFqULbhjMKPpAeim65b-k0,7688
+scriptcollection-4.0.46.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+scriptcollection-4.0.46.dist-info/entry_points.txt,sha256=_izhaQEyHiyBIfM2zTYDaJ7qvgsP1WntkVChFnkWymE,4431
+scriptcollection-4.0.46.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+scriptcollection-4.0.46.dist-info/RECORD,,

{scriptcollection-4.0.44.dist-info → scriptcollection-4.0.46.dist-info}/entry_points.txt

@@ -6,6 +6,7 @@ scbuildcodeunitsc = ScriptCollection.Executables:BuildCodeUnitsC
 sccalculatebitcoinblockhash = ScriptCollection.Executables:CalculateBitcoinBlockHash
 scchangefileextension = ScriptCollection.Executables:ChangeFileExtensions
 scchangehashofprogram = ScriptCollection.Executables:ChangeHashOfProgram
+sccleantoolscache = ScriptCollection.Executables:CleanToolsCache
 scconvertgitrepositorytobarerepository = ScriptCollection.Executables:ConvertGitRepositoryToBareRepository
 sccopy = ScriptCollection.Executables:Copy
 sccreatechangelogentry = ScriptCollection.Executables:CreateChangelogEntry