diff --git a/adafruit_editor/__init__.py b/adafruit_editor/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/adafruit_editor/__main__.py b/adafruit_editor/__main__.py new file mode 100644 index 0000000..6a45499 --- /dev/null +++ b/adafruit_editor/__main__.py @@ -0,0 +1,12 @@ +# SPDX-FileCopyrightText: 2023 Jeff Epler for Adafruit Industries +# +# SPDX-License-Identifier: MIT +from .editor import edit + +if __name__ == "__main__": + import argparse + + parser = argparse.ArgumentParser() + parser.add_argument("filename") + args = parser.parse_args() + edit(args.filename) diff --git a/dang.py b/adafruit_editor/dang.py similarity index 100% rename from dang.py rename to adafruit_editor/dang.py diff --git a/editor.py b/adafruit_editor/editor.py similarity index 97% rename from editor.py rename to adafruit_editor/editor.py index ce76cda..76519f9 100644 --- a/editor.py +++ b/adafruit_editor/editor.py @@ -6,7 +6,7 @@ import gc import os -import dang as curses +from . import dang as curses class MaybeDisableReload: @@ -287,12 +287,3 @@ def editor(stdscr, filename): # pylint: disable=too-many-branches,too-many-stat def edit(filename): with MaybeDisableReload(): return curses.wrapper(editor, filename) - - -if __name__ == "__main__": - import argparse - - parser = argparse.ArgumentParser() - parser.add_argument("filename") - args = parser.parse_args() - edit(args.filename) diff --git a/picker.py b/adafruit_editor/picker.py similarity index 98% rename from picker.py rename to adafruit_editor/picker.py index acca544..cc5b927 100644 --- a/picker.py +++ b/adafruit_editor/picker.py @@ -4,7 +4,7 @@ import os -import dang as curses +from . import dang as curses always = ["code.py", "boot.py", "settings.toml", "boot_out.txt"] good_extensions = [".py", ".toml", ".txt", ".json"] diff --git a/dangtest.py b/examples/event_test.py similarity index 82% rename from dangtest.py rename to examples/event_test.py index 09e312c..4f56612 100644 --- a/dangtest.py +++ b/examples/event_test.py @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: MIT -from dang import wrapper +from adafruit_editor.dang import wrapper def main(stdscr): diff --git a/code.py b/examples/pick_and_edit.py similarity index 59% rename from code.py rename to examples/pick_and_edit.py index 7852f87..6557a2d 100644 --- a/code.py +++ b/examples/pick_and_edit.py @@ -2,11 +2,14 @@ # # SPDX-License-Identifier: MIT -import editor -import picker +from adafruit_editor import editor, picker while True: - filename = picker.pick_file() + try: + filename = picker.pick_file() + except KeyboardInterrupt: + break + try: editor.edit(filename) except KeyboardInterrupt: