omdev 0.0.0.dev472__tar.gz → 0.0.0.dev474__tar.gz

{omdev-0.0.0.dev472/omdev.egg-info → omdev-0.0.0.dev474}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev472
+Version: 0.0.0.dev474
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev472
+Requires-Dist: omlish==0.0.0.dev474
 Provides-Extra: all
 Requires-Dist: black~=25.9; extra == "all"
 Requires-Dist: pycparser~=2.23; extra == "all"
@@ -27,7 +27,7 @@ Requires-Dist: mypy~=1.18; extra == "all"
 Requires-Dist: gprof2dot~=2025.4; extra == "all"
 Requires-Dist: segno~=1.6; extra == "all"
 Requires-Dist: rich~=14.2; extra == "all"
-Requires-Dist: textual~=6.4; extra == "all"
+Requires-Dist: textual~=6.5; extra == "all"
 Provides-Extra: black
 Requires-Dist: black~=25.9; extra == "black"
 Provides-Extra: c
@@ -46,7 +46,7 @@ Provides-Extra: qr
 Requires-Dist: segno~=1.6; extra == "qr"
 Provides-Extra: tui
 Requires-Dist: rich~=14.2; extra == "tui"
-Requires-Dist: textual~=6.4; extra == "tui"
+Requires-Dist: textual~=6.5; extra == "tui"
 Dynamic: license-file
 
 # Overview

{omdev-0.0.0.dev472 → omdev-0.0.0.dev474}/omdev/__about__.py

@@ -44,7 +44,7 @@ class Project(ProjectBase):
 
         'tui': [
             'rich ~= 14.2',
-            'textual ~= 6.4',
+            'textual ~= 6.5',
         ],
     }
 

{omdev-0.0.0.dev472 → omdev-0.0.0.dev474}/omdev/pyproject/pkg.py

@@ -93,7 +93,7 @@ class BasePyprojectPackageGenerator(Abstract):
 
     def _write_git_ignore(self) -> None:
         with open(os.path.join(self._pkg_dir(), '.gitignore'), 'w') as f:
-            f.write('\n'.join(self._GIT_IGNORE))
+            f.write('\n'.join([*self._GIT_IGNORE, '']))
 
     #
 
@@ -516,12 +516,17 @@ class _PyprojectCextPackageGenerator(_PyprojectExtensionPackageGenerator):
         ext_lines = []
 
         for ext_src in self.find_cext_srcs():
+            ext_lang = ext_src.rpartition('.')[2]
+            compile_args = {
+                'c': ['-std=c11'],
+                'cc': ['-std=c++20'],
+            }.get(ext_lang, [])
             ext_name = ext_src.rpartition('.')[0].replace(os.sep, '.')
             ext_lines.extend([
                 'st.Extension(',
                 f"    name='{ext_name}',",
                 f"    sources=['{ext_src}'],",
-                "    extra_compile_args=['-std=c++20'],",
+                f'    extra_compile_args={compile_args!r},',
                 '),',
             ])
 

{omdev-0.0.0.dev472 → omdev-0.0.0.dev474}/omdev/scripts/ci.py

@@ -1293,7 +1293,7 @@ class ExitStacked:
             es.__enter__()
             try:
                 self._enter_contexts()
-            except Exception:  # noqa
+            except BaseException:  # noqa
                 es.__exit__(*sys.exc_info())
                 raise
             return self
@@ -1304,7 +1304,7 @@ class ExitStacked:
             return None
         try:
             self._exit_contexts()
-        except Exception:  # noqa
+        except BaseException:  # noqa
             es.__exit__(*sys.exc_info())
             raise
         return es.__exit__(exc_type, exc_val, exc_tb)
@@ -1352,7 +1352,7 @@ class AsyncExitStacked:
             await es.__aenter__()
             try:
                 await self._async_enter_contexts()
-            except Exception:  # noqa
+            except BaseException:  # noqa
                 await es.__aexit__(*sys.exc_info())
                 raise
             return self
@@ -1363,7 +1363,7 @@ class AsyncExitStacked:
             return None
         try:
             await self._async_exit_contexts()
-        except Exception:  # noqa
+        except BaseException:  # noqa
             await es.__aexit__(*sys.exc_info())
             raise
         return await es.__aexit__(exc_type, exc_val, exc_tb)

{omdev-0.0.0.dev472 → omdev-0.0.0.dev474}/omdev/scripts/pyproject.py

