hilda 2.0.8__tar.gz → 2.0.10__tar.gz

{hilda-2.0.8 → hilda-2.0.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hilda
-Version: 2.0.8
+Version: 2.0.10
 Summary: LLDB wrapped and empowered by iPython's features
 Author-email: doronz88 <doron88@gmail.com>, matan <matan1008@gmail.com>, netanel cohen <netanelc305@protonmail.com>
 Maintainer-email: doronz88 <doron88@gmail.com>, matan <matan1008@gmail.com>, netanel cohen <netanelc305@protonmail.com>

{hilda-2.0.8 → hilda-2.0.10}/hilda/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.0.8'
-__version_tuple__ = version_tuple = (2, 0, 8)
+__version__ = version = '2.0.10'
+__version_tuple__ = version_tuple = (2, 0, 10)

{hilda-2.0.8 → hilda-2.0.10}/hilda/cli.py

@@ -53,7 +53,7 @@ def attach(name: Optional[str], pid: Optional[int], startup_files: List[str]) ->
     if name is not None:
         hilda_client = create_hilda_client_using_attach_by_name(name)
     elif pid is not None:
-        hilda_client = create_hilda_client_using_attach_by_pid(name)
+        hilda_client = create_hilda_client_using_attach_by_pid(pid)
     else:
         raise click.UsageError('You must specify a process name or pid')
     hilda_client.interact(startup_files=startup_files)

{hilda-2.0.8 → hilda-2.0.10}/hilda/hilda_client.py

@@ -58,7 +58,8 @@ GREETING = f"""
 <b>Hilda has been successfully loaded! 😎
 Usage:
  <span style="color: magenta">p</span>   Global to access all features.
- <span style="color: magenta">F1</span>  UI Show.
+ <span style="color: magenta">F1</span>  Show UI.
+ <span style="color: magenta">F2</span>  Toggle enabling of stdout & stderr.
  <span style="color: magenta">F7</span>  Step Into.
  <span style="color: magenta">F8</span>  Step Over.
  <span style="color: magenta">F9</span>  Continue.
@@ -92,6 +93,8 @@ class Configs:
         'doc': 'Whether to exclude NSObject during evaluation - reduce ipython autocomplete results.'})
     objc_verbose_monitor: bool = field(default=False, metadata={
         'doc': 'When set to True, using monitor() will automatically print objc methods arguments.'})
+    enable_stdout_stderr: bool = field(default=True, metadata={
+        'doc': 'When set to True, will enable process stdout and stderr.'})
 
     def __repr__(self):
         return self.__str__()
@@ -1089,6 +1092,10 @@ class HildaClient:
         sys.argv = ['a']
         IPython.start_ipython(config=ipython_config, user_ns=namespace)
 
+    def toggle_enable_stdout_stderr(self, *args) -> None:
+        self.configs.enable_stdout_stderr = not self.configs.enable_stdout_stderr
+        self.logger.info(f'Changed stdout and stderr status to: {self.configs.enable_stdout_stderr}')
+
     def __enter__(self) -> 'HildaClient':
         return self
 

{hilda-2.0.8 → hilda-2.0.10}/hilda/ipython_extensions/keybindings.py

@@ -7,6 +7,7 @@ def load_ipython_extension(ipython):
     def register_keybindings():
         hilda = ipython.user_ns['p']
         keys_mapping = {Keys.F1: hilda.ui_manager.show,
+                        Keys.F2: hilda.toggle_enable_stdout_stderr,
                         Keys.F7: hilda.step_into,
                         Keys.F8: hilda.step_over,
                         Keys.F9: lambda _: (hilda.log_info('Sending continue'), hilda.cont()),

{hilda-2.0.8 → hilda-2.0.10}/hilda/launch_lldb.py

@@ -1,5 +1,6 @@
 import logging
 import os
+import sys
 from abc import ABC, abstractmethod
 from threading import Thread
 from typing import List, Optional
@@ -46,6 +47,20 @@ class LLDBListenerThread(Thread, ABC):
             return
         raise LLDBError(self.error.description)
 
+    def _process_stdout(self) -> None:
+        stdout = self.process.GetSTDOUT(1024)
+        while stdout:
+            if lldb.hilda_client is not None and lldb.hilda_client.configs.enable_stdout_stderr:
+                sys.stdout.write(stdout)
+            stdout = self.process.GetSTDOUT(1024)
+
+    def _process_stderr(self) -> None:
+        stderr = self.process.GetSTDERR(1024)
+        while stderr:
+            if lldb.hilda_client is not None and lldb.hilda_client.configs.enable_stdout_stderr:
+                sys.stderr.write(stderr)
+            stderr = self.process.GetSTDERR(1024)
+
     def run(self):
         event = lldb.SBEvent()
         last_state = lldb.eStateStopped
@@ -54,6 +69,13 @@ class LLDBListenerThread(Thread, ABC):
                 continue
             if not lldb.SBProcess.EventIsProcessEvent(event):
                 continue
+
+            event_type = event.GetType()
+            if event_type & lldb.SBProcess.eBroadcastBitSTDOUT:
+                self._process_stdout()
+            if event_type & lldb.SBProcess.eBroadcastBitSTDERR:
+                self._process_stderr()
+
             state = self.process.GetStateFromEvent(event)
             if state == lldb.eStateDetached:
                 logger.debug('Process Detached')

{hilda-2.0.8 → hilda-2.0.10}/hilda/symbols_jar.py

@@ -139,15 +139,15 @@ class SymbolsJar(dict):
         :param args: given arguments for monitor command
         """
         for name, address in self.items():
-            args_c = args.copy()
+            options = args.copy()
             if name == '_client':
                 continue
             if self.__dict__['_client'].configs.objc_verbose_monitor:
                 arg_count = name.count(':')
                 if arg_count > 0:
-                    args_c['regs'] = {f'x{i + 2}': 'po' for i in range(arg_count)}
-            name = args_c.get('name', name)
-            address.monitor(name=name, **args_c)
+                    options['expr'] = {f'$arg{i + 3}': 'po' for i in range(arg_count)}
+            name = options.get('name', name)
+            address.monitor(name=name, **options)
 
     def startswith(self, exp, case_sensitive=True):
         """

{hilda-2.0.8 → hilda-2.0.10}/hilda.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hilda
-Version: 2.0.8
+Version: 2.0.10
 Summary: LLDB wrapped and empowered by iPython's features
 Author-email: doronz88 <doron88@gmail.com>, matan <matan1008@gmail.com>, netanel cohen <netanelc305@protonmail.com>
 Maintainer-email: doronz88 <doron88@gmail.com>, matan <matan1008@gmail.com>, netanel cohen <netanelc305@protonmail.com>