0.4.6

ica-rs/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ica-rs"
-version = "0.4.4"
+version = "0.4.6"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

ica-rs/ica_typing.py

@@ -55,6 +55,9 @@ class NewMessage:
     @property
     def is_from_self(self) -> bool:
         ...
+    @property
+    def is_reply(self) -> bool:
+        ...
 
 
 class IcaClient:

ica-rs/plugins/base.py

@@ -9,7 +9,7 @@ else:
 _version_ = "1.0.0"
 
 def on_message(msg: NewMessage, client: IcaClient) -> None:
-    if not msg.is_from_self:
+    if not (msg.is_from_self or msg.is_reply):
-        if msg.content == "/bot-rs-py":
+        if msg.content == "/bot":
             reply = msg.reply_with(f"ica-async-rs-sync-py {_version_}")
             client.send_message(reply)

ica-rs/plugins/bmcl.py

@@ -81,6 +81,6 @@ def bmcl(msg: NewMessage, client: IcaClient) -> None:
     
 
 def on_message(msg: NewMessage, client: IcaClient) -> None:
-    if not msg.is_from_self:
+    if not (msg.is_from_self or msg.is_reply):
-        if msg.content == "/bmcl-rs":
+        if msg.content == "/bmcl":
             bmcl(msg, client)

ica-rs/src/data_struct/messages.rs

@@ -194,6 +194,13 @@ impl NewMessage {
         }
     }
 
+    pub fn output(&self) -> String {
+        format!(
+            "Room: {}, Sender: {}|{}, Content: {}",
+            self.room_id, self.sender_id, self.sender_name, self.content
+        )
+    }
+
     /// 作为回复消息使用
     pub fn as_reply(&self) -> ReplyMessage {
         ReplyMessage {

ica-rs/src/events.rs

@@ -30,13 +30,7 @@ pub async fn add_message(payload: Payload, client: Client) {
     if let Payload::Text(values) = payload {
         if let Some(value) = values.first() {
             let message = NewMessage::new_from_json(value);
-            info!("add_message {}", format!("{:#?}", message).cyan());
+            info!("add_message {}", message.output().cyan());
-            // if message.is_reply() {
-            //     return;
-            // }
-            // if message.is_from_self() {
-            //     return;
-            // }
             // 就在这里处理掉最基本的消息
             // 之后的处理交给插件
             if message.content.eq("/bot-rs") && !message.is_from_self() && !message.is_reply() {

ica-rs/src/py/class.rs

@@ -139,6 +139,10 @@ impl NewMessagePy {
     pub fn get_is_from_self(&self) -> bool {
         self.msg.is_from_self()
     }
+    #[getter]
+    pub fn get_is_reply(&self) -> bool {
+        self.msg.is_reply()
+    }
 }
 
 impl NewMessagePy {

ica-rs/src/py/mod.rs

@@ -3,10 +3,11 @@ pub mod class;
 use std::time::SystemTime;
 use std::{collections::HashMap, path::PathBuf};
 
-use pyo3::{prelude::*, types::IntoPyDict};
+use pyo3::prelude::*;
 use rust_socketio::asynchronous::Client;
 use tracing::{debug, info, warn};
 
+use crate::client::IcalinguaStatus;
 use crate::config::IcaConfig;
 use crate::data_struct::messages::NewMessage;
 
@@ -21,7 +22,6 @@ impl PyStatus {
             match PYSTATUS.files.as_ref() {
                 Some(files) => files,
                 None => {
-                    debug!("No files in py status");
                     PYSTATUS.files = Some(HashMap::new());
                     PYSTATUS.files.as_ref().unwrap()
                 }
@@ -34,10 +34,8 @@ impl PyStatus {
             match PYSTATUS.files.as_mut() {
                 Some(files) => {
                     files.insert(path, (changed_time, py_module));
-                    debug!("Added file to py status, {:?}", files);
                 }
                 None => {
-                    warn!("No files in py status, creating new");
                     let mut files = HashMap::new();
                     files.insert(path, (changed_time, py_module));
                     PYSTATUS.files = Some(files);
@@ -127,28 +125,47 @@ pub fn load_py_plugins(path: &PathBuf) {
 }
 
 pub fn verify_plugins() {
-    let plugins = PyStatus::get_files();
+    let mut need_reload_files: Vec<PathBuf> = Vec::new();
-    for (path, _) in plugins.iter() {
+    let plugin_path = IcalinguaStatus::get_config().py_plugin_path.as_ref().unwrap().to_owned();
-        if !PyStatus::verify_file(path) {
+    for entry in std::fs::read_dir(&plugin_path).unwrap() {
-            info!("file changed: {:?}", path);
+        if let Ok(entry) = entry {
-            if let Ok((changed_time, content)) = load_py_file(path) {
+            let path = entry.path();
+            if let Some(ext) = path.extension() {
+                if ext == "py" {
+                    if !PyStatus::verify_file(&path) {
+                        need_reload_files.push(path);
+                    }
+                }
+            }
+        }
+    }
+
+    if need_reload_files.is_empty() {
+        return;
+    }
+    info!("file change list: {:?}", need_reload_files);
+    for reload_file in need_reload_files {
+        match load_py_file(&reload_file) {
+            Ok((changed_time, content)) => {
                 let py_module = Python::with_gil(|py| -> Py<PyAny> {
                     let module: Py<PyAny> = PyModule::from_code(
                         py,
                         &content,
-                        &path.to_string_lossy(),
+                        &reload_file.to_string_lossy(),
-                        &path.to_string_lossy(),
+                        &reload_file.to_string_lossy(),
                         // !!!! 请注意, 一定要给他一个名字, cpython 会自动把后面的重名模块覆盖掉前面的
                     )
                     .unwrap()
                     .into();
                     module
                 });
-                PyStatus::add_file(path.clone(), changed_time, py_module);
+                PyStatus::add_file(reload_file.clone(), changed_time, py_module);
+            },
+            Err(e) => {
+                warn!("重载 Python 插件: {:?} 失败, e: {:?}", reload_file, e);
             }
         }
     }
-
 }
 
 pub fn get_change_time(path: &PathBuf) -> Option<SystemTime> {

news.md

@@ -1,5 +1,13 @@
 # 更新日志
 
+## 0.4.6
+
+现在更适合部署了
+
+## 0.4.5
+
+添加 `is_reply` api 到 `NewMessagePy`
+
 ## 0.4.4
 
 现在正式支持 Python 插件了