Refactor LuaExpr passing & BasePeripheral

Author: neumond

computercraft/lua.py

@@ -57,12 +57,11 @@ def lua_value(v):
     raise ValueError('Can\'t convert a value to lua {}'.format(v))
 
 
-def lua_args(*params, omit_nulls=True):
-    if omit_nulls:
-        for idx in range(len(params) - 1, -1, -1):
-            if params[idx] is not None:
-                break
-        else:
-            idx = -1
-        params = params[:idx + 1]
+def lua_args(*params):
+    for idx in range(len(params) - 1, -1, -1):
+        if params[idx] is not None:
+            break
+    else:
+        idx = -1
+    params = params[:idx + 1]
     return ', '.join(lua_value(p) for p in params)

computercraft/server.py

@@ -55,25 +55,25 @@ def __init__(self, nid, program, cleanup_callback):
         self._event_to_tids = {}
         self._tid_to_event = {}
 
-        self.colors = ColorsAPI(self)
-        self.commands = CommandsAPI(self)
-        self.disk = DiskAPI(self)
-        self.fs = FSAPI(self)
-        self.gps = GpsAPI(self)
-        self.help = HelpAPI(self)
-        self.keys = KeysAPI(self)
-        self.multishell = MultishellAPI(self)
-        self.os = OSAPI(self)
-        self.peripheral = PeripheralAPI(self)
-        self.pocket = PocketAPI(self)
-        self.rednet = RednetAPI(self)
-        self.redstone = RedstoneAPI(self)
-        self.settings = SettingsAPI(self)
-        self.shell = ShellAPI(self)  # TODO: autocomplete functions
-        self.term = TermAPI(self)  # TODO: window redirections
-        self.textutils = TextutilsAPI(self)
-        self.turtle = TurtleAPI(self)
-        self.window = WindowAPI(self)  # TODO: unimplemented
+        self.colors = ColorsAPI(self, 'colors')
+        self.commands = CommandsAPI(self, 'commands')
+        self.disk = DiskAPI(self, 'disk')
+        self.fs = FSAPI(self, 'fs')
+        self.gps = GpsAPI(self, 'gps')
+        self.help = HelpAPI(self, 'help')
+        self.keys = KeysAPI(self, 'keys')
+        self.multishell = MultishellAPI(self, 'multishell')
+        self.os = OSAPI(self, 'os')
+        self.peripheral = PeripheralAPI(self, 'peripheral')
+        self.pocket = PocketAPI(self, 'pocket')
+        self.rednet = RednetAPI(self, 'rednet')
+        self.redstone = RedstoneAPI(self, 'redstone')
+        self.settings = SettingsAPI(self, 'settings')
+        self.shell = ShellAPI(self, 'shell')  # TODO: autocomplete functions
+        self.term = TermAPI(self, 'term')  # TODO: window redirections
+        self.textutils = TextutilsAPI(self, 'textutils')
+        self.turtle = TurtleAPI(self, 'turtle')
+        self.window = WindowAPI(self, 'window')  # TODO: unimplemented
 
         async def prog_wrap():
             err = None

computercraft/subapis/base.py

@@ -1,13 +1,18 @@
-from ..lua import lua_args
+from ..lua import LuaExpr, lua_args
 
 
-class BaseSubAPI:
-    _API = NotImplemented
-
-    def __init__(self, cc):
+class BaseSubAPI(LuaExpr):
+    def __init__(self, cc, lua_expr):
         self._cc = cc
+        self._lua_expr = lua_expr
+
+    def get_expr_code(self):
+        return self._lua_expr
+
+    async def _send(self, method, *params):
+        return await self._method(method, *params)
 
-    async def _send(self, method, *params, omit_nulls=True):
+    async def _method(self, name, *params):
         return await self._cc.eval_coro('return {}.{}({})'.format(
-            self._API, method, lua_args(*params, omit_nulls=omit_nulls)
+            self._lua_expr, name, lua_args(*params),
         ))

computercraft/subapis/colors.py

@@ -5,8 +5,6 @@
 
 
 class ColorsAPI(BaseSubAPI):
-    _API = 'colors'
-
     white = 0x1
     orange = 0x2
     magenta = 0x4

computercraft/subapis/commands.py

