omdev 0.0.0.dev127__tar.gz → 0.0.0.dev129__tar.gz

{omdev-0.0.0.dev127/omdev.egg-info → omdev-0.0.0.dev129}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev127
+Version: 0.0.0.dev129
 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.dev127
+Requires-Dist: omlish==0.0.0.dev129
 Provides-Extra: all
 Requires-Dist: black~=24.10; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev127 → omdev-0.0.0.dev129}/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-0.0.0.dev127 → omdev-0.0.0.dev129}/omdev/scripts/interp.py

@@ -548,6 +548,30 @@ 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

{omdev-0.0.0.dev127 → omdev-0.0.0.dev129}/omdev/scripts/pyproject.py

@@ -1838,6 +1838,30 @@ 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

{omdev-0.0.0.dev127 → omdev-0.0.0.dev129/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev127
+Version: 0.0.0.dev129
 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.dev127
+Requires-Dist: omlish==0.0.0.dev129
 Provides-Extra: all
 Requires-Dist: black~=24.10; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev127 → omdev-0.0.0.dev129}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev127
+omlish==0.0.0.dev129
 
 [all]
 black~=24.10

{omdev-0.0.0.dev127 → omdev-0.0.0.dev129}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev127'
+version = '0.0.0.dev129'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev127',
+    'omlish == 0.0.0.dev129',
 ]
 
 [project.optional-dependencies]