Merge branch 'Pennyw0rth:main' into rdp-nego

Author: Mauriceter

nxc/database.py

@@ -1,5 +1,6 @@
 import configparser
 import ipaddress
+import platform
 import shutil
 import sys
 from os import mkdir
@@ -170,11 +171,23 @@ def reflect_table(self, table):
 
                 return reflected_table
             except (NoInspectionAvailable, NoSuchTableError, ValueError) as e:
+                commands_platform = {
+                    "Windows": [
+                        f"cmd /c copy {self.db_path} %USERPROFILE%\\nxc_{self.protocol.lower()}.bak",
+                        f"del {self.db_path}"
+                    ],
+                    "Linux": [
+                        f"cp {self.db_path} ~/nxc_{self.protocol.lower()}.bak",
+                        f"rm -f {self.db_path}"
+                    ]
+                }
+                copy_command = commands_platform["Windows"][0] if platform.system() == "Windows" else commands_platform["Linux"][0]
+                delete_command = commands_platform["Windows"][1] if platform.system() == "Windows" else commands_platform["Linux"][1]
                 nxc_logger.fail(f"Schema mismatch detected for table '{table.__tablename__}' in protocol '{self.protocol}'")
                 nxc_logger.debug(e)
                 nxc_logger.fail("This is probably because a newer version of nxc is being run on an old DB schema.")
-                nxc_logger.fail(f"Optionally save the old DB data (`cp {self.db_path} ~/nxc_{self.protocol.lower()}.bak`)")
-                nxc_logger.fail(f"Then remove the {self.protocol} DB (`rm -f {self.db_path}`) and run nxc to initialize the new DB")
+                nxc_logger.fail(f"Optionally save the old DB data (`{copy_command}`)")
+                nxc_logger.fail(f"Then remove the {self.protocol} DB (`{delete_command}`) and run nxc to initialize the new DB")
                 sys.exit()
 
     def shutdown_db(self):

nxc/protocols/ftp.py

@@ -121,7 +121,7 @@ def list_directory_full(self):
         # ftplib's "dir" prints directly to stdout, and "nlst" only returns the folder name, not full details
         files = []
         try:
-            self.conn.retrlines("LIST", callback=files.append)
+            self.conn.retrlines("LIST -a", callback=files.append)
         except error_perm as error_message:
             self.logger.fail(f"Failed to list directory. Response: ({error_message})")
             self.conn.close()

nxc/protocols/ftp/proto_args.py

@@ -6,7 +6,7 @@ def proto_args(parser, parents):
     ftp_parser.add_argument("--port", type=int, default=21, help="FTP port")
 
     cgroup = ftp_parser.add_argument_group("File Operations")
-    cgroup.add_argument("--ls", metavar="DIRECTORY", nargs="?", const=".", help="List files in the directory")
+    cgroup.add_argument("--ls", metavar="DIRECTORY", nargs="?", const=".", help="List all files (including hidden) in the directory")
     cgroup.add_argument("--get", metavar="FILE", help="Download a file")
     cgroup.add_argument("--put", metavar=("LOCAL_FILE", "REMOTE_FILE"), nargs=2, help="Upload a file")
     return parser