Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make file types live reload

Browse source
This commit is contained in:
Mikayla Maki 2023-07-17 13:09:47 -07:00
parent 96ef6ab326
commit 8c855680e7
No known key found for this signature in database
4 changed files with 68 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

58
crates/project_panel/src/file_associations.rs
View file

@ -4,6 +4,7 @@ use collections::HashMap;
use gpui::{AppContext, AssetSource};
use serde_derive::Deserialize;
use util::iife;
#[derive(Deserialize, Debug)]
struct TypeConfig {
@ -16,9 +17,9 @@ pub struct FileAssociations {
types: HashMap<String, TypeConfig>,
}
pub const TEXT_FILE_ASSET: &'static str = "icons/file_icons/quill/file.svg";
const DIRECTORY_TYPE: &'static str = "directory";
const EXPANDED_DIRECTORY_TYPE: &'static str = "expanded_directory";
pub const FILE_TYPES_ASSET: &'static str = "icons/file_icons/file_types.json";
pub fn init(assets: impl AssetSource, cx: &mut AppContext) {
cx.set_global(FileAssociations::new(assets))
@ -28,8 +29,9 @@ impl FileAssociations {
pub fn new(assets: impl AssetSource) -> Self {
assets
.load("icons/file_icons/file_types.json")
.map(|file| {
serde_json::from_str::<FileAssociations>(str::from_utf8(&file).unwrap()).unwrap()
.and_then(|file| {
serde_json::from_str::<FileAssociations>(str::from_utf8(&file).unwrap())
.map_err(Into::into)
})
.unwrap_or_else(|_| FileAssociations {
suffixes: HashMap::default(),
@ -37,35 +39,37 @@ impl FileAssociations {
})
}
pub fn get_icon(path: &Path, cx: &AppContext) -> Option<Arc<str>> {
if !cx.has_global::<Self>() {
return None;
}
pub fn get_icon(path: &Path, cx: &AppContext) -> Arc<str> {
iife!({
let this = cx.has_global::<Self>().then(|| cx.global::<Self>())?;
let this = cx.global::<Self>();
let suffix = path.extension()?.to_str()?;
iife!({
let suffix = path.extension()?.to_str()?;
this.suffixes
.get(suffix)
.and_then(|type_str| this.types.get(type_str))
.map(|type_config| type_config.icon.clone())
this.suffixes
.get(suffix)
.and_then(|type_str| this.types.get(type_str))
.map(|type_config| type_config.icon.clone())
})
.or_else(|| this.types.get("default").map(|config| config.icon.clone()))
})
.unwrap_or_else(|| Arc::from("".to_string()))
}
pub fn get_folder_icon(expanded: bool, cx: &AppContext) -> Option<Arc<str>> {
if !cx.has_global::<Self>() {
return None;
}
pub fn get_folder_icon(expanded: bool, cx: &AppContext) -> Arc<str> {
iife!({
let this = cx.has_global::<Self>().then(|| cx.global::<Self>())?;
let this = cx.global::<Self>();
let key = if expanded {
EXPANDED_DIRECTORY_TYPE
} else {
DIRECTORY_TYPE
};
let key = if expanded {
EXPANDED_DIRECTORY_TYPE
} else {
DIRECTORY_TYPE
};
this.types
.get(key)
.map(|type_config| type_config.icon.clone())
this.types
.get(key)
.map(|type_config| type_config.icon.clone())
})
.unwrap_or_else(|| Arc::from("".to_string()))
}
}

15
crates/project_panel/src/project_panel.rs
View file

@ -1,11 +1,12 @@
mod file_associations;
pub mod file_associations;
mod project_panel_settings;
use context_menu::{ContextMenu, ContextMenuItem};
use db::kvp::KEY_VALUE_STORE;
use drag_and_drop::{DragAndDrop, Draggable};
use editor::{Cancel, Editor};
use file_associations::{FileAssociations, TEXT_FILE_ASSET};
use file_associations::FileAssociations;
use futures::stream::StreamExt;
use gpui::{
actions,
@ -234,6 +235,10 @@ impl ProjectPanel {
})
.detach();
cx.observe_global::<FileAssociations, _>(|_, cx| {
cx.notify();
}).detach();
let view_id = cx.view_id();
let mut this = Self {
project: project.clone(),
@ -1189,11 +1194,9 @@ impl ProjectPanel {
let is_expanded = expanded_entry_ids.binary_search(&entry.id).is_ok();
let icon = show_file_icons
.then(|| match entry.kind {
EntryKind::File(_) => FileAssociations::get_icon(&entry.path, cx)
.or_else(|| Some(TEXT_FILE_ASSET.into())),
EntryKind::File(_) => FileAssociations::get_icon(&entry.path, cx),
_ => FileAssociations::get_folder_icon(is_expanded, cx),
})
.flatten();
});
let mut details = EntryDetails {
filename: entry