update v0.2.2

osnosn · Apr 3, 2024 · 9edf531 · 9edf531
1 parent 3472c9b
commit 9edf531
Show file tree

Hide file tree

Showing 21 changed files with 174 additions and 72 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,6 +2,7 @@
 resolver="2"
 members=[
 	"qar_decode",
+	"qar_decode_lua",
 	"qar_raw_dump"
 ]
 

diff --git a/build.sh b/build.sh
@@ -12,9 +12,9 @@
    echo target x86_64-unknown-linux-gnu
    RUSTFLAGS='-C target-feature=+crt-static' cargo build --release --target x86_64-unknown-linux-gnu
    echo target x86_64-unknown-linux-musl
-   RUSTFLAGS='-C target-feature=+crt-static' cargo build --release --target x86_64-unknown-linux-musl
+   RUSTFLAGS='-C target-feature=+crt-static' cargo build --release --target x86_64-unknown-linux-musl --workspace --exclude qar_decode_lua
    echo target i686-pc-windows-gnu
-   RUSTFLAGS='-C target-feature=+crt-static' cargo build --release --target i686-pc-windows-gnu
+   RUSTFLAGS='-C target-feature=+crt-static' cargo build --release --target i686-pc-windows-gnu --workspace --exclude qar_decode_lua
    echo target x86_64-pc-windows-gnu
    RUSTFLAGS='-C target-feature=+crt-static' cargo build --release --target x86_64-pc-windows-gnu
    echo target aarch64-unknown-linux-gnu

diff --git a/qar_decode/Cargo.toml b/qar_decode/Cargo.toml
@@ -1,18 +1,15 @@
 [package]
 name = "qar_decode"
-version = "0.2.0"
+version = "0.2.2"
 edition = "2021"
 authors = ["osnosn <osnosn@126.com>", "LLGZ <LLGZ@csair.com>"]
-rust-version = "1.71"
 description = "Use PRM decode Aligned raw.dat"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 lexopt = { version = "0.3.0", registry = "rsproxy" }
 memmap2 = { version = "0.9.4", registry = "rsproxy" }
-mlua = { version = "0.9.6", registry = "rsproxy", features= ["luajit52","vendored"] }
-#mlua = { version = "0.9.6", registry = "rsproxy", features= ["lua54","vendored"] }
 
 #[profile.release]
 #strip = true