@@ -10877,7 +10877,7 @@ class BasePyprojectPackageGenerator(Abstract):
 
     def _write_git_ignore(self) -> None:
         with open(os.path.join(self._pkg_dir(), '.gitignore'), 'w') as f:
-            f.write('\n'.join(self._GIT_IGNORE))
+            f.write('\n'.join([*self._GIT_IGNORE, '']))
 
     #
 
@@ -11300,12 +11300,17 @@ class _PyprojectCextPackageGenerator(_PyprojectExtensionPackageGenerator):
         ext_lines = []
 
         for ext_src in self.find_cext_srcs():
+            ext_lang = ext_src.rpartition('.')[2]
+            compile_args = {
+                'c': ['-std=c11'],
+                'cc': ['-std=c++20'],
+            }.get(ext_lang, [])
             ext_name = ext_src.rpartition('.')[0].replace(os.sep, '.')
             ext_lines.extend([
                 'st.Extension(',
                 f"    name='{ext_name}',",
                 f"    sources=['{ext_src}'],",
-                "    extra_compile_args=['-std=c++20'],",
+                f'    extra_compile_args={compile_args!r},',
                 '),',
             ])
 

omdev-0.0.0.dev474/omdev/tui/apps/edit/main.py

@@ -0,0 +1,163 @@
+import argparse
+import pathlib
+import typing as ta
+
+from ... import textual as tx
+
+
+##
+
+
+class QuitConfirmScreen(tx.ModalScreen[bool]):
+    """Screen with a dialog to confirm quit without saving."""
+
+    CSS = """
+        QuitConfirmScreen {
+            align: center middle;
+        }
+
+        #dialog {
+            width: 60;
+            height: 11;
+            border: thick $background 80%;
+            background: $surface;
+            padding: 1 2;
+        }
+
+        #question {
+            height: 3;
+            content-align: center middle;
+        }
+
+        Button {
+            width: 1fr;
+        }
+    """
+
+    def compose(self) -> tx.ComposeResult:
+        yield tx.Vertical(
+            tx.Label('You have unsaved changes. Do you want to save before quitting?', id='question'),
+            tx.Button('Save and Quit', variant='success', id='save'),
+            tx.Button('Quit Without Saving', variant='warning', id='quit'),
+            tx.Button('Cancel', variant='primary', id='cancel'),
+            id='dialog',
+        )
+
+    def on_button_pressed(self, event: tx.Button.Pressed) -> None:
+        if event.button.id == 'save':
+            self.dismiss(True)
+        elif event.button.id == 'quit':
+            self.dismiss(False)
+        else:
+            self.dismiss(None)
+
+
+class TextEditor(tx.App):
+    """A simple text editor using Textual."""
+
+    CSS = """
+        TextArea {
+            height: 1fr;
+        }
+
+        Container {
+            height: 100%;
+        }
+    """
+
+    BINDINGS: ta.ClassVar[ta.Sequence[tx.Binding]] = [
+        tx.Binding('ctrl+s', 'save', 'Save', show=True),
+        tx.Binding('ctrl+q', 'quit', 'Quit', show=True),
+    ]
+
+    def __init__(self, filepath: pathlib.Path):
+        super().__init__()
+
+        self.filepath = filepath
+        self.text_area: tx.TextArea | None = None
+        self.modified = False
+        self.original_content = ''
+
+    def compose(self) -> tx.ComposeResult:
+        """Create child widgets for the app."""
+
+        yield tx.Header()
+        yield tx.Container(tx.TextArea(id='editor'))
+        yield tx.Footer()
+
+    def on_mount(self) -> None:
+        """Load the file content when the app starts."""
+
+        self.text_area = self.query_one('#editor', tx.TextArea)
+
+        # Load existing file or create new
+        if self.filepath.exists():
+            content = self.filepath.read_text()
+            self.text_area.load_text(content)
+            self.original_content = content
+        else:
+            self.original_content = ''
+
+        self.title = f'Text Editor - {self.filepath.name}'
+        self.sub_title = str(self.filepath)
+
+    def on_text_area_changed(self, event: tx.TextArea.Changed) -> None:
+        """Track if the document has been modified."""
+
+        if self.text_area:
+            current_content = self.text_area.text
+            self.modified = current_content != self.original_content
+
+            # Update title to show modified status
+            status = ' *' if self.modified else ''
+            self.title = f'Text Editor - {self.filepath.name}{status}'
+
+    def action_save(self) -> None:
+        """Save the current content to file."""
+
+        if self.text_area:
+            content = self.text_area.text
+            self.filepath.write_text(content)
+            self.original_content = content
+            self.modified = False
+            self.title = f'Text Editor - {self.filepath.name}'
+            self.notify(f'Saved to {self.filepath.name}')
+
+    async def action_quit(self) -> None:
+        """Quit the editor, prompting to save if modified."""
+
+        if self.modified:
+            def check_quit(should_save: bool | None) -> None:
+                if should_save is None:
+                    # User cancelled
+                    return
+
+                if should_save:
+                    self.action_save()
+
+                self.exit()
+
+            await self.push_screen(QuitConfirmScreen(), callback=check_quit)
+
+        else:
+            self.exit()
+
+
+def main() -> None:
+    """Parse arguments and run the editor."""
+
+    parser = argparse.ArgumentParser(description='Simple text editor')
+    parser.add_argument('filename', help='File to edit')
+    args = parser.parse_args()
+
+    filepath = pathlib.Path(args.filename).resolve()
+
+    # Create parent directories if needed
+    filepath.parent.mkdir(parents=True, exist_ok=True)
+
+    app = TextEditor(filepath)
+    app.run()
+
+
+if __name__ == '__main__':
+    main()

