mirror of
https://github.com/Tencent/BrowserSkill.git
synced 2026-09-10 13:01:23 +08:00
fix(bsk): fix ci
This commit is contained in:
@@ -91,7 +91,7 @@ pub fn dispatch(args: DownloadArgs, format: Format) -> Result<(), CliError> {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn write_transfer(sock: &PathBuf, id: &str, out: &Path, overwrite: bool) -> Result<(), CliError> {
|
fn write_transfer(sock: &Path, id: &str, out: &Path, overwrite: bool) -> Result<(), CliError> {
|
||||||
let parent = out
|
let parent = out
|
||||||
.parent()
|
.parent()
|
||||||
.filter(|p| !p.as_os_str().is_empty())
|
.filter(|p| !p.as_os_str().is_empty())
|
||||||
@@ -107,7 +107,7 @@ fn write_transfer(sock: &PathBuf, id: &str, out: &Path, overwrite: bool) -> Resu
|
|||||||
let mut offset = 0u64;
|
let mut offset = 0u64;
|
||||||
loop {
|
loop {
|
||||||
let chunk: TransferChunkResult = crate::cli::business_rpc::call(
|
let chunk: TransferChunkResult = crate::cli::business_rpc::call(
|
||||||
sock.clone(),
|
sock.to_path_buf(),
|
||||||
"transfer-read",
|
"transfer-read",
|
||||||
Method::TransferRead,
|
Method::TransferRead,
|
||||||
Some(TransferChunkParams {
|
Some(TransferChunkParams {
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
use std::fs::File;
|
use std::fs::File;
|
||||||
use std::io::Read;
|
use std::io::Read;
|
||||||
use std::path::PathBuf;
|
use std::path::{Path, PathBuf};
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
|
|
||||||
use anyhow::Context;
|
use anyhow::Context;
|
||||||
@@ -93,7 +93,7 @@ pub fn dispatch(args: UploadArgs, format: Format) -> Result<(), CliError> {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn stage_file(sock: &PathBuf, session: &str, path: &PathBuf) -> Result<(String, String), CliError> {
|
fn stage_file(sock: &Path, session: &str, path: &PathBuf) -> Result<(String, String), CliError> {
|
||||||
let mut file = File::open(path)
|
let mut file = File::open(path)
|
||||||
.with_context(|| format!("open upload file {}", path.display()))
|
.with_context(|| format!("open upload file {}", path.display()))
|
||||||
.map_err(CliError::Local)?;
|
.map_err(CliError::Local)?;
|
||||||
@@ -114,7 +114,7 @@ fn stage_file(sock: &PathBuf, session: &str, path: &PathBuf) -> Result<(String,
|
|||||||
.ok_or_else(|| CliError::Local(anyhow::anyhow!("upload file has no valid basename")))?
|
.ok_or_else(|| CliError::Local(anyhow::anyhow!("upload file has no valid basename")))?
|
||||||
.to_string();
|
.to_string();
|
||||||
let begin: TransferBeginResult = crate::cli::business_rpc::call(
|
let begin: TransferBeginResult = crate::cli::business_rpc::call(
|
||||||
sock.clone(),
|
sock.to_path_buf(),
|
||||||
"transfer-begin",
|
"transfer-begin",
|
||||||
Method::TransferBegin,
|
Method::TransferBegin,
|
||||||
Some(TransferBeginParams {
|
Some(TransferBeginParams {
|
||||||
@@ -133,7 +133,7 @@ fn stage_file(sock: &PathBuf, session: &str, path: &PathBuf) -> Result<(String,
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
let reply: TransferChunkResult = crate::cli::business_rpc::call(
|
let reply: TransferChunkResult = crate::cli::business_rpc::call(
|
||||||
sock.clone(),
|
sock.to_path_buf(),
|
||||||
"transfer-chunk",
|
"transfer-chunk",
|
||||||
Method::TransferChunk,
|
Method::TransferChunk,
|
||||||
Some(TransferChunkParams {
|
Some(TransferChunkParams {
|
||||||
@@ -146,7 +146,7 @@ fn stage_file(sock: &PathBuf, session: &str, path: &PathBuf) -> Result<(String,
|
|||||||
offset = reply.next_offset;
|
offset = reply.next_offset;
|
||||||
}
|
}
|
||||||
let _: TransferReadyResult = crate::cli::business_rpc::call(
|
let _: TransferReadyResult = crate::cli::business_rpc::call(
|
||||||
sock.clone(),
|
sock.to_path_buf(),
|
||||||
"transfer-finish",
|
"transfer-finish",
|
||||||
Method::TransferFinish,
|
Method::TransferFinish,
|
||||||
Some(TransferIdParams {
|
Some(TransferIdParams {
|
||||||
@@ -163,9 +163,9 @@ fn stage_file(sock: &PathBuf, session: &str, path: &PathBuf) -> Result<(String,
|
|||||||
Ok((begin.transfer_id, name))
|
Ok((begin.transfer_id, name))
|
||||||
}
|
}
|
||||||
|
|
||||||
fn release(sock: &PathBuf, id: &str) -> Result<TransferReleaseResult, CliError> {
|
fn release(sock: &Path, id: &str) -> Result<TransferReleaseResult, CliError> {
|
||||||
crate::cli::business_rpc::call(
|
crate::cli::business_rpc::call(
|
||||||
sock.clone(),
|
sock.to_path_buf(),
|
||||||
"transfer-release",
|
"transfer-release",
|
||||||
Method::TransferRelease,
|
Method::TransferRelease,
|
||||||
Some(TransferIdParams {
|
Some(TransferIdParams {
|
||||||
|
|||||||
@@ -461,7 +461,7 @@ mod tests {
|
|||||||
.unwrap();
|
.unwrap();
|
||||||
assert!(
|
assert!(
|
||||||
registry
|
registry
|
||||||
.resolve_uploads("s1", &[begin.transfer_id.clone()])
|
.resolve_uploads("s1", std::slice::from_ref(&begin.transfer_id))
|
||||||
.is_err()
|
.is_err()
|
||||||
);
|
);
|
||||||
registry
|
registry
|
||||||
@@ -478,7 +478,7 @@ mod tests {
|
|||||||
.unwrap();
|
.unwrap();
|
||||||
assert!(
|
assert!(
|
||||||
registry
|
registry
|
||||||
.resolve_uploads("s2", &[begin.transfer_id.clone()])
|
.resolve_uploads("s2", std::slice::from_ref(&begin.transfer_id))
|
||||||
.is_err()
|
.is_err()
|
||||||
);
|
);
|
||||||
let [path] = registry
|
let [path] = registry
|
||||||
|
|||||||
Reference in New Issue
Block a user