diff --git a/qar_decode/src/CmdLineArgs_aligned.rs → qar_decode/src/CmdLineArgs.rs b/qar_decode/src/CmdLineArgs_aligned.rs → qar_decode/src/CmdLineArgs.rs
@@ -1,4 +1,5 @@
 pub struct Args {
+    pub bin_name: String, //当前程序名
     pub help: bool,
     pub help2: bool,
     pub rawfile: String,
@@ -12,6 +13,7 @@ pub fn parse_args() -> Result<Args, lexopt::Error> {
     let mut rawfile = None;
     let mut cmd = None;
     let mut parser = lexopt::Parser::from_env();
+    let bin_name = parser.bin_name().unwrap_or("myapp").to_string();
     while let Some(arg) = parser.next()? {
         match arg {
             Short('f') => {
@@ -35,13 +37,15 @@ pub fn parse_args() -> Result<Args, lexopt::Error> {
             _ => {
                 println!("{:#?}", arg.unexpected());
                 //println!("Usage: dump_raw_aligned -f raw.dat [-h | --help]");
-                println!("Usage: dump_raw_aligned [1|2|3|4|5|....]");
+                //println!("Usage: dump_raw_aligned [1|2|3|4|5|....]");
+                super::showHelp(bin_name);
                 std::process::exit(0);
             }
         }
     }
 
     Ok(Args {
+        bin_name, //当前程序名
         help,
         help2,
         rawfile: rawfile.unwrap_or("data/raw.dat".to_string()), //缺省值为 "raw.dat"

diff --git a/qar_decode/src/CmdLineArgs_aligned4.rs → qar_decode/src/CmdLineArgs4.rs b/qar_decode/src/CmdLineArgs_aligned4.rs → qar_decode/src/CmdLineArgs4.rs
@@ -1,4 +1,5 @@
 pub struct Args {
+    pub bin_name: String, //当前程序名
     pub help: bool,
     pub help2: bool,
     pub mem: bool,
@@ -16,6 +17,7 @@ pub fn parse_args() -> Result<Args, lexopt::Error> {
     let mut csvfile = None;
     let mut cmd = None;
     let mut parser = lexopt::Parser::from_env();
+    let bin_name = parser.bin_name().unwrap_or("myapp").to_string();
     while let Some(arg) = parser.next()? {
         match arg {
             Short('r') => {
@@ -48,13 +50,14 @@ pub fn parse_args() -> Result<Args, lexopt::Error> {
                 println!("{:#?}", arg.unexpected());
                 //println!("Usage: dump_raw_aligned -f raw.dat [-h | --help]");
                 //println!("Usage: dump_raw_aligned [1|2|3|4|5|....] [-h | --help]");
-                super::showHelp();
+                super::showHelp(bin_name);
                 std::process::exit(0);
             }
         }
     }
 
     Ok(Args {
+        bin_name, //当前程序名
         help,
         help2,
         mem,

diff --git a/qar_decode/src/bin/qar_decode2.rs b/qar_decode/src/bin/qar_decode2.rs
@@ -10,20 +10,20 @@ use std::io::{BufReader, Read, Write};
 //use std::process;
 //use std::fs::read_to_string;
 
-#[path = "../CmdLineArgs_aligned.rs"]
-mod CmdLineArgs_aligned;
+#[path = "../CmdLineArgs.rs"]
+mod CmdLineArgs;
 
 fn main() {
     let args;
-    match CmdLineArgs_aligned::parse_args() {
+    match CmdLineArgs::parse_args() {
         Ok(tmp) => args = tmp,
-        _ => {
-            showHelp();
+        Err(err) => {
+            println!("Command line parse ERR.\r\n{err}");
             return ();
         }
     }
     if args.help || args.help2 {
-        showHelp();
+        showHelp(args.bin_name);
         return ();
     }
 
@@ -144,7 +144,7 @@ fn main() {
             res_B = n21_res[1];
         }
         _ => {
-            showHelp();
+            showHelp(args.bin_name);
             return ();
         }
     };
@@ -264,8 +264,8 @@ fn find_sync(
         *byte_cnt += 1;
     }
 }
-fn showHelp() {
-    println!("Usage: qar_decode [1|2|3|4|5|6] [-h | --help]");
+fn showHelp(bin_name: String) {
+    println!("Usage: {bin_name} [1|2|3|4|5|6] [-h | --help]");
     println!("   Detail:");
     println!("      -h        简略的命令行帮助");
     println!(" 说明: ");

diff --git a/qar_decode/src/bin/qar_decode3.rs b/qar_decode/src/bin/qar_decode3.rs
@@ -11,20 +11,20 @@ use std::fs::OpenOptions;
 use std::io::Write;
 //use std::process;
 
-#[path = "../CmdLineArgs_aligned.rs"]
-mod CmdLineArgs_aligned;
+#[path = "../CmdLineArgs.rs"]
+mod CmdLineArgs;
 
 fn main() {
     let args;
-    match CmdLineArgs_aligned::parse_args() {
+    match CmdLineArgs::parse_args() {
         Ok(tmp) => args = tmp,
-        _ => {
-            showHelp();
+        Err(err) => {
+            println!("Command line parse ERR.\r\n{err}");
             return ();
         }
     }
     if args.help || args.help2 {
-        showHelp();
+        showHelp(args.bin_name);
         return ();
     }
 
@@ -147,7 +147,7 @@ fn main() {
             res_B = n21_res[1];
         }
         _ => {
-            showHelp();
+            showHelp(args.bin_name);
             return ();
         }
     };
@@ -268,8 +268,8 @@ fn find_sync(
         *byte_cnt += 1;
     }
 }
-fn showHelp() {
-    println!("Usage: qar_decode [1|2|3|4|5|6] [-h | --help]");
+fn showHelp(bin_name: String) {
+    println!("Usage: {bin_name} [1|2|3|4|5|6] [-h | --help]");
     println!("   Detail:");
     println!("      -h        简略的命令行帮助");
     println!(" 说明: ");

diff --git a/qar_decode/src/bin/qar_decode4.rs b/qar_decode/src/bin/qar_decode4.rs
@@ -11,20 +11,20 @@ use std::fs::File;
 use std::fs::OpenOptions;
 use std::io::Write;
 
-#[path = "../CmdLineArgs_aligned4.rs"]
-mod CmdLineArgs_aligned;
+#[path = "../CmdLineArgs4.rs"]
+mod CmdLineArgs;
 
 fn main() {
     let args;
-    match CmdLineArgs_aligned::parse_args() {
+    match CmdLineArgs::parse_args() {
         Ok(tmp) => args = tmp,
-        _ => {
-            showHelp();
+        Err(err) => {
+            println!("Command line parse ERR.\r\n{err}");
             return ();
         }
     }
     if args.help || args.help2 {
-        showHelp();
+        showHelp(args.bin_name);
         return ();
     }
 
@@ -189,7 +189,7 @@ fn main() {
             [signed, res_A, res_B] = gmts_res;
         }
         _ => {
-            showHelp();
+            showHelp(args.bin_name);
             return ();
         }
     };
@@ -412,9 +412,9 @@ fn find_sync(
         *byte_cnt += 1;
     }
 }
-fn showHelp() {
+fn showHelp(bin_name: String) {
     println!(
-        "Usage: qar_decode [-r data/raw.dat] [-w data/output_data.csv] [-h | --help] [1|2|3|4|5|6|7|8|h|m|s]"
+        "Usage: {bin_name} [-r data/raw.dat] [-w data/output_data.csv] [-h | --help] [1|2|3|4|5|6|7|8|h|m|s]"
     );
     println!("   Detail:");
     println!("      -h        简略的命令行帮助");

diff --git a/qar_decode/src/bin/qar_decode5.rs b/qar_decode/src/bin/qar_decode5.rs
@@ -13,23 +13,23 @@ use std::fs::File;
 use std::fs::OpenOptions;
 use std::io::Write;
 
-#[path = "../CmdLineArgs_aligned4.rs"]
-mod CmdLineArgs_aligned;
+#[path = "../CmdLineArgs4.rs"]
+mod CmdLineArgs;
 
 #[path = "../prm_conf5.rs"]
 mod prm_conf;
 
 fn main() {
     let args;
-    match CmdLineArgs_aligned::parse_args() {
+    match CmdLineArgs::parse_args() {
         Ok(tmp) => args = tmp,
-        _ => {
-            showHelp();
+        Err(err) => {
+            println!("Command line parse ERR.\r\n{err}");
             return ();
         }
     }
     if args.help || args.help2 {
-        showHelp();
+        showHelp(args.bin_name);
         return ();
     }
 
@@ -85,7 +85,7 @@ fn main() {
             "DAY"
         }
         _ => {
-            showHelp();
+            showHelp(args.bin_name);
             return ();
         }
     };
@@ -379,9 +379,9 @@ fn find_sync(
         *byte_cnt += 1;
     }
 }
-fn showHelp() {
+fn showHelp(bin_name: String) {
     println!(
-        "Usage: qar_decode [-r data/raw.dat] [-w data/output_data.csv] [-h | --help] [1|2|3|4|5|6|7|8|h|m|s|sup|day]"
+        "Usage: {bin_name} [-r data/raw.dat] [-w data/output_data.csv] [-h | --help] [1|2|3|4|5|6|7|8|h|m|s|sup|day]"
     );
     println!("   Detail:");
     println!("      -h        简略的命令行帮助");

diff --git a/qar_decode_lua/Cargo.toml b/qar_decode_lua/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "qar_decode_lua"
+version = "0.2.2"
+edition = "2021"
+publish = ["rsproxy"]
+authors = ["osnosn <osnosn@126.com>", "LLGZ <LLGZ@csair.com>"]
+description = "Use PRM decode Aligned raw.dat, with lua."
+rust-version = "1.71"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+lexopt = { version = "0.3.0", registry = "rsproxy" }
+memmap2 = { version = "0.9.4", registry = "rsproxy" }
+mlua = { version = "0.9.6", registry = "rsproxy", features= ["luajit52","vendored"] }
+#mlua = { version = "0.9.6", registry = "rsproxy", features= ["lua54","vendored"] }