Merge pull request #1514 from maurosoria/fix/windows-session-path

Fix PyInstaller sessions path on Windows

Author: maurosoria

README.md

@@ -180,7 +180,8 @@ Options:
                         Number of threads
     --list-sessions     List resumable sessions and exit
     --sessions-dir=PATH Directory to search for resumable sessions (default:
-                        current directory)
+                        dirsearch path /sessions, or $HOME/.dirsearch/sessions
+                        when bundled)
     --async             Enable asynchronous mode
     -r, --recursive     Brute-force recursively
     --deep-recursive    Perform recursive scan on every directory depth (e.g.

lib/core/options.py

@@ -18,13 +18,15 @@
 
 from __future__ import annotations
 
+import os
 import sys
 import time
 from optparse import Values
 from typing import Any
 from lib.core.settings import (
     AUTHENTICATION_TYPES,
     COMMON_EXTENSIONS,
+    DEFAULT_SESSION_DIR,
     DEFAULT_TOR_PROXIES,
     FILE_BASED_OUTPUT_FORMATS,
     SCRIPT_PATH,
@@ -40,12 +42,23 @@
 def parse_options() -> dict[str, Any]:
     opt = merge_config(parse_arguments())
 
+    def _session_debug(message: str) -> None:
+        if not os.environ.get("DIRSEARCH_SESSIONS_DEBUG"):
+            return
+        try:
+            sys.stderr.write(f"[sessions] {message}\n")
+            sys.stderr.flush()
+        except Exception:
+            return
+
     if opt.list_sessions:
         from lib.controller.session import SessionStore
 
-        base_dir = opt.sessions_dir or "."
+        base_dir = opt.sessions_dir or DEFAULT_SESSION_DIR
+        _session_debug(f"--list-sessions enabled base_dir={base_dir!r}")
         session_store = SessionStore({})
         sessions = session_store.list_sessions(base_dir)
+        _session_debug(f"--list-sessions completed total={len(sessions)}")
 
         if not sessions:
             print(f"No resumable sessions found in {base_dir}")
@@ -74,9 +87,11 @@ def parse_options() -> dict[str, Any]:
     if opt.session_id:
         from lib.controller.session import SessionStore
 
-        base_dir = opt.sessions_dir or "."
+        base_dir = opt.sessions_dir or DEFAULT_SESSION_DIR
+        _session_debug(f"--session-id enabled base_dir={base_dir!r}")
         session_store = SessionStore({})
         sessions = session_store.list_sessions(base_dir)
+        _session_debug(f"--session-id sessions found total={len(sessions)}")
         if not sessions:
             print(f"No resumable sessions found in {base_dir}")
             sys.exit(1)
@@ -85,12 +100,14 @@ def parse_options() -> dict[str, Any]:
         except ValueError:
             print(f"Invalid session id: {opt.session_id}")
             sys.exit(1)
+        _session_debug(f"--session-id parsed index={session_index}")
         if session_index < 1 or session_index > len(sessions):
             print(
                 f"Session id out of range: {session_index} (1-{len(sessions)})"
             )
             sys.exit(1)
         opt.session_file = sessions[session_index - 1]["path"]
+        _session_debug(f"--session-id resolved path={opt.session_file!r}")
 
     if opt.session_file:
         return vars(opt)

lib/core/settings.py

@@ -79,7 +79,19 @@
     "cache-control": "max-age=0",
 }
 
-DEFAULT_SESSION_FILE = "sessions/{date}/session_{datetime}"
+def _get_default_session_dir() -> str:
+    if getattr(sys, "frozen", False) or hasattr(sys, "_MEIPASS"):
+        home_dir = os.path.expanduser("~")
+        return FileUtils.build_path(home_dir, ".dirsearch", "sessions")
+    return FileUtils.build_path(SCRIPT_PATH, "sessions")
+
+
+DEFAULT_SESSION_DIR = _get_default_session_dir()
+DEFAULT_SESSION_FILE = FileUtils.build_path(
+    DEFAULT_SESSION_DIR,
+    "{date}",
+    "session_{datetime}",
+)
 
 REFLECTED_PATH_MARKER = "__REFLECTED_PATH__"
 

lib/parse/cmdline.py

@@ -179,7 +179,10 @@ def parse_arguments() -> Values:
         action="store",
         dest="sessions_dir",
         metavar="PATH",
-        help="Directory to search for resumable sessions (default: current directory)",
+        help=(
+            "Directory to search for resumable sessions (default: dirsearch path "
+            "/sessions, or $HOME/.dirsearch/sessions when bundled)"
+        ),
     )
     general.add_option(
         "-a",