ScriptCollection 3.5.146__py3-none-any.whl → 3.5.148__py3-none-any.whl

ScriptCollection/SCLog.py

@@ -19,17 +19,19 @@ class LogLevel(Enum):
 class SCLog:
     loglevel: LogLevel
     log_file: str
-    add_overhead: bool
+    add_overhead_to_console: bool
+    add_overhead_to_logfile: bool
     print_as_color: bool
     zone_of_time: timezone = None
 
-    def __init__(self, log_file: str = None, loglevel: LogLevel = None, add_overhead: bool = False, print_as_color: bool = True):
+    def __init__(self, log_file: str = None, loglevel: LogLevel = None, print_as_color: bool = True):
         self.log_file = log_file
         if loglevel is None:
             self.loglevel = LogLevel.Information
         else:
             self.loglevel = loglevel
-        self.add_overhead = add_overhead
+        self.add_overhead_to_console = False
+        self.add_overhead_to_logfile = False
         self.print_as_color = print_as_color
 
     @GeneralUtilities.check_arguments
@@ -43,6 +45,10 @@ class SCLog:
 
     @GeneralUtilities.check_arguments
     def __log_line(self, message: str, loglevel: LogLevel = None):
+
+        print_to_console: bool = True
+        print_to_logfile: bool = self.log_file is not None
+
         if loglevel is None:
             loglevel = LogLevel.Information
 
@@ -62,43 +68,51 @@ class SCLog:
             part3 = f"Debug: {message}"
         if loglevel == LogLevel.Diagnostic:
             part3 = f"Diagnostic: {message}"
-        if self.add_overhead:
-            moment: datetime = None
-            if self.zone_of_time is None:
-                moment = datetime.now()
-            else:
-                moment = datetime.now(self.zone_of_time)
-            part1 = f"[{GeneralUtilities.datetime_to_string_for_logfile_entry(moment)}] ["
-            if loglevel == LogLevel.Information:
-                part2 = f"Information"
-            elif loglevel == LogLevel.Error:
-                part2 = f"Error"
-            elif loglevel == LogLevel.Warning:
-                part2 = f"Warning"
-            elif loglevel == LogLevel.Debug:
-                part2 = f"Debug"
-            elif loglevel == LogLevel.Diagnostic:
-                part2 = f"Diagnostic"
-            else:
-                raise ValueError("Unknown loglevel.")
-            part3 = f"] {message}"
 
-        print_to_std_out: bool = loglevel in (LogLevel.Debug, LogLevel.Information)
-        GeneralUtilities.print_text(part1, print_to_std_out)
+        moment: datetime = None
+        if self.zone_of_time is None:
+            moment = datetime.now()
+        else:
+            moment = datetime.now(self.zone_of_time)
+
+        part1 = f"[{GeneralUtilities.datetime_to_string_for_logfile_entry(moment)}] ["
         if loglevel == LogLevel.Information:
-            GeneralUtilities.print_text_in_green(part2, print_to_std_out, self.print_as_color)
+            part2 = f"Information"
         elif loglevel == LogLevel.Error:
-            GeneralUtilities.print_text_in_red(part2, print_to_std_out, self.print_as_color)
+            part2 = f"Error"
         elif loglevel == LogLevel.Warning:
-            GeneralUtilities.print_text_in_yellow(part2, print_to_std_out, self.print_as_color)
-        elif loglevel == LogLevel.Debug:
-            GeneralUtilities.print_text_in_cyan(part2, print_to_std_out, self.print_as_color)
+            part2 = f"Warning"
         elif loglevel == LogLevel.Debug:
-            GeneralUtilities.print_text_in_cyan(part2, print_to_std_out, self.print_as_color)
+            part2 = f"Debug"
+        elif loglevel == LogLevel.Diagnostic:
+            part2 = f"Diagnostic"
         else:
             raise ValueError("Unknown loglevel.")
-        GeneralUtilities.print_text(part3+"\n", print_to_std_out)
+        part3 = f"] {message}"
+
+        if print_to_console:
+            print_to_std_out: bool = loglevel in (LogLevel.Debug, LogLevel.Information)
+            if self.add_overhead_to_console:
+                GeneralUtilities.print_text(part1, print_to_std_out)
+                if loglevel == LogLevel.Information:
+                    GeneralUtilities.print_text_in_green(part2, print_to_std_out, self.print_as_color)
+                elif loglevel == LogLevel.Error:
+                    GeneralUtilities.print_text_in_red(part2, print_to_std_out, self.print_as_color)
+                elif loglevel == LogLevel.Warning:
+                    GeneralUtilities.print_text_in_yellow(part2, print_to_std_out, self.print_as_color)
+                elif loglevel == LogLevel.Debug:
+                    GeneralUtilities.print_text_in_cyan(part2, print_to_std_out, self.print_as_color)
+                elif loglevel == LogLevel.Debug:
+                    GeneralUtilities.print_text_in_cyan(part2, print_to_std_out, self.print_as_color)
+                else:
+                    raise ValueError("Unknown loglevel.")
+                GeneralUtilities.print_text(part3+"\n", print_to_std_out)
+            else:
+                GeneralUtilities.print_text(message+"\n", print_to_std_out)
 
