pymobiledevice3 6.0.1__py3-none-any.whl → 6.1.0__py3-none-any.whl

pymobiledevice3/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '6.0.1'
-__version_tuple__ = version_tuple = (6, 0, 1)
+__version__ = version = '6.1.0'
+__version_tuple__ = version_tuple = (6, 1, 0)
 
 __commit_id__ = commit_id = None

pymobiledevice3/cli/syslog.py

@@ -33,7 +33,7 @@ def syslog_live_old(service_provider: LockdownClient):
         print(line)
 
 
-def format_line(color, pid, syslog_entry, include_label):
+def format_line(color, pid, syslog_entry, include_label: bool, image_offset: bool = False) -> Optional[str]:
     log_level_colors = {
         SyslogLogLevel.NOTICE.name: "white",
         SyslogLogLevel.INFO.name: "white",
@@ -50,6 +50,7 @@ def format_line(color, pid, syslog_entry, include_label):
     image_name = posixpath.basename(syslog_entry.image_name)
     message = syslog_entry.message
     process_name = posixpath.basename(filename)
+    image_offset_str = f"+0x{syslog_entry.image_offset:x}" if image_offset else ""
     label = ""
 
     if (pid != -1) and (syslog_pid != pid):
@@ -63,13 +64,15 @@ def format_line(color, pid, syslog_entry, include_label):
         process_name = click.style(process_name, "magenta")
         if len(image_name) > 0:
             image_name = click.style(image_name, "magenta")
+        if image_offset:
+            image_offset_str = click.style(image_offset_str, "blue")
         syslog_pid = click.style(syslog_pid, "cyan")
         log_level_color = log_level_colors[level]
         level = click.style(level, log_level_color)
         label = click.style(label, "cyan")
         message = click.style(message, log_level_color)
 
-    line_format = "{timestamp} {process_name}{{{image_name}}}[{pid}] <{level}>: {message}"
+    line_format = "{timestamp} {process_name}{{{image_name}{image_offset_str}}}[{pid}] <{level}>: {message}"
 
     if include_label:
         line_format += f" {label}"
@@ -81,6 +84,7 @@ def format_line(color, pid, syslog_entry, include_label):
         pid=syslog_pid,
         level=level,
         message=message,
+        image_offset_str=image_offset_str,
     )
 
     return line
@@ -96,6 +100,7 @@ def syslog_live(
     include_label: bool,
     regex: list[str],
     insensitive_regex: list[str],
+    image_offset: bool = False,
 ) -> None:
     match_regex = [re.compile(f".*({r}).*", re.DOTALL) for r in regex]
     match_regex += [re.compile(f".*({r}).*", re.IGNORECASE | re.DOTALL) for r in insensitive_regex]
