sharkit 0.2.0.dev2__tar.gz → 0.2.1__tar.gz

{sharkit-0.2.0.dev2 → sharkit-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: sharkit
-Version: 0.2.0.dev2
+Version: 0.2.1
 Summary: OSINT / HUMINT / GEOINT research framework
 Project-URL: Homepage, https://github.com/sshsrv/sharkit
 Project-URL: Repository, https://github.com/sshsrv/sharkit

{sharkit-0.2.0.dev2 → sharkit-0.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sharkit"
-version = "0.2.0.dev2"
+version = "0.2.1"
 description = "OSINT / HUMINT / GEOINT research framework"
 readme = "README.md"
 license = "MIT"

{sharkit-0.2.0.dev2 → sharkit-0.2.1}/src/sharkit/app.py

@@ -20,7 +20,7 @@ NON_LINUX_MESSAGE = (
     "it was built for open water,\n"
     "where it can actually swim.\n"
     "\n"
-    "windows/mac is more of a glass aquarium.\n"
+    "windows is more of a glass aquarium.\n"
     "tidy, bright, and a little too enclosed.\n"
     "\n"
     "the shark doesn't dislike the aquarium.\n"
@@ -37,7 +37,7 @@ def main() -> int:
     sys.stdout.flush()
     renderer = Renderer()
 
-    if sys.platform != "linux":
+    if sys.platform == "win32":
         renderer.banner(tool_count=0, message=NON_LINUX_MESSAGE)
         return 1
 

{sharkit-0.2.0.dev2 → sharkit-0.2.1}/src/sharkit/commands/builtins.py

@@ -193,10 +193,16 @@ class UseCommand(Command):
                     self._log(context, f'Tool "{name}" is not installed. Run: install {name}')
                     return None
                 renderer = context.session.get("renderer")
+                first_progress = [True]
 
                 def on_progress(msg: str) -> None:
                     if renderer is not None:
-                        renderer.log_line(f"install {display}", msg, color=GREEN)
+                        tag = f"install {display}"
+                        if first_progress[0]:
+                            renderer.gutter(tag, msg, GREEN, is_first=True)
+                            first_progress[0] = False
+                        else:
+                            renderer.gutter(tag, msg, GREEN, is_first=False)
 
                 ok, message = tool_manager.install(name, spec, on_progress=on_progress)
                 if not ok:
@@ -382,7 +388,13 @@ class SetCommand(Command):
             tool_instance.set_option(key, value)
             renderer = context.session.get("renderer")
             if renderer is not None:
-                renderer.log_line(f"set ({context.current_tool})", f"{key} = {value}")
+                tool_registry = context.session.get("tool_registry")
+                display = context.current_tool
+                if tool_registry is not None and context.current_tool is not None:
+                    display = tool_registry.format_display(
+                        tool_registry.get_tool_path(context.current_tool),
+                    )
+                renderer.log_line(f"set {display}", f"{key} = {value}")
                 return None
             return f"Set {key} = {value}"
         except Exception as e:
@@ -627,24 +639,44 @@ class InstallCommand(Command):
         tool_cls = tool_registry.get_tool(name)
         if tool_cls is None or tool_cls.metadata.install is None:
             return f'Tool "{name}" is not an external tool or was not found.'
-        display = tool_registry.format_display(tool_registry.get_tool_path(name))
-        if tool_manager.is_installed(name):
+        tool_name = tool_cls.metadata.name
+        display = tool_registry.format_display(tool_registry.get_tool_path(tool_name))
+        if tool_manager.is_installed(tool_name):
             renderer = context.session.get("renderer")
             if renderer is not None:
                 renderer.log_line(f"install {display}", "already installed", color=GREEN)
             return None
         renderer = context.session.get("renderer")
+        first_progress = [True]
 
         def on_progress(msg: str) -> None:
             if renderer is not None:
-                renderer.log_line(f"install {display}", msg, color=GREEN)
+                tag = f"install {display}"
+                if first_progress[0]:
+                    renderer.gutter(tag, msg, GREEN, is_first=True)
+                    first_progress[0] = False
+                else:
+                    renderer.gutter(tag, msg, GREEN, is_first=False)
 
-        ok, message = tool_manager.install(name, tool_cls.metadata.install, on_progress=on_progress)
+        install_spec = tool_cls.metadata.install
+        ok, message = tool_manager.install(
+            tool_name, install_spec, on_progress=on_progress
+        )
         if renderer is not None:
+            tag = f"install {display}"
             if ok:
-                renderer.log_line(f"install {display}", "installed", color=GREEN)
+                msg = "installed"
+            elif message == "Aborted":
+                msg = "aborted"
+                print("\r\033[K", end="")
             else:
-                renderer.log_line(f"install {display}", f"failed: {message}", color=GREEN)
+                msg = f"failed: {message}"
+            if first_progress[0]:
+                renderer.log_line(tag, msg, color=GREEN)
+            else:
+                lines = msg.splitlines() or [""]
+                for line in lines:
+                    renderer.gutter(tag, line, GREEN, is_first=False)
             return None
         return str(message)
 
@@ -671,24 +703,44 @@ class UpgradeCommand(Command):
         tool_cls = tool_registry.get_tool(name)
         if tool_cls is None or tool_cls.metadata.install is None:
             return f'Tool "{name}" is not an external tool or was not found.'
-        display = tool_registry.format_display(tool_registry.get_tool_path(name))
-        if not tool_manager.is_installed(name):
+        tool_name = tool_cls.metadata.name
+        display = tool_registry.format_display(tool_registry.get_tool_path(tool_name))
+        if not tool_manager.is_installed(tool_name):
             renderer = context.session.get("renderer")
             if renderer is not None:
                 renderer.log_line(f"upgrade {display}", "not installed (skipped)", color=BLUE)
             return None
         renderer = context.session.get("renderer")
+        first_progress = [True]
 
         def on_progress(msg: str) -> None:
             if renderer is not None:
-                renderer.log_line(f"upgrade {display}", msg, color=BLUE)
+                tag = f"upgrade {display}"
+                if first_progress[0]:
+                    renderer.gutter(tag, msg, BLUE, is_first=True)
+                    first_progress[0] = False
+                else:
+                    renderer.gutter(tag, msg, BLUE, is_first=False)
 
-        ok, message = tool_manager.update(name, tool_cls.metadata.install, on_progress=on_progress)
+        upgrade_spec = tool_cls.metadata.install
+        ok, message = tool_manager.update(
+            tool_name, upgrade_spec, on_progress=on_progress
+        )
         if renderer is not None:
+            tag = f"upgrade {display}"
             if ok:
-                renderer.log_line(f"upgrade {display}", "upgraded", color=BLUE)
+                msg = "upgraded"
+            elif message == "Aborted":
+                msg = "aborted"
+                print("\r\033[K", end="")
             else:
-                renderer.log_line(f"upgrade {display}", f"failed: {message}", color=BLUE)
+                msg = f"failed: {message}"
+            if first_progress[0]:
+                renderer.log_line(tag, msg, color=BLUE)
+            else:
+                lines = msg.splitlines() or [""]
+                for line in lines:
+                    renderer.gutter(tag, line, BLUE, is_first=False)
             return None
         return str(message)
 
@@ -721,17 +773,37 @@ class UpgradeCommand(Command):
                     renderer.log_line(f"upgrade {display}", "not installed (skipped)", color=BLUE)
                 continue
             renderer = context.session.get("renderer")
-
-            def on_progress(msg: str, display: str = display, renderer: Any = renderer) -> None:
-                if renderer is not None:
-                    renderer.log_line(f"upgrade {display}", msg, color=BLUE)
+            first_progress = [True]
+
+            def on_progress(
+                msg: str,
+                _first: list[bool] = first_progress,
+                _tag: str = f"upgrade {display}",
+                _renderer: Any = renderer,
+            ) -> None:
+                if _renderer is not None:
+                    if _first[0]:
+                        _renderer.gutter(_tag, msg, BLUE, is_first=True)
+                        _first[0] = False
+                    else:
+                        _renderer.gutter(_tag, msg, BLUE, is_first=False)
 
             ok, message = tool_manager.update(name, spec, on_progress=on_progress)
             if renderer is not None:
+                tag = f"upgrade {display}"
                 if ok:
-                    renderer.log_line(f"upgrade {display}", "upgraded", color=BLUE)
+                    msg = "upgraded"
+                elif message == "Aborted":
+                    msg = "aborted"
+                    print("\r\033[K", end="")
+                else:
+                    msg = f"failed: {message}"
+                if first_progress[0]:
+                    renderer.log_line(tag, msg, color=BLUE)
                 else:
-                    renderer.log_line(f"upgrade {display}", f"failed: {message}", color=BLUE)
+                    lines = msg.splitlines() or [""]
+                    for line in lines:
+                        renderer.gutter(tag, line, BLUE, is_first=False)
         return None
 
 
@@ -753,9 +825,10 @@ class RemoveCommand(Command):
         tool_cls = tool_registry.get_tool(name)
         if tool_cls is None or tool_cls.metadata.install is None:
             return f'Tool "{name}" is not an external tool or was not found.'
-        display = tool_registry.format_display(tool_registry.get_tool_path(name))
+        tool_name = tool_cls.metadata.name
+        display = tool_registry.format_display(tool_registry.get_tool_path(tool_name))
         renderer = context.session.get("renderer")
-        ok, message = tool_manager.uninstall(name)
+        ok, message = tool_manager.uninstall(tool_name)
         if renderer is not None:
             if ok:
                 renderer.log_line(f"remove {display}", "removed", color=RED)

{sharkit-0.2.0.dev2 → sharkit-0.2.1}/src/sharkit/output/renderer.py

@@ -253,7 +253,10 @@ class Renderer:
         print(text, end="")
 
     def log_line(self, tag: str, message: str, color: str = PINK) -> None:
-        print(f"{color}{BOLD}{tag} - {RESET}{message}")
+        lines = message.splitlines() or [""]
+        self.gutter(tag, lines[0], color, is_first=True)
+        for line in lines[1:]:
+            print(f"{color}{BOLD}│{RESET} {line}")
 
     def gutter(self, name: str, line: str, color: str, is_first: bool) -> None:
         if is_first:

{sharkit-0.2.0.dev2 → sharkit-0.2.1}/src/sharkit/tools/manager.py

@@ -54,7 +54,11 @@ class ToolManager:
                     self._run([pip, "install", *spec.pip_args])
             dest.joinpath(".installed").write_text(name)
             return True, f'Tool "{name}" installed.'
+        except KeyboardInterrupt:
+            shutil.rmtree(dest, ignore_errors=True)
+            return False, "Aborted"
         except Exception as e:
+            shutil.rmtree(dest, ignore_errors=True)
             return False, f'Failed to install "{name}": {e}'
 
     def update(
@@ -82,6 +86,8 @@ class ToolManager:
                         on_progress("upgrading packages...")
                     self._run([pip, "install", "--upgrade", *spec.pip_args])
             return True, f'Tool "{name}" updated.'
+        except KeyboardInterrupt:
+            return False, "Aborted"
         except Exception as e:
             return False, f'Failed to update "{name}": {e}'
 
@@ -96,4 +102,12 @@ class ToolManager:
             return False, f'Failed to uninstall "{name}": {e}'
 
     def _run(self, cmd: list[str]) -> None:
-        subprocess.run(cmd, check=True, capture_output=True)
+        result = subprocess.run(cmd, capture_output=True, text=True)
+        if result.returncode != 0:
+            stderr = result.stderr.strip() if result.stderr else ""
+            stdout = result.stdout.strip() if result.stdout else ""
+            raw = stderr or stdout or "No output"
+            # Truncate long build output — keep last 20 lines where the actual error lives
+            lines = raw.splitlines()
+            detail = "\n".join(lines[-20:]) if len(lines) > 20 else raw
+            raise RuntimeError(detail)

{sharkit-0.2.0.dev2 → sharkit-0.2.1}/src/sharkit/tools/osint/recon/hybrid/blackbird.py

@@ -107,7 +107,7 @@ class BlackbirdTool(Tool):
                 success=False,
                 error="Both 'type' and 'query' options are required.",
             )
-        args = [f"--{stype}", query, "--no-update"]
+        args = [f"--{stype}", query]
         if parse_bool(context.options.get("pdf")):
             args.append("--pdf")
         renderer = context.renderer
@@ -191,6 +191,8 @@ class BlackbirdTool(Tool):
                 proc.kill()
             current = ""
             if renderer is not None:
+                # \r\033[K clears the ^C echo from the terminal before printing.
+                print("\r\033[K", end="")
                 renderer.gutter(name, "Run aborted (Ctrl+C).", tool_color, first)
             else:
                 print("Run aborted (Ctrl+C).")

{sharkit-0.2.0.dev2 → sharkit-0.2.1}/src/sharkit/tools/osint/recon/username/maigret.py

@@ -233,6 +233,7 @@ class MaigretTool(Tool):
                 proc.kill()
             current = ""
             if renderer is not None:
+                print("\r\033[K", end="")
                 renderer.gutter(name, "Run aborted (Ctrl+C).", tool_color, first)
             else:
                 print("Run aborted (Ctrl+C).")

{sharkit-0.2.0.dev2 → sharkit-0.2.1}/src/sharkit/tools/osint/recon/username/sherlock.py

@@ -233,6 +233,7 @@ class SherlockTool(Tool):
                 proc.kill()
             current = ""
             if renderer is not None:
+                print("\r\033[K", end="")
                 renderer.gutter(name, "Run aborted (Ctrl+C).", tool_color, first)
             else:
                 print("Run aborted (Ctrl+C).")