{omdev-0.0.0.dev472 → omdev-0.0.0.dev474}/omdev/tui/apps/irc/app.py

@@ -12,7 +12,7 @@ import typing as ta
 
 from omlish import lang
 
-from ... import textual
+from ... import textual as tx
 from .client import IrcClient
 from .commands import ALL_COMMANDS
 from .commands import IrcCommand
@@ -37,7 +37,7 @@ class IrcWindow:
         self.unread += 1
 
 
-class IrcApp(textual.App):
+class IrcApp(tx.App):
     """IRC client application."""
 
     _commands: ta.ClassVar[ta.Mapping[str, IrcCommand]] = ALL_COMMANDS
@@ -65,9 +65,9 @@ class IrcApp(textual.App):
     }
     """
 
-    BINDINGS: ta.ClassVar[ta.Sequence[textual.Binding]] = [
-        textual.Binding('ctrl+n', 'next_window', 'Next Window', show=False),
-        textual.Binding('ctrl+p', 'prev_window', 'Previous Window', show=False),
+    BINDINGS: ta.ClassVar[ta.Sequence[tx.Binding]] = [
+        tx.Binding('ctrl+n', 'next_window', 'Next Window', show=False),
+        tx.Binding('ctrl+p', 'prev_window', 'Previous Window', show=False),
     ]
 
     def __init__(
@@ -94,12 +94,12 @@ class IrcApp(textual.App):
 
     #
 
-    def compose(self) -> textual.ComposeResult:
-        text_area = textual.TextArea(id='messages', read_only=True, show_line_numbers=False)
+    def compose(self) -> tx.ComposeResult:
+        text_area = tx.TextArea(id='messages', read_only=True, show_line_numbers=False)
         text_area.cursor_blink = False
         yield text_area
-        yield textual.Static('', id='status')
-        yield textual.Input(placeholder='Enter command or message', id='input', select_on_focus=False)
+        yield tx.Static('', id='status')
+        yield tx.Input(placeholder='Enter command or message', id='input', select_on_focus=False)
 
     async def on_mount(self) -> None:
         """Initialize on mount."""
@@ -120,21 +120,21 @@ class IrcApp(textual.App):
             await self.add_message('system', f'Executing: {cmd}')
             await self.handle_command(cmd)
 
-    async def on_key(self, event: textual.Key) -> None:
+    async def on_key(self, event: tx.Key) -> None:
         """Handle key events - redirect typing to input when messages area is focused."""
 
         focused = self.focused
         if focused and focused.id == 'messages':
             # If a printable character or common input key is pressed, focus the input and forward event
             if event.is_printable or event.key in ('space', 'backspace', 'delete'):
-                input_widget = self.query_one('#input', textual.Input)
+                input_widget = self.query_one('#input', tx.Input)
                 input_widget.focus()
                 # Post the key event to the input widget so it handles it naturally
-                input_widget.post_message(textual.Key(event.key, event.character))
+                input_widget.post_message(tx.Key(event.key, event.character))
                 # Stop the event from being processed by the messages widget
                 event.stop()
 
-    async def on_input_submitted(self, event: textual.Input.Submitted) -> None:
+    async def on_input_submitted(self, event: tx.Input.Submitted) -> None:
         """Handle user input."""
 
         text = event.value.strip()
@@ -232,7 +232,7 @@ class IrcApp(textual.App):
         current_window.unread = 0
 
         # Update messages display
-        messages_widget = self.query_one('#messages', textual.TextArea)
+        messages_widget = self.query_one('#messages', tx.TextArea)
 
         # Check if we switched windows or need full reload
         window_changed = self._last_window != current_window_name
@@ -271,7 +271,7 @@ class IrcApp(textual.App):
             window_list.append(indicator)
 
         status_text = ' '.join(window_list)
-        self.query_one('#status', textual.Static).update(status_text)
+        self.query_one('#status', tx.Static).update(status_text)
 
     async def on_unmount(self) -> None:
         if (cl := self._client) is not None:

{omdev-0.0.0.dev472 → omdev-0.0.0.dev474}/omdev/tui/textual/__init__.py

@@ -27,6 +27,7 @@ with _lang.auto_proxy_init(globals()):
     from textual import timer  # noqa
     from textual import widget  # noqa
     from textual import widgets  # noqa
+    from textual import work  # noqa
     from textual.app import ActionError  # noqa
     from textual.app import ActiveModeError  # noqa
     from textual.app import App as App_  # noqa

{omdev-0.0.0.dev472 → omdev-0.0.0.dev474/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev472
+Version: 0.0.0.dev474
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev472
+Requires-Dist: omlish==0.0.0.dev474
 Provides-Extra: all
 Requires-Dist: black~=25.9; extra == "all"
 Requires-Dist: pycparser~=2.23; extra == "all"
@@ -27,7 +27,7 @@ Requires-Dist: mypy~=1.18; extra == "all"
 Requires-Dist: gprof2dot~=2025.4; extra == "all"
 Requires-Dist: segno~=1.6; extra == "all"
 Requires-Dist: rich~=14.2; extra == "all"
-Requires-Dist: textual~=6.4; extra == "all"
+Requires-Dist: textual~=6.5; extra == "all"
 Provides-Extra: black
 Requires-Dist: black~=25.9; extra == "black"
 Provides-Extra: c
@@ -46,7 +46,7 @@ Provides-Extra: qr
 Requires-Dist: segno~=1.6; extra == "qr"
 Provides-Extra: tui
 Requires-Dist: rich~=14.2; extra == "tui"
-Requires-Dist: textual~=6.4; extra == "tui"
+Requires-Dist: textual~=6.5; extra == "tui"
 Dynamic: license-file
 
 # Overview

{omdev-0.0.0.dev472 → omdev-0.0.0.dev474}/omdev.egg-info/SOURCES.txt

@@ -345,6 +345,8 @@ omdev/tools/pawk/__main__.py
 omdev/tools/pawk/pawk.py
 omdev/tui/__init__.py
 omdev/tui/apps/__init__.py
+omdev/tui/apps/edit/__init__.py
+omdev/tui/apps/edit/main.py
 omdev/tui/apps/irc/__init__.py
 omdev/tui/apps/irc/__main__.py
 omdev/tui/apps/irc/app.py

{omdev-0.0.0.dev472 → omdev-0.0.0.dev474}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev472
+omlish==0.0.0.dev474
 
 [all]
 black~=25.9
@@ -12,7 +12,7 @@ mypy~=1.18
 gprof2dot~=2025.4
 segno~=1.6
 rich~=14.2
-textual~=6.4
+textual~=6.5
 
 [black]
 black~=25.9
@@ -38,4 +38,4 @@ segno~=1.6
 
 [tui]
 rich~=14.2
-textual~=6.4
+textual~=6.5

{omdev-0.0.0.dev472 → omdev-0.0.0.dev474}/pyproject.toml

@@ -13,7 +13,7 @@ urls = {source = 'https://github.com/wrmsr/omlish'}
 license = 'BSD-3-Clause'
 readme = 'README.md'
 requires-python = '>=3.13'
-version = '0.0.0.dev472'
+version = '0.0.0.dev474'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,7 +24,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev472',
+    'omlish == 0.0.0.dev474',
 ]
 
 [project.optional-dependencies]
@@ -40,7 +40,7 @@ all = [
     'gprof2dot ~= 2025.4',
     'segno ~= 1.6',
     'rich ~= 14.2',
-    'textual ~= 6.4',
+    'textual ~= 6.5',
 ]
 black = [
     'black ~= 25.9',
@@ -66,7 +66,7 @@ qr = [
 ]
 tui = [
     'rich ~= 14.2',
-    'textual ~= 6.4',
+    'textual ~= 6.5',
 ]
 
 [project.entry-points]