sharkit 1.0.0.dev1__tar.gz → 1.0.0.dev2__tar.gz

{sharkit-1.0.0.dev1 → sharkit-1.0.0.dev2}/PKG-INFO

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

{sharkit-1.0.0.dev1 → sharkit-1.0.0.dev2}/pyproject.toml

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

{sharkit-1.0.0.dev1 → sharkit-1.0.0.dev2}/src/sharkit/commands/builtins.py

@@ -286,7 +286,7 @@ class ShowCommand(Command):
     name = "show"
     aliases = []
     description = "Show tools or tool options"
-    usage = "show <all|osint|humint|options> [tool]"
+    usage = "show <all|osint|humint|geoint|options> [tool]"
 
     def execute(self, context: CommandContext, args: list[str]) -> str | None:
         if not args:
@@ -297,7 +297,7 @@ class ShowCommand(Command):
             return self._show_options(context, args[1] if len(args) > 1 else None)
         if args[0] == "all":
             return self._show_tools(context, None)
-        if args[0] in ("osint", "humint"):
+        if args[0] in ("osint", "humint", "geoint"):
             return self._show_tools(context, args[0])
         return f"Unknown show subcommand: {args[0]}\nUsage: {self.usage}"
 
@@ -307,35 +307,47 @@ class ShowCommand(Command):
         renderer = context.session.get("renderer")
         if tool_registry is None or renderer is None:
             return "Tool registry not available."
+
         all_tools = tool_registry.get_all_tools()
         if not all_tools:
             return "No tools available."
 
-        categories: dict[str, list[tuple[str, type]]] = {}
-        for tool_path, tool_cls in all_tools.items():
-            meta = tool_cls.metadata
-            cat = meta.category.split(".")[0] if meta.category else "other"
-            if category and cat != category:
-                continue
-            categories.setdefault(cat, []).append((tool_path, tool_cls))
+        def matches_category(tool_path: str, tool_cls: type) -> bool:
+            if category is None:
+                return True
+
+            normalized_category = category.lower()
+            tool_category = (tool_cls.metadata.category or "").lower()
+            first_segment = tool_category.split(".")[0]
+            return (
+                normalized_category == tool_category
+                or normalized_category == first_segment
+                or normalized_category in tool_category
+                or tool_path.lower().startswith(f"{normalized_category}/")
+            )
+
+        filtered = [
+            (tool_path, tool_cls)
+            for tool_path, tool_cls in all_tools.items()
+            if matches_category(tool_path, tool_cls)
+        ]
 
-        if not categories:
+        if not filtered:
             return f'No tools found for category "{category}".'
 
         title = f"show > {category or 'all'}"
-        for cat_name in sorted(categories):
-            tools = sorted(categories[cat_name], key=lambda x: x[0])
-            rows = []
-            for tool_path, tool_cls in tools:
-                meta = tool_cls.metadata
-                if meta.install is None or (
-                    tool_manager is not None and tool_manager.is_installed(meta.name)
-                ):
-                    installed = f"{BOLD}{PINK}Yes{RESET}"
-                else:
-                    installed = ""
-                rows.append([tool_path, installed, meta.description])
-            renderer.table(f"{title} > {cat_name}", ["Tool", "Installed", "Description"], rows)
+        rows = []
+        for tool_path, tool_cls in sorted(filtered, key=lambda item: item[0]):
+            meta = tool_cls.metadata
+            if meta.install is None or (
+                tool_manager is not None and tool_manager.is_installed(meta.name)
+            ):
+                installed = f"{BOLD}{PINK}Yes{RESET}"
+            else:
+                installed = ""
+            rows.append([tool_path, installed, meta.description])
+
+        renderer.table(title, ["Tool", "Installed", "Description"], rows)
         return None
 
     def _show_options(self, context: CommandContext, tool_arg: str | None) -> str | None:

{sharkit-1.0.0.dev1 → sharkit-1.0.0.dev2}/src/sharkit/console/completion.py

@@ -42,7 +42,10 @@ class CompletionEngine:
 
         if text_lower.startswith("show "):
             prefix = text_lower[5:]
-            return sorted(s for s in ("all", "osint", "humint", "options") if s.startswith(prefix))
+            return sorted(
+                s for s in ("all", "osint", "humint", "geoint", "options")
+                if s.startswith(prefix)
+            )
 
         if text_lower.startswith("set ") or text_lower.startswith("unset "):
             if current_tool is None:

