omlish 0.0.0.dev95__py3-none-any.whl → 0.0.0.dev96__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev95'
-__revision__ = '40763ed67700ccfb9317c5f357737baadbc16159'
+__version__ = '0.0.0.dev96'
+__revision__ = '0cb14143907ab35daec49550a83b060cb60de483'
 
 
 #

omlish/bootstrap/diag.py

@@ -169,17 +169,12 @@ class TimebombBootstrap(ContextBootstrap['TimebombBootstrap.Config']):
 class PycharmBootstrap(SimpleBootstrap['PycharmBootstrap.Config']):
     @dc.dataclass(frozen=True)
     class Config(Bootstrap.Config):
-        debug_host: ta.Optional[str] = None
-        debug_port: ta.Optional[int] = None
-        version: ta.Optional[str] = None
+        debug: ta.Optional[str] = None
 
     def run(self) -> None:
-        if self._config.debug_port is not None:
-            diagpc.pycharm_remote_debugger_attach(
-                self._config.debug_host,
-                self._config.debug_port,
-                version=self._config.version,
-            )
+        if self._config.debug is not None:
+            prd = diagpc.PycharmRemoteDebugger.parse(self._config.debug)
+            diagpc.pycharm_remote_debugger_attach(prd)
 
 
 ##

omlish/diag/pycharm/__init__.py

