update logs

src/linktools/_config.py

@@ -379,7 +379,7 @@ def _load(self, env: BaseEnviron, key: Any, cache: Any):
 
             default = cache
             if default is not __missing__ and not self.always_ask:
-                if not env.get_config("RELOAD_CONFIG", type=bool):
+                if not env.get_config("RELOAD_CONFIG", type=bool, default=False):
                     return default
 
             if default is __missing__:
@@ -417,7 +417,7 @@ def _load(self, env: BaseEnviron, key: Any, cache: Any):
 
             default = cache
             if default is not __missing__ and not self.always_ask:
-                if not env.get_config("RELOAD_CONFIG", type=bool):
+                if not env.get_config("RELOAD_CONFIG", type=bool, default=False):
                     return default
 
             if default is __missing__:

src/linktools/_environ.py

@@ -200,10 +200,6 @@ def _internal_config(self):
         config.update(
             DEBUG=False,
             STORAGE_PATH=str(pathlib.Path.home() / f".{metadata.__name__}"),
-            ENVVAR_PREFIX=None,
-            RELOAD_CONFIG=False,
-            SHOW_LOG_TIME=False,
-            SHOW_LOG_LEVEL=True,
         )
 
         yaml_path = os.path.join(root_path, "template", "tools.yml")

src/linktools/_rich.py

