Embedded assets

Co-authored-by: Alistair Smith <hi@alistair.sh>

Author: roobscoob

Cargo.lock

@@ -27,6 +27,7 @@ tokio = { version = "1.41.1", features = ["full"] }
 components = { package = "ui", git = "https://github.com/longbridgeapp/gpui-component", version = "0.1.0" }
 log = "0.4.22"
 random-string = "1.1.0"
+rust-embed = "8.5.0"
 
 [features]
 default = ["gpui/x11"]

src/ui/Cargo.toml

@@ -7,20 +7,19 @@ use std::{fs, path::PathBuf, sync::Arc};
 use app_state::AppState;
 use components::theme::Theme;
 use gpui::*;
+use http_client::anyhow;
 
-struct Assets {
-  base: PathBuf,
-}
+#[derive(rust_embed::RustEmbed)]
+#[folder = "../../assets"]
+struct Assets;
 
 impl AssetSource for Assets {
   fn load(&self, path: &str) -> Result<Option<std::borrow::Cow<'static, [u8]>>> {
-    fs::read(self.base.join(path)).map(|data| Some(std::borrow::Cow::Owned(data))).map_err(|e| e.into())
+    Self::get(path).map(|f| Some(f.data)).ok_or_else(|| anyhow!("could not find asset at path \"{}\"", path))
   }
 
   fn list(&self, path: &str) -> Result<Vec<SharedString>> {
-    fs::read_dir(self.base.join(path))
-      .map(|entries| entries.filter_map(|entry| entry.ok().and_then(|entry| entry.file_name().into_string().ok()).map(SharedString::from)).collect())
-      .map_err(|e| e.into())
+    Ok(Self::iter().filter_map(|p| if p.starts_with(path) { Some(p.into()) } else { None }).collect())
   }
 }
 
@@ -40,31 +39,26 @@ async fn main() {
 
   let app_state = Arc::new(AppState {});
 
-  App::new()
-    .with_assets(Assets {
-      base: PathBuf::from("assets"),
-    })
-    .with_http_client(Arc::new(reqwest_client::ReqwestClient::new()))
-    .run(move |cx: &mut AppContext| {
-      AppState::set_global(Arc::downgrade(&app_state), cx);
-
-      if let Err(e) = init(app_state.clone(), cx) {
-        log::error!("{}", e);
-        return;
-      }
-
-      Theme::sync_system_appearance(cx);
-
-      let opts = WindowOptions {
-        window_decorations: Some(WindowDecorations::Client),
-        titlebar: Some(TitlebarOptions {
-          appears_transparent: true,
-          title: Some(SharedString::new_static("scope")),
-          ..Default::default()
-        }),
+  App::new().with_assets(Assets).with_http_client(Arc::new(reqwest_client::ReqwestClient::new())).run(move |cx: &mut AppContext| {
+    AppState::set_global(Arc::downgrade(&app_state), cx);
+
+    if let Err(e) = init(app_state.clone(), cx) {
+      log::error!("{}", e);
+      return;
+    }
+
+    Theme::sync_system_appearance(cx);
+
+    let opts = WindowOptions {
+      window_decorations: Some(WindowDecorations::Client),
+      titlebar: Some(TitlebarOptions {
+        appears_transparent: true,
+        title: Some(SharedString::new_static("scope")),
         ..Default::default()
-      };
+      }),
+      ..Default::default()
+    };
 
-      cx.open_window(opts, |cx| cx.new_view(|cx| crate::app::App::new(cx))).unwrap();
-    });
+    cx.open_window(opts, |cx| cx.new_view(|cx| crate::app::App::new(cx))).unwrap();
+  });
 }