omdev 0.0.0.dev128__py3-none-any.whl → 0.0.0.dev130__py3-none-any.whl

omdev/pycharm/cli.py

@@ -5,8 +5,10 @@ TODO:
   - https://unix.stackexchange.com/questions/17255/is-there-a-command-to-list-all-open-displays-on-a-machine
   - w -oush
 """
+import dataclasses as dc
 import inspect
 import os.path
+import shlex
 import subprocess
 import sys
 import tempfile
@@ -15,6 +17,9 @@ from omlish import argparse as ap
 from omlish.diag.pycharm import get_pycharm_version
 
 
+##
+
+
 _DARWIN_OPEN_SCRIPT = """
 tell application "{app}"
     activate
@@ -24,26 +29,53 @@ return
 """
 
 
-_LINUX_OPEN_SCRIPT = """
-# sudo apt install xdotool wmctrl
+##
+
+
+_LINUX_PYCHARM_WM_CLASS = 'jetbrains-pycharm.jetbrains-pycharm'
+_LINUX_CLION_WM_CLASS = 'jetbrains-clion.jetbrains-pycharm'
+
 
-# wmctrl -lx
-# 0x03000054  0 jetbrains-pycharm.jetbrains-pycharm  spinlock-ws omlish - cli.py
-# 0x0480004c  0 jetbrains-clion.jetbrains-clion  spinlock-ws cpython - ceval.c
-# wmctrl -i -a 0x03000054
-
-if pgrep -x "pycharm.sh" > /dev/null; then
-    # export DISPLAY=":1"
-    wmctrl -x -a jetbrains-pycharm.jetbrains-pycharm
-    xdotool key --delay 20 alt+f alt+o
-    xdotool type --delay 10 "$(pwd)"
-    xdotool key Return
-else
-    nohup pycharm.sh "$PROJECT_PATH" > /dev/null 2>&1 &
-fi
+# sudo apt install xdotool wmctrl
+# TODO: nohup pycharm.sh "$PROJECT_PATH" > /dev/null 2>&1 & ?
+_LINUX_OPEN_SCRIPT = """
+xdotool key --delay 1000 alt+f alt+o
+xdotool type --delay 1000 {dir}
+xdotool key Return
 """
 
 
+@dc.dataclass(frozen=True)
+class WmctrlLine:
+    window_id: str
+    desktop_id: str
+    pid: str
+    wm_class: str
+    user: str
+    title: str
+
+
+# TODO: https://stackoverflow.com/a/79016360
+def parse_wmctrl_lxp_line(l: str) -> WmctrlLine:
+    window_id, _, l = l.lstrip().partition(' ')
+    desktop_id, _, l = l.lstrip().partition(' ')
+    pid, _, l = l.lstrip().partition(' ')
+    wm_class, _, l = l.lstrip().partition(' ')
+    user, _, l = l.lstrip().partition(' ')
+    title = l.strip()
+    return WmctrlLine(
+        window_id,
+        desktop_id,
+        pid,
+        wm_class,
+        user,
+        title,
+    )
+
+
+##
+
+
 class Cli(ap.Cli):
     @ap.command()
     def version(self) -> None:
@@ -90,7 +122,18 @@ class Cli(ap.Cli):
             subprocess.check_call(['osascript', scpt_file])
 
         elif plat == 'linux':
-            # FIXME:
+            env = os.environ
+            env.setdefault('DISPLAY', ':1')
+
+            wmc_out = subprocess.check_output(['wmctrl', '-lxp'], env=env).decode()
+            wls = [parse_wmctrl_lxp_line(l) for l in wmc_out.splitlines()]
+            tgt_wmc = _LINUX_CLION_WM_CLASS if self.args.clion else _LINUX_PYCHARM_WM_CLASS
+            tgt_wl = next(wl for wl in wls if wl.wm_class == tgt_wmc)
+            subprocess.check_call(['wmctrl', '-ia', tgt_wl.window_id], env=env)
+
+            scpt = _LINUX_OPEN_SCRIPT.format(dir=shlex.quote(os.path.expanduser(dir)))
+            print(scpt)
+            # subprocess.check_call(scpt, shell=True, env=env)  # noqa
             raise NotImplementedError
 
         else:

