mirror of
https://github.com/tauri-apps/plugins-workspace.git
synced 2026-07-24 17:20:51 +02:00
feat(upload): Add function to download files (#89)
This commit is contained in:
Generated
+1
-1
@@ -4422,7 +4422,7 @@ dependencies = [
|
|||||||
name = "tauri-plugin-upload"
|
name = "tauri-plugin-upload"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"futures",
|
"futures-util",
|
||||||
"log",
|
"log",
|
||||||
"read-progress-stream",
|
"read-progress-stream",
|
||||||
"reqwest",
|
"reqwest",
|
||||||
|
|||||||
@@ -18,5 +18,5 @@ thiserror.workspace = true
|
|||||||
tokio = { version = "1", features = [ "fs" ] }
|
tokio = { version = "1", features = [ "fs" ] }
|
||||||
tokio-util = { version = "0.7", features = [ "codec" ] }
|
tokio-util = { version = "0.7", features = [ "codec" ] }
|
||||||
reqwest = { version = "0.11", features = [ "json", "stream" ] }
|
reqwest = { version = "0.11", features = [ "json", "stream" ] }
|
||||||
futures = "0.3"
|
futures-util = "0.3"
|
||||||
read-progress-stream = "1.0.0"
|
read-progress-stream = "1.0.0"
|
||||||
@@ -11,12 +11,12 @@ type ProgressHandler = (progress: number, total: number) => void;
|
|||||||
const handlers: Map<number, ProgressHandler> = new Map();
|
const handlers: Map<number, ProgressHandler> = new Map();
|
||||||
let listening = false;
|
let listening = false;
|
||||||
|
|
||||||
async function listenToUploadEventIfNeeded(): Promise<void> {
|
async function listenToEventIfNeeded(event: string): Promise<void> {
|
||||||
if (listening) {
|
if (listening) {
|
||||||
return await Promise.resolve();
|
return await Promise.resolve();
|
||||||
}
|
}
|
||||||
return await appWindow
|
return await appWindow
|
||||||
.listen<ProgressPayload>("upload://progress", ({ payload }) => {
|
.listen<ProgressPayload>(event, ({ payload }) => {
|
||||||
const handler = handlers.get(payload.id);
|
const handler = handlers.get(payload.id);
|
||||||
if (handler != null) {
|
if (handler != null) {
|
||||||
handler(payload.progress, payload.total);
|
handler(payload.progress, payload.total);
|
||||||
@@ -27,7 +27,7 @@ async function listenToUploadEventIfNeeded(): Promise<void> {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
export default async function upload(
|
async function upload(
|
||||||
url: string,
|
url: string,
|
||||||
filePath: string,
|
filePath: string,
|
||||||
progressHandler?: ProgressHandler,
|
progressHandler?: ProgressHandler,
|
||||||
@@ -41,7 +41,7 @@ export default async function upload(
|
|||||||
handlers.set(id, progressHandler);
|
handlers.set(id, progressHandler);
|
||||||
}
|
}
|
||||||
|
|
||||||
await listenToUploadEventIfNeeded();
|
await listenToEventIfNeeded("upload://progress");
|
||||||
|
|
||||||
await invoke("plugin:upload|upload", {
|
await invoke("plugin:upload|upload", {
|
||||||
id,
|
id,
|
||||||
@@ -50,3 +50,30 @@ export default async function upload(
|
|||||||
headers: headers ?? {},
|
headers: headers ?? {},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function download(
|
||||||
|
url: string,
|
||||||
|
filePath: string,
|
||||||
|
progressHandler?: ProgressHandler,
|
||||||
|
headers?: Map<string, string>
|
||||||
|
): Promise<void> {
|
||||||
|
const ids = new Uint32Array(1);
|
||||||
|
window.crypto.getRandomValues(ids);
|
||||||
|
const id = ids[0];
|
||||||
|
|
||||||
|
if (progressHandler != null) {
|
||||||
|
handlers.set(id, progressHandler);
|
||||||
|
}
|
||||||
|
|
||||||
|
await listenToEventIfNeeded("download://progress");
|
||||||
|
|
||||||
|
await invoke("plugin:upload|upload", {
|
||||||
|
id,
|
||||||
|
url,
|
||||||
|
filePath,
|
||||||
|
headers: headers ?? {},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export default upload;
|
||||||
|
export { download, upload };
|
||||||
|
|||||||
@@ -2,14 +2,14 @@
|
|||||||
// SPDX-License-Identifier: Apache-2.0
|
// SPDX-License-Identifier: Apache-2.0
|
||||||
// SPDX-License-Identifier: MIT
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
use futures::TryStreamExt;
|
use futures_util::TryStreamExt;
|
||||||
use serde::{ser::Serializer, Serialize};
|
use serde::{ser::Serializer, Serialize};
|
||||||
use tauri::{
|
use tauri::{
|
||||||
command,
|
command,
|
||||||
plugin::{Builder as PluginBuilder, TauriPlugin},
|
plugin::{Builder as PluginBuilder, TauriPlugin},
|
||||||
Runtime, Window,
|
Runtime, Window,
|
||||||
};
|
};
|
||||||
use tokio::fs::File;
|
use tokio::{fs::File, io::AsyncWriteExt};
|
||||||
use tokio_util::codec::{BytesCodec, FramedRead};
|
use tokio_util::codec::{BytesCodec, FramedRead};
|
||||||
|
|
||||||
use read_progress_stream::ReadProgressStream;
|
use read_progress_stream::ReadProgressStream;
|
||||||
@@ -24,6 +24,8 @@ pub enum Error {
|
|||||||
Io(#[from] std::io::Error),
|
Io(#[from] std::io::Error),
|
||||||
#[error(transparent)]
|
#[error(transparent)]
|
||||||
Request(#[from] reqwest::Error),
|
Request(#[from] reqwest::Error),
|
||||||
|
#[error("{0}")]
|
||||||
|
ContentLength(String),
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Serialize for Error {
|
impl Serialize for Error {
|
||||||
@@ -42,6 +44,46 @@ struct ProgressPayload {
|
|||||||
total: u64,
|
total: u64,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[command]
|
||||||
|
async fn download<R: Runtime>(
|
||||||
|
window: Window<R>,
|
||||||
|
id: u32,
|
||||||
|
url: &str,
|
||||||
|
file_path: &str,
|
||||||
|
headers: HashMap<String, String>,
|
||||||
|
) -> Result<u32> {
|
||||||
|
let client = reqwest::Client::new();
|
||||||
|
|
||||||
|
let mut request = client.get(url);
|
||||||
|
// Loop trought the headers keys and values
|
||||||
|
// and add them to the request object.
|
||||||
|
for (key, value) in headers {
|
||||||
|
request = request.header(&key, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
let response = request.send().await?;
|
||||||
|
let total = response.content_length().ok_or_else(|| {
|
||||||
|
Error::ContentLength(format!("Failed to get content length from '{}'", url))
|
||||||
|
})?;
|
||||||
|
|
||||||
|
let mut file = File::create(file_path).await?;
|
||||||
|
let mut stream = response.bytes_stream();
|
||||||
|
|
||||||
|
while let Some(chunk) = stream.try_next().await? {
|
||||||
|
file.write_all(&chunk).await?;
|
||||||
|
let _ = window.emit(
|
||||||
|
"download://progress",
|
||||||
|
ProgressPayload {
|
||||||
|
id,
|
||||||
|
progress: chunk.len() as u64,
|
||||||
|
total,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(id)
|
||||||
|
}
|
||||||
|
|
||||||
#[command]
|
#[command]
|
||||||
async fn upload<R: Runtime>(
|
async fn upload<R: Runtime>(
|
||||||
window: Window<R>,
|
window: Window<R>,
|
||||||
@@ -88,6 +130,6 @@ fn file_to_body<R: Runtime>(id: u32, window: Window<R>, file: File) -> reqwest::
|
|||||||
|
|
||||||
pub fn init<R: Runtime>() -> TauriPlugin<R> {
|
pub fn init<R: Runtime>() -> TauriPlugin<R> {
|
||||||
PluginBuilder::new("upload")
|
PluginBuilder::new("upload")
|
||||||
.invoke_handler(tauri::generate_handler![upload])
|
.invoke_handler(tauri::generate_handler![download, upload])
|
||||||
.build()
|
.build()
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user