@@ -1,4 +1,5 @@
 from .pycharm import (  # noqa
+    PycharmRemoteDebugger,
     get_pycharm_version,
     is_pycharm_hosted,
     pycharm_remote_debugger_attach,

omlish/diag/pycharm/pycharm.py

@@ -1,5 +1,7 @@
+import dataclasses as dc
 import os.path
 import plistlib
+import re
 import subprocess
 import sys
 import typing as ta
@@ -106,12 +108,33 @@ def _import_pydevd_pycharm(*, version: str | None = None) -> ta.Any:
     return pydevd_pycharm
 
 
-def pycharm_remote_debugger_attach(
-        host: str | None,
-        port: int,
-        *,
-        version: str | None = None,
-) -> None:
+@dc.dataclass(frozen=True)
+class PycharmRemoteDebugger:
+    host: str | None
+    port: int
+    version: str | None = None
+
+    def __str__(self) -> str:
+        return ''.join([
+            f'@{self.version}:' if self.version is not None else '',
+            f'{self.host}:' if self.host is not None else '',
+            str(self.port),
+        ])
+
+    @classmethod
+    def parse(cls, s: str) -> 'PycharmRemoteDebugger':
+        if (m := re.fullmatch(r'(@(?P<version>[^:]+):)?((?P<host>[^:]+):)?(?P<port>\d+)', s)) is None:
+            raise ValueError(s)
+        gd = m.groupdict()
+        return cls(
+            host=gd.get('host'),
+            port=int(gd['port']),
+            version=gd.get('version'),
+        )
+
+
+def pycharm_remote_debugger_attach(prd: PycharmRemoteDebugger) -> None:
+    host = prd.host
     if host is None:
         if (
                 sys.platform == 'linux' and
@@ -122,6 +145,7 @@ def pycharm_remote_debugger_attach(
         else:
             host = 'localhost'
 
+    version = prd.version
     if version is None and host in ('localhost', '127.0.0.1'):
         version = get_pycharm_version()
 
@@ -132,7 +156,7 @@ def pycharm_remote_debugger_attach(
 
     pydevd_pycharm.settrace(
         host,
-        port=port,
+        port=prd.port,
         stdoutToServer=True,
         stderrToServer=True,
     )

{omlish-0.0.0.dev95.dist-info → omlish-0.0.0.dev96.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev95
+Version: 0.0.0.dev96
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev95.dist-info → omlish-0.0.0.dev96.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=hTFp9tvE72BxKloIq1s1SS0LRQlIsvMtO69Sbc47rKg,1704
-omlish/__about__.py,sha256=CrlzN0XqTgVfMvKp_IYNBS-xeNlXgZLdXijAy8GS_kY,3345
+omlish/__about__.py,sha256=xYYDai8LigmF6omaHMQLajgl5laeQZWUoKdsMxJXys4,3345
 omlish/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/argparse.py,sha256=Dc73G8lyoQBLvXhMYUbzQUh4SJu_OTvKUXjSUxq_ang,7499
 omlish/c3.py,sha256=4vogWgwPb8TbNS2KkZxpoWbwjj7MuHG2lQG-hdtkvjI,8062
@@ -89,7 +89,7 @@ omlish/asyncs/trio_asyncio.py,sha256=oqdOHy0slj9PjVxaDf3gJkq9AAgg7wYZbB469jOftVw
 omlish/bootstrap/__init__.py,sha256=-Rtsg7uPQNhh1dIT9nqrz96XlqizwoLnWf-FwOEstJI,730
 omlish/bootstrap/__main__.py,sha256=4jCwsaogp0FrJjJZ85hzF4-WqluPeheHbfeoKynKvNs,194
 omlish/bootstrap/base.py,sha256=d8hqn4hp1XMMi5PgcJBQXPKmW47epu8CxBlqDZiRZb4,1073
-omlish/bootstrap/diag.py,sha256=LADLhusbJ1tKxVD8-gmia1HShX1VeszRO1OApIQhSpI,5507
+omlish/bootstrap/diag.py,sha256=iemH0nQEHEDzyZztvd_ygGGVpRpgn5UG6naxeQTvXp0,5347
 omlish/bootstrap/harness.py,sha256=VW8YP-yENGyXIuJ8GL_xintArF13nafwpz-iAghPt34,1967
 omlish/bootstrap/main.py,sha256=yZhOHDDlj4xB5a89dRdT8z58FsqqnpoBg1-tvY2CJe4,5903
 omlish/bootstrap/marshal.py,sha256=ZxdAeMNd2qXRZ1HUK89HmEhz8tqlS9OduW34QBscKw0,516
@@ -159,9 +159,9 @@ omlish/diag/pydevd.py,sha256=tHI0fc2ZaYKudUWTRuUe5B66qGeNktPC49ZKb8x0rSY,7298
 omlish/diag/threads.py,sha256=1-x02VCDZ407gfbtXm1pWK-ubqhqfePm9PMqkHCVoqk,3642
 omlish/diag/_pycharm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/diag/_pycharm/runhack.py,sha256=eJlaUXIcFzAjOop_793RwNS_KF9NmhLv0i22xRVVeo0,34951
-omlish/diag/pycharm/__init__.py,sha256=sT-ub7flKeCCbM_i32z9-eGV8hgGJ45hwdcqtGDkVRY,153
+omlish/diag/pycharm/__init__.py,sha256=-hZryZ3RfuoH4arwhBl-RmCZ6j-ybuUIEUf9C8o37iY,180
 omlish/diag/pycharm/cli.py,sha256=7SRh6yj8S5YGda4bq9BD4Kzwtgg4_Wa-K202ReZN2iI,1011
-omlish/diag/pycharm/pycharm.py,sha256=g-IfF8FBH93o6k_KDrLy8kIiFSLe3n39I2URipfFy0Q,3115
+omlish/diag/pycharm/pycharm.py,sha256=GFcnkNedY3bbwRM3l7_9lFiaW9BcxOB0KZl01Nk_xPs,3854
 omlish/diag/replserver/__init__.py,sha256=uLo6V2aQ29v9z3IMELlPDSlG3_2iOT4-_X8VniF-EgE,235
 omlish/diag/replserver/__main__.py,sha256=LmU41lQ58bm1h4Mx7S8zhE_uEBSC6kPcp9mn5JRpulA,32
 omlish/diag/replserver/console.py,sha256=XzBDVhYlr8FY6ym4OwoaIHuFOHnGK3dTYlMDIOMUUlA,7410
@@ -457,9 +457,9 @@ omlish/text/delimit.py,sha256=ubPXcXQmtbOVrUsNh5gH1mDq5H-n1y2R4cPL5_DQf68,4928
 omlish/text/glyphsplit.py,sha256=Ug-dPRO7x-OrNNr8g1y6DotSZ2KH0S-VcOmUobwa4B0,3296
 omlish/text/indent.py,sha256=6Jj6TFY9unaPa4xPzrnZemJ-fHsV53IamP93XGjSUHs,1274
 omlish/text/parts.py,sha256=7vPF1aTZdvLVYJ4EwBZVzRSy8XB3YqPd7JwEnNGGAOo,6495
-omlish-0.0.0.dev95.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev95.dist-info/METADATA,sha256=PTGAL5lZAs2yviTLTiaEtMx1B4hL3uInPDX8T8sWDAI,3987
-omlish-0.0.0.dev95.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-omlish-0.0.0.dev95.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev95.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev95.dist-info/RECORD,,
+omlish-0.0.0.dev96.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev96.dist-info/METADATA,sha256=iXdvwNxhVdlcnIH8lTiXDRPrhbVOy6uHDmpchaAJPsE,3987
+omlish-0.0.0.dev96.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+omlish-0.0.0.dev96.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev96.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev96.dist-info/RECORD,,