From 57a432f2bc7c880a477f2ff7373ff6cc711916ce Mon Sep 17 00:00:00 2001 From: Kevin Matz Date: Mon, 18 Nov 2019 13:21:36 -0500 Subject: [PATCH] re-organize file tree --- __init__.py | 1 - .../OscListener.py | 28 ++------- bacon/__init__.py | 1 + .../commentmacro/CommentMacro.g4 | 0 .../commentmacro/CommentMacroLexer.py | 0 .../commentmacro/CommentMacroListener.py | 0 .../commentmacro/CommentMacroParser.py | 0 bacon/commentmacro/__init__.py | 1 + comment.py => bacon/script.py | 59 ++----------------- example.bs => examples/example.bs | 0 10 files changed, 12 insertions(+), 78 deletions(-) delete mode 100644 __init__.py rename OscCommentMacroListener.py => bacon/OscListener.py (94%) create mode 100644 bacon/__init__.py rename CommentMacro.g4 => bacon/commentmacro/CommentMacro.g4 (100%) rename CommentMacroLexer.py => bacon/commentmacro/CommentMacroLexer.py (100%) rename CommentMacroListener.py => bacon/commentmacro/CommentMacroListener.py (100%) rename CommentMacroParser.py => bacon/commentmacro/CommentMacroParser.py (100%) create mode 100644 bacon/commentmacro/__init__.py rename comment.py => bacon/script.py (60%) mode change 100755 => 100644 rename example.bs => examples/example.bs (100%) diff --git a/__init__.py b/__init__.py deleted file mode 100644 index 71c13d6..0000000 --- a/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__all__ = ["comment", "CommentMacroLexer", "CommentMacroListener", "CommentMacroParser", "OscCommentMacroListener"] diff --git a/OscCommentMacroListener.py b/bacon/OscListener.py similarity index 94% rename from OscCommentMacroListener.py rename to bacon/OscListener.py index f0b00cd..b8a070e 100644 --- a/OscCommentMacroListener.py +++ b/bacon/OscListener.py @@ -1,32 +1,12 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -"""OscCommentMacroListener.py: Hog 4 comment macro antlr4 listener for OSC.""" - -__author__ = "Kevin Matz" -__copyright__ = "Copyright 2018, Company 235, LLC" -__credits__ = ["Kevin Matz"] - -__license__ = "MIT" -__version__ = "3.9" -__maintainer__ = "Kevin Matz" -__email__ = "kevin@company235.com" - -__status__ = "Prototype" - +"""OscCommentMacroListener.py: Hog 4 comment macro antlr4 listener for OSC. +""" import logging from pythonosc import osc_message_builder from time import sleep -try: - # include reletive path imports when a module - from .CommentMacroParser import CommentMacroParser - from .CommentMacroListener import CommentMacroListener -except ImportError: - # include directly when called directly - from CommentMacroParser import CommentMacroParser - from CommentMacroListener import CommentMacroListener +from .commentmacro.CommentMacroParser import CommentMacroParser +from .commentmacro.CommentMacroListener import CommentMacroListener logger = logging.getLogger('__main__') diff --git a/bacon/__init__.py b/bacon/__init__.py new file mode 100644 index 0000000..b73597c --- /dev/null +++ b/bacon/__init__.py @@ -0,0 +1 @@ +__all__ = ["baconscript", "OscCommentMacroListener"] diff --git a/CommentMacro.g4 b/bacon/commentmacro/CommentMacro.g4 similarity index 100% rename from CommentMacro.g4 rename to bacon/commentmacro/CommentMacro.g4 diff --git a/CommentMacroLexer.py b/bacon/commentmacro/CommentMacroLexer.py similarity index 100% rename from CommentMacroLexer.py rename to bacon/commentmacro/CommentMacroLexer.py diff --git a/CommentMacroListener.py b/bacon/commentmacro/CommentMacroListener.py similarity index 100% rename from CommentMacroListener.py rename to bacon/commentmacro/CommentMacroListener.py diff --git a/CommentMacroParser.py b/bacon/commentmacro/CommentMacroParser.py similarity index 100% rename from CommentMacroParser.py rename to bacon/commentmacro/CommentMacroParser.py diff --git a/bacon/commentmacro/__init__.py b/bacon/commentmacro/__init__.py new file mode 100644 index 0000000..3b6c1c4 --- /dev/null +++ b/bacon/commentmacro/__init__.py @@ -0,0 +1 @@ +__all__ = ["CommentMacroLexer", "CommentMacroListener", "CommentMacroParser"] diff --git a/comment.py b/bacon/script.py old mode 100755 new mode 100644 similarity index 60% rename from comment.py rename to bacon/script.py index 41a01be..64da320 --- a/comment.py +++ b/bacon/script.py @@ -1,40 +1,17 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -"""comment.py: Hog 4 comment macro interpreter and OSC bridge.""" - -__author__ = "Kevin Matz" -__copyright__ = "Copyright 2018, Company 235, LLC" -__credits__ = ["Kevin Matz"] - -__license__ = "MIT" -__version__ = "3.9" -__maintainer__ = "Kevin Matz" -__email__ = "kevin@company235.com" - -__status__ = "Prototype" - +"""comment.py: Hog 4 comment macro interpreter and OSC bridge. +""" import configparser import logging import sys -from antlr4 import CommonTokenStream -from antlr4 import InputStream -from antlr4 import ParseTreeWalker +from antlr4 import CommonTokenStream, InputStream, ParseTreeWalker from antlr4.error.ErrorListener import ErrorListener from pythonosc import udp_client -try: - # include reletive path imports when a module - from .CommentMacroLexer import CommentMacroLexer - from .CommentMacroParser import CommentMacroParser - from .OscCommentMacroListener import OscCommentMacroListener -except ImportError: - # include directly when called directly - from CommentMacroLexer import CommentMacroLexer - from CommentMacroParser import CommentMacroParser - from OscCommentMacroListener import OscCommentMacroListener +from .commentmacro.CommentMacroLexer import CommentMacroLexer +from .commentmacro.CommentMacroParser import CommentMacroParser +from .OscListener import OscCommentMacroListener # define an error listener that raises SyntaxError exceptions @@ -109,27 +86,3 @@ def comment(text): except SyntaxError as e: logger.debug(e) # antlr internal listener prints the error # # log it to the debug logger anyway - - -# handle user input if run directly -if __name__ == '__main__': - if len(sys.argv) > 1: - # look for macros passed as arguments - logger.debug("found macro at argv[1]") - comment(sys.argv[1]) - else: - # for input history and line editing - import readline - # be an interactive shell - while True: - # get user input - try: - text = input("comment# ") - except (KeyboardInterrupt, EOFError): - text = 'exit' - print(text) - # catch exit keyword - if text.lower() == 'exit': - break - # exec user input - comment(text) diff --git a/example.bs b/examples/example.bs similarity index 100% rename from example.bs rename to examples/example.bs