diff --git a/.gitignore b/.gitignore index f1ba05a..202f0e1 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ d2/book1/books *.so .mypy_cache .ruff_cache +.tmuxp diff --git a/Makefile b/Makefile index f4919dd..913c34d 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,9 @@ host_deps: ./m host_deps +python_lint: + ./m mypy -- -f vscode -i deps/com.github.aiortc.aiortc/src/ 2>&1 | less + python_clean_online_fxreader_vpn: rm -fr \ deps/com.github.aiortc.aiortc/src/online_fxreader/vpn/dist; diff --git a/_m.py b/_m.py index f2ecc4d..4e1c01e 100644 --- a/_m.py +++ b/_m.py @@ -205,11 +205,14 @@ def mypy(argv: list[str]) -> None: assert not res is None try: - errors = [ + errors = sorted([ json.loads(o) for o in res.stdout.decode('utf-8').splitlines() if not o.strip() == '' - ] + ], key=lambda x: ( + x.get('file', ''), + x.get('line', 0), + )) except: logger.exception('') logger.error(res.stdout.decode('utf-8')) diff --git a/deps/com.github.aiortc.aiortc b/deps/com.github.aiortc.aiortc index a1b860d..69fe05c 160000 --- a/deps/com.github.aiortc.aiortc +++ b/deps/com.github.aiortc.aiortc @@ -1 +1 @@ -Subproject commit a1b860da536ff11bf2b03ed810c4f0a43aad2c05 +Subproject commit 69fe05c5e17c1396a513df5cdc5cbbaba1dbac50 diff --git a/dotfiles/.config/Code - OSS/User/keybindings.json b/dotfiles/.config/Code - OSS/User/keybindings.json index 1469a90..43c213e 100644 --- a/dotfiles/.config/Code - OSS/User/keybindings.json +++ b/dotfiles/.config/Code - OSS/User/keybindings.json @@ -10,7 +10,7 @@ "when": "terminalFocus && terminalHasBeenCreated && terminalIsOpen || terminalFocus && terminalIsOpen && terminalProcessSupported" }, { - "key": "alt+z", + "key": "alt+r", "command": "workbench.action.toggleMaximizeEditorGroup", "when": "editorPartMaximizedEditorGroup || editorPartMultipleEditorGroups" }, @@ -20,7 +20,7 @@ "when": "editorPartMaximizedEditorGroup || editorPartMultipleEditorGroups" }, { - "key": "alt+z", + "key": "alt+r", "command": "workbench.action.toggleMaximizedPanel", "when": "!editorTextFocus" }, @@ -70,5 +70,34 @@ { "key": "ctrl+shift+f", "command": "-workbench.action.findInFiles" + }, + { + "key": "ctrl+g", + "command": "-workbench.action.gotoLine" + }, + { + "key": "ctrl+g", + "command": "-workbench.action.terminal.goToRecentDirectory", + "when": "terminalFocus && terminalHasBeenCreated || terminalFocus && terminalProcessSupported" + }, + { + "key": "alt+r", + "command": "-toggleSearchRegex", + "when": "searchViewletFocus" + }, + { + "key": "alt+r", + "command": "-toggleFindRegex", + "when": "editorFocus" + }, + { + "key": "alt+r", + "command": "-workbench.action.terminal.toggleFindRegex", + "when": "terminalFindVisible && terminalHasBeenCreated || terminalFindVisible && terminalProcessSupported" + }, + { + "key": "alt+r", + "command": "-toggleSearchEditorRegex", + "when": "inSearchEditor && searchInputBoxFocus" } ] \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 4d8a39d..9fa0f40 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,3 +13,4 @@ numpy scoping types-setuptools uvloop +pydantic \ No newline at end of file