Fix imports, host and port cmdline parameters

Author: neumond

README.md

@@ -1,5 +1,8 @@
 # Pythonized ComputerCraft API
 
+```
+python -m computercraft.server
+```
+
 TODO:
-- add host and port cmdline parameters for server
 - use current dir for programs

computercraft/errors.py

@@ -1,4 +1,4 @@
-class TurtleException(Exception):
+class CommandException(Exception):
     pass
 
 

computercraft/server.py

@@ -6,27 +6,29 @@
 from os.path import getmtime, join, dirname, abspath
 from os import listdir
 import importlib
-from subapis.root import RootAPIMixin
-from common import LuaException
-
-from subapis.colors import ColorsAPI
-from subapis.commands import CommandsAPI
-from subapis.disk import DiskAPI
-from subapis.fs import FSAPI
-from subapis.gps import GpsAPI
-from subapis.help import HelpAPI
-from subapis.keys import KeysAPI
-from subapis.multishell import MultishellAPI
-from subapis.os import OSAPI
-from subapis.peripheral import PeripheralAPI
-from subapis.rednet import RednetAPI
-from subapis.redstone import RedstoneAPI
-from subapis.settings import SettingsAPI
-from subapis.shell import ShellAPI
-from subapis.term import TermAPI
-from subapis.textutils import TextutilsAPI
-from subapis.turtle import TurtleAPI
-from subapis.window import WindowAPI
+import argparse
+
+from .subapis.root import RootAPIMixin
+from .errors import LuaException
+
+from .subapis.colors import ColorsAPI
+from .subapis.commands import CommandsAPI
+from .subapis.disk import DiskAPI
+from .subapis.fs import FSAPI
+from .subapis.gps import GpsAPI
+from .subapis.help import HelpAPI
+from .subapis.keys import KeysAPI
+from .subapis.multishell import MultishellAPI
+from .subapis.os import OSAPI
+from .subapis.peripheral import PeripheralAPI
+from .subapis.rednet import RednetAPI
+from .subapis.redstone import RedstoneAPI
+from .subapis.settings import SettingsAPI
+from .subapis.shell import ShellAPI
+from .subapis.term import TermAPI
+from .subapis.textutils import TextutilsAPI
+from .subapis.turtle import TurtleAPI
+from .subapis.window import WindowAPI
 
 
 THIS_DIR = dirname(abspath(__file__))
@@ -202,6 +204,10 @@ async def taskresult(request):
 def backdoor(request):
     with open(LUA_FILE, 'r') as f:
         fcont = f.read()
+    fcont = fcont.replace(
+        "local url = 'http://127.0.0.1:4343/'",
+        "local url = '{}://{}/'".format(request.scheme, request.host)
+    )
     return web.Response(text=fcont)
 
 
@@ -236,13 +242,25 @@ def enable_request_logging():
 
 def main():
     # enable_request_logging()
+
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--host')
+    parser.add_argument('--port', type=int)
+    args = parser.parse_args()
+
+    app_kw = {}
+    if args.host is not None:
+        app_kw['host'] = args.host
+    if args.port is not None:
+        app_kw['port'] = args.port
+
     asyncio.ensure_future(module_reloader())
     app = web.Application()
     app.router.add_get('/', backdoor)
     app.router.add_post('/start/{turtle}/{program}/', start)
     app.router.add_post('/gettask/{turtle}/', gettask)
     app.router.add_post('/taskresult/{turtle}/{task_id}/', taskresult)
-    web.run_app(app, port=4343)
+    web.run_app(app, **app_kw)
 
 
 if __name__ == '__main__':

computercraft/subapis/base.py

@@ -1,4 +1,4 @@
-from common import TurtleException, ApiException
+from ..errors import CommandException, ApiException
 from typing import Union
 
 
@@ -68,7 +68,7 @@ def bool_success(v):
         return
     if len(v) == 2 and v[0] is False:
         assert isinstance(v[1], str)
-        raise TurtleException(v[1])
+        raise CommandException(v[1])
     raise ApiException('Bad return value: {}'.format(v))
 
 

computercraft/subapis/root.py

@@ -1,4 +1,4 @@
-from subapis.base import nil_return, bool_return, lua_args, str_return
+from .base import nil_return, bool_return, lua_args, str_return
 
 
 class RootAPIMixin:

computercraft/subapis/turtle.py

@@ -1,6 +1,6 @@
 from typing import Optional
 from .base import BaseSubAPI, bool_success, number_return, LuaNum, int_return, bool_return, opt_dict_return
-from common import TurtleException
+from ..errors import CommandException
 
 
 class TurtleAPI(BaseSubAPI):
@@ -89,7 +89,7 @@ async def _inspect_result(self, v):
         if not r and data == 'No block to inspect':
             return None
         if not r:
-            raise TurtleException(data)
+            raise CommandException(data)
         return data
 
     async def inspect(self) -> Optional[dict]: