ms-toollib - npm Package Compare versions

Comparing version 1.4.13 to 1.4.14

base/src/videos/avf_video.rs

@@ -17,2 +17,3 @@ // use crate::MouseState;
 /// ```python
+/// import ms_toollib as ms
 /// v = ms.AvfVideo("video_name.avf") # 第一步，读取文件的二进制内容
@@ -63,5 +64,5 @@ /// v.parse_video() # 第二步，解析文件的二进制内容
 /// class MyVideo(ms.AvfVideo):
-///     def __new__(cls, f):
-///         return ms.AvfVideo.__new__(cls, f)
-///     def __init__(self, f):
+///     def __new__(cls, *args, **kargs):
+///         return ms.AvfVideo.__new__(cls, *args, **kargs):
+///     def __init__(self, *args, **kargs):
 ///         super(MyVideo, self).__init__()
@@ -79,5 +80,21 @@ ///     def print_something(self):
 ///         print(f"flag: {self.flag}")
-/// m_v = MyVideo("jze.avf")
-/// m_v.print_something()
+/// my_video = MyVideo("jze.avf")
+/// my_video.print_something()
+/// print(my_video.bbbv_solved)
 /// ```
+/// - 其他实例化方法  
+/// 
+/// ```python
+/// import ms_toollib as ms
+/// # 使用绝对路径实例化
+/// v_1 = ms.AvfVideo(r"F:\SomePath\Beg_NF_3.90_3BV=12_3BVs=3.07_Wang Jianing.avf")
+/// 
+/// # 使用二进制列表实例化
+/// with open(r"F:\SomePath\Beg_NF_3.90_3BV=12_3BVs=3.07_Wang Jianing.avf", 'rb') as file:
+///     video_data_list = list(file.read())
+///     # 自定义另一个文件名
+///     v_2 = ms.AvfVideo(r"my_file.avf", video_data_list)
+///     # 也可以缺省第一个参数`file_name`，则file_name为空字符串
+///     v_3 = ms.AvfVideo(raw_data=video_data_list)
+/// ```
 pub struct AvfVideo {
@@ -84,0 +101,0 @@ pub file_name: String,

base/tests/test_analyse.rs

 // 测试录像分析模块
 use ms_toollib::videos::base_video::{NewBaseVideo, NewBaseVideo2};
-use ms_toollib::videos::{NewSomeVideo};
+use ms_toollib::videos::NewSomeVideo;
 use ms_toollib::{AvfVideo, BaseVideo, EvfVideo, MinesweeperBoard, MvfVideo, RmvVideo, SafeBoard};
 use std::thread;
+use tract_onnx::tract_core::anyhow::Ok;
 
@@ -40,20 +41,91 @@ #[test]
     // 录像解析工具测试
-    let mut video = AvfVideo::new("wjn.avf");
+    let mut video =
+        AvfVideo::new("../test_files/HI-SCORE Exp_49.25_3BV=127_3BVs=2.57_Wang Jianing G01825.avf");
 
     let r = video.parse_video();
-    println!("结果：{:?}", r);
-    video.data.print_event();
+    assert_eq!(r.unwrap(), ());
+    // video.data.print_event();
     video.data.analyse();
-    println!("标识：{:?}", video.data.player_identifier);
-    println!("局面：{:?}", video.data.board);
+    assert!(
+        video.data.player_identifier
+            == vec![
+                87, 97, 110, 103, 32, 74, 105, 97, 110, 105, 110, 103, 32, 71, 48, 49, 56, 50, 53
+            ]
+    );
+    assert!(std::str::from_utf8(&video.data.player_identifier).unwrap() == "Wang Jianing G01825");
+    assert_eq!(
+        video.data.board,
+        vec![
+            [
+                0, 0, 0, 0, 0, 0, 0, 0, 1, 2, -1, -1, 1, 0, 0, 0, 0, 0, 1, -1, 3, -1, 4, -1, 2, 1,
+                1, 1, 2, 1
+            ],
+            [
+                1, 1, 0, 0, 0, 1, 2, 2, 2, -1, 4, 3, 2, 0, 0, 0, 1, 1, 3, 2, 4, -1, -1, 3, -1, 2,
+                2, -1, 2, -1
+            ],
+            [
+                -1, 1, 0, 1, 2, 3, -1, -1, 4, 2, 2, -1, 1, 0, 0, 0, 2, -1, 3, -1, 2, 2, 3, 4, 4,
+                -1, 2, 1, 2, 1
+            ],
+            [
+                1, 1, 0, 1, -1, -1, 4, -1, -1, 1, 1, 1, 2, 2, 3, 2, 4, -1, 4, 2, 2, 1, 1, -1, -1,
+                2, 2, 1, 1, 0
+            ],
+            [
+                1, 1, 0, 1, 2, 2, 2, 2, 2, 1, 1, 1, 2, -1, -1, -1, 4, -1, 3, 2, -1, 1, 1, 2, 2, 2,
+                2, -1, 1, 0
+            ],
+            [
+                -1, 2, 0, 0, 1, 1, 1, 0, 0, 0, 1, -1, 2, 2, 3, 3, -1, 3, -1, 3, 2, 2, 0, 0, 0, 1,
+                -1, 2, 1, 0
+            ],
+            [
+                -1, 2, 0, 0, 2, -1, 3, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1, 2, 1, 3, -1, 2, 0, 0, 0, 2, 2,
+                2, 0, 0
+            ],
+            [
+                1, 1, 1, 1, 3, -1, 4, -1, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, -1, 3, 1, 0, 1, 2,
+                -1, 2, 1, 0
+            ],
+            [
+                0, 0, 2, -1, 4, 2, 4, -1, -1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 2, -1, 1, 1, 3, -1,
+                4, -1, 1, 0
+            ],
+            [
+                1, 1, 3, -1, 3, -1, 3, 3, 2, 1, 1, -1, 1, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 2, -1, -1,
+                4, 3, 2, 1
+            ],
+            [
+                2, -1, 2, 1, 3, 3, -1, 2, 1, 0, 1, 1, 1, 0, 1, -1, 1, 0, 0, 0, 1, 1, 2, 4, -1, 6,
+                -1, 3, -1, 2
+            ],
+            [
+                -1, 4, 2, 0, 1, -1, 3, -1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, 3, -1, 4, -1, -1,
+                -1, 3, 4, -1, 2
+            ],
+            [
+                -1, -1, 1, 0, 2, 3, 4, 3, 2, 1, 0, 1, -1, 1, 0, 0, 0, 0, 0, 1, -1, -1, -1, 4, 3, 2,
+                2, -1, 2, 1
+            ],
+            [
+                2, 2, 1, 0, 1, -1, -1, 4, -1, 4, 2, 2, 2, 2, 2, 2, 3, 2, 1, 1, 2, 5, -1, 3, 0, 0,
+                1, 1, 2, 1
+            ],
+            [
+                1, 2, 1, 1, 1, 2, 3, -1, -1, -1, -1, 3, 3, -1, 2, -1, -1, -1, 1, 1, 1, 3, -1, 4, 3,
+                2, 1, 0, 1, -1
+            ],
+            [
+                -1, 2, -1, 1, 0, 0, 1, 2, 4, -1, 4, -1, -1, 2, 2, 3, -1, 3, 1, 1, -1, 2, 2, -1, -1,
+                -1, 1, 0, 1, 1
+            ]
+        ]
+    );
     video.data.set_current_time(0.0);
-    // println!("game_board_stream：{:?}", video.data.game_board_stream[0]);
-    // println!("局面：{:?}", video.data.get_game_board());
-    println!("3BV：{:?}", video.data.static_params.bbbv);
-    // println!("3BV：{:?}", video.s.s);
-    println!("time：{:?}", video.data.get_rtime().unwrap());
-    println!("time_ms：{:?}", video.data.get_rtime_ms().unwrap());
-    println!("is win: {:?}", video.data.is_completed);
-    println!("STNB: {:?}", video.data.get_stnb().unwrap());
-    // video.analyse_for_features(vec!["super_fl_local", "mouse_trace"]);
+    assert_eq!(video.data.static_params.bbbv, 127);
+    assert_eq!(video.data.get_rtime().unwrap(), 49.25);
+    assert_eq!(video.data.get_rtime_ms().unwrap(), 49250);
+    assert!(video.data.is_completed);
+    assert_eq!(video.data.get_stnb().unwrap(), 0.0);
     video.data.analyse_for_features(vec![
@@ -65,14 +137,88 @@ "needless_guess",
     ]);
-    video.data.print_comments();
+    // video.data.print_comments();
     video.data.set_current_time(1000.0);
-    println!("局面: {:?}", video.data.get_game_board());
-    println!("solved_3BV：{:?}", video.data.get_bbbv_solved());
-    println!("3BV/s：{:?}", video.data.get_bbbv_s());
-    println!("thrp: {:?}", video.data.get_thrp());
-    println!("level: {:?}", video.data.level);
-    println!("is_valid: {:?}", video.data.is_valid());
-    println!("get_right: {:?}", video.data.get_right());
-    println!("get_flag: {:?}", video.data.get_flag());
-    println!("get_left: {:?}", video.data.get_left());
-    println!("get_double: {:?}", video.data.get_double());
+    assert_eq!(
+        video.data.get_game_board(),
+        vec![
+            [
+                0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 10, 10, 1, 0, 0, 0, 0, 0, 1, 10, 3, 10, 4, 10, 2, 1,
+                1, 1, 2, 1
+            ],
+            [
+                1, 1, 0, 0, 0, 1, 2, 2, 2, 10, 4, 3, 2, 0, 0, 0, 1, 1, 3, 2, 4, 10, 10, 3, 10, 2,
+                2, 10, 2, 10
+            ],
+            [
+                10, 1, 0, 1, 2, 3, 10, 10, 4, 2, 2, 10, 1, 0, 0, 0, 2, 10, 3, 10, 2, 2, 3, 4, 4,
+                10, 2, 1, 2, 1
+            ],
+            [
+                1, 1, 0, 1, 10, 10, 4, 10, 10, 1, 1, 1, 2, 2, 3, 2, 4, 10, 4, 2, 2, 1, 1, 10, 10,
+                2, 2, 1, 1, 0
+            ],
+            [
+                1, 1, 0, 1, 2, 2, 2, 2, 2, 1, 1, 1, 2, 10, 10, 10, 4, 10, 3, 2, 11, 1, 1, 2, 2, 2,
+                2, 10, 1, 0
+            ],
+            [
+                10, 2, 0, 0, 1, 1, 1, 0, 0, 0, 1, 10, 2, 2, 3, 3, 10, 3, 10, 3, 2, 2, 0, 0, 0, 1,
+                10, 2, 1, 0
+            ],
+            [
+                11, 2, 0, 0, 2, 11, 3, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1, 2, 1, 3, 10, 2, 0, 0, 0, 2, 2,
+                2, 0, 0
+            ],
+            [
+                1, 1, 1, 1, 3, 10, 4, 10, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 10, 3, 1, 0, 1, 2,
+                11, 2, 1, 0
+            ],
+            [
+                0, 0, 2, 10, 4, 2, 4, 10, 10, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 2, 11, 1, 1, 3, 11,
+                4, 10, 1, 0
+            ],
+            [
+                1, 1, 3, 10, 3, 10, 3, 3, 2, 1, 1, 10, 1, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 2, 10, 10,
+                4, 3, 2, 1
+            ],
+            [
+                2, 10, 2, 1, 3, 3, 10, 2, 1, 0, 1, 1, 1, 0, 1, 10, 1, 0, 0, 0, 1, 1, 2, 4, 10, 6,
+                10, 3, 10, 2
+            ],
+            [
+                10, 4, 2, 0, 1, 10, 3, 10, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, 3, 10, 4, 10, 10,
+                10, 3, 4, 10, 2
+            ],
+            [
+                10, 10, 1, 0, 2, 3, 4, 3, 2, 1, 0, 1, 11, 1, 0, 0, 0, 0, 0, 1, 11, 10, 10, 4, 3, 2,
+                2, 10, 2, 1
+            ],
+            [
+                2, 2, 1, 0, 1, 10, 10, 4, 10, 4, 2, 2, 2, 2, 2, 2, 3, 2, 1, 1, 2, 5, 10, 3, 0, 0,
+                1, 1, 2, 1
+            ],
+            [
+                1, 2, 1, 1, 1, 2, 3, 10, 10, 10, 10, 3, 3, 10, 2, 10, 10, 11, 1, 1, 1, 3, 10, 4, 3,
+                2, 1, 0, 1, 10
+            ],
+            [
+                10, 2, 11, 1, 0, 0, 1, 2, 4, 10, 4, 10, 10, 2, 2, 3, 10, 3, 1, 1, 10, 2, 2, 10, 10,
+                11, 1, 0, 1, 1
+            ]
+        ]
+    );
+    assert_eq!(video.data.get_bbbv_solved().unwrap(), 127);
+    assert_eq!(video.data.get_bbbv_s().unwrap(), 2.5786802030456855);
+    assert_eq!(video.data.get_thrp().unwrap(), 0.8819444444444444);
+    assert_eq!(video.data.level, 5);
+    assert_eq!(video.data.is_valid(), 0);
+    assert_eq!(video.data.get_right(), 11);
+    assert_eq!(video.data.get_flag(), 11);
+    assert_eq!(video.data.get_left(), 126);
+    assert_eq!(video.data.get_double(), 14);
+    assert_eq!(video.data.get_lce().unwrap(), 119);
+    assert_eq!(video.data.get_rce().unwrap(), 11);
+    assert_eq!(video.data.get_dce().unwrap(), 14);
+    assert_eq!(video.data.get_left_s(), 2.5583756345177666);
+    assert_eq!(video.data.get_right_s(), 0.2233502538071066);
+    assert_eq!(video.data.get_double_s(), 0.28426395939086296);
 }
@@ -79,0 +225,0 @@

PKG-INFO

@@ -1,4 +0,4 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: ms_toollib
-Version: 1.4.13
+Version: 1.4.14
 Summary: Algorithms for minesweeper.
@@ -5,0 +5,0 @@ Keywords: minesweeper,possibility,solver,laymine,3BV

pyproject.toml

 [project]
 name = "ms_toollib"
-version = "1.4.13"
+version = "1.4.14"
 description = "Algorithms for minesweeper."
@@ -5,0 +5,0 @@ readme = "readme.md"

python_package/Cargo.lock

 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
@@ -37,5 +37,5 @@ [[package]]
 name = "anyhow"
-version = "1.0.93"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775"
+checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04"
 
@@ -71,5 +71,5 @@ [[package]]
 name = "bitflags"
-version = "2.6.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
 
@@ -99,11 +99,11 @@ [[package]]
 name = "bytes"
-version = "1.8.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da"
+checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
 
 [[package]]
 name = "cc"
-version = "1.2.1"
+version = "1.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47"
+checksum = "13208fcbb66eaeffe09b99fffbe1af420f00a7b35aa99ad683dfc1aa76145229"
 dependencies = [
@@ -121,5 +121,5 @@ "shlex",
 name = "chrono"
-version = "0.4.38"
+version = "0.4.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
 dependencies = [
@@ -142,5 +142,5 @@ "android-tzdata",
 name = "cpufeatures"
-version = "0.2.15"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ca741a962e1b0bff6d724a1a0958b686406e853bb14061f218562e1896f95e6"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
 dependencies = [
@@ -236,3 +236,3 @@ "libc",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.96",
 ]
@@ -248,8 +248,8 @@
 name = "errno"
-version = "0.3.9"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys",
 ]
@@ -259,5 +259,5 @@
 name = "fastrand"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 
@@ -273,3 +273,3 @@ [[package]]
  "libredox",
- "windows-sys 0.59.0",
+ "windows-sys",
 ]
