More working, output looks better pformat(!). :D

tcp-proxy.py

@@ -14,6 +14,8 @@ from subprocess import check_output
 
 from colorama import Fore, Back, Style
 from itertools import cycle
+from deprecated import deprecated
+from pprint import pformat
 
 # This isn't the best configuration, but it's simple
 # and works.  Mostly.
@@ -102,14 +104,26 @@ class Observer(object):
             if len(self.dispatch[signal]) == 0:
                 self.dispatch.pop(signal)
 
-    def get_funcs(self):
-        """ Gives a copy of the dispatch. """
-        return dict(self.dispatch)
+    def save(self):
+        """ Save the current dispatch. """
+        ret = dict(self.dispatch)
+        self.dispath = {}
+        return ret
+
+    def load(self, dispatch):
+        """ Load/restore the dispatch. """
+        self.dispatch = dict(dispatch)
 
+    @deprecated("Use save/load instead.")
     def set_funcs(self, dispatch):
         """ Replaces the dispatch. """
         self.dispatch = dict(dispatch)
 
+    @deprecated("Use save/load instead.")
+    def get_funcs(self):
+        """ Gives a copy of the dispatch. """
+        return dict(self.dispatch)
+
     def get_funcs_(self, signal):
         """ Gives a copy of the dispatch for a given signal. """
         if signal in self.dispatch:
@@ -194,6 +208,7 @@ class MCP(object):
         c2 = merge(Style.NORMAL + Fore.BLUE)
 
         self.queue_game.put(nl + c + "TradeWars Proxy active." + r + nl)
+        self.queue_game.put(" " + c1 + "D" + c2 + " - " + c1 + "Diagnostics" + nl)        
         self.queue_game.put(
             " " + c1 + "T" + c2 + " - " + c1 + "Display current Time" + nl
         )
@@ -234,7 +249,9 @@ class MCP(object):
             self.scripts()
 
         elif key == 'D':
-            self.queue_game.put(nl + "Diagnostics" + nl + "portdata:" + nl + repr(self.portdata) + nl)
+            self.queue_game.put(nl + "Diagnostics" + nl + "portdata:" + nl)
+            line = pformat(self.portdata).replace("\n", "\n\r")
+            self.queue_game.put(line + nl)
             self.displayMenu()
 
         elif key == "X":
@@ -295,7 +312,7 @@ class MCP(object):
 
         if line == ': ENDINTERROG':
             log.msg("CIM Done")
-            log.msg(self.portdata)
+            log.msg(pformat(self.portdata))
             self.queue_game.put("\b \b" + "\n\r")
             self.observer.disconnect('prompt', self.portPrompt)
             self.observer.disconnect('game-line', self.portParse)
@@ -356,7 +373,7 @@ class MCP(object):
             log.msg(repr(parts))
 
     def scripts(self):
-        self.scripts = dict()
+        self.script = dict()
 
         self.observer.disconnect("player", self.fromPlayer)
         self.observer.connect("player", self.scriptFromPlayer)
@@ -372,6 +389,12 @@ class MCP(object):
         self.queue_game.put(" " + c1 + "P" + c2 + " - " + c1 + "Port Trading Pair" + nl)
         self.queue_game.put("   " + c + "-=>" + r + " ")
 
+    def unscript(self):
+        self.observer.connect("player", self.fromPlayer)
+        self.observer.disconnect("player", self.scriptFromPlayer)
+        self.observer.disconnect('game-line', self.scriptLine)
+        self.displayMenu()
+
     def scriptLine(self, line):
         pass
 
@@ -398,56 +421,70 @@ class MCP(object):
 
     def save_sector(self, sector):
         log.msg("save_sector {0}".format(sector))
-        log.msg( self.observer.dispatch)        
+        if sector.strip() == '':
+            self.queue_game.put("Script Aborted.")
+            self.unscript()
+            return
         s = int(sector.strip())
-        self.scripts['sector'] = s
+        self.script['sector'] = s
         d = self.playerInput("Enter times to execute script: ", 6)
         d.addCallback(self.save_loop)
 
     def save_loop(self, loop):
-        log.msg("save_loop {0}".format(loop))        
-        log.msg( self.observer.dispatch)        
+        log.msg("save_loop {0}".format(loop))
+        if loop.strip() == '':
+            self.queue_game.put("Script Aborted.")
+            self.unscript()
+            return
         l = int(loop.strip())