omdev/scripts/interp.py

@@ -54,6 +54,9 @@ VersionComparisonMethod = ta.Callable[[VersionCmpKey, VersionCmpKey], bool]
 # ../../../omlish/lite/cached.py
 T = ta.TypeVar('T')
 
+# ../../../omlish/lite/check.py
+SizedT = ta.TypeVar('SizedT', bound=ta.Sized)
+
 # ../../packaging/specifiers.py
 UnparsedVersion = ta.Union['Version', str]
 UnparsedVersionVar = ta.TypeVar('UnparsedVersionVar', bound=UnparsedVersion)
@@ -548,11 +551,47 @@ def check_not_equal(l: T, r: T) -> T:
     return l
 
 
+def check_is(l: T, r: T) -> T:
+    if l is not r:
+        raise ValueError(l, r)
+    return l
+
+
+def check_is_not(l: T, r: ta.Any) -> T:
+    if l is r:
+        raise ValueError(l, r)
+    return l
+
+
+def check_in(v: T, c: ta.Container[T]) -> T:
+    if v not in c:
+        raise ValueError(v, c)
+    return v
+
+
+def check_not_in(v: T, c: ta.Container[T]) -> T:
+    if v in c:
+        raise ValueError(v, c)
+    return v
+
+
 def check_single(vs: ta.Iterable[T]) -> T:
     [v] = vs
     return v
 
 
+def check_empty(v: SizedT) -> SizedT:
+    if len(v):
+        raise ValueError(v)
+    return v
+
+
+def check_non_empty(v: SizedT) -> SizedT:
+    if not len(v):
+        raise ValueError(v)
+    return v
+
+
 ########################################
 # ../../../omlish/lite/json.py
 

omdev/scripts/pyproject.py

@@ -92,6 +92,9 @@ TomlPos = int  # ta.TypeAlias
 # ../../../omlish/lite/cached.py
 T = ta.TypeVar('T')
 
+# ../../../omlish/lite/check.py
+SizedT = ta.TypeVar('SizedT', bound=ta.Sized)
+
 # ../../packaging/specifiers.py
 UnparsedVersion = ta.Union['Version', str]
 UnparsedVersionVar = ta.TypeVar('UnparsedVersionVar', bound=UnparsedVersion)
@@ -1838,11 +1841,47 @@ def check_not_equal(l: T, r: T) -> T:
     return l
 
 
+def check_is(l: T, r: T) -> T:
+    if l is not r:
+        raise ValueError(l, r)
+    return l
+
+
+def check_is_not(l: T, r: ta.Any) -> T:
+    if l is r:
+        raise ValueError(l, r)
+    return l
+
+
+def check_in(v: T, c: ta.Container[T]) -> T:
+    if v not in c:
+        raise ValueError(v, c)
+    return v
+
+
+def check_not_in(v: T, c: ta.Container[T]) -> T:
+    if v in c:
+        raise ValueError(v, c)
+    return v
+
+
 def check_single(vs: ta.Iterable[T]) -> T:
     [v] = vs
     return v
 
 
+def check_empty(v: SizedT) -> SizedT:
+    if len(v):
+        raise ValueError(v)
+    return v
+
+
+def check_non_empty(v: SizedT) -> SizedT:
+    if not len(v):
+        raise ValueError(v)
+    return v
+
+
 ########################################
 # ../../../omlish/lite/json.py
 

{omdev-0.0.0.dev128.dist-info → omdev-0.0.0.dev130.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev128
+Version: 0.0.0.dev130
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev128
+Requires-Dist: omlish==0.0.0.dev130
 Provides-Extra: all
 Requires-Dist: black~=24.10; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev128.dist-info → omdev-0.0.0.dev130.dist-info}/RECORD