@@ -55,8 +55,8 @@ class LogHandler(RichHandler):
     def __init__(self, environ: BaseEnviron):
         super().__init__(
             show_path=False,
-            show_level=environ.get_config("SHOW_LOG_LEVEL"),
-            show_time=environ.get_config("SHOW_LOG_TIME"),
+            show_level=environ.get_config("SHOW_LOG_LEVEL", type=bool, default=True),
+            show_time=environ.get_config("SHOW_LOG_TIME", type=bool, default=False),
             omit_repeated_times=False,
             log_time_format=self.make_time_text
             # markup=True,
@@ -125,10 +125,13 @@ def make_time_text(self, time: Union[float, datetime, None] = None, format: str
             time = datetime.now()
         elif isinstance(time, (int, float)):
             time = datetime.fromtimestamp(time)
-        if not format:
-            format = "[%x %X]"
         if not style:
             style = "log.time"
+        if not format:
+            if self.formatter:
+                format = self.formatter.datefmt
+            if not format:
+                format = "[%x %X]"
         return Text(time.strftime(format), style=style)
 
     def make_level_text(self, level_no: int, level_name: str = None, style: str = None) -> Text:
@@ -182,33 +185,41 @@ def __init__(self):
         super().__init__(table_column=Column(no_wrap=True))
 
     def render(self, task: Task = None) -> Union[str, Text]:
-        handler = LogHandler.get_instance()
-        if not handler:
-            return ""
         result = Text()
-        if handler.show_time:
-            date_format = None
-            if handler.formatter:
-                date_format = handler.formatter.datefmt
-            result.append(handler.make_time_text(format=date_format))
-            result.append(" ")
-        if handler.show_level:
-            result.append(handler.make_level_text(logging.INFO, "⇲"))
+
+        handler = LogHandler.get_instance()
+        if handler:
+            if handler.show_time:
+                if len(result) > 0:
+                    result.append(" ")
+                result.append(handler.make_time_text())
+
+            if handler.show_level:
+                if len(result) > 0:
+                    result.append(" ")
+                result.append(handler.make_level_text(logging.INFO))
+
         return result
 
 
 def create_progress():
-    return Progress(
-        LogColumn(),
+    columns = []
+
+    handler = LogHandler.get_instance()
+    if handler and (handler.show_time or handler.show_level):
+        columns.append(LogColumn())
+
+    columns.extend([
         TextColumn("[progress.description]{task.description}"),
         BarColumn(),
         DownloadColumn(),
         TransferSpeedColumn(),
         TaskProgressColumn(),
         TextColumn("eta"),
         TimeRemainingColumn(),
-        refresh_per_second=.1,
-    )
+    ])
+
+    return Progress(*columns, refresh_per_second=.1)
 
 
 PromptType = TypeVar("PromptType", bound=PromptBase)

src/linktools/cli/commands/android/adb.py

@@ -52,6 +52,11 @@ class Command(AndroidCommand):
         "detach",
     ]
 
+    def main(self, *args, **kwargs) -> None:
+        self.environ.config.set_default("SHOW_LOG_LEVEL", False)
+        self.environ.config.set_default("SHOW_LOG_TIME", False)
+        return super().main(*args, **kwargs)
+
     def init_arguments(self, parser: ArgumentParser) -> None:
         parser.add_argument("adb_args", nargs="...", metavar="args", help="adb args")
 

src/linktools/cli/commands/android/frida.py

@@ -43,6 +43,11 @@ class Command(AndroidCommand):
     Easy to use frida (require Android device rooted)
     """
 
+    def main(self, *args, **kwargs) -> None:
+        self.environ.config.set_default("SHOW_LOG_LEVEL", True)
+        self.environ.config.set_default("SHOW_LOG_TIME", True)
+        return super().main(*args, **kwargs)
+
     @property
     def known_errors(self) -> List[Type[BaseException]]:
         return super().known_errors + [DownloadError]

src/linktools/cli/commands/common/shell.py

@@ -16,6 +16,11 @@ class Command(BaseCommand):
     Shell with environment variables already initialized
     """
 
+    def main(self, *args, **kwargs) -> None:
+        self.environ.config.set_default("SHOW_LOG_LEVEL", False)
+        self.environ.config.set_default("SHOW_LOG_TIME", False)
+        return super().main(*args, **kwargs)
+
     def __init__(self):
         self._shell_path = None
         if environ.system in ["darwin", "linux"]:

src/linktools/cli/commands/common/tools.py

@@ -42,6 +42,11 @@ class Command(BaseCommand):
     Download and use tools
     """
 
+    def main(self, *args, **kwargs) -> None:
+        self.environ.config.set_default("SHOW_LOG_LEVEL", False)
+        self.environ.config.set_default("SHOW_LOG_TIME", False)
+        return super().main(*args, **kwargs)
+
     @property
     def known_errors(self) -> List[Type[BaseException]]:
         return super().known_errors + [ToolError, DownloadError]

src/linktools/cli/commands/ios/frida.py

@@ -43,6 +43,11 @@ class Command(IOSCommand):
     Easy to use frida (require iOS device jailbreak)
     """
 
+    def main(self, *args, **kwargs) -> None:
+        self.environ.config.set_default("SHOW_LOG_LEVEL", True)
+        self.environ.config.set_default("SHOW_LOG_TIME", True)
+        return super().main(*args, **kwargs)
+
     @property
     def known_errors(self) -> List[Type[BaseException]]:
         return super().known_errors + [DownloadError]

src/linktools/cli/commands/ios/sib.py

@@ -20,6 +20,11 @@ class Command(IOSCommand):
         "remote",
     ]
 
+    def main(self, *args, **kwargs) -> None:
+        self.environ.config.set_default("SHOW_LOG_LEVEL", False)
+        self.environ.config.set_default("SHOW_LOG_TIME", False)
+        return super().main(*args, **kwargs)
+
     def init_arguments(self, parser: ArgumentParser) -> None:
         parser.add_argument('sib_args', nargs='...', metavar="args", help="sib args")
 

src/linktools/cli/commands/ios/ssh.py

@@ -42,6 +42,11 @@ class Command(IOSCommand):
     OpenSSH remote login client (require iOS device jailbreak)
     """
 
+    def main(self, *args, **kwargs) -> None:
+        self.environ.config.set_default("SHOW_LOG_LEVEL", False)
+        self.environ.config.set_default("SHOW_LOG_TIME", False)
+        return super().main(*args, **kwargs)
+
     @property
     def known_errors(self) -> List[Type[BaseException]]:
         return super().known_errors + [SSHException]