-        if self.log_file is not None:
+        if print_to_logfile:
             GeneralUtilities.ensure_file_exists(self.log_file)
-            GeneralUtilities.append_line_to_file(self.log_file, part1+part2+part3)
+            if self.add_overhead_to_logfile:
+                GeneralUtilities.append_line_to_file(self.log_file, part1+part2+part3)
+            else:
+                GeneralUtilities.append_line_to_file(self.log_file, message)

ScriptCollection/ScriptCollectionCore.py

@@ -33,7 +33,7 @@ from .ProgramRunnerPopen import ProgramRunnerPopen
 from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
 from .SCLog import SCLog, LogLevel
 
-version = "3.5.146"
+version = "3.5.148"
 __version__ = version
 
 

ScriptCollection/TasksForCommonProjectStructure.py

@@ -3413,11 +3413,11 @@ class TasksForCommonProjectStructure:
         self.__sc.install_requirementstxt_file(repository_folde+"/Other/requirements.txt", verbosity)
 
     @GeneralUtilities.check_arguments
-    def update_submodule(self, repository_folder: str, submodule_name: str):
+    def update_submodule(self, repository_folder: str, submodule_name: str,local_branch:str="main",remote_branch:str="main",remote:str="origin"):
         submodule_folder = GeneralUtilities.resolve_relative_path("Other/Resources/Submodules/"+submodule_name, repository_folder)
-        self.__sc.git_fetch(submodule_folder, "origin")
-        self.__sc.git_checkout(submodule_folder, "main")
-        self.__sc.git_pull(submodule_folder, "origin", "main", "main", True)
+        self.__sc.git_fetch(submodule_folder, remote)
+        self.__sc.git_checkout(submodule_folder, local_branch)
+        self.__sc.git_pull(submodule_folder, remote, local_branch, remote_branch, True)
         current_version = self.__sc.get_semver_version_from_gitversion(repository_folder)
         changelog_file = os.path.join(repository_folder, "Other", "Resources", "Changelog", f"v{current_version}.md")
         if (not os.path.isfile(changelog_file)):

{scriptcollection-3.5.146.dist-info → scriptcollection-3.5.148.dist-info}/METADATA

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

{scriptcollection-3.5.146.dist-info → scriptcollection-3.5.148.dist-info}/RECORD

@@ -6,12 +6,12 @@ ScriptCollection/ProcessesRunner.py,sha256=3mu4ZxzZleQo0Op6o9EYTCFiJfb6kx5ov2YfZ
 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=4NaR1RMkWdhaYd8z2XpgsCoMSnK57xXm-d3qfxRgZlo,136482
-ScriptCollection/TasksForCommonProjectStructure.py,sha256=4EfcaVh1az8YXyedjlGvEwakAgVJ6Qq0NoYFJPDSbRM,240627
+ScriptCollection/SCLog.py,sha256=GJ44S6VaBVwX5Dd6MIrdZn6I0dpaaYKVq9w-N0nMXlo,4496
+ScriptCollection/ScriptCollectionCore.py,sha256=ue-SRkt8EVrFEXTqSJ-g0V-EtaxbN67jbI1J3T3Lk_g,136482
+ScriptCollection/TasksForCommonProjectStructure.py,sha256=aVwQq2kQwZmL-NAhOVo_G4ikYHsI92SGvhkmmGJlSw8,240711
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-scriptcollection-3.5.146.dist-info/METADATA,sha256=oyQjQJEN2N-60yQLQUHOJyw_n268J_6-k9lPhYh1iB8,7694
-scriptcollection-3.5.146.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-scriptcollection-3.5.146.dist-info/entry_points.txt,sha256=AvmVO9iyWImExpvzL3YYQ9AOEiUIN9guPRRG_W_VNWY,4116
-scriptcollection-3.5.146.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-scriptcollection-3.5.146.dist-info/RECORD,,
+scriptcollection-3.5.148.dist-info/METADATA,sha256=5LUruhTUIaiA13P-RyZTSV_OSgRma7YCEpMuyO4KKG4,7694
+scriptcollection-3.5.148.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+scriptcollection-3.5.148.dist-info/entry_points.txt,sha256=AvmVO9iyWImExpvzL3YYQ9AOEiUIN9guPRRG_W_VNWY,4116
+scriptcollection-3.5.148.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+scriptcollection-3.5.148.dist-info/RECORD,,