fix filesystem, fix pop

Author: CppCXY

resources/debugger.lua

@@ -0,0 +1 @@
+-- empty file

resources/testmain.lua

@@ -10,5 +10,11 @@ local counter = 0
 taskpad:push("hello world", "hello world2", counter)
 ]])
 while true do
-    print(d:bpop())
+    local a, err, c, d = d:pop()
+    if a then
+        print(err, c, d)
+    else
+        print("sleep 1000")
+        thread.sleep(1000)
+    end
 end

src/bee/lua_filesystem.rs

@@ -162,30 +162,30 @@ fn path_constructor(_: &Lua, path: String) -> LuaResult<LuaFilePath> {
     Ok(LuaFilePath::new(path))
 }
 
-fn status(_: &Lua, path: String) -> LuaResult<()> {
+fn status(_: &Lua, path: LuaFilePath) -> LuaResult<()> {
     let _ = path;
     // Implementation for status function
     Ok(())
 }
 
-fn exists(_: &Lua, path: String) -> LuaResult<bool> {
-    Ok(std::path::Path::new(&path).exists())
+fn exists(_: &Lua, path: LuaFilePath) -> LuaResult<bool> {
+    Ok(std::path::Path::new(&path.path).exists())
 }
 
-fn is_directory(_: &Lua, path: String) -> LuaResult<bool> {
-    Ok(std::path::Path::new(&path).is_dir())
+fn is_directory(_: &Lua, path: LuaFilePath) -> LuaResult<bool> {
+    Ok(std::path::Path::new(&path.path).is_dir())
 }
 
-fn is_regular_file(_: &Lua, path: String) -> LuaResult<bool> {
-    Ok(std::path::Path::new(&path).is_file())
+fn is_regular_file(_: &Lua, path: LuaFilePath) -> LuaResult<bool> {
+    Ok(std::path::Path::new(&path.path).is_file())
 }
 
-fn file_size(_: &Lua, path: String) -> LuaResult<u64> {
-    Ok(std::fs::metadata(&path).map(|m| m.len()).unwrap_or(0))
+fn file_size(_: &Lua, path: LuaFilePath) -> LuaResult<u64> {
+    Ok(std::fs::metadata(&path.path).map(|m| m.len()).unwrap_or(0))
 }
 
-fn create_directory(_: &Lua, path: String) -> LuaResult<()> {
-    std::fs::create_dir(&path)?;
+fn create_directory(_: &Lua, path: LuaFilePath) -> LuaResult<()> {
+    std::fs::create_dir(&path.path)?;
     Ok(())
 }
 
@@ -354,7 +354,17 @@ pub fn bee_filesystem(lua: &Lua) -> LuaResult<Table> {
         "temp_directory_path",
         lua.create_function(temp_directory_path)?,
     )?;
-    // exports.set("pairs", lua.create_function(pairs_ctor)?)?;
+    exports.set("pairs", lua.create_function(|lua, path: LuaFilePath| -> LuaResult<_> {
+        let table = lua.create_table()?;
+        for entry in std::fs::read_dir(&path.path)? {
+            let entry = entry?;
+            let path = entry.path();
+            let path = LuaFilePath::new(path.to_str().unwrap_or("").to_string());
+            table.set(path.clone(), true)?;
+        }
+        let next = lua.globals().get::<mlua::Function>("next").unwrap();
+        Ok((next, table, mlua::Nil))
+    })?)?;
     // exports.set("pairs_r", lua.create_function(pairs_r_ctor)?)?;
 
     Ok(exports)

src/bee/lua_thread.rs

@@ -88,12 +88,12 @@ impl UserData for LuaChannel {
             Ok(())
         });
 
-        methods.add_async_method("pop", |lua, this, ()| async move {
+        methods.add_method("pop", |lua, this, ()| {
             let id = this.id;
             let opt_receiver = { ChannelMgr.lock().unwrap().get_receiver(id) };
             if let Some(receiver) = opt_receiver {
-                let data = receiver.lock().unwrap().recv().await;
-                if let Some(data) = data {
+                let data = receiver.lock().unwrap().try_recv();
+                if let Ok(data) = data {
                     let lua_seri_unpack = lua.globals().get::<LuaFunction>("lua_seri_unpack")?;
                     let mut returns = lua_seri_unpack.call::<mlua::MultiValue>(data).unwrap();
                     returns.insert(0, mlua::Value::Boolean(true));

src/lua_preload.rs

@@ -1,6 +1,7 @@
 use mlua::{lua_State, prelude::*}; 
 use crate::bee;
 use crate::lua_seri;
+use crate::override_lua;
 
 extern "C-unwind" {
     fn luaopen_lpeglabel(lua: *mut lua_State) -> i32;
@@ -50,6 +51,8 @@ pub fn lua_preload(lua: &Lua) -> LuaResult<()> {
     // lua_seri
     lua_seri::register_lua_seri(&lua)?;
 
+    // override
+
     add_package_path(
         &lua,
         "resources/?.lua;resources/?/init.lua;resources/script/?.lua;resources/script/?/init.lua",

src/main.rs

@@ -1,6 +1,7 @@
 mod bee;
 mod lua_seri;
 mod lua_preload;
+mod override_lua;
 
 #[macro_use]
 extern crate lazy_static;