@@ -109,8 +114,8 @@ def syslog_live(
         if process_name and posixpath.basename(syslog_entry.filename) != process_name:
             continue
 
-        line_no_style = format_line(False, pid, syslog_entry, include_label)
-        line = format_line(user_requested_colored_output(), pid, syslog_entry, include_label)
+        line_no_style = format_line(False, pid, syslog_entry, include_label, image_offset)
+        line = format_line(user_requested_colored_output(), pid, syslog_entry, include_label, image_offset)
 
         skip = False
 
@@ -172,6 +177,7 @@ def syslog_live(
 @click.option("include_label", "--label", is_flag=True, help="should include label")
 @click.option("-e", "--regex", multiple=True, help="filter only lines matching given regex")
 @click.option("-ei", "--insensitive-regex", multiple=True, help="filter only lines matching given regex (insensitive)")
+@click.option("-im", "--image-offset", is_flag=True, help="Include image offset in log line")
 def cli_syslog_live(
     service_provider: LockdownServiceProvider,
     out: Optional[TextIO],
@@ -182,11 +188,21 @@ def cli_syslog_live(
     include_label: bool,
     regex: list[str],
     insensitive_regex: list[str],
+    image_offset: bool,
 ) -> None:
     """view live syslog lines"""
 
     syslog_live(
-        service_provider, out, pid, process_name, match, match_insensitive, include_label, regex, insensitive_regex
+        service_provider,
+        out,
+        pid,
+        process_name,
+        match,
+        match_insensitive,
+        include_label,
+        regex,
+        insensitive_regex,
+        image_offset,
     )
 
 

pymobiledevice3/services/os_trace.py

@@ -43,6 +43,7 @@ class SyslogEntry:
     timestamp: datetime
     level: SyslogLogLevel
     image_name: str
+    image_offset: int
     filename: str
     message: str
     label: typing.Optional[SyslogLabel] = None
@@ -93,8 +94,12 @@ def parse_syslog_entry(data: bytes) -> SyslogEntry:
     message_size = struct.unpack("<H", data[offset : offset + 2])[0]
     offset += 2
 
-    # Skip 6 bytes
-    offset += 6
+    # Skip 2 bytes
+    offset += 2
+
+    # Parse sender_image_offset (4 bytes, little-endian unsigned int)
+    sender_image_offset = struct.unpack("<I", data[offset : offset + 4])[0]
+    offset += 4
 
     # Parse subsystem_size (4 bytes, little-endian unsigned int)
     subsystem_size = struct.unpack("<I", data[offset : offset + 4])[0]
@@ -134,6 +139,7 @@ def parse_syslog_entry(data: bytes) -> SyslogEntry:
         timestamp=timestamp,
         level=SyslogLogLevel(level),
         image_name=image_name,
+        image_offset=sender_image_offset,
         filename=filename,
         message=message,
         label=label,

{pymobiledevice3-6.0.1.dist-info → pymobiledevice3-6.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymobiledevice3
-Version: 6.0.1
+Version: 6.1.0
 Summary: Pure python3 implementation for working with iDevices (iPhone, etc...)
 Author-email: doronz88 <doron88@gmail.com>, matan <matan1008@gmail.com>
 Maintainer-email: doronz88 <doron88@gmail.com>, matan <matan1008@gmail.com>

{pymobiledevice3-6.0.1.dist-info → pymobiledevice3-6.1.0.dist-info}/RECORD

@@ -8,7 +8,7 @@ misc/understanding_idevice_protocol_layers.md,sha256=8tEqRXWOUPoxOJLZVh7C7H9JGCh
 misc/usbmux_sniff.sh,sha256=iWtbucOEQ9_UEFXk9x-2VNt48Jg5zrPsnUbZ_LfZxwA,212
 pymobiledevice3/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymobiledevice3/__main__.py,sha256=hpLgWH1Pmwkf1pX-JvYkfJUkphpEb4YhoRV3qQUwbOs,12718
-pymobiledevice3/_version.py,sha256=L46iiAhgbehSMhT8JATTVAPNNB1a16B69BZiNy8IzXs,704
+pymobiledevice3/_version.py,sha256=oi6TX3BV_lJKewictnXlp6Z_C5gyJqyHQKAhpLK1dSk,704
 pymobiledevice3/bonjour.py,sha256=y1Zd-__GnvK2ShxmvqFpNfi5NGF6PEWGcuKp8mJVFNA,13419
 pymobiledevice3/ca.py,sha256=5_Y4F-zDFX_KeDL-M_TRCKKyrRRb9h1lBE8MGTWv91o,10606
 pymobiledevice3/common.py,sha256=FZzF0BQYV5fCEUPbLo6jbt2Ig9s5YwR8AvX_iR124Ew,329
@@ -47,7 +47,7 @@ pymobiledevice3/cli/provision.py,sha256=SofHAYdmxb54n9KSRyPKol6jOMUXN1hBACr2VBQr
 pymobiledevice3/cli/remote.py,sha256=xkIVR4bu1Vdpw-sswH1b-pekBM6rV6AS7YUeYQU5UyY,12375
 pymobiledevice3/cli/restore.py,sha256=xwiUIofoyCMxDSgRq4bndAn5GNUq1P-RcC446M_6I7Y,8085
 pymobiledevice3/cli/springboard.py,sha256=hVoLqLU_gHxXa6q17ar61lc2ovmWejeu-rvxQpHXWD0,3094
-pymobiledevice3/cli/syslog.py,sha256=NwUzgqUBgHsnx-nVqH9f4A9yQJbXrIoTLIoyqmKTwTc,7543
+pymobiledevice3/cli/syslog.py,sha256=-1qdNTMj_eRynv2-fbjOXOtxuftTznv_xkLERV-wjK8,8097
 pymobiledevice3/cli/usbmux.py,sha256=Bx-5OSxEbHBhLeYaRt9LvZzp3RIazn49Q86pFi-EtpQ,2354
 pymobiledevice3/cli/version.py,sha256=N7UY328WNR6FpQ2w7aACyL74XQxkRmi53WV5SVlCgCo,345
 pymobiledevice3/cli/webinspector.py,sha256=dUsaaZZBV2OQPaYCj8C809ElO0O-G-NSSLvj7x26L94,16705
@@ -121,7 +121,7 @@ pymobiledevice3/services/mobile_config.py,sha256=2UmdqYNikznxI6bA2lkyIWS3NcHg3pT
 pymobiledevice3/services/mobile_image_mounter.py,sha256=PZEN9O7XtLW9VH1qNTJ19zo_tFZhX68bTX0O-Uy9sck,15034
 pymobiledevice3/services/mobilebackup2.py,sha256=M2sVY-vXl6f25QFom-z5bUkeTdA4Twbiw1tH-4Tb79M,18303
 pymobiledevice3/services/notification_proxy.py,sha256=mk4kxLRi6aDTXKOazgldliZG4q0bME7jBcxPyJsSpDw,2125
-pymobiledevice3/services/os_trace.py,sha256=VS4LYGuc3pFLNAEZdgp6pvs2cCQwjmkBfgRGbpHUx2U,7195
+pymobiledevice3/services/os_trace.py,sha256=nTODlyWvb10fpqWHDU3m7i9sADIMF0ezfyo9Ql2BZa8,7422
 pymobiledevice3/services/pcapd.py,sha256=Gd6xN9eBHnLIQ5M2LM-y4Z-eCquxVEnSKuyBECwZlRs,11960
 pymobiledevice3/services/power_assertion.py,sha256=hh-9tpPbNctAegsV0IYE3ilikT-o4t758-y3u0Td9wM,1212
 pymobiledevice3/services/preboard.py,sha256=QJ1miS0e2lY9y4sS4GxsMZh-uxKDeDi6upgPTyqTpfs,894
@@ -167,9 +167,9 @@ pymobiledevice3/services/web_protocol/switch_to.py,sha256=TCdVrMfsvd18o-vZ0owVrE
 pymobiledevice3/tunneld/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymobiledevice3/tunneld/api.py,sha256=Lwl1OdhPTgX6Zqezy8T4dEcXRfaEPwyGNClioTx3fUc,2338
 pymobiledevice3/tunneld/server.py,sha256=dMEZAv_X-76l0vSalpq4x0IVkbE-MNGR77T-u1TiHuE,25752
-pymobiledevice3-6.0.1.dist-info/licenses/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
-pymobiledevice3-6.0.1.dist-info/METADATA,sha256=GGX1Mzg-hTIM5QtT3J05RpH9LQEkR4EDRHk7cyKmWmw,17416
-pymobiledevice3-6.0.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pymobiledevice3-6.0.1.dist-info/entry_points.txt,sha256=jJMlOanHlVwUxcY__JwvKeWPrvBJr_wJyEq4oHIZNKE,66
-pymobiledevice3-6.0.1.dist-info/top_level.txt,sha256=MjZoRqcWPOh5banG-BbDOnKEfsS3kCxqV9cv-nzyg2Q,21
-pymobiledevice3-6.0.1.dist-info/RECORD,,
+pymobiledevice3-6.1.0.dist-info/licenses/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
+pymobiledevice3-6.1.0.dist-info/METADATA,sha256=Kc1aB01LI303p-FzJbxI_232-MeLu_CM-ZMla141-eU,17416
+pymobiledevice3-6.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pymobiledevice3-6.1.0.dist-info/entry_points.txt,sha256=jJMlOanHlVwUxcY__JwvKeWPrvBJr_wJyEq4oHIZNKE,66
+pymobiledevice3-6.1.0.dist-info/top_level.txt,sha256=MjZoRqcWPOh5banG-BbDOnKEfsS3kCxqV9cv-nzyg2Q,21
+pymobiledevice3-6.1.0.dist-info/RECORD,,