@@ -8,8 +8,6 @@
 
 
 class CommandsAPI(BaseSubAPI):
-    _API = 'commands'
-
     async def exec(self, command: str) -> Tuple[bool, List[str], Optional[int]]:
         return command_result(await self._send('exec', command))
 

computercraft/subapis/disk.py

@@ -5,8 +5,6 @@
 
 
 class DiskAPI(BaseSubAPI):
-    _API = 'disk'
-
     async def isPresent(self, side: str) -> bool:
         return boolean(await self._send('isPresent', side))
 

computercraft/subapis/fs.py

@@ -2,7 +2,7 @@
 from typing import Optional, List
 
 from .base import BaseSubAPI
-from ..lua import LuaExpr, lua_string
+from ..lua import lua_string
 from ..rproc import boolean, string, integer, nil, array_string, option_string, fact_scheme_dict
 
 
@@ -14,16 +14,7 @@
 }, {})
 
 
-class BaseHandle(BaseSubAPI, LuaExpr):
-    def __init__(self, cc, var):
-        super().__init__(cc)
-        self._API = var
-
-    def get_expr_code(self):
-        return self._API
-
-
-class ReadHandle(BaseHandle):
+class ReadHandle(BaseSubAPI):
     async def read(self, count: int) -> Optional[str]:
         return option_string(await self._send('read', count))
 
@@ -43,7 +34,7 @@ async def __anext__(self):
         return line
 
 
-class WriteHandle(BaseHandle):
+class WriteHandle(BaseSubAPI):
     async def write(self, text: str):
         return nil(await self._send('write', text))
 
@@ -55,8 +46,6 @@ async def flush(self):
 
 
 class FSAPI(BaseSubAPI):
-    _API = 'fs'
-
     async def list(self, path: str) -> List[str]:
         return array_string(await self._send('list', path))
 
@@ -111,7 +100,7 @@ async def open(self, path: str, mode: str):
         fid = self._cc._new_task_id()
         var = 'temp[{}]'.format(lua_string(fid))
         await self._cc.eval_coro('{} = fs.open({}, {})'.format(
-            var, *map(lua_string, [path, mode])))
+            var, lua_string(path), lua_string(mode)))
         try:
             yield (ReadHandle if 'r' in mode else WriteHandle)(self._cc, var)
         finally:
@@ -133,7 +122,7 @@ async def complete(
         self, partialName: str, path: str, includeFiles: bool = None, includeDirs: bool = None,
     ) -> List[str]:
         return array_string(await self._send(
-            'complete', partialName, path, includeFiles, includeDirs, omit_nulls=False))
+            'complete', partialName, path, includeFiles, includeDirs))
 
     async def attributes(self, path: str) -> dict:
         return attribute(await self._send('attributes', path))

computercraft/subapis/gps.py

@@ -9,9 +9,7 @@
 
 
 class GpsAPI(BaseSubAPI):
-    _API = 'gps'
-
     CHANNEL_GPS = 65534
 
     async def locate(self, timeout: LuaNum = None, debug: bool = None) -> Optional[Tuple[LuaNum, LuaNum, LuaNum]]:
-        return option_tuple3_number(await self._send('locate', timeout, debug, omit_nulls=False))
+        return option_tuple3_number(await self._send('locate', timeout, debug))

computercraft/subapis/help.py

@@ -5,8 +5,6 @@
 
 
 class HelpAPI(BaseSubAPI):
-    _API = 'help'
-
     async def path(self) -> str:
         return string(await self._send('path'))
 

computercraft/subapis/keys.py

@@ -6,16 +6,14 @@
 
 
 class KeysAPI(BaseSubAPI):
-    _API = 'keys'
-
     async def getCode(self, name: str) -> Optional[int]:
         # replaces properties
         # keys.space → await api.keys.getCode('space')
         return option_integer(await self._cc.eval_coro('''
-if type({api}[{key}]) == 'number' then
-    return {api}[{key}]
+if type({module}[{key}]) == 'number' then
+    return {module}[{key}]
 end
-return nil'''.format(api=self._API, key=lua_string(name))))
+return nil'''.format(module=self.get_expr_code(), key=lua_string(name))))
 
     async def getName(self, code: int) -> Optional[str]:
         return option_string(await self._send('getName', code))