fix: refactor out __name__ override, mypy lower version

fsociety/__main__.py

@@ -120,7 +120,11 @@ def agreement():
     items[module_name(item)] = item
     for tool in item.__tools__:
         subcommands.append(
-            {"parent": item.__name__, "tool": tool, "name": tool.__str__()}
+            {
+                "parent": item.__name__.split(".")[-1],
+                "tool": tool,
+                "name": tool.__str__(),
+            }
         )
 commands = list(items.keys()) + list(BUILTIN_FUNCTIONS.keys())
 
@@ -140,24 +144,6 @@ def doexcept(error: Exception, style: Optional[Union[str, Style]] = "red") -> No
         errorhandle(e, style=style)
 
 
-"""
-# we know it's not a command, let's see if it's a subcommand
-try:
-    subcmd = next((subcommand for subcommand in subcommands if subcommand["name"] == selected_command))
-    if subcmd:
-        # execute parent cli, pass subcmd.name -> cli
-        return subcmd["tool"].run()
-    # looks like we didn't find a subcommand, either
-    return errorhandle(Exception("Invalid Command"), style="bold yellow")
-except Exception as error:
-    return errorhandle(error)
-"""
-
-"""old
-return errorhandle(Exception("Invalid Command"), style="bold yellow")
-"""
-
-
 def mainloop():
     agreement()
     console.print(choice(BANNERS), style="red", highlight=False)

fsociety/core/errors.py

@@ -9,11 +9,15 @@
 config = get_config()
 
 
+def input_wait():
+    input("\nPress [ENTER] to continue... ")
+
+
 def errorhandle(error: Exception, style: Optional[Union[str, Style]] = "red") -> None:
     console.print(str(error), style=style)
     if config.getboolean("fsociety", "development"):
         console.print_exception()
-    input("Press [Enter/Return] to return to menu... ")
+    input_wait()
     return
 
 

fsociety/core/menu.py

@@ -74,10 +74,6 @@ def prompt(path="", base_path="~"):
     return f"\nfsociety {encoded_path}# "
 
 
-def input_wait():
-    input("\nPress [ENTER] to continue... ")
-
-
 def run_tool(tool, selected_tool: str):
     if hasattr(tool, "install") and not tool.installed():
         tool.install()
@@ -116,7 +112,7 @@ def tools_cli(name, tools, links=True):
     console.print(table)
     console.print("back", style="command")
     set_readline(list(tools_dict.keys()) + BACK_COMMANDS)
-    selected_tool = input(prompt(name.split(".")[-1])).strip()
+    selected_tool = input(prompt(name.split(".")[-2])).strip()
     if selected_tool not in tools_dict:
         if selected_tool in BACK_COMMANDS:
             return
@@ -125,9 +121,7 @@ def tools_cli(name, tools, links=True):
         console.print("Invalid Command", style="bold yellow")
         return tools_cli(name, tools, links)
     tool = tools_dict.get(selected_tool)
-    run_tool(tool, selected_tool)
-
-    return input_wait()
+    return run_tool(tool, selected_tool)
 
 
 def confirm(message="Do you want to?"):

fsociety/core/repo.py

@@ -141,7 +141,7 @@ def uninstall(self) -> None:
             target_os = config.get("fsociety", "os")
             command = "exit 1"
             if isinstance(install, dict):
-                if target_os == "macos" and "brew" in install and which("brew"):
+                if "brew" in install and which("brew"):
                     brew_opts = install.get("brew")
                     command = f"brew uninstall {brew_opts}"
                 elif target_os == "windows" and "winget" in install and which("winget"):

fsociety/core/utilities.py

@@ -105,4 +105,3 @@ def cli():
     tools_cli(__name__, __tools__, links=False)
 
 
-__name__ = "utilities"

fsociety/information_gathering/cli.py

@@ -16,4 +16,3 @@ def cli():
     tools_cli(__name__, __tools__)
 
 
-__name__ = "information_gathering"

fsociety/networking/cli.py

@@ -11,4 +11,3 @@ def cli():
     tools_cli(__name__, __tools__)
 
 
-__name__ = "networking"

fsociety/obfuscation/cli.py

@@ -10,4 +10,3 @@ def cli():
     tools_cli(__name__, __tools__)
 
 
-__name__ = "obfuscation"

fsociety/passwords/cli.py

@@ -14,4 +14,3 @@ def cli():
     tools_cli(__name__, __tools__)
 
 
-__name__ = "passwords"

fsociety/web_apps/cli.py

@@ -11,4 +11,3 @@ def cli():
     tools_cli(__name__, __tools__)
 
 
-__name__ = "web_apps"

mypy.ini

@@ -1,5 +1,5 @@
 [mypy]
-python_version = 3.13
+python_version = 3.8
 files = fsociety
 
 [mypy-git.*]