flyshell 1.1.5__tar.gz → 1.1.7__tar.gz

{flyshell-1.1.5/src/flyshell.egg-info → flyshell-1.1.7}/PKG-INFO

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

{flyshell-1.1.5 → flyshell-1.1.7}/src/flyshell/abstract/base_cmd.py

@@ -1,6 +1,6 @@
 # src\flyshell\abstract\base_cmd.py
 
-from typing import List, Optional, Tuple, Union
+from typing import List, Optional, Tuple
 
 
 class BaseCmd:
@@ -10,7 +10,7 @@ class BaseCmd:
     options: Optional[str] = None
     aliases: List[str] = []
 
-    def execute(self, args: List[str]) -> Union[int, Tuple[int, str], str, None]:
+    def execute(self, args: List[str]) -> Tuple[int, str]:
         raise NotImplementedError(
             f"Command '{self.__class__.__name__}' has not implemented the execute method"
         )

{flyshell-1.1.5 → flyshell-1.1.7}/src/flyshell/abstract/parent_cmd.py

@@ -2,7 +2,7 @@
 
 from flyshell.abstract.base_cmd import BaseCmd
 
-from typing import Dict, List, Tuple, Union
+from typing import Dict, List, Tuple
 
 
 class ParentCmd(BaseCmd):

{flyshell-1.1.5 → flyshell-1.1.7}/src/flyshell/builtin/diskops.py

@@ -108,7 +108,7 @@ class Copy(BaseCmd):
                     .strip()
                     .lower()
                 )
-            except KeyboardInterrupt:
+            except (KeyboardInterrupt, EOFError):
                 return (1, "\nCopy cancelled by user.\n")
             if confirm != "y":
                 return (0, "\nOperation cancelled. No files were copied.\n")
@@ -241,7 +241,7 @@ class Move(BaseCmd):
                     .strip()
                     .lower()
                 )
-            except KeyboardInterrupt:
+            except (KeyboardInterrupt, EOFError):
                 return (1, "\nMove cancelled by user.\n")
             if confirm != "y":
                 return (0, "\nOperation cancelled. No files were moved.\n")

{flyshell-1.1.5 → flyshell-1.1.7}/src/flyshell/builtin/system.py

@@ -6,7 +6,6 @@ from flyshell.core import auth, data
 
 import getpass
 import os
-import re
 import shutil
 import subprocess
 

{flyshell-1.1.5 → flyshell-1.1.7}/src/flyshell/constants.py

@@ -5,8 +5,8 @@ import os
 import platform
 import time
 
-BUILD = 118
-VERSION = "1.1.5"
+BUILD = 120
+VERSION = "1.1.7"
 
 
 def _resolve_app_dir() -> Path:

{flyshell-1.1.5 → flyshell-1.1.7}/src/flyshell/core/auth.py

@@ -7,7 +7,6 @@ import getpass
 import hashlib
 import re
 import secrets
-import sys
 
 
 def hash_password(password, salt=None):

{flyshell-1.1.5 → flyshell-1.1.7}/src/flyshell/core/directory.py

@@ -151,13 +151,9 @@ def _execute_single(raw_cmd: str) -> int:
             elif code == -2:
                 sys.exit(1)
             return code
-        elif isinstance(result, int):
-            return result
-        elif isinstance(result, str):
-            if result:
-                print(result)
-            return 0
-        return 0
+        else:
+            print("\nCommand Error: Unknown exit code error occurred.\n")
+            return 1
     elif cmd_name in c.PLUGINS:
         log(raw_cmd)
         plugin = c.PLUGINS[cmd_name]

{flyshell-1.1.5 → flyshell-1.1.7/src/flyshell.egg-info}/PKG-INFO

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