flyshell 1.0.10__tar.gz → 1.0.11__tar.gz

{flyshell-1.0.10/src/flyshell.egg-info → flyshell-1.0.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flyshell
-Version: 1.0.10
+Version: 1.0.11
 Summary: A modular, zero-dependency command-line environment in Python.
 License: MIT
 Requires-Python: >=3.10

{flyshell-1.0.10 → flyshell-1.0.11}/src/flyshell/builtin/diskops.py

@@ -32,7 +32,10 @@ class Cat(BaseCmd):
                     skip_next = True
                     continue
                 else:
-                    return (1, f"\nCommand Error: '{token}' requires a positive integer limit.\n")
+                    return (
+                        1,
+                        f"\nCommand Error: '{token}' requires a positive integer limit.\n",
+                    )
             filtered_args.append(token)
         if not filtered_args:
             return (1, "\nCommand Error: Target file not specified.\n")
@@ -62,7 +65,10 @@ class Cat(BaseCmd):
             output_lines.append(f"\nEnd of '{target_path.name}'\n")
             return (0, "\n".join(output_lines))
         except PermissionError:
-            return (1, f"\nSystem Error: Permission denied. Cannot read '{raw_target}'\n")
+            return (
+                1,
+                f"\nSystem Error: Permission denied. Cannot read '{raw_target}'\n",
+            )
         except Exception as e:
             return (1, f"\nSystem Error: Failed to read file '{raw_target}' ({e})\n")
 
@@ -120,18 +126,24 @@ class MkDir(BaseCmd):
             return (1, f"\nSystem Error: Unable to create directory '{target}' ({e})\n")
 
 
-class RmDir(BaseCmd):
-    name = "rmdir"
-    description = "Remove the specified directory"
+class Rm(BaseCmd):
+    name = "rm"
+    description = "Remove files from the filesystem"
     min_args = 1
-    options = "Target directory"
-    aliases = []
+    options = "Target file"
+    aliases = ["del"]
 
     def execute(self, args):
         force = ("-f" in args) or ("--force" in args)
-        path_tokens = [arg for arg in args if arg not in ("-f", "--force")]
+        recursive = ("-r" in args) or ("--recursive" in args)
+        flags = {"-f", "--force", "-r", "--recursive"}
+        path_tokens = [arg for arg in args if arg not in flags]
+        if not path_tokens:
+            return (1, "\nCommand Error: No target file or directory specified.\n")
         raw_target = " ".join(path_tokens).strip("\"'")
         target_path = Path(raw_target).expanduser().resolve()
+        if not target_path.exists():
+            return (1, f"\nSystem Error: Target '{raw_target}' not found.\n")
         if target_path == target_path.parent or str(target_path) == target_path.anchor:
             return (
                 1,
@@ -173,6 +185,102 @@ class RmDir(BaseCmd):
             c.PACKAGE_ROOT.resolve(),
             c.PROJECT_ROOT.resolve(),
         ]
+        for protected in flyshell_dirs:
+            if target_path == protected or target_path.is_relative_to(protected):
+                return (
+                    1,
+                    "\nSecurity Error: Flyshell has blocked this action.\n"
+                    f"Target '{raw_target}' contains or belongs to Flyshell system files.\n"
+                    "If you wish to delete Flyshell, use the host.\n",
+                )
+        is_directory = target_path.is_dir()
+        if is_directory and not recursive:
+            return (
+                1,
+                f"\nCommand Error: '{raw_target}' is a directory.\n"
+                "Use '-r' or '--recursive' to remove directories.\n",
+            )
+        if not force:
+            target_type = "directory and all its contents" if is_directory else "file"
+            prompt_msg = f"\nAre you sure you want to permanently delete {target_type} '{raw_target}'? [y/n]: "
+            try:
+                confirm = input(prompt_msg).strip().lower()
+            except (KeyboardInterrupt, EOFError):
+                return (1, "\nDeletion cancelled by user.\n")
+            if confirm != "y":
+                return (0, "\nOperation cancelled. No files were deleted.\n")
+        try:
+            if is_directory:
+                shutil.rmtree(target_path)
+                return (0, f"\nSUCCESS! Deleted directory '{raw_target}' and all its contents.\n")
+            else:
+                os.remove(target_path)
+                return (0, f"\nSUCCESS! Deleted file '{raw_target}'\n")
+        except PermissionError:
+            return (1, f"\nSystem Error: Permission denied. Cannot remove '{raw_target}'\n")
+        except OSError as e:
+            return (1, f"\nSystem Error: Unable to remove '{raw_target}' ({e.strerror})\n")
+        except Exception as e:
+            return (1, f"\nSystem Error: Unexpected error removing '{raw_target}' ({e})\n")
+
+
+class RmDir(BaseCmd):
+    name = "rmdir"
+    description = "Remove the specified directory"
+    min_args = 1
+    options = "Target directory"
+    aliases = []
+
+    def execute(self, args):
+        force = ("-f" in args) or ("--force" in args)
+        path_tokens = [arg for arg in args if arg not in ("-f", "--force")]
+        raw_target = " ".join(path_tokens).strip("\"'")
+        target_path = Path(raw_target).expanduser().resolve()
+        if target_path == target_path.parent or str(target_path) == target_path.anchor:
+            return (
+                1,
+                "\nSecurity Error: Flyshell has blocked this action.\n"
+                "You cannot delete the root filesystem directory.\n",
+            )
+        critical_system_dirs = [
+            Path.home().parent.resolve(),
+            Path.home().resolve(),
+        ]
+        if c.HOST_OS == "Windows":
+            system_drive = os.environ.get("SystemDrive", "C:")
+            critical_system_dirs.extend(
+                [
+                    Path(f"{system_drive}\\Windows").resolve(),
+                    Path(f"{system_drive}\\Program Files").resolve(),
+                    Path(f"{system_drive}\\Program Files (x86)").resolve(),
+                ]
+            )
+        else:
+            critical_system_dirs.extend(
+                [
+                    Path("/bin").resolve(),
+                    Path("/etc").resolve(),
+                    Path("/usr").resolve(),
+                    Path("/var").resolve(),
+                ]
+            )
+        if target_path in critical_system_dirs:
+            return (
+                1,
+                "\nSecurity Error: Flyshell has blocked this action.\n"
+                f"Target '{raw_target}' is a protected operating system directory.\n",
+            )
+        if target_path == Path(os.getcwd()).resolve():
+            return (
+                1,
+                "\nSystem Error: Cannot remove current working directory.\n"
+                "Switch to a different directory using 'cd' first.\n",
+            )
+        flyshell_dirs = [
+            c.APP_DIR.resolve(),
+            c.PACKAGE_ROOT.resolve(),
+            c.PROJECT_ROOT.resolve(),
+        ]
         for protected in flyshell_dirs:
             if target_path == protected or target_path.is_relative_to(protected):
                 return (
@@ -209,3 +317,45 @@ class RmDir(BaseCmd):
                 1,
                 f"\nSystem Error: Unexpected error removing '{raw_target}' ({e})\n",
             )
+
+
+class Touch(BaseCmd):
+    name = "touch"
+    description = "Create a new empty file or update timestamps of an existing file"
+    min_args = 1
+    options = "Target file"
+    aliases = []
+
+    def execute(self, args):
+        raw_target = " ".join(args).strip("\"'")
+        target_path = Path(raw_target).expanduser().resolve()
+        if target_path.is_dir():
+            return (
+                1,
+                f"\nCommand Error: '{raw_target}' is a directory, not a file.\n",
+            )
+        if not target_path.parent.exists():
+            return (
+                1,
+                f"\nSystem Error: Cannot create file '{raw_target}'. Parent directory does not exist.\n",
+            )
+        try:
+            if target_path.exists():
+                target_path.touch()
+                return (
+                    0,
+                    f"\nSUCCESS! Updated timestamp for existing file '{raw_target}'\n",
+                )
+            else:
+                target_path.touch(exist_ok=False)
+                return (0, f"\nSUCCESS! Created file '{raw_target}'\n")
+        except PermissionError:
+            return (
+                1,
+                f"\nSystem Error: Permission denied. Cannot access '{raw_target}'.\n",
+            )
+        except Exception as e:
+            return (
+                1,
+                f"\nSystem Error: Failed to touch file '{raw_target}' ({e})\n",
+            )

{flyshell-1.0.10 → flyshell-1.0.11}/src/flyshell/constants.py

@@ -7,8 +7,8 @@ import os
 import platform
 import time
 
-BUILD = 109
-VERSION = "1.0.10"
+BUILD = 110
+VERSION = "1.0.11"
 
 
 def _resolve_app_dir() -> Path:

{flyshell-1.0.10 → flyshell-1.0.11}/src/flyshell/core/directory.py

@@ -61,9 +61,11 @@ INSTALLED_COMMANDS: list[BaseCmd] = [
     diskops.MkDir(),
     system.OpenFile(),
     utils.Reboot(),
+    diskops.Rm(),
     diskops.RmDir(),
     utils.Sleep(),
     system.SysExe(),
+    diskops.Touch(),
 ]
 COMMAND_REGISTRY: dict[str, BaseCmd] = {}
 for cmd_obj in INSTALLED_COMMANDS:

{flyshell-1.0.10 → flyshell-1.0.11}/src/flyshell/main.py

@@ -1,20 +1,24 @@
 # src\flyshell\main.py
 
-from flyshell import constants as c
-
 from pathlib import Path
 import importlib.util
 import os
 import sys
 
-if str(c.SRC_DIR) not in sys.path:
-    sys.path.insert(0, str(c.SRC_DIR))
-
 
 def boot_check():
     print("\nFlyshell will now check that your modules exist.")
     present = []
     missing = []
+    try:
+        from flyshell import constants as c
+
+        if str(c.SRC_DIR) not in sys.path:
+            sys.path.insert(0, str(c.SRC_DIR))
+    except ImportError:
+        print(
+            "\nCRITICAL BOOT ERROR: Failed to initialise system due to corrupted or missing files.\n"
+        )
     for obj in c.REQUIRED_COMPONENTS:
         path = Path(c.PACKAGE_ROOT / obj)
         if path.exists():
@@ -58,11 +62,12 @@ def boot_check():
 
 def main():
     os.system("")
-    print(c.CLEAR_SCREEN, end="")
+    print("\033[H\033[2J", end="")
     print("\nLaunch process initiated. Flyshell is checking it is able to launch...")
     try:
         if boot_check():
-            from flyshell.core import auth, console, data, loader
+            from flyshell import constants as c
+            from flyshell.core import auth, console, loader
 
             if c.HOST_OS in ["Windows", "Darwin", "Linux"]:
                 if sys.version_info < c.SUPPORTED_PYTHON:

{flyshell-1.0.10 → flyshell-1.0.11/src/flyshell.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flyshell
-Version: 1.0.10
+Version: 1.0.11
 Summary: A modular, zero-dependency command-line environment in Python.
 License: MIT
 Requires-Python: >=3.10