From 81eec837fb8124530543141f84105f60ca9c0ff0 Mon Sep 17 00:00:00 2001 From: Gabriel Tofvesson Date: Tue, 28 Feb 2023 00:56:36 +0100 Subject: [PATCH] Implement download and extraction of multiple audio files --- Cargo.lock | 315 ++++++++++++++++++++++++++++++++++++++++++ Cargo.toml | 1 + src/api/history.rs | 17 ++- src/elevenlabs_api.rs | 2 +- src/lib.rs | 27 +++- src/model/error.rs | 28 +++- src/model/history.rs | 78 +++++++++-- 7 files changed, 448 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 97c154c..d290b78 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,6 +2,24 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aes" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", + "opaque-debug", +] + [[package]] name = "autocfg" version = "1.1.0" @@ -14,29 +32,74 @@ version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + [[package]] name = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "block-buffer" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +dependencies = [ + "generic-array", +] + [[package]] name = "bumpalo" version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + [[package]] name = "bytes" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +[[package]] +name = "bzip2" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" +dependencies = [ + "bzip2-sys", + "libc", +] + +[[package]] +name = "bzip2-sys" +version = "0.1.11+1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + [[package]] name = "cc" version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +dependencies = [ + "jobserver", +] [[package]] name = "cfg-if" @@ -44,6 +107,21 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cipher" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" +dependencies = [ + "generic-array", +] + +[[package]] +name = "constant_time_eq" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" + [[package]] name = "core-foundation" version = "0.9.3" @@ -60,6 +138,54 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +[[package]] +name = "cpufeatures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "digest" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +dependencies = [ + "block-buffer", + "crypto-common", + "subtle", +] + [[package]] name = "elevenlabs_rs" version = "0.1.0" @@ -68,6 +194,7 @@ dependencies = [ "reqwest", "serde", "tokio", + "zip", ] [[package]] @@ -109,6 +236,16 @@ dependencies = [ "instant", ] +[[package]] +name = "flate2" +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + [[package]] name = "fnv" version = "1.0.7" @@ -178,6 +315,16 @@ dependencies = [ "pin-utils", ] +[[package]] +name = "generic-array" +version = "0.14.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +dependencies = [ + "typenum", + "version_check", +] + [[package]] name = "h2" version = "0.3.15" @@ -212,6 +359,15 @@ dependencies = [ "libc", ] +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + [[package]] name = "http" version = "0.2.9" @@ -334,6 +490,15 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" +[[package]] +name = "jobserver" +version = "0.1.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b" +dependencies = [ + "libc", +] + [[package]] name = "js-sys" version = "0.3.61" @@ -392,6 +557,15 @@ version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +[[package]] +name = "miniz_oxide" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +dependencies = [ + "adler", +] + [[package]] name = "mio" version = "0.8.6" @@ -438,6 +612,12 @@ version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +[[package]] +name = "opaque-debug" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" + [[package]] name = "openssl" version = "0.10.45" @@ -506,6 +686,29 @@ dependencies = [ "windows-sys 0.45.0", ] +[[package]] +name = "password-hash" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" +dependencies = [ + "base64ct", + "rand_core", + "subtle", +] + +[[package]] +name = "pbkdf2" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" +dependencies = [ + "digest", + "hmac", + "password-hash", + "sha2", +] + [[package]] name = "percent-encoding" version = "2.2.0" @@ -548,6 +751,12 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" + [[package]] name = "redox_syscall" version = "0.2.16" @@ -695,6 +904,28 @@ dependencies = [ "serde", ] +[[package]] +name = "sha1" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + [[package]] name = "signal-hook-registry" version = "1.4.1" @@ -729,6 +960,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "subtle" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" + [[package]] name = "syn" version = "1.0.109" @@ -753,6 +990,22 @@ dependencies = [ "windows-sys 0.42.0", ] +[[package]] +name = "time" +version = "0.3.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" +dependencies = [ + "serde", + "time-core", +] + +[[package]] +name = "time-core" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" + [[package]] name = "tinyvec" version = "1.6.0" @@ -855,6 +1108,12 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +[[package]] +name = "typenum" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" + [[package]] name = "unicode-bidi" version = "0.3.10" @@ -893,6 +1152,12 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + [[package]] name = "want" version = "0.3.0" @@ -1096,3 +1361,53 @@ checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" dependencies = [ "winapi", ] + +[[package]] +name = "zip" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0445d0fbc924bb93539b4316c11afb121ea39296f99a3c4c9edad09e3658cdef" +dependencies = [ + "aes", + "byteorder", + "bzip2", + "constant_time_eq", + "crc32fast", + "crossbeam-utils", + "flate2", + "hmac", + "pbkdf2", + "sha1", + "time", + "zstd", +] + +[[package]] +name = "zstd" +version = "0.11.2+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "5.0.2+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +dependencies = [ + "libc", + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "2.0.7+zstd.1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94509c3ba2fe55294d752b79842c530ccfab760192521df74a081a78d2b3c7f5" +dependencies = [ + "cc", + "libc", + "pkg-config", +] diff --git a/Cargo.toml b/Cargo.toml index 40276ae..de3986e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,3 +10,4 @@ bytes = "1.4.0" reqwest = { version = "0.11", features = ["json"] } serde = { version = "1.0.152", features = ["std", "derive"] } tokio = { version = "1", features = ["full"] } +zip = "0.6.4" diff --git a/src/api/history.rs b/src/api/history.rs index c2ae649..a70f2b8 100644 --- a/src/api/history.rs +++ b/src/api/history.rs @@ -1,10 +1,10 @@ use bytes::Bytes; -use crate::{elevenlabs_api::{ElevenLabsAPI, self}, model::{history::{HistoryItems, HistoryResponse}, error::{APIError, HTTPValidationError}}}; +use crate::{elevenlabs_api::{ElevenLabsAPI, self}, model::{history::{HistoryItems, HistoryResponse, AudioItem}, error::{APIError, HTTPValidationError, ZippedAudioApiError}}}; impl ElevenLabsAPI { - pub async fn download_history(&self, items: HistoryItems) -> Result { - let response = self.get(elevenlabs_api::history::GET::History)?.json(&items).send().await?; + pub async fn download_history_raw(&self, items: HistoryItems) -> Result { + let response = self.post(elevenlabs_api::history::POST::DownloadHistory)?.json(&items).send().await?; if response.status().is_success() { Ok(response.bytes().await?) @@ -14,6 +14,17 @@ impl ElevenLabsAPI { } } + pub async fn download_history(&self, items: HistoryItems) -> Result { + let count = items.history_item_ids.len(); + let response = self.download_history_raw(items).await?; + + Ok(if count == 1 { + AudioItem::new_single(response) + } else { + AudioItem::new_zipped(response)? + }) + } + pub async fn delete_history(&self, item: String) -> Result { let response = self.delete(elevenlabs_api::history::DELETE::HistoryItem { item_id: item })?.send().await?; diff --git a/src/elevenlabs_api.rs b/src/elevenlabs_api.rs index e00a33e..accc967 100644 --- a/src/elevenlabs_api.rs +++ b/src/elevenlabs_api.rs @@ -1,4 +1,4 @@ -use reqwest::{Response, Error, Client, RequestBuilder}; +use reqwest::{Error, Client, RequestBuilder}; #[derive(Debug)] pub struct ElevenLabsAPI { diff --git a/src/lib.rs b/src/lib.rs index c891712..3ab9a10 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -3,9 +3,12 @@ pub mod api; pub mod elevenlabs_api; extern crate reqwest; +extern crate zip; #[cfg(test)] mod tests { + use crate::model::history::HistoryItems; + use super::*; fn get_api() -> elevenlabs_api::ElevenLabsAPI { @@ -30,6 +33,28 @@ mod tests { let result = api.get_history_items().await; assert!(result.is_ok()); - println!("{:?}", result.unwrap()); + let result = result.unwrap(); + + let item = result.history.last().unwrap(); + + let single_audio = api.get_history_audio(item.history_item_id.clone()).await; + assert!(single_audio.is_ok()); + + //std::fs::write("test0.mp3", single_audio.audio(0).unwrap()).unwrap(); + + if result.history.len() > 1 { + let audio_result = api.download_history(HistoryItems { + history_item_ids: result.history[0..=1].iter().map(|x| x.history_item_id.clone()).collect() + }).await; + + assert!(audio_result.is_ok()); + + let audio_result = audio_result.unwrap(); + let audio = audio_result.audio(); + assert!(audio.len() == 2); + + //std::fs::write("test1.mp3", audio.audio(0).unwrap()).unwrap(); + //std::fs::write("test2.mp3", audio.audio(1).unwrap()).unwrap(); + } } } diff --git a/src/model/error.rs b/src/model/error.rs index 89b0990..f16bdc7 100644 --- a/src/model/error.rs +++ b/src/model/error.rs @@ -1,5 +1,7 @@ use serde::Deserialize; +use super::history::AudioExtractionError; + #[derive(Debug, Deserialize)] pub enum Location { StringLocation(String), @@ -8,16 +10,16 @@ pub enum Location { #[derive(Debug, Deserialize)] pub struct ValidationError { - loc: Vec, - msg: String, + pub loc: Vec, + pub msg: String, #[serde(rename = "type")] - error_type: String, + pub error_type: String, } #[derive(Debug, Deserialize)] pub struct HTTPValidationError { - detail: Vec, + pub detail: Vec, } #[derive(Debug)] @@ -36,4 +38,22 @@ impl From for APIError { fn from(error: HTTPValidationError) -> Self { Self::HTTPError(error) } +} + +#[derive(Debug)] +pub enum ZippedAudioApiError { + AudioExtractionError(AudioExtractionError), + APIError(APIError), +} + +impl From for ZippedAudioApiError { + fn from(error: AudioExtractionError) -> Self { + Self::AudioExtractionError(error) + } +} + +impl From for ZippedAudioApiError { + fn from(error: APIError) -> Self { + Self::APIError(error) + } } \ No newline at end of file diff --git a/src/model/history.rs b/src/model/history.rs index 553d1d1..c743f2e 100644 --- a/src/model/history.rs +++ b/src/model/history.rs @@ -1,4 +1,8 @@ +use std::io::Read; + +use bytes::Bytes; use serde::{Serialize, Deserialize}; +use zip::result::ZipError; #[derive(Debug, Deserialize)] pub enum State { @@ -15,23 +19,75 @@ pub struct Settings; #[derive(Debug, Deserialize)] pub struct Item { - history_item_id: String, - voice_id: String, - text: String, - date_unix: u64, - character_count_change_from: u32, - character_count_change_to: u32, - content_type: String, - state: State, - //settings: Settings, + pub history_item_id: String, + pub voice_id: String, + pub text: String, + pub date_unix: u64, + pub character_count_change_from: u32, + pub character_count_change_to: u32, + pub content_type: String, + pub state: State, + //pub settings: Settings, } #[derive(Debug, Deserialize)] pub struct HistoryResponse { - history: Vec, + pub history: Vec, } #[derive(Debug, Serialize)] pub struct HistoryItems { - history_item_ids: Vec, + pub history_item_ids: Vec, +} + +#[derive(Debug)] +pub enum AudioExtractionError { + IoError(std::io::Error), + ZipError(ZipError), +} + +impl From for AudioExtractionError { + fn from(error: ZipError) -> Self { + Self::ZipError(error) + } +} + +impl From for AudioExtractionError { + fn from(error: std::io::Error) -> Self { + Self::IoError(error) + } +} + +#[derive(Debug)] +pub struct AudioItem { + data: Vec>, +} + +impl AudioItem { + pub(crate) fn new_single(audio: Bytes) -> Self { + Self { + data: vec![audio.to_vec()], + } + } + + pub(crate) fn new_zipped(audio: Bytes) -> Result { + let reader = std::io::Cursor::new(&audio); + + let mut zip = zip::ZipArchive::new(reader)?; + let mut collect = Vec::new(); + for index in 0..zip.len() { + let mut buffer = Vec::new(); + let mut file = zip.by_index(index)?; + file.read_to_end(&mut buffer)?; // TODO: Unwrap? + collect.push(buffer); + } + + Ok(Self { + data: collect, + }) + } + + pub fn audio(&self) -> &Vec> { + &self.data + } } \ No newline at end of file