From 126f4b7d7b44b8fe4d23934a4db8a43b7a561c49 Mon Sep 17 00:00:00 2001 From: mc_fdc Date: Sat, 8 Apr 2023 18:47:03 +0000 Subject: [PATCH] add: default header --- README.md | 2 +- examples/basic.rs | 4 ++-- src/client.rs | 6 +++--- src/restapi.rs | 11 ++++++++--- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 7ea1735..014a8ae 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ use std::{io::Write, fs::File}; #[tokio::main] async fn main() -> Result<()> { - let client = Client::new("http://localhost:50021".to_string()); + let client = Client::new("http://localhost:50021".to_string(), None); let audio_query = client .create_audio_query("こんにちは", 1, None) .await?; diff --git a/examples/basic.rs b/examples/basic.rs index ecb0ad3..f44a1a5 100644 --- a/examples/basic.rs +++ b/examples/basic.rs @@ -1,10 +1,10 @@ use voicevox_client::Client; -use reqwest::Result; +use reqwest::{Result, header::HeaderMap}; use std::{io::Write, fs::File}; #[tokio::main] async fn main() -> Result<()> { - let client = Client::new("http://localhost:50021".to_string()); + let client = Client::new("http://localhost:50021".to_string(), None); let audio_query = client .create_audio_query("こんにちは", 1, None) .await?; diff --git a/src/client.rs b/src/client.rs index fcdc918..fecec81 100644 --- a/src/client.rs +++ b/src/client.rs @@ -1,14 +1,14 @@ use crate::{audio_query::AudioQuery, restapi::RestAPI, types::audio_query::AudioQueryType}; -use reqwest::Result; +use reqwest::{Result, header::HeaderMap}; pub struct Client { restapi: RestAPI, } impl Client { - pub fn new(base_path: String) -> Self { + pub fn new(base_path: String, headers: Option) -> Self { Self { - restapi: RestAPI::new(base_path), + restapi: RestAPI::new(base_path, headers), } } diff --git a/src/restapi.rs b/src/restapi.rs index 0cb3335..7889bff 100644 --- a/src/restapi.rs +++ b/src/restapi.rs @@ -1,6 +1,6 @@ use crate::types::audio_query::AudioQueryType; use bytes::Bytes; -use reqwest::{Client, RequestBuilder, Result}; +use reqwest::{Client, RequestBuilder, Result, header::HeaderMap}; #[derive(Clone)] pub struct RestAPI { @@ -9,10 +9,15 @@ pub struct RestAPI { } impl RestAPI { - pub fn new(base_path: String) -> Self { + pub fn new(base_path: String, headers: Option) -> Self { + let mut client_builder = Client::builder(); + if let Some(headers) = headers { + client_builder = client_builder.default_headers(headers); + } + let client = client_builder.build().unwrap(); Self { base_path, - client: Client::new(), + client, } }