-        self.scripts['loop'] = l
+        self.script['loop'] = l
         d = self.playerInput("Enter markup/markdown percentage: ", 3)
         d.addCallback(self.save_mark)
 
     def save_mark(self, mark):
         log.msg("save_mark {0}".format(mark))                
         if mark.strip() == "":
-            self.scripts['mark'] = 5
+            self.script['mark'] = 5
         else:
-            self.scripts['mark'] = int(mark.strip())
-        self.queue_game.put(repr(self.scripts) +"\n\r")
+            self.script['mark'] = int(mark.strip())
+        # Ok, we have the values we need to run the Port trade script
+        self.queue_game.put(pformat(self.script).replace("\n", "\n\r"))
+        self.unscript()
 
     def playerInput(self, prompt, limit):
-        log.msg("playerInput({0}, {1}".format(prompt, limit))
-        log.msg( self.observer.dispatch) 
+        """ Given a prompt and limit, this handles user input.
 
+        This displays the prompt, and sets up the proper
+        observers, while preserving the "current" ones.
+        This returns a deferred, so you can chain the results
+        of this.
+        """
+        log.msg("playerInput({0}, {1}".format(prompt, limit))
         nl = "\n\r"
         c = merge(Style.BRIGHT + Fore.WHITE + Back.BLUE)
         r = Style.RESET_ALL
         self.queue_game.put(r + nl + c + prompt)
+        # This should set the background and show the size of the entry area.
+        self.queue_game.put(" " * limit + "\b" * limit)
         d = defer.Deferred()
         self.player_input = d
         self.input_limit = limit
         self.input_input = ''
         self.save = self.observer.get_funcs()
         input_funcs = { 'player': [self.niceInput] }
-        self.observer.set_funcs(input_funcs)
-        log.msg( self.observer.dispatch)         
+        self.observer.set_funcs(input_funcs)     
         return d
 
     def niceInput(self, chunk):
         """ Data from player (in bytes).  """
         chunk = chunk.decode("utf-8", "ignore")
-        log.msg("niceInput:", repr(chunk))
+        # log.msg("niceInput:", repr(chunk))
         r = Style.RESET_ALL
 
         for c in chunk:
             if c == '\b':
                 # Backspace
-                if len(self.input_input) > 1:
+                if len(self.input_input) > 0:
                     self.queue_game.put("\b \b")
                     self.input_input = self.input_input[0:-1]
                 else:
@@ -461,13 +498,11 @@ class MCP(object):
                 self.save = None
                 line = self.input_input
                 log.msg("finishing niceInput {0}".format(line))
-                self.queue_game.put("[{0}]\n\r".format(line))
+                # self.queue_game.put("[{0}]\n\r".format(line))
                 self.input_input = ''
                 # Ok, maybe this isn't the way to do this ...
                 # self.player_input.callback(line)
                 reactor.callLater(0, self.player_input.callback, line)                
-                log.msg("callback({0})".format(line))
-                # Maybe I don't want to do this?
                 self.player_input = None
 
             if c.isprintable():
@@ -708,12 +743,16 @@ class Player(protocol.Protocol):
                 prompt = self.game.getPrompt()
                 if "Selection (? for menu)" in prompt:
                     self.observer.emit("notyet", prompt)
-                if "Enter your choice:" in prompt:
+                elif "Enter your choice:" in prompt:
                     self.observer.emit("notyet", prompt)
-                if re.match(r"Computer command \[TL=.* \(\?=Help\)\? :", prompt):
+                elif re.match(r"Computer command \[TL=.* \(\?=Help\)\? :", prompt):
                     self.observer.emit("notyet", prompt)
-                if re.match(r"Command \[TL=.* \(\?=Help\)\? :", prompt):
+                elif re.match(r"Command \[TL=.* \(\?=Help\)\? :", prompt):
                     self.observer.emit("hotkey", prompt)
+                else:
+                    log.msg("Unsure about [{0}] prompt.".format(prompt))
+                    # but try anyway!  :P
+                    self.observer.emit("notyet", prompt)
 
             # Selection (? for menu):   (the game server menu)
             # Enter your choice:  (game menu)