Restructured code. twgs-proxy.py is the main program.

proxy.py is now a module that defines most of the IO classes.

flexible.py

@@ -1101,7 +1101,7 @@ class ScriptExplore(object):
             self.state += 1
             self.send2game("SH")
         if self.state == 12:
-            # Looking for "Engage the Autopiolot?"
+            # Looking for "Engage the Autopilot?"
             if prompt.startswith('Engage the Autopilot? (Y/N/Single step/Express) [Y]'):
                 self.send2game("S")
                 self.travel_path.pop(0)                

tcp-proxy.py → proxy.py

@@ -1,6 +1,4 @@
-#!/usr/bin/env python3
 
-import sys
 import re
 
 from twisted.internet import defer
@@ -9,44 +7,12 @@ from twisted.internet import reactor
 from twisted.internet import task
 from twisted.internet.task import coiterate
 from twisted.python import log
-from twisted.python.logfile import DailyLogFile
+
 import pendulum
-from subprocess import check_output
-import os
 from colorama import Fore, Back, Style
 
 from pprint import pformat
-
-import yaml
-
-
-def config_load(filename: str):
-    global config
-    with open(filename, "r") as fp:
-        config = yaml.safe_load(fp)
-
-
-if os.path.exists("config_dev.yaml"):
-    config_load("config_dev.yaml")
-else:
-    config_load("config.yaml")
-
-# Extract the version information from git.
-# The match gives us only tags starting with v[0-9]*  Using anything else trips up on double digits.
-version = check_output(
-    [
-        "git",
-        "describe",
-        "--abbrev=8",
-        "--long",
-        "--tags",
-        "--dirty",
-        "--always",
-        "--match",
-        "v[0-9]*",
-    ],
-    universal_newlines=True,
-).strip()
+from __main__ import config, version
 
 
 def merge(color_string: str):
@@ -567,23 +533,3 @@ class GlueFactory(protocol.ClientFactory):
 
 
 
-if __name__ == "__main__":
-    if "logfile" in config and config["logfile"]:
-        log.startLogging(DailyLogFile("proxy.log", "."))
-    else:
-        log.startLogging(sys.stdout)
-
-    log.msg("This is version: %s" % version)
-    factory = protocol.Factory()
-    factory.protocol = Player
-    reactor.listenTCP(config["listen_port"], factory, interface=config["listen_on"])
-    reactor.run()
-else:
-    # I can't seem to get twistd -y tcp-proxy.py
-    # to work.  Missing imports?
-    pass
-    # application = service.Application("TradeWarsGameServer-Proxy")
-    # factory = protocol.Factory()
-    # factory.protocol = Player
-    # internet.TCPServer(config["listen_port"], factory).setServiceParent(application)
-

twgs-proxy.py

@@ -0,0 +1,54 @@
+#!/usr/bin/env python3
+
+import sys
+import os
+from subprocess import check_output
+
+from twisted.internet import reactor
+from twisted.internet import protocol
+from twisted.python import log
+from twisted.python.logfile import DailyLogFile
+import yaml
+
+
+def config_load(filename: str):
+    global config
+    with open(filename, "r") as fp:
+        config = yaml.safe_load(fp)
+
+
+if os.path.exists("config_dev.yaml"):
+    config_load("config_dev.yaml")
+else:
+    config_load("config.yaml")
+
+# Extract the version information from git.
+# The match gives us only tags starting with v[0-9]*  Using anything else trips up on double digits.
+version = check_output(
+    [
+        "git",
+        "describe",
+        "--abbrev=8",
+        "--long",
+        "--tags",
+        "--dirty",
+        "--always",
+        "--match",
+        "v[0-9]*",
+    ],
+    universal_newlines=True,
+).strip()
+
+
+from proxy import Player
+
+if "logfile" in config and config["logfile"]:
+    log.startLogging(DailyLogFile("proxy.log", "."))
+else:
+    log.startLogging(sys.stdout)
+
+log.msg("This is version: {0}".format(version))
+factory = protocol.Factory()
+factory.protocol = Player
+reactor.listenTCP(config["listen_port"], factory, interface=config["listen_on"])
+reactor.run()