idapro 0.0.4.dev1__tar.gz → 0.0.6.dev1__tar.gz

{idapro-0.0.4.dev1 → idapro-0.0.6.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: idapro
-Version: 0.0.4.dev1
+Version: 0.0.6.dev1
 Summary: IDA Library Python module
 Author: Hex-Rays SA
 Author-email: support@hex-rays.com

{idapro-0.0.4.dev1 → idapro-0.0.6.dev1}/idapro/__init__.py

@@ -2,13 +2,14 @@ from __future__ import annotations
 import sys
 import platform
 from pathlib import Path
+from typing import Optional
 import ctypes
 import os
 from .config import get_ida_install_dir
 
 def find_file(name, path):
     """Internal method used for recursively find a file in a folder"""
-    for root, dirs, files in os.walk(path):
+    for root, _, files in os.walk(path):
         if name in files:
             return os.path.join(root, name)
     return None
@@ -27,30 +28,9 @@ else:
 
 # Get the ida-install-dir setting
 root_dir = get_ida_install_dir()
-
-if platform_str == "Windows":
-    # IDA kernel and modules may need dependencies in its root dir (e.g. clp64.dll)
-    # tell Windows loader where they can be found
-    # NB: for AddDllDirectory() be effective for indirectly loaded DLLs,
-    # SetDefaultDllDirectories(LOAD_LIBRARY_SEARCH_USER_DIRS) has to be called first
-    kernel32 = ctypes.WinDLL('kernel32', use_last_error=True)
-    SetDefaultDllDirectories = getattr(kernel32, "SetDefaultDllDirectories")
-    if SetDefaultDllDirectories:
-        from  ctypes.wintypes import DWORD, BOOL
-        SetDefaultDllDirectories.argtypes = [DWORD]
-        SetDefaultDllDirectories.restype = BOOL
-        LOAD_LIBRARY_SEARCH_DEFAULT_DIRS = 0x00001000
-        LOAD_LIBRARY_SEARCH_USER_DIRS = 0x00000400
-        flags = LOAD_LIBRARY_SEARCH_DEFAULT_DIRS | LOAD_LIBRARY_SEARCH_USER_DIRS
-        if SetDefaultDllDirectories(flags):
-            # finally, add IDA's directory for dependencies
-            os.add_dll_directory(root_dir)
-    else:
-        os.environ['PATH'] = root_dir + os.pathsep + os.environ.get('PATH', '')
-
-idalib_path = find_file(name=name, path=root_dir)
+idalib_path = find_file(name=name, path=root_dir) if root_dir else None
 if idalib_path is None:
-    raise ImportError(f"Could not find {name} in {root_dir}. Please make sure you are using IDA version 9.0 or newer and the IDADIR environment variable is set and points to the active IDA installation.")
+    raise ImportError(f"Cannot load IDA library file {name}. Please make sure you are using IDA version 9.0 or newer and the IDADIR environment variable is set and points to the active IDA installation.")
 
 if "IDA_IS_INTERACTIVE" in os.environ:
     if os.environ["IDA_IS_INTERACTIVE"] == "1":
@@ -58,6 +38,26 @@ if "IDA_IS_INTERACTIVE" in os.environ:
 
 # load the library and initialize the kernel
 try:
+    if platform_str == "Windows":
+        # IDA kernel and modules may need dependencies in its root dir (e.g. clp64.dll)
+        # tell Windows loader where they can be found
+        # NB: for AddDllDirectory() be effective for indirectly loaded DLLs,
+        # SetDefaultDllDirectories(LOAD_LIBRARY_SEARCH_USER_DIRS) has to be called first
+        kernel32 = ctypes.WinDLL('kernel32', use_last_error=True)
+        SetDefaultDllDirectories = getattr(kernel32, "SetDefaultDllDirectories")
+        if SetDefaultDllDirectories:
+            from  ctypes.wintypes import DWORD, BOOL
+            SetDefaultDllDirectories.argtypes = [DWORD]
+            SetDefaultDllDirectories.restype = BOOL
+            LOAD_LIBRARY_SEARCH_DEFAULT_DIRS = 0x00001000
+            LOAD_LIBRARY_SEARCH_USER_DIRS = 0x00000400
+            flags = LOAD_LIBRARY_SEARCH_DEFAULT_DIRS | LOAD_LIBRARY_SEARCH_USER_DIRS
+            if SetDefaultDllDirectories(flags):
+                # finally, add IDA's directory for dependencies
+                os.add_dll_directory(root_dir)
+        else:
+            os.environ['PATH'] = root_dir + os.pathsep + os.environ.get('PATH', '')
+
     libida = ctypes.cdll.LoadLibrary(idalib_path)
 except Exception as e:
     raise ImportError(f"Failed loading IDA library file {idalib_path}, exception {e}\n")
@@ -76,12 +76,15 @@ if error_description != None:
 sys.path.append(str(Path(idalib_path).parent / "python/lib-dynload"))
 sys.path.append(str(Path(idalib_path).parent / "python"))
 
-def open_database(file_name:str, run_auto_analysis: bool, args: str = None)->int:
+def open_database(file_name:str, run_auto_analysis: bool, args: Optional[str] = None, enable_history: bool = False)->int:
     """Opens the database specified by the file_name argument.
     If run_auto_analysis is set to True, the auto-analysis will start and wait for its completion.
+    If enable_history is set to True, update the file history list; the default within idalib is not to update it.
     Optionally, additional arguments can be provided via args parameter, which follow the same format as IDA's command-line arguments.
     NOTE: All library functions must be called from the same thread that initialized the library.
     The library is single-threaded, and performing database operations from a different thread may result in undefined behavior."""
+    if enable_history:
+        args = (args or "") + " -Oidalib:enable_history"
     return libida.open_database(file_name.encode(), run_auto_analysis, args.encode() if args is not None else None)
 
 def close_database(save = True)->None:

{idapro-0.0.4.dev1 → idapro-0.0.6.dev1}/idapro/config.py

@@ -7,12 +7,16 @@ def get_user_config_path():
     """Get the path to the user's config file based on platform following IDA's user directories."""
     system = platform.system()
 
-    if system == "Windows":
-        # On Windows, use the %APPDATA%\Hex-Rays\IDA Pro directory
-        config_dir = Path(os.getenv('APPDATA')) / "Hex-Rays" / "IDA Pro"
+    idausr_env = os.getenv("IDAUSR")
+    if idausr_env:
+        config_dir = Path(idausr_env)
     else:
-        # On macOS and Linux, use ~/.idapro
-        config_dir = Path.home() / ".idapro"
+        if system == "Windows":
+            # On Windows, use the %APPDATA%\Hex-Rays\IDA Pro directory
+            config_dir = Path(os.getenv('APPDATA')) / "Hex-Rays" / "IDA Pro"
+        else:
+            # On macOS and Linux, use ~/.idapro
+            config_dir = Path.home() / ".idapro"
 
     # Return the full path to the config file (now in JSON format)
     user_config_path = config_dir / "ida-config.json"
@@ -71,12 +75,11 @@ def set_ida_install_dir(new_path):
 def get_ida_install_dir():
     """Retrieve the IDA installation directory."""
 
+    # $IDADIR overrides JSON config
+    idadir = os.environ.get('IDADIR')
+    if idadir:
+        return idadir
+
     # Read the configuration JSON file
     config = load_config()
-    install_dir = config['Paths'].get('ida-install-dir', None)
-
-    # Fallback to IDADIR env var if the JSON value is not set
-    if install_dir is None or len(install_dir) == 0:
-        install_dir = os.environ.get('IDADIR', '')
-
-    return install_dir
+    return config['Paths'].get('ida-install-dir', None)

{idapro-0.0.4.dev1 → idapro-0.0.6.dev1}/idapro.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: idapro
-Version: 0.0.4.dev1
+Version: 0.0.6.dev1
 Summary: IDA Library Python module
 Author: Hex-Rays SA
 Author-email: support@hex-rays.com

{idapro-0.0.4.dev1 → idapro-0.0.6.dev1}/setup.py

@@ -74,7 +74,7 @@ example_code = "#!/usr/bin/env python3\n\"\"\"\nIDA Pro Python Library Usage Exa
 
 setup(
     name="idapro",
-    version="0.0.4.dev1",
+    version="0.0.6.dev1",
     author="Hex-Rays SA",
     author_email="support@hex-rays.com",
     description="IDA Library Python module",