sharkit-1.0.0.dev2/src/sharkit/tools/flatten_tools.sh

@@ -0,0 +1,107 @@
+#!/usr/bin/env bash
+# flatten_tools.sh
+# Sube cada herramienta un nivel: cat/subcat/esp/tool/tool.py -> cat/subcat/esp/tool.py
+# Borra las carpetas propias vacías resultantes.
+#
+# Uso:
+#   ./flatten_tools.sh           # dry-run
+#   ./flatten_tools.sh --apply # ejecuta de verdad
+#   ./flatten_tools.sh --force  # sobrescribe destinos existentes
+
+set -euo pipefail
+
+ROOT="$(pwd)"
+APPLY=false
+FORCE=false
+
+for arg in "$@"; do
+  case "$arg" in
+    --apply) APPLY=true ;;
+    --force) FORCE=true ;;
+    -h|--help)
+      sed -n '2,9p' "$0"; exit 0 ;;
+    *) echo "Argumento desconocido: $arg" >&2; exit 2 ;;
+  esac
+done
+
+log()  { printf '\033[1;34m[info]\033[0m %s\n' "$*"; }
+warn() { printf '\033[1;33m[warn]\033[0m %s\n' "$*" >&2; }
+err()  { printf '\033[1;31m[err ]\033[0m %s\n' "$*" >&2; }
+
+if [[ ! -d "$ROOT" ]]; then
+  err "El directorio actual no existe"; exit 1
+fi
+
+# Detectar automáticamente todos los cat/subcat/esp/tool/tool.py
+# (estructura de 4 segmentos + archivo con mismo nombre que la carpeta)
+moves_count=0
+declare -a MOVES=()
+
+while IFS= read -r -d '' py; do
+  # py = .../cat/subcat/esp/tool/tool.py
+  dir="$(dirname "$py")"
+  tool_name="$(basename "$dir")"
+  parent="$(dirname "$dir")"
+  dst="${parent}/${tool_name}.py"
+
+  # Ignora si por algún motivo no coincide el nombre
+  if [[ "$(basename "$py" .py)" != "$tool_name" ]]; then
+    warn "nombre inconsistente, salto: $py"; continue
+  fi
+
+  # Seguridad: no subir si ya hay un archivo en el destino (a menos que --force)
+  if [[ -e "$dst" && "$FORCE" != true ]]; then
+    err "destino ya existe, salto: $dst (usa --force)"
+    continue
+  fi
+
+  MOVES+=("$py|$dst")
+  moves_count=$((moves_count + 1))
+done < <(find "$ROOT" -mindepth 5 -maxdepth 5 -name "*.py" -not -name "__init__.py" -print0)
+
+log "Detectadas $moves_count herramientas a aplanar."
+log "MODO = $([[ "$APPLY" == true ]] && echo 'APPLY' || echo 'DRY-RUN')"
+log "FORCE = $FORCE"
+
+for entry in "${MOVES[@]}"; do
+  src="${entry%|*}"
+  dst="${entry#*|}"
+
+  if [[ "$APPLY" == true ]]; then
+    mv "$src" "$dst"
+    log "movido: $src -> $dst"
+  else
+    printf 'DRY-RUN mv %s -> %s\n' "$src" "$dst"
+  fi
+done
+
+# Borrar carpetas propias (cat/subcat/esp/tool/) que hayan quedado vacías
+# Recorremos las mismas que acabamos de mover
+log "Borrando carpetas propias vacías…"
+
+clean_dirs=()
+for entry in "${MOVES[@]}"; do
+  src="${entry%|*}"
+  d="$(dirname "$src")"
+  clean_dirs+=("$d")
+done
+
+# Borrar __pycache__ que pueda haber dentroif [[ "$APPLY" == true ]]; then
+  find "$ROOT" -type d -name __pycache__ -prune -exec rm -rf {} +
+else
+  find "$ROOT" -type d -name __pycache__ -printf 'DRY-RUN rm -rf %p\n'
+fi
+
+for d in "${clean_dirs[@]}"; do
+  [[ -d "$d" ]] || continue
+  if [[ -n "$(ls -A "$d" 2>/dev/null)" ]]; then
+    warn "no vacía, no borro: $d"; continue
+  fi
+  if [[ "$APPLY" == true ]]; then
+    rmdir "$d" && log "borrada: $d"
+  else
+    printf 'DRY-RUN rmdir %s\n' "$d"
+  fi
+done
+
+log "Listo."