flyshell 1.0.8__tar.gz → 1.0.10__tar.gz

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

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

flyshell-1.0.10/src/flyshell/builtin/diskops.py

@@ -0,0 +1,211 @@
+# src\flyshell\builtin\diskops.py
+
+from flyshell import constants as c
+from flyshell.abstract.base_cmd import BaseCmd
+
+from pathlib import Path
+import os
+import shutil
+
+
+class Cat(BaseCmd):
+    name = "cat"
+    description = "Display the contents of a text file"
+    min_args = 1
+    options = "Target file"
+    aliases = ["read"]
+
+    def execute(self, args):
+        show_numbers = ("-n" in args) or ("--number" in args)
+        limit = None
+        filtered_args = []
+        skip_next = False
+        for i, token in enumerate(args):
+            if skip_next:
+                skip_next = False
+                continue
+            if token in ("-n", "--number"):
+                continue
+            if token in ("-l", "--limit"):
+                if i + 1 < len(args) and args[i + 1].isdigit():
+                    limit = int(args[i + 1])
+                    skip_next = True
+                    continue
+                else:
+                    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")
+        raw_target = " ".join(filtered_args).strip("\"'")
+        target_path = Path(raw_target).expanduser().resolve()
+        if not target_path.exists():
+            return (1, f"\nSystem Error: File '{raw_target}' not found.\n")
+        if target_path.is_dir():
+            return (1, f"\nSystem Error: '{raw_target}' is a directory, not a file.\n")
+        try:
+            with open(target_path, "r", encoding="utf-8", errors="replace") as f:
+                lines = f.readlines()
+            total_lines = len(lines)
+            if total_lines == 0:
+                return (1, f"\nSystem Error: '{raw_target}' is empty.\n")
+            if limit is not None:
+                lines = lines[:limit]
+            output_lines = [
+                f"\nDisplaying contents of file '{target_path.name}' ({len(lines)}/{total_lines} lines)\n"
+            ]
+            for line_idx, line in enumerate(lines, start=1):
+                clean_line = line.rstrip("\r\n")
+                if show_numbers:
+                    output_lines.append(f"{line_idx:4d} | {clean_line}")
+                else:
+                    output_lines.append(clean_line)
+            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")
+        except Exception as e:
+            return (1, f"\nSystem Error: Failed to read file '{raw_target}' ({e})\n")
+
+
+class Dir(BaseCmd):
+    name = "dir"
+    description = "List all files in the current working directory"
+    min_args = 0
+    options = None
+    aliases = ["ls"]
+
+    def execute(self, args):
+        try:
+            current_path = os.getcwd()
+            items = os.listdir(current_path)
+            lines = [f"\nDirectory: '{current_path}'"]
+            for item in items:
+                if os.path.isdir(os.path.join(current_path, item)):
+                    lines.append(f"[DIR] {item}/")
+                else:
+                    lines.append(f"[FILE] {item}")
+            lines.append(f"\nTotal items in directory: {len(items)}\n")
+            return (0, "\n".join(lines))
+        except Exception as e:
+            return (1, f"\nSystem Error: Unable to list directory ({e})\n")
+
+
+class MkDir(BaseCmd):
+    name = "mkdir"
+    description = "Create a new directory from the current working directory"
+    min_args = 1
+    options = "Directory name"
+    aliases = ["md"]
+
+    def execute(self, args):
+        use_parents = ("-p" in args) or ("--parents" in args)
+        path_tokens = [arg for arg in args if arg not in ("-p", "--parents")]
+        target = " ".join(path_tokens).strip("\"'")
+        try:
+            if use_parents:
+                os.makedirs(target, exist_ok=True)
+            else:
+                os.mkdir(target)
+            return (0, f"\nSUCCESS! Created directory '{target}'\n")
+        except FileExistsError:
+            return (1, f"\nSystem Error: Directory '{target}' already exists.\n")
+        except FileNotFoundError:
+            return (
+                1,
+                "\nSystem Error: Parent directory does not exist. Use '-p' or '--parents' to create parent directories.\n",
+            )
+        except PermissionError:
+            return (1, f"\nSystem Error: Permission denied. Cannot create '{target}'\n")
+        except Exception as e:
+            return (1, f"\nSystem Error: Unable to create directory '{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 (
+                    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",
+                )
+        try:
+            has_contents = any(target_path.iterdir())
+            if has_contents and not force:
+                return (
+                    1,
+                    f"\nDirectory Error: Directory '{raw_target}' is not empty.\n"
+                    "Use '-f' or '--force' to remove a non-empty directory and its contents.\n",
+                )
+            if has_contents and force:
+                shutil.rmtree(target_path)
+            else:
+                os.rmdir(target_path)
+            return (0, f"\nSUCCESS! Removed directory '{raw_target}'\n")
+        except PermissionError:
+            return (
+                1,
+                f"\nSystem Error: Permission denied. Cannot delete '{raw_target}'\n",
+            )
+        except OSError as e:
+            return (
+                1,
+                f"\nSystem Error: Unable to remove directory '{raw_target}' ({e.strerror})\n",
+            )
+        except Exception as e:
+            return (
+                1,
+                f"\nSystem Error: Unexpected error removing '{raw_target}' ({e})\n",
+            )

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

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

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