@@ -109,7 +109,7 @@ omdev/ptk/apps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/ptk/apps/ncdu.py,sha256=dOkEJoc2Wjv1u_Uge7Vpei_LvXldoPP5833Eia355tc,4548
 omdev/pycharm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/pycharm/__main__.py,sha256=hUPp11D024eMdT86BxXiRVtF7AGBk5W6Zn8_mEHSksY,163
-omdev/pycharm/cli.py,sha256=13q3ShvRlm6PDnLEzAuNJCafw5xLQOWd2lH2hy31wdA,2697
+omdev/pycharm/cli.py,sha256=C853Ioh6h2TAiTF5D_cuEu8PfIviuQAawzlXJIphysk,3798
 omdev/pyproject/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/pyproject/__main__.py,sha256=gn3Rl1aYPYdiTtEqa9ifi0t-e4ZwPY0vhJ4UXvYdJDY,165
 omdev/pyproject/cexts.py,sha256=x13piOOnNrYbA17qZLDVuR0p1sqhgEwpk4FtImX-klM,4281
@@ -122,8 +122,8 @@ omdev/scripts/bumpversion.py,sha256=Kn7fo73Hs8uJh3Hi3EIyLOlzLPWAC6dwuD_lZ3cIzuY,
 omdev/scripts/execrss.py,sha256=mR0G0wERBYtQmVIn63lCIIFb5zkCM6X_XOENDFYDBKc,651
 omdev/scripts/exectime.py,sha256=sFb376GflU6s9gNX-2-we8hgH6w5MuQNS9g6i4SqJIo,610
 omdev/scripts/importtrace.py,sha256=oa7CtcWJVMNDbyIEiRHej6ICfABfErMeo4_haIqe18Q,14041
-omdev/scripts/interp.py,sha256=u_rdez9SARWzziYAApEDF9ub7l31xWzJRqepTcQVd-A,73116
-omdev/scripts/pyproject.py,sha256=rnrkzAoK1u9VrRAeLNGY0smAKk3EInhii3bceKQAZBY,174432
+omdev/scripts/interp.py,sha256=iVV4QevTNDwOGaiZXhZSrbqA3Sc5tUoUd-wye9O14yE,73812
+omdev/scripts/pyproject.py,sha256=xIkBg1B9tzZlmPqupzuh5CWCZxhhl71qzpvxEAM8NtU,175128
 omdev/scripts/slowcat.py,sha256=lssv4yrgJHiWfOiHkUut2p8E8Tq32zB-ujXESQxFFHY,2728
 omdev/scripts/tmpexec.py,sha256=WTYcf56Tj2qjYV14AWmV8SfT0u6Y8eIU6cKgQRvEK3c,1442
 omdev/toml/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
@@ -143,9 +143,9 @@ omdev/tools/sqlrepl.py,sha256=tmFZh80-xsGM62dyQ7_UGLebChrj7IHbIPYBWDJMgVk,5741
 omdev/tools/pawk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/pawk/__main__.py,sha256=VCqeRVnqT1RPEoIrqHFSu4PXVMg4YEgF4qCQm90-eRI,66
 omdev/tools/pawk/pawk.py,sha256=Eckymn22GfychCQcQi96BFqRo_LmiJ-EPhC8TTUJdB4,11446
-omdev-0.0.0.dev128.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev128.dist-info/METADATA,sha256=IC1_To9nTxjRrVyFTnFCu8U2PaX2yX2c-JqJOBzUo1E,1760
-omdev-0.0.0.dev128.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-omdev-0.0.0.dev128.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev128.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev128.dist-info/RECORD,,
+omdev-0.0.0.dev130.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev130.dist-info/METADATA,sha256=GEYhiTG7zY1nHG26pJY_ewUU9VUwHdiGVqmLw7xKqcU,1760
+omdev-0.0.0.dev130.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+omdev-0.0.0.dev130.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev130.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev130.dist-info/RECORD,,