Removed print_msg(), convert to display()

Author: danwroy

nxc/cli.py

@@ -125,7 +125,7 @@ def gen_cli_args():
         sys.exit(1)
 
     if args.version:
-        nxc_logger.print_msg(f"{VERSION} - {CODENAME} - {COMMIT} - {DISTANCE}")
+        nxc_logger.display(f"{VERSION} - {CODENAME} - {COMMIT} - {DISTANCE}")
         sys.exit(1)
 
     # Multiply output_tries by 10 to enable more fine granural control, see exec methods

nxc/database.py

@@ -27,7 +27,7 @@ def open_config(config_path):
         config = configparser.ConfigParser()
         config.read(config_path)
     except Exception as e:
-        nxc_logger.print_msg(f"[-] Error reading nxc.conf: {e}")
+        nxc_logger.display(f"[-] Error reading nxc.conf: {e}")
         sys.exit(1)
     return config
 
@@ -40,7 +40,7 @@ def set_workspace(config_path, workspace_name):
     config = open_config(config_path)
     config.set("nxc", "workspace", workspace_name)
     write_configfile(config, config_path)
-    nxc_logger.print_msg(f"[*] Workspace set to {workspace_name}")
+    nxc_logger.display(f"[*] Workspace set to {workspace_name}")
 
 
 def get_db(config):
@@ -63,7 +63,7 @@ def init_protocol_dbs(workspace_name, p_loader=None):
         proto_db_path = path_join(WORKSPACE_DIR, workspace_name, f"{protocol}.db")
 
         if not exists(proto_db_path):
-            nxc_logger.print_msg(
+            nxc_logger.display(
                 f"[*] Initializing {protocol.upper()} protocol database"
             )
             conn = connect(proto_db_path)
@@ -93,17 +93,17 @@ def create_workspace(workspace_name, p_loader=None):
         None
     """
     if exists(path_join(WORKSPACE_DIR, workspace_name)):
-        nxc_logger.print_msg(f"[-] Workspace {workspace_name} already exists")
+        nxc_logger.display(f"[-] Workspace {workspace_name} already exists")
     else:
-        nxc_logger.print_msg(f"[*] Creating {workspace_name} workspace")
+        nxc_logger.display(f"[*] Creating {workspace_name} workspace")
         mkdir(path_join(WORKSPACE_DIR, workspace_name))
 
     init_protocol_dbs(workspace_name, p_loader)
 
 
 def delete_workspace(workspace_name):
     shutil.rmtree(path_join(WORKSPACE_DIR, workspace_name))
-    nxc_logger.print_msg(f"[*] Workspace {workspace_name} deleted")
+    nxc_logger.display(f"[*] Workspace {workspace_name} deleted")
 
 
 def initialize_db():

nxc/logger.py

@@ -126,14 +126,6 @@ def format(self, msg, *args, **kwargs):
 
         return (f"{module_name:<24} {self.extra['host']:<15} {self.extra['port']:<6} {self.extra['hostname'] if self.extra['hostname'] else 'NONE':<16} {msg}", kwargs)
 
-    @no_debug
-    def print_msg(self, msg, to_file=False, *args, **kwargs):
-        """For print statements, with option to log to file"""
-        text = Text.from_ansi(msg)
-        nxc_console.print(text, *args, **kwargs)
-        if to_file:
-            self.log_console_to_file(text, *args, **kwargs)
-
     @no_debug
     def display(self, msg, *args, **kwargs):
         """Display text to console, formatted for nxc"""