Refactor, add AudioAgent

This commit is contained in:
Rob Watson 2020-09-04 17:25:16 +02:00
parent ef1159c139
commit 9fe3c89ce1
4 changed files with 85 additions and 32 deletions

76
src/agents/audio_agent.rs Normal file
View File

@ -0,0 +1,76 @@
use web_sys::File;
use yew::services::reader::{FileChunk, ReaderTask};
use yew::services::{ConsoleService, ReaderService};
use yew::worker::*;
pub struct AudioAgent {
link: AgentLink<Self>,
reader_service: ReaderService,
reader_task: Option<ReaderTask>,
}
pub enum Request {
LoadSamplesFromFile(File),
}
pub enum Msg {
FileProgress(Option<FileChunk>),
}
impl Agent for AudioAgent {
type Reach = Context<Self>;
type Message = Msg;
type Input = Request;
type Output = ();
fn create(link: AgentLink<Self>) -> Self {
Self {
link,
reader_service: ReaderService::new(),
reader_task: None,
}
}
fn update(&mut self, msg: Self::Message) {
match msg {
Msg::FileProgress(Some(chunk)) => {
if let Err(e) = self.handle_file_progress(chunk) {
ConsoleService::error(&e);
}
}
Msg::FileProgress(None) => (),
};
}
fn handle_input(&mut self, input: Self::Input, _: HandlerId) {
match input {
Request::LoadSamplesFromFile(file) => self.load_samples_from_file(file),
};
}
}
impl AudioAgent {
fn load_samples_from_file(&mut self, file: File) -> Result<(), String> {
let cb = self.link.callback(Msg::FileProgress);
let task = self
.reader_service
.read_file_by_chunks(file, cb, 256)
.map_err(|e| e.to_string())?;
self.reader_task = Some(task);
Ok(())
}
fn handle_file_progress(&mut self, chunk: FileChunk) -> Result<(), String> {
match chunk {
FileChunk::Started { name, .. } => ConsoleService::log(&format!("Started: {}", name)),
FileChunk::DataChunk { progress, .. } => {
ConsoleService::log(&format!("Got chunk, progress: {}", progress))
}
FileChunk::Finished => ConsoleService::log("Finished"),
}
Ok(())
}
}

1
src/agents/mod.rs Normal file
View File

@ -0,0 +1 @@
pub mod audio_agent;

View File

@ -1,18 +1,17 @@
use crate::agents::audio_agent::{self, AudioAgent};
use web_sys::HtmlInputElement; use web_sys::HtmlInputElement;
use yew::agent::Dispatcher;
use yew::prelude::*; use yew::prelude::*;
use yew::services::reader::{FileChunk, ReaderTask}; use yew::services::ConsoleService;
use yew::services::{ConsoleService, ReaderService};
pub struct Controls { pub struct Controls {
link: ComponentLink<Self>, link: ComponentLink<Self>,
file_input: NodeRef, file_input: NodeRef,
reader_service: ReaderService, audio_agent: Dispatcher<AudioAgent>,
reader_task: Option<ReaderTask>,
} }
pub enum Msg { pub enum Msg {
SubmitForm, SubmitForm,
FileProgress(Option<FileChunk>),
} }
impl Component for Controls { impl Component for Controls {
@ -23,8 +22,7 @@ impl Component for Controls {
Self { Self {
link, link,
file_input: NodeRef::default(), file_input: NodeRef::default(),
reader_service: ReaderService::new(), audio_agent: AudioAgent::dispatcher(),
reader_task: None,
} }
} }
@ -35,11 +33,6 @@ impl Component for Controls {
ConsoleService::error(&e); ConsoleService::error(&e);
}; };
} }
Msg::FileProgress(c) => {
if let Err(e) = self.handle_file_progress(c) {
ConsoleService::error(&e);
};
}
}; };
true true
} }
@ -72,28 +65,10 @@ impl Controls {
let file_list = file_input.files().ok_or("could not get file list")?; let file_list = file_input.files().ok_or("could not get file list")?;
let file = file_list.get(0).ok_or("could not get file")?; let file = file_list.get(0).ok_or("could not get file")?;
let cb = self.link.callback(Msg::FileProgress);
let task = self self.audio_agent
.reader_service .send(audio_agent::Request::LoadSamplesFromFile(file));
.read_file_by_chunks(file, cb, 256)
.map_err(|e| e.to_string())?;
self.reader_task = Some(task);
Ok(())
}
fn handle_file_progress(&self, chunk: Option<FileChunk>) -> Result<(), String> {
match chunk {
Some(FileChunk::Started { name, .. }) => {
ConsoleService::log(&format!("Started: {}", name))
}
Some(FileChunk::DataChunk { progress, .. }) => {
ConsoleService::log(&format!("Got chunk, progress: {}", progress))
}
Some(FileChunk::Finished) => ConsoleService::log("Finished"),
_ => (),
}
Ok(()) Ok(())
} }
} }

View File

@ -5,6 +5,7 @@ use std::panic;
use wasm_bindgen::prelude::*; use wasm_bindgen::prelude::*;
use yew::prelude::*; use yew::prelude::*;
mod agents;
mod app; mod app;
mod canvas; mod canvas;
mod controls; mod controls;