16366cf9f2
https://github.com/zed-industries/zed/issues/30972 brought up another case where our context is not enough to track the actual source of the issue: we get a general top-level error without inner error. The reason for this was `.ok_or_else(|| anyhow!("failed to read HEAD SHA"))?; ` on the top level. The PR finally reworks the way we use anyhow to reduce such issues (or at least make it simpler to bubble them up later in a fix). On top of that, uses a few more anyhow methods for better readability. * `.ok_or_else(|| anyhow!("..."))`, `map_err` and other similar error conversion/option reporting cases are replaced with `context` and `with_context` calls * in addition to that, various `anyhow!("failed to do ...")` are stripped with `.context("Doing ...")` messages instead to remove the parasitic `failed to` text * `anyhow::ensure!` is used instead of `if ... { return Err(...); }` calls * `anyhow::bail!` is used instead of `return Err(anyhow!(...));` Release Notes: - N/A
57 lines
1.6 KiB
Rust
57 lines
1.6 KiB
Rust
use std::{io::Cursor, sync::Arc};
|
|
|
|
use anyhow::{Context as _, Result};
|
|
use collections::HashMap;
|
|
use gpui::{App, AssetSource, Global};
|
|
use rodio::{
|
|
Decoder, Source,
|
|
source::{Buffered, SamplesConverter},
|
|
};
|
|
|
|
type Sound = Buffered<SamplesConverter<Decoder<Cursor<Vec<u8>>>, f32>>;
|
|
|
|
pub struct SoundRegistry {
|
|
cache: Arc<parking_lot::Mutex<HashMap<String, Sound>>>,
|
|
assets: Box<dyn AssetSource>,
|
|
}
|
|
|
|
struct GlobalSoundRegistry(Arc<SoundRegistry>);
|
|
|
|
impl Global for GlobalSoundRegistry {}
|
|
|
|
impl SoundRegistry {
|
|
pub fn new(source: impl AssetSource) -> Arc<Self> {
|
|
Arc::new(Self {
|
|
cache: Default::default(),
|
|
assets: Box::new(source),
|
|
})
|
|
}
|
|
|
|
pub fn global(cx: &App) -> Arc<Self> {
|
|
cx.global::<GlobalSoundRegistry>().0.clone()
|
|
}
|
|
|
|
pub(crate) fn set_global(source: impl AssetSource, cx: &mut App) {
|
|
cx.set_global(GlobalSoundRegistry(SoundRegistry::new(source)));
|
|
}
|
|
|
|
pub fn get(&self, name: &str) -> Result<impl Source<Item = f32> + use<>> {
|
|
if let Some(wav) = self.cache.lock().get(name) {
|
|
return Ok(wav.clone());
|
|
}
|
|
|
|
let path = format!("sounds/{}.wav", name);
|
|
let bytes = self
|
|
.assets
|
|
.load(&path)?
|
|
.map(anyhow::Ok)
|
|
.with_context(|| format!("No asset available for path {path}"))??
|
|
.into_owned();
|
|
let cursor = Cursor::new(bytes);
|
|
let source = Decoder::new(cursor)?.convert_samples::<f32>().buffered();
|
|
|
|
self.cache.lock().insert(name.to_string(), source.clone());
|
|
|
|
Ok(source)
|
|
}
|
|
}
|