From 3247352fd0b1e34a840d336175178097b087613d Mon Sep 17 00:00:00 2001 From: Kevin Matz Date: Sun, 21 Oct 2018 14:20:11 -0400 Subject: [PATCH] remove unused return values --- OscCommentMacroListener.py | 4 +--- OscMacroDefinitions.py | 30 +++++++++--------------------- comment.py | 8 ++++++-- 3 files changed, 16 insertions(+), 26 deletions(-) diff --git a/OscCommentMacroListener.py b/OscCommentMacroListener.py index 81eccc8..1cd2164 100644 --- a/OscCommentMacroListener.py +++ b/OscCommentMacroListener.py @@ -75,15 +75,13 @@ class OscCommentMacroListener(CommentMacroListener): logger.info(beautify_lisp_string(lisp_tree_str)) # execute macro from name - ret = -1 name = ctx.children[0].getText() try: - ret = self.osc.command[name](self, ctx) + self.osc.command[name](self, ctx) except KeyError: print(name + " macro is not compatable with OSC.") return -1 logger.debug("Exiting Macro") - return ret def enterMaster(self, ctx: CommentMacroParser.MasterContext): ctx.targets = [] diff --git a/OscMacroDefinitions.py b/OscMacroDefinitions.py index a34b9c9..08d3e17 100644 --- a/OscMacroDefinitions.py +++ b/OscMacroDefinitions.py @@ -37,16 +37,15 @@ class HogDevice(): if (device.type.getText() != 'h'): logger.warn("Only Hog type devices are curently supported.") logger.error("ERROR: macro discarded!") - return -1 + return else: try: osc = self.servers[device.number.value] except KeyError: logger.warn("Net# "+str(device.number.value)+" not found.") logger.error("ERROR: macro discarded!") - return -1 + return osc.send_message(path, arg) - return 1 def _master_go(self, ctx): if ctx.number is not None: @@ -55,7 +54,7 @@ class HogDevice(): if (len(ctx.master.targets) == 0): logger.info("Main GO") self.osc.button_press(ctx.device, "/hog/hardware/maingo") - return 1 + return else: for i in ctx.master.targets: if isinstance(i, int) is not True: @@ -68,13 +67,12 @@ class HogDevice(): master = str(i) logger.info("GO on master " + master) self.osc.button_press(ctx.device, "/hog/hardware/go/" + master) - return 1 def _master_halt(self, ctx): if (len(ctx.master.targets) == 0): logger.info("Main HALT") self.osc.button_press(ctx.device, "/hog/hardware/mainhalt") - return 1 + return else: for i in ctx.master.targets: if isinstance(i, int) is not True: @@ -88,20 +86,19 @@ class HogDevice(): logger.info("HALT on master " + master) self.osc.button_press(ctx.device, "/hog/hardware/pause/" + master) - return 1 def _master_fade(self, ctx): if (ctx.number) is None: logger.error("ERROR: Missing required argument for LEVEL") - return -1 + return else: level = ctx.number.value if (level < 0 or level > 100): logger.error("Level must be between 0 and 100.") - return -1 + return if (len(ctx.master.targets) == 0): logger.error("MASTER FADE doesn't support * current master.") - return -1 + return else: for i in ctx.master.targets: if isinstance(i, int) is not True: @@ -117,26 +114,23 @@ class HogDevice(): self.osc.send_message(ctx.device, "/hog/hardware/fader/" + master, level) - return 1 def _master_fade_grand(self, ctx): level = ctx.number.value if (level < 0 or level > 100): logger.error("Level must be between 0 and 100.") - return -1 + return logger.info("Fading Grand Master to " + str(level) + "%") level *= 255 / 100 # percent in Macro, 0>255 in OSC self.osc.send_message(ctx.device, "/hog/hardware/fader/0", level) - return 1 def _master_choose(self, ctx): if (ctx.number.value < 0): logger.error("Master must be greater than 0.") - return -1 + return master = str(ctx.number.value) logger.info("Choose Master " + master) self.osc.button_press(ctx.device, "/hog/hardware/choose/" + master) - return 1 def _list_go(self, ctx): for i in ctx.targets: @@ -145,37 +139,31 @@ class HogDevice(): list += "." + str(ctx.number.value) logger.info("Go on List " + list) self.osc.send_message(ctx.device, "/hog/playback/go/0", list) - return 1 def _list_halt(self, ctx): for i in ctx.targets: logger.info("Halting List " + str(i)) self.osc.send_message(ctx.device, "/hog/playback/halt/0", i) - return 1 def _list_release(self, ctx): for i in ctx.targets: logger.info("Releasing List " + str(i)) self.osc.send_message(ctx.device, "/hog/playback/release/0", i) - return 1 def _scene_go(self, ctx): for i in ctx.targets: logger.info("Go on Scene " + str(i)) self.osc.send_message(ctx.device, "/hog/playback/go/1", i) - return 1 def _scene_halt(self, ctx): for i in ctx.targets: logger.info("Halt Scene " + str(i)) self.osc.send_message(ctx.device, "/hog/playback/halt/1", i) - return 1 def _scene_release(self, ctx): for i in ctx.targets: logger.info("Release Scene " + str(i)) self.osc.send_message(ctx.device, "/hog/playback/release/1", i) - return 1 command = {"GM": _master_go, "HM": _master_halt, diff --git a/comment.py b/comment.py index fd817a1..890e748 100755 --- a/comment.py +++ b/comment.py @@ -58,6 +58,11 @@ def comment(text): walker.walk(oscMacro, tree) +def orderly_exit(): + logger.info('Goodbye.') + sys.exit(0) + + if __name__ == '__main__': signal.signal(signal.SIGINT, orderly_exit) if len(sys.argv) > 1: @@ -67,7 +72,6 @@ if __name__ == '__main__': while True: text = input("comment# ") if text == 'exit': - logger.info('Goodbye.') - sys.exit(0) + orderly_exit() else: comment(text)