@@ -322,5 +322,5 @@
 name = "hashbrown"
-version = "0.15.1"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
 
@@ -344,7 +344,7 @@ [[package]]
 name = "home"
-version = "0.5.9"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
+checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys",
 ]
@@ -377,5 +377,5 @@
 name = "indexmap"
-version = "2.6.0"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
+checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
 dependencies = [
@@ -412,6 +412,7 @@ "equivalent",
 name = "js-sys"
-version = "0.3.72"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
 dependencies = [
+ "once_cell",
  "wasm-bindgen",
@@ -437,5 +438,5 @@ ]
 name = "libc"
-version = "0.2.164"
+version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
 
@@ -455,5 +456,5 @@ [[package]]
 name = "linux-raw-sys"
-version = "0.4.14"
+version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
 
@@ -520,5 +521,5 @@ [[package]]
 name = "log"
-version = "0.4.22"
+version = "0.4.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
 
@@ -574,5 +575,5 @@ [[package]]
 name = "miniz_oxide"
-version = "0.8.0"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
+checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924"
 dependencies = [
@@ -584,3 +585,3 @@ "adler2",
 name = "ms_toollib"
-version = "0.0.0"
+version = "1.4.11-alpha"
 dependencies = [
@@ -687,5 +688,5 @@ "itertools 0.6.5",
 name = "pest"
-version = "2.7.14"
+version = "2.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442"
+checksum = "8b7cafe60d6cf8e62e1b9b2ea516a089c008945bb5a275416789e7db0bc199dc"
 dependencies = [
@@ -699,5 +700,5 @@ "memchr",
 name = "pest_derive"
-version = "2.7.14"
+version = "2.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d214365f632b123a47fd913301e14c946c61d1c183ee245fa76eb752e59a02dd"
+checksum = "816518421cfc6887a0d62bf441b6ffb4536fcc926395a69e1a85852d4363f57e"
 dependencies = [
@@ -710,5 +711,5 @@ "pest",
 name = "pest_generator"
-version = "2.7.14"
+version = "2.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb55586734301717aea2ac313f50b2eb8f60d2fc3dc01d190eefa2e625f60c4e"
+checksum = "7d1396fd3a870fc7838768d171b4616d5c91f6cc25e377b673d714567d99377b"
 dependencies = [
@@ -719,3 +720,3 @@ "pest",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.96",
 ]
@@ -725,5 +726,5 @@
 name = "pest_meta"
-version = "2.7.14"
+version = "2.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b75da2a70cf4d9cb76833c990ac9cd3923c9a8905a8929789ce347c84564d03d"
+checksum = "e1e58089ea25d717bfd31fb534e4f3afcc2cc569c70de3e239778991ea3b7dea"
 dependencies = [
@@ -747,5 +748,5 @@ "once_cell",
 name = "portable-atomic"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
+checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
 
@@ -769,5 +770,5 @@ [[package]]
 name = "proc-macro2"
-version = "1.0.89"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
+checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
 dependencies = [
@@ -901,3 +902,3 @@ "unicode-ident",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.96",
 ]
@@ -915,3 +916,3 @@
  "quote",
- "syn 2.0.87",
+ "syn 2.0.96",
 ]
@@ -921,5 +922,5 @@
 name = "quote"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
 dependencies = [
@@ -967,5 +968,5 @@ "proc-macro2",
 name = "redox_syscall"
-version = "0.5.7"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
+checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
 dependencies = [
@@ -1006,5 +1007,5 @@ "bitflags",
 name = "rustix"
-version = "0.38.41"
+version = "0.38.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6"
+checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 dependencies = [
@@ -1015,6 +1016,12 @@ "bitflags",
  "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys",
 ]
 
 [[package]]
+name = "rustversion"
+version = "1.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4"
+
+[[package]]
 name = "same-file"
@@ -1030,5 +1037,5 @@ version = "1.0.6"
 name = "serde"
-version = "1.0.215"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
+checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
 dependencies = [
@@ -1040,9 +1047,9 @@ "serde_derive",
 name = "serde_derive"
-version = "1.0.215"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
+checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.96",
 ]
@@ -1086,5 +1093,5 @@
 name = "syn"
-version = "2.0.87"
+version = "2.0.96"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
+checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80"
 dependencies = [
@@ -1115,11 +1122,12 @@ "proc-macro2",
 name = "tempfile"
-version = "3.14.0"
+version = "3.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c"
+checksum = "9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704"
 dependencies = [
  "cfg-if",
  "fastrand",
+ "getrandom",
  "once_cell",
  "rustix",
- "windows-sys 0.59.0",
+ "windows-sys",
 ]
@@ -1129,5 +1137,5 @@
 name = "thiserror"
-version = "1.0.69"
+version = "2.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc"
 dependencies = [
@@ -1139,9 +1147,9 @@ "thiserror-impl",
 name = "thiserror-impl"
-version = "1.0.69"
+version = "2.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.96",
 ]
@@ -1151,5 +1159,5 @@
 name = "tinyvec"
-version = "1.8.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
+checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8"
 dependencies = [
@@ -1303,5 +1311,5 @@ "tinyvec_macros",
 name = "unicode-ident"
-version = "1.0.14"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
+checksum = "11cd88e12b17c6494200a9c1b683a04fcac9573ed74cd1b62aeb2727c5592243"
 
@@ -1353,8 +1361,9 @@ [[package]]
 name = "wasm-bindgen"
-version = "0.2.95"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
+checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
 dependencies = [
  "cfg-if",
  "once_cell",
+ "rustversion",
  "wasm-bindgen-macro",
@@ -1365,12 +1374,11 @@ ]
 name = "wasm-bindgen-backend"
-version = "0.2.95"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
 dependencies = [
  "bumpalo",
  "log",
- "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.96",
  "wasm-bindgen-shared",
@@ -1381,5 +1389,5 @@ ]
 name = "wasm-bindgen-macro"
-version = "0.2.95"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
 dependencies = [
@@ -1392,9 +1400,9 @@ "quote",
 name = "wasm-bindgen-macro-support"
-version = "0.2.95"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.96",
  "wasm-bindgen-backend",
@@ -1406,5 +1414,8 @@ "wasm-bindgen-shared",
 name = "wasm-bindgen-shared"
-version = "0.2.95"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+dependencies = [
+ "unicode-ident",
+]
 
@@ -1445,3 +1456,3 @@ [[package]]
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys",
 ]
@@ -1466,11 +1477,2 @@
 name = "windows-sys"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
-dependencies = [
- "windows-targets",
-]
-
-[[package]]
-name = "windows-sys"
 version = "0.59.0"
@@ -1549,5 +1551,5 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "xattr"
-version = "1.3.1"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f"
+checksum = "e105d177a3871454f754b33bb0ee637ecaaac997446375fd3e5d43a2ed00c909"
 dependencies = [
@@ -1577,3 +1579,3 @@ "libc",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.96",
 ]

python_package/Cargo.toml

 [package]
 name = "ms_toollib"
-# version = "1.4.11-alpha"
+version = "1.4.11-alpha"
 description = "Algorithms  for Minesweeper"
@@ -5,0 +5,0 @@ documentation = "https://docs.rs/ms_toollib/"

python_package/src/avf_video.rs

@@ -372,5 +372,5 @@ use crate::PyGameBoard;
     }
-    #[setter]
-    pub fn set_video_playing_pix_size(&mut self, pix_size: u8) {
-        self.core.data.set_video_playing_pix_size(pix_size);
+    #[getter]
+    pub fn get_pix_size(&self) -> PyResult<u8> {
+        Ok(self.core.data.get_pix_size().unwrap())
     }
@@ -381,2 +381,9 @@ #[setter]
     }
+    pub fn is_valid(&self) -> PyResult<u8> {
+        Ok(self.core.data.is_valid())
+    }
+    #[setter]
+    pub fn set_video_playing_pix_size(&mut self, pix_size: u8) {
+        self.core.data.set_video_playing_pix_size(pix_size);
+    }
 }

python_package/src/base_video.rs

@@ -71,2 +71,5 @@ use crate::PyGameBoard;
     #[new]
+    #[pyo3(
+        signature = (board, cell_pixel_size = 16)
+    )]
     pub fn new(board: Vec<Vec<i32>>, cell_pixel_size: u8) -> PyBaseVideo {
@@ -73,0 +76,0 @@ let c = BaseVideo::<SafeBoard>::new(board, cell_pixel_size);

python_package/src/evf_video.rs

@@ -373,5 +373,5 @@ use crate::PyGameBoard;
     }
-    #[setter]
-    pub fn set_video_playing_pix_size(&mut self, pix_size: u8) {
-        self.core.data.set_video_playing_pix_size(pix_size);
+    #[getter]
+    pub fn get_pix_size(&self) -> PyResult<u8> {
+        Ok(self.core.data.get_pix_size().unwrap())
     }
@@ -382,2 +382,9 @@ #[setter]
     }
+    pub fn is_valid(&self) -> PyResult<u8> {
+        Ok(self.core.data.is_valid())
+    }
+    #[setter]
+    pub fn set_video_playing_pix_size(&mut self, pix_size: u8) {
+        self.core.data.set_video_playing_pix_size(pix_size);
+    }
 }

python_package/src/lib.rs

@@ -9,2 +9,4 @@ use pyo3::exceptions::PyRuntimeError;
 
+// 发布pypi：打tag，工作流直接发布
+
 use ms_toollib_original::*;
@@ -11,0 +13,0 @@ mod board;

python_package/src/mvf_video.rs

@@ -373,5 +373,5 @@ use crate::PyGameBoard;
     }
-    #[setter]
-    pub fn set_video_playing_pix_size(&mut self, pix_size: u8) {
-        self.core.data.set_video_playing_pix_size(pix_size);
+    #[getter]
+    pub fn get_pix_size(&self) -> PyResult<u8> {
+        Ok(self.core.data.get_pix_size().unwrap())
     }
@@ -382,2 +382,9 @@ #[setter]
     }
+    pub fn is_valid(&self) -> PyResult<u8> {
+        Ok(self.core.data.is_valid())
+    }
+    #[setter]
+    pub fn set_video_playing_pix_size(&mut self, pix_size: u8) {
+        self.core.data.set_video_playing_pix_size(pix_size);
+    }
 }

python_package/src/rmv_video.rs

@@ -373,5 +373,5 @@ use crate::PyGameBoard;
     }
-    #[setter]
-    pub fn set_video_playing_pix_size(&mut self, pix_size: u8) {
-        self.core.data.set_video_playing_pix_size(pix_size);
+    #[getter]
+    pub fn get_pix_size(&self) -> PyResult<u8> {
+        Ok(self.core.data.get_pix_size().unwrap())
     }
@@ -382,2 +382,9 @@ #[setter]
     }
+    pub fn is_valid(&self) -> PyResult<u8> {
+        Ok(self.core.data.is_valid())
+    }
+    #[setter]
+    pub fn set_video_playing_pix_size(&mut self, pix_size: u8) {
+        self.core.data.set_video_playing_pix_size(pix_size);
+    }
 }

Alert delta unavailable

Currently unable to show alert delta for PyPI packages.

Improved metrics

Total package byte prevSize

609636

1.62%