@@ -49,6 +49,7 @@ class Cmds(BaseCmd):
 
 
 INSTALLED_COMMANDS: list[BaseCmd] = [
+    diskops.Cat(),
     system.Cd(),
     Cmds(),
     utils.Clear(),

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

@@ -83,7 +83,7 @@ def main():
                     sys.exit(0)
             else:
                 print(
-                    f"\nCRITICAL ERROR: Host operating system '{data.HOST_OS}' is not supported."
+                    f"\nCRITICAL ERROR: Host operating system '{c.HOST_OS}' is not supported."
                 )
                 print(
                     "Flyshell cannot launch because your operating system is not supported."

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

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

flyshell-1.0.8/src/flyshell/builtin/diskops.py

@@ -1,114 +0,0 @@
-# src\flyshell\builtin\diskops.py
-
-from flyshell import constants as c
-from flyshell.abstract.base_cmd import BaseCmd
-
-from pathlib import Path
-import os
-import shutil
-
-
-class Dir(BaseCmd):
-    name = "dir"
-    description = "List all files in the current working directory"
-    min_args = 0
-    options = None
-    aliases = ["ls"]
-
-    def execute(self, args):
-        try:
-            current_path = os.getcwd()
-            items = os.listdir(current_path)
-            lines = [f"\nDirectory: '{current_path}'"]
-            for item in items:
-                if os.path.isdir(os.path.join(current_path, item)):
-                    lines.append(f"[DIR] {item}/")
-                else:
-                    lines.append(f"[FILE] {item}")
-            lines.append(f"\nTotal items in directory: {len(items)}\n")
-            return (0, "\n".join(lines))
-        except Exception as e:
-            return (1, f"\nSystem Error: Unable to list directory ({e})\n")
-
-class MkDir(BaseCmd):
-    name = "mkdir"
-    description = "Create a new directory from the current working directory"
-    min_args = 1
-    options = "Directory name"
-    aliases = ["md"]
-
-    def execute(self, args):
-        use_parents = ("-p" in args) or ("--parents" in args)
-        path_tokens = [arg for arg in args if arg not in ("-p", "--parents")]
-        target = " ".join(path_tokens).strip("\"'")
-        try:
-            if use_parents:
-                os.makedirs(target, exist_ok=True)
-            else:
-                os.mkdir(target)
-            return (0, f"\nSUCCESS! Created directory '{target}'\n")
-        except FileExistsError:
-            return (1, f"\nSystem Error: Directory '{target}' already exists.\n")
-        except FileNotFoundError:
-            return (1, f"\nSystem Error: Parent directory does not exist. Use '-p' or '--parents' to create parent directories.\n")
-        except PermissionError:
-            return (1, f"\nSystem Error: Permission denied. Cannot create '{target}'\n")
-        except Exception as e:
-            return (1, f"\nSystem Error: Unable to create directory '{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 not target_path.exists():
-            return (1, f"\nSystem Error: Directory '{raw_target}' not found.\n")
-        if not target_path.is_dir():
-            return (1, f"\nCommand Error: '{raw_target}' is a file, not a directory.\n")
-        if target_path == target_path.anchor or target_path.parent == target_path:
-            return (
-                1,
-                "\nSecurity Error: Flyshell has blocked this action.\n"
-                "You cannot delete the root filesystem directory.\n",
-            )
-        flyshell_app = c.APP_DIR.resolve()
-        flyshell_package = c.PACKAGE_ROOT.resolve()
-        if target_path in (flyshell_app, flyshell_package) or flyshell_app in target_path.parents or flyshell_package in target_path.parents:
-            return (
-                1,
-                "\nSecurity Error: Flyshell has blocked this action.\n"
-                f"You cannot delete '{raw_target}' because it contains core Flyshell files or data.\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",
-            )
-        try:
-            has_contents = any(target_path.iterdir())
-            if has_contents and not force:
-                return (
-                    1,
-                    f"\nDirectory Error: Directory '{raw_target}' is not empty.\n"
-                    "Use '-f' or '--force' to remove a non-empty directory and its contents.\n",
-                )
-            if has_contents and force:
-                shutil.rmtree(target_path)
-            else:
-                os.rmdir(target_path)
-            return (0, f"\nSUCCESS! Removed directory '{raw_target}'\n")
-        except PermissionError:
-            return (1, f"\nSystem Error: Permission denied. Cannot delete '{raw_target}'\n")
-        except OSError as e:
-            return (1, f"\nSystem Error: Unable to remove directory '{raw_target}' ({e.strerror})\n")
-        except Exception as e:
-            return (1, f"\nSystem Error: Unexpected error removing '{raw_target}' ({e})\n")