Bugfixes

Author: neumond

computercraft/back.lua

@@ -4,6 +4,7 @@ local event_sub = {}
 genv.temp = temp
 local url = 'http://127.0.0.1:4343/'
 local tasks = {}
+local filters = {}
 local ycounts = {}
 
 ws = http.websocket(url..'ws/')
@@ -59,6 +60,7 @@ while true do
         elseif msg.action == 'drop' then
             for _, task_id in ipairs(msg.task_ids) do
                 tasks[task_id] = nil
+                filters[task_id] = nil
                 ycounts[task_id] = nil
             end
         elseif msg.action == 'sub' then
@@ -83,21 +85,29 @@ while true do
 
     local del_tasks = {}
     for task_id in pairs(tasks) do
-        local r = {coroutine.resume(tasks[task_id], event, p1, p2, p3, p4, p5)}
-        if coroutine.status(tasks[task_id]) == 'dead' then
-            ws.send(textutils.serializeJSON{
-                action='task_result',
-                task_id=task_id,
-                result=r,
-                yields=ycounts[task_id],
-            })
-            del_tasks[task_id] = true
-        else
-            ycounts[task_id] = ycounts[task_id] + 1
+        if filters[task_id] == nil or filters[task_id] == event then
+            local r = {coroutine.resume(tasks[task_id], event, p1, p2, p3, p4, p5)}
+            if coroutine.status(tasks[task_id]) == 'dead' then
+                ws.send(textutils.serializeJSON{
+                    action='task_result',
+                    task_id=task_id,
+                    result=r,
+                    yields=ycounts[task_id],
+                })
+                del_tasks[task_id] = true
+            else
+                if r[1] == true then
+                    filters[task_id] = r[2]
+                else
+                    filters[task_id] = nil
+                end
+                ycounts[task_id] = ycounts[task_id] + 1
+            end
         end
     end
     for task_id in pairs(del_tasks) do
         tasks[task_id] = nil
+        filters[task_id] = nil
         ycounts[task_id] = nil
     end
 end

computercraft/sess.py

@@ -73,7 +73,7 @@ def readline(self, size=-1):
                     "stdin readline method with parameter")
             return rproc.string(eval_lua(
                 return_lua_call('io.read')
-            ))
+            )) + '\n'
 
     def write(self, s):
         if _is_global_greenlet():

computercraft/subapis/colors.py

@@ -95,6 +95,6 @@ def unpackRGB(rgb: int) -> Tuple[float, float, float]:
 }
 
 
-def iter_colors(self):
-    for c in self.chars.values():
+def iter_colors():
+    for c in chars.values():
         yield c

computercraft/subapis/fs.py

@@ -1,3 +1,4 @@
+import builtins
 from contextlib import contextmanager
 from typing import Optional, List, Union
 
@@ -20,7 +21,7 @@ class SeekMixin:
     def seek(self, whence: str = None, offset: int = None) -> int:
         # whence: set, cur, end
         r = self._method('seek', whence, offset)
-        if isinstance(r, list):
+        if isinstance(r, builtins.list):
             assert r[0] is False
             raise LuaException(r[1])
         return integer(r)

computercraft/subapis/os.py

@@ -51,11 +51,11 @@ def run(environment: dict, programPath: str, *args: List[str]):
     return boolean(method('run', environment, programPath, *args))
 
 
-def pullEvent(event: str) -> tuple:
+def pullEvent(event: str = None) -> tuple:
     return tuple(any_list(method('pullEvent', event)))
 
 
-def pullEventRaw(event: str) -> tuple:
+def pullEventRaw(event: str = None) -> tuple:
     return tuple(any_list(method('pullEventRaw', event)))
 
 

computercraft/subapis/peripheral.py

@@ -6,7 +6,7 @@
 from ..lua import LuaNum, lua_args, return_lua_call
 from ..rproc import (
     boolean, nil, integer, string, option_integer, option_string,
-    tuple2_integer, array_string, option_string_bool, try_result,
+    tuple2_integer, array_string, option_string_bool, flat_try_result,
 )
 from ..sess import eval_lua, eval_lua_method_factory
 
@@ -137,11 +137,12 @@ def receive(self, channel: int):
         try:
             while True:
                 evt = pullEvent('modem_message')
-                if evt[0] != self._side:
+                assert evt[0] == 'modem_message'
+                if evt[1] != self._side:
                     continue
-                if evt[1] != channel:
+                if evt[2] != channel:
                     continue
-                yield ModemMessage(*evt[2:])
+                yield ModemMessage(*evt[3:])
         finally:
             self.close(channel)
 
@@ -246,7 +247,7 @@ def setCommand(self, command: str):
         return nil(self._method('setCommand', command))
 
     def runCommand(self):
-        return try_result(self._method('runCommand'))
+        return flat_try_result(self._method('runCommand'))
 
 
 class CCWorkbench(BasePeripheral):

computercraft/subapis/rednet.py

@@ -50,7 +50,7 @@ def broadcast(message: Any, protocol: str = None):
 
 
 def receive(
-    self, protocolFilter: str = None, timeout: LuaNum = None,
+    protocolFilter: str = None, timeout: LuaNum = None,
 ) -> Optional[Tuple[int, Any, Optional[str]]]:
     return recv_result(method('receive', protocolFilter, timeout))
 

computercraft/subapis/redstone.py

@@ -22,7 +22,7 @@
 )
 
 
-def getSides(self) -> List[str]:
+def getSides() -> List[str]:
     return array_string(method('getSides'))
 
 

computercraft/subapis/shell.py

@@ -30,19 +30,19 @@
 )
 
 
-def exit(self):
+def exit():
     return nil(method('exit'))
 
 
-def dir(self) -> str:
+def dir() -> str:
     return string(method('dir'))
 
 
 def setDir(path: str):
     return nil(method('setDir', path))
 
 
-def path(self) -> str:
+def path() -> str:
     return string(method('path'))
 
 
@@ -58,7 +58,7 @@ def resolveProgram(name: str) -> Optional[str]:
     return option_string(method('resolveProgram', name))
 
 
-def aliases(self) -> Dict[str, str]:
+def aliases() -> Dict[str, str]:
     return map_string_string(method('aliases'))
 
 
@@ -74,7 +74,7 @@ def programs(showHidden: bool = None) -> List[str]:
     return array_string(method('programs', showHidden))
 
 
-def getRunningProgram(self) -> str:
+def getRunningProgram() -> str:
     return string(method('getRunningProgram'))
 
 

computercraft/subapis/term.py

@@ -24,6 +24,7 @@ class TermAPI(BaseSubAPI, TermMixin):
     'getCursorPos',
     'setCursorPos',
     'getCursorBlink',
+    'setCursorBlink',
     'isColor',
     'getSize',
     'scroll',
@@ -33,6 +34,10 @@ class TermAPI(BaseSubAPI, TermMixin):
     'getBackgroundColor',
     'getPaletteColor',
     'setPaletteColor',
+    'nativePaletteColor',
+    'redirect',
+    'get_current_target',
+    'get_native_target',
 )
 
 
@@ -43,6 +48,7 @@ class TermAPI(BaseSubAPI, TermMixin):
 getCursorPos = tapi.getCursorPos
 setCursorPos = tapi.setCursorPos
 getCursorBlink = tapi.getCursorBlink
+setCursorBlink = tapi.setCursorBlink
 isColor = tapi.isColor
 getSize = tapi.getSize
 scroll = tapi.scroll