From b0d9cbfb610b18b3f4bcfc750fc10b226fd74f04 Mon Sep 17 00:00:00 2001 From: Hatter Jiang Date: Mon, 13 Oct 2025 23:33:56 +0800 Subject: [PATCH] feat: update osssendfile --- osssendfile-rs/src/main.rs | 17 +++++++++++++++-- script-meta-v2.json | 6 +++--- script-meta.json | 4 ++-- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/osssendfile-rs/src/main.rs b/osssendfile-rs/src/main.rs index a7dcc77..95cfbe8 100755 --- a/osssendfile-rs/src/main.rs +++ b/osssendfile-rs/src/main.rs @@ -250,6 +250,19 @@ async fn main() -> XResult<()> { } fn load_config(config: &Option) -> XResult { + if let Some(config_str) = config { + if let Ok(oss_send_config) = serde_json::from_str::(config_str) { + return Ok(oss_send_config); + } + if let Ok(config_vec) = STANDARD.decode(config_str) { + if let Ok(config_str_ori) = String::from_utf8(config_vec) { + if let Ok(oss_send_config) = serde_json::from_str::(&config_str_ori) { + return Ok(oss_send_config); + } + } + } + } + let config_file_opt = util_file::read_config( config.clone(), &[OSS_SEND_FILE_CONFIG_FILE.to_string()], @@ -381,5 +394,5 @@ async fn parse_sts_response(response: Response) -> XResult { Ok(sts) } -// @SCRIPT-SIGNATURE-V1: yk-r1.ES256.20251010T002421+08:00.MEQCIDpVktuwmcLXHLxEDQYk -// C22TommHKEEhA6lpSqVGtIXqAiBMe7RqBUIfXYUd/+4Nu960nGuQq0m1Z6xcE527UOH0Zg== +// @SCRIPT-SIGNATURE-V1: yk-r1.ES256.20251013T233142+08:00.MEQCIAJA6GipLx8rl7COAqr6 +// tn8fjlnwNyfgKsqJ9xq/ESefAiAIuLmVwnSAe20Rz4YCf2yd1OQpueEDh4yaaj5pFSuxdA== diff --git a/script-meta-v2.json b/script-meta-v2.json index f001db5..fdf04ef 100644 --- a/script-meta-v2.json +++ b/script-meta-v2.json @@ -82,11 +82,11 @@ }, "osssendfile.rs": { "script_name": "osssendfile.rs", - "script_length": 14153, - "script_sha256": "48a41196a640a3f34a56a40c4b292cb71cf55dbab479a3bd032219af727895da", + "script_length": 14672, + "script_sha256": "a0fa65bd6d185a0d7fd0b6480e877ebc216816587f0d78625d6f9bb0886298c9", "script_full_url": "https://git.hatter.ink/rust-scripts/scriptbase/raw/branch/main/osssendfile-rs/src/main.rs", "publish_time": 1737272563311, - "update_time": 1760027083520 + "update_time": 1760369626453 }, "post.rs": { "script_name": "post.rs", diff --git a/script-meta.json b/script-meta.json index 771925f..889f0d3 100644 --- a/script-meta.json +++ b/script-meta.json @@ -46,8 +46,8 @@ }, "osssendfile-rs": { "script_name": "osssendfile-rs", - "script_length": 14153, - "script_sha256": "48a41196a640a3f34a56a40c4b292cb71cf55dbab479a3bd032219af727895da" + "script_length": 14672, + "script_sha256": "a0fa65bd6d185a0d7fd0b6480e877ebc216816587f0d78625d6f9bb0886298c9" }, "post-rs": { "script_name": "post-rs",