Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| bc7cf6b8ed | |||
| 7272d19207 | |||
| 9614d2884b |
Vendored
+2
-2
@@ -6,8 +6,8 @@
|
|||||||
"files.trimFinalNewlines": true,
|
"files.trimFinalNewlines": true,
|
||||||
"files.trimTrailingWhitespace": true,
|
"files.trimTrailingWhitespace": true,
|
||||||
"rust-analyzer.cargo.features": [
|
"rust-analyzer.cargo.features": [
|
||||||
"llm",
|
"native",
|
||||||
"native"
|
"llm"
|
||||||
],
|
],
|
||||||
"rust-analyzer.cargo.noDefaultFeatures": true,
|
"rust-analyzer.cargo.noDefaultFeatures": true,
|
||||||
"rust-analyzer.cargo.allFeatures": false
|
"rust-analyzer.cargo.allFeatures": false
|
||||||
|
|||||||
@@ -1,6 +1,10 @@
|
|||||||
use egui::{TextEdit, vec2};
|
use egui::{TextEdit, vec2};
|
||||||
|
|
||||||
use crate::{PROJECT_FOLDER, util};
|
use crate::{
|
||||||
|
PROJECT_FOLDER,
|
||||||
|
filesystem::{FILESYSTEM, FsError, LegacyFileSystem},
|
||||||
|
util,
|
||||||
|
};
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
pub struct Asset {
|
pub struct Asset {
|
||||||
@@ -25,15 +29,14 @@ impl Asset {
|
|||||||
println!("old_path: {old_path:?}");
|
println!("old_path: {old_path:?}");
|
||||||
println!("new_path: {new_path:?}");
|
println!("new_path: {new_path:?}");
|
||||||
|
|
||||||
// move from src dir to name path
|
if let Err(FsError::Io(err)) = FILESYSTEM.rename(&old_path, &new_path) {
|
||||||
if let Err(err) = std::fs::rename(&old_path, &new_path) {
|
|
||||||
match err.kind() {
|
match err.kind() {
|
||||||
std::io::ErrorKind::NotFound => {
|
std::io::ErrorKind::NotFound => {
|
||||||
let dir = new_path.parent().unwrap();
|
let dir = new_path.parent().unwrap();
|
||||||
if !dir.exists() {
|
if !dir.exists() {
|
||||||
std::fs::create_dir_all(dir).unwrap();
|
FILESYSTEM.mkdir(dir).unwrap();
|
||||||
}
|
}
|
||||||
std::fs::rename(&old_path, &new_path).unwrap();
|
FILESYSTEM.rename(&old_path, &new_path).unwrap();
|
||||||
}
|
}
|
||||||
_ => panic!("Failed to rename file: {err}"),
|
_ => panic!("Failed to rename file: {err}"),
|
||||||
}
|
}
|
||||||
@@ -73,7 +76,7 @@ impl Asset {
|
|||||||
|
|
||||||
ui.separator();
|
ui.separator();
|
||||||
|
|
||||||
if let Ok(bytes) = std::fs::read(Self::path(&self.name)) {
|
if let Ok(bytes) = FILESYSTEM.read_bytes(&Self::path(&self.name)) {
|
||||||
let image_source = egui::ImageSource::Bytes {
|
let image_source = egui::ImageSource::Bytes {
|
||||||
uri: std::borrow::Cow::Owned(self.name.clone()),
|
uri: std::borrow::Cow::Owned(self.name.clone()),
|
||||||
bytes: bytes.into(),
|
bytes: bytes.into(),
|
||||||
|
|||||||
@@ -1,10 +1,12 @@
|
|||||||
|
use std::path::Path;
|
||||||
|
|
||||||
use egui::TextEdit;
|
use egui::TextEdit;
|
||||||
use egui_commonmark::{CommonMarkCache, CommonMarkViewer};
|
use egui_commonmark::{CommonMarkCache, CommonMarkViewer};
|
||||||
use serde::{self, Deserialize, Serialize};
|
use serde::{self, Deserialize, Serialize};
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
PROJECT_FOLDER,
|
|
||||||
editors::{settings_editor::ProjectSettings, tags::Tag},
|
editors::{settings_editor::ProjectSettings, tags::Tag},
|
||||||
|
filesystem::{FILESYSTEM, LegacyFileSystem},
|
||||||
util,
|
util,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -43,10 +45,7 @@ impl Clone for MainEditor {
|
|||||||
|
|
||||||
#[derive(Serialize, Deserialize, Clone, Debug)]
|
#[derive(Serialize, Deserialize, Clone, Debug)]
|
||||||
pub struct ContentSection {
|
pub struct ContentSection {
|
||||||
#[serde(default)]
|
|
||||||
pub title: String,
|
pub title: String,
|
||||||
|
|
||||||
#[serde(default)]
|
|
||||||
pub id: String,
|
pub id: String,
|
||||||
|
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
@@ -80,21 +79,16 @@ impl ContentSection {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn save(&mut self) -> Result<(), Box<dyn std::error::Error>> {
|
pub fn save(&mut self) -> Result<(), Box<dyn std::error::Error>> {
|
||||||
let path = PROJECT_FOLDER
|
FILESYSTEM.write(
|
||||||
.join("documents")
|
Path::new(&format!("documents/{id}.json", id = &self.id)),
|
||||||
.join(format!("{}.json", &self.id));
|
self.clone(),
|
||||||
|
)?;
|
||||||
let content = serde_json::to_string_pretty(self)?;
|
|
||||||
std::fs::write(path, content)?;
|
|
||||||
self.saved = true;
|
self.saved = true;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn load(id: &str) -> Result<Self, Box<dyn std::error::Error>> {
|
pub fn load(id: &str) -> Result<Self, Box<dyn std::error::Error>> {
|
||||||
let path = PROJECT_FOLDER.join("documents").join(format!("{id}.json"));
|
let mut section: Self = FILESYSTEM.read(Path::new(&format!("documents/{id}.json")))?;
|
||||||
|
|
||||||
let content = std::fs::read_to_string(&path)?;
|
|
||||||
let mut section: Self = serde_json::from_str(&content)?;
|
|
||||||
section.saved = true;
|
section.saved = true;
|
||||||
section.id = id.to_string();
|
section.id = id.to_string();
|
||||||
Ok(section)
|
Ok(section)
|
||||||
@@ -175,12 +169,12 @@ impl MainEditor {
|
|||||||
|
|
||||||
// delete button
|
// delete button
|
||||||
if ui.button("Delete").clicked() {
|
if ui.button("Delete").clicked() {
|
||||||
std::fs::remove_file(
|
FILESYSTEM
|
||||||
PROJECT_FOLDER
|
.delete(Path::new(&format!(
|
||||||
.join("documents")
|
"documents/{id}.json",
|
||||||
.join(format!("{}.json", self.content.id)),
|
id = &self.content.id
|
||||||
)
|
)))
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
||||||
*self = Self::new();
|
*self = Self::new();
|
||||||
}
|
}
|
||||||
@@ -195,7 +189,9 @@ impl MainEditor {
|
|||||||
|
|
||||||
// assistant toggle
|
// assistant toggle
|
||||||
#[cfg(feature = "llm")]
|
#[cfg(feature = "llm")]
|
||||||
ui.checkbox(&mut self.show_ai, "AI Assistant");
|
if project.ai_enabled() {
|
||||||
|
ui.checkbox(&mut self.show_ai, "AI Assistant");
|
||||||
|
}
|
||||||
|
|
||||||
// editor toggle
|
// editor toggle
|
||||||
ui.checkbox(&mut self.editor_separate_window, "Pop out editor");
|
ui.checkbox(&mut self.editor_separate_window, "Pop out editor");
|
||||||
@@ -243,7 +239,7 @@ impl MainEditor {
|
|||||||
ui.separator();
|
ui.separator();
|
||||||
|
|
||||||
#[cfg(feature = "llm")]
|
#[cfg(feature = "llm")]
|
||||||
if self.show_ai {
|
if self.show_ai && project.ai_enabled() {
|
||||||
let dialog = &mut self.dialog;
|
let dialog = &mut self.dialog;
|
||||||
|
|
||||||
dialog.content = self.content.content.clone();
|
dialog.content = self.content.content.clone();
|
||||||
@@ -324,7 +320,7 @@ impl MainEditor {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
fn editor_ui(&mut self, ui: &mut egui::Ui, project: &mut ProjectSettings) {
|
fn editor_ui(&mut self, ui: &mut egui::Ui, _project: &mut ProjectSettings) {
|
||||||
let _response = egui::ScrollArea::both()
|
let _response = egui::ScrollArea::both()
|
||||||
.auto_shrink([false, false])
|
.auto_shrink([false, false])
|
||||||
.id_salt("editor_scroll")
|
.id_salt("editor_scroll")
|
||||||
@@ -342,7 +338,7 @@ impl MainEditor {
|
|||||||
|
|
||||||
ui.set_min_width(max_width as f32);
|
ui.set_min_width(max_width as f32);
|
||||||
|
|
||||||
ui.add(
|
let response = ui.add(
|
||||||
TextEdit::multiline(&mut self.content.content)
|
TextEdit::multiline(&mut self.content.content)
|
||||||
.id_source("MainEditor_editor")
|
.id_source("MainEditor_editor")
|
||||||
.font(egui::TextStyle::Monospace)
|
.font(egui::TextStyle::Monospace)
|
||||||
@@ -352,6 +348,9 @@ impl MainEditor {
|
|||||||
.hint_text("Type here...")
|
.hint_text("Type here...")
|
||||||
.desired_width(max_width as f32),
|
.desired_width(max_width as f32),
|
||||||
);
|
);
|
||||||
|
if response.changed() {
|
||||||
|
self.content.saved = false;
|
||||||
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
+41
-16
@@ -1,13 +1,19 @@
|
|||||||
use std::fs;
|
use std::path::Path;
|
||||||
|
|
||||||
use egui::TextEdit;
|
use egui::TextEdit;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
use crate::{PROJECT_FOLDER, editors::tags::Tag, util};
|
use crate::{
|
||||||
|
editors::tags::Tag,
|
||||||
|
filesystem::{FILESYSTEM, LegacyFileSystem},
|
||||||
|
util,
|
||||||
|
};
|
||||||
|
|
||||||
#[derive(Debug, Serialize, Deserialize, Clone)]
|
#[derive(Debug, Serialize, Deserialize, Clone)]
|
||||||
pub struct Note {
|
pub struct Note {
|
||||||
|
pub id: String,
|
||||||
pub name: String,
|
pub name: String,
|
||||||
|
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
pub content: String,
|
pub content: String,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
@@ -17,12 +23,14 @@ pub struct Note {
|
|||||||
pub tags: Vec<String>,
|
pub tags: Vec<String>,
|
||||||
|
|
||||||
#[serde(skip)]
|
#[serde(skip)]
|
||||||
pub id: String,
|
#[serde(default = "default_saved")]
|
||||||
|
|
||||||
#[serde(skip)]
|
|
||||||
pub saved: bool,
|
pub saved: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn default_saved() -> bool {
|
||||||
|
true
|
||||||
|
}
|
||||||
|
|
||||||
impl Default for Note {
|
impl Default for Note {
|
||||||
fn default() -> Self {
|
fn default() -> Self {
|
||||||
Self {
|
Self {
|
||||||
@@ -48,18 +56,15 @@ impl Note {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn save(&mut self) -> std::io::Result<()> {
|
pub fn save(&mut self) -> Result<(), Box<dyn std::error::Error>> {
|
||||||
let id = &self.id;
|
let id = &self.id;
|
||||||
let path = PROJECT_FOLDER.join("notes").join(format!("{id}.json"));
|
FILESYSTEM.write(Path::new(&format!("notes/{id}.json")), self.clone())?;
|
||||||
fs::write(path, serde_json::to_string(&self)?)?;
|
|
||||||
self.saved = true;
|
self.saved = true;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn load(id: &str) -> std::io::Result<Self> {
|
pub fn load(id: &str) -> Result<Self, Box<dyn std::error::Error>> {
|
||||||
let path = PROJECT_FOLDER.join("notes").join(format!("{id}.json"));
|
let mut note: Self = FILESYSTEM.read(Path::new(&format!("notes/{id}.json")))?;
|
||||||
let content = fs::read_to_string(path)?;
|
|
||||||
let mut note: Note = serde_json::from_str(&content)?;
|
|
||||||
note.id = id.to_string();
|
note.id = id.to_string();
|
||||||
note.saved = true;
|
note.saved = true;
|
||||||
Ok(note)
|
Ok(note)
|
||||||
@@ -74,11 +79,31 @@ impl Note {
|
|||||||
|
|
||||||
util::saved_status(ui, self.saved, &self.id, &self.name);
|
util::saved_status(ui, self.saved, &self.id, &self.name);
|
||||||
|
|
||||||
if ui.button("Save").clicked() {
|
ui.horizontal(|ui| {
|
||||||
if let Err(e) = self.save() {
|
if ui.button("Save").clicked() {
|
||||||
eprintln!("Failed to save: {e}");
|
if let Err(e) = self.save() {
|
||||||
|
eprintln!("Failed to save: {e}");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
if ui.button("Create Copy").clicked() {
|
||||||
|
let new_id = uuid::Uuid::new_v4().to_string();
|
||||||
|
let mut new_note = self.clone();
|
||||||
|
new_note.id = new_id;
|
||||||
|
new_note.name = format!("{} (Copy)", self.name);
|
||||||
|
if let Err(e) = new_note.save() {
|
||||||
|
eprintln!("Failed to save copy: {e}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ui.button("Delete").clicked() {
|
||||||
|
if let Err(e) =
|
||||||
|
FILESYSTEM.delete(Path::new(&format!("notes/{id}.json", id = self.id)))
|
||||||
|
{
|
||||||
|
eprintln!("Failed to delete: {e}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
let id = ui.make_persistent_id("note_name");
|
let id = ui.make_persistent_id("note_name");
|
||||||
egui::collapsing_header::CollapsingState::load_with_default_open(ui.ctx(), id, true)
|
egui::collapsing_header::CollapsingState::load_with_default_open(ui.ctx(), id, true)
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
use core::f32;
|
use core::f32;
|
||||||
use egui::{CollapsingHeader, RichText, Sense, TextEdit, Ui, UiBuilder, vec2};
|
use egui::{CollapsingHeader, RichText, Sense, TextEdit, Ui, UiBuilder, vec2};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
use std::path::Path;
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
PROJECT_FOLDER, RightPanelContent,
|
PROJECT_FOLDER, RightPanelContent,
|
||||||
@@ -8,6 +9,7 @@ use crate::{
|
|||||||
tags::Tag,
|
tags::Tag,
|
||||||
template_editor::{FieldValue, Template},
|
template_editor::{FieldValue, Template},
|
||||||
},
|
},
|
||||||
|
filesystem::{FILESYSTEM, LegacyFileSystem},
|
||||||
util,
|
util,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -81,21 +83,14 @@ impl ObjectInstance {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn save(&mut self) -> Result<(), Box<dyn std::error::Error>> {
|
pub fn save(&mut self) -> Result<(), Box<dyn std::error::Error>> {
|
||||||
let path = PROJECT_FOLDER
|
let id = &self.id;
|
||||||
.join("objects")
|
FILESYSTEM.write(Path::new(&format!("objects/{id}.json")), self.clone())?;
|
||||||
.join(format!("{}.json", &self.id));
|
|
||||||
|
|
||||||
let content = serde_json::to_string_pretty(self)?;
|
|
||||||
std::fs::write(&path, content)?;
|
|
||||||
self.saved = true;
|
self.saved = true;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn load(id: &str) -> Result<Self, Box<dyn std::error::Error>> {
|
pub fn load(id: &str) -> Result<Self, Box<dyn std::error::Error>> {
|
||||||
let path = PROJECT_FOLDER.join("objects").join(format!("{id}.json"));
|
let mut instance: Self = FILESYSTEM.read(Path::new(&format!("objects/{id}.json")))?;
|
||||||
|
|
||||||
let content = std::fs::read_to_string(&path)?;
|
|
||||||
let mut instance: ObjectInstance = serde_json::from_str(&content)?;
|
|
||||||
instance.saved = true;
|
instance.saved = true;
|
||||||
Ok(instance)
|
Ok(instance)
|
||||||
}
|
}
|
||||||
@@ -137,12 +132,10 @@ impl ObjectInstance {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ui.button("Delete").clicked() {
|
if ui.button("Delete").clicked() {
|
||||||
std::fs::remove_file(
|
let id = &self.id;
|
||||||
PROJECT_FOLDER
|
FILESYSTEM
|
||||||
.join("objects")
|
.delete(Path::new(&format!("objects/{id}.json")))
|
||||||
.join(format!("{}.json", self.id)),
|
.expect("Failed to delete object");
|
||||||
)
|
|
||||||
.unwrap();
|
|
||||||
|
|
||||||
*right_panel = Some(RightPanelContent::None);
|
*right_panel = Some(RightPanelContent::None);
|
||||||
}
|
}
|
||||||
@@ -274,7 +267,7 @@ impl ObjectInstance {
|
|||||||
if !value.is_empty() {
|
if !value.is_empty() {
|
||||||
let path = PROJECT_FOLDER.join("assets").join(&value);
|
let path = PROJECT_FOLDER.join("assets").join(&value);
|
||||||
|
|
||||||
if let Ok(bytes) = std::fs::read(&path) {
|
if let Ok(bytes) = FILESYSTEM.read_bytes(&path) {
|
||||||
let image_source = egui::ImageSource::Bytes {
|
let image_source = egui::ImageSource::Bytes {
|
||||||
uri: std::borrow::Cow::Owned(path.to_str().unwrap().to_string()),
|
uri: std::borrow::Cow::Owned(path.to_str().unwrap().to_string()),
|
||||||
bytes: bytes.into(),
|
bytes: bytes.into(),
|
||||||
|
|||||||
+196
-127
@@ -2,9 +2,12 @@ use chrono::NaiveDate;
|
|||||||
use egui::TextEdit;
|
use egui::TextEdit;
|
||||||
use egui_extras::DatePickerButton;
|
use egui_extras::DatePickerButton;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use std::{io::Read, path::PathBuf, sync::LazyLock};
|
use std::path::{Path, PathBuf};
|
||||||
|
|
||||||
use crate::{PROJECT_FOLDER, util::saved_status};
|
use crate::{
|
||||||
|
filesystem::{FILESYSTEM, LegacyFileSystem},
|
||||||
|
util::saved_status,
|
||||||
|
};
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize, Clone)]
|
#[derive(Serialize, Deserialize, Clone)]
|
||||||
pub struct ProjectSettings {
|
pub struct ProjectSettings {
|
||||||
@@ -14,6 +17,7 @@ pub struct ProjectSettings {
|
|||||||
project_description: String,
|
project_description: String,
|
||||||
|
|
||||||
// AI settings
|
// AI settings
|
||||||
|
#[cfg(feature = "llm")]
|
||||||
pub ai_context: String,
|
pub ai_context: String,
|
||||||
|
|
||||||
// settings
|
// settings
|
||||||
@@ -29,17 +33,6 @@ pub struct ProjectSettings {
|
|||||||
pub saved: bool,
|
pub saved: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
static GLOBAL_SETTINGS_PATH: LazyLock<String> =
|
|
||||||
LazyLock::new(|| match std::env::var("XDG_CONFIG_HOME") {
|
|
||||||
Ok(path) => path + "/worldcoder/settings.json",
|
|
||||||
Err(_) => {
|
|
||||||
eprintln!(
|
|
||||||
"XDG_CONFIG_HOME not set, using default path of ~/.config/worldcoder/settings.json"
|
|
||||||
);
|
|
||||||
"~/.config/worldcoder/settings.json".to_string()
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
impl ProjectSettings {
|
impl ProjectSettings {
|
||||||
#[allow(dead_code)]
|
#[allow(dead_code)]
|
||||||
pub fn new() -> Self {
|
pub fn new() -> Self {
|
||||||
@@ -47,25 +40,10 @@ impl ProjectSettings {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn load() -> Self {
|
pub fn load() -> Self {
|
||||||
let project_path = PROJECT_FOLDER.join("project.json");
|
if let Ok(mut proj) = FILESYSTEM.read::<Self>(Path::new("project.json")) {
|
||||||
|
|
||||||
let mut file = if let Ok(file) = std::fs::File::open(project_path) {
|
|
||||||
file
|
|
||||||
} else {
|
|
||||||
return Self::default();
|
|
||||||
};
|
|
||||||
|
|
||||||
let mut contents = String::new();
|
|
||||||
file.read_to_string(&mut contents).unwrap();
|
|
||||||
if let Ok(mut proj) = serde_json::from_str::<Self>(&contents) {
|
|
||||||
proj.saved = true;
|
proj.saved = true;
|
||||||
|
|
||||||
// load global settings
|
|
||||||
proj.global_settings = EditorSettings::load_global();
|
proj.global_settings = EditorSettings::load_global();
|
||||||
|
|
||||||
// load local overrides
|
|
||||||
proj.local_overrides = EditorSettings::load();
|
proj.local_overrides = EditorSettings::load();
|
||||||
|
|
||||||
proj
|
proj
|
||||||
} else {
|
} else {
|
||||||
Self::default()
|
Self::default()
|
||||||
@@ -73,9 +51,9 @@ impl ProjectSettings {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn save(&mut self) {
|
pub fn save(&mut self) {
|
||||||
let project_path = PROJECT_FOLDER.join("project.json");
|
FILESYSTEM
|
||||||
let content = serde_json::to_string_pretty(self).unwrap();
|
.write(Path::new("project.json"), self.clone())
|
||||||
std::fs::write(project_path, content).unwrap();
|
.unwrap();
|
||||||
|
|
||||||
self.global_settings.save();
|
self.global_settings.save();
|
||||||
self.local_overrides.save();
|
self.local_overrides.save();
|
||||||
@@ -83,7 +61,93 @@ impl ProjectSettings {
|
|||||||
self.saved = true;
|
self.saved = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
#[allow(dead_code)]
|
#[allow(unused)]
|
||||||
|
fn config_str_override(
|
||||||
|
label: &str,
|
||||||
|
field: &mut Option<String>,
|
||||||
|
default: &str,
|
||||||
|
ui: &mut egui::Ui,
|
||||||
|
) -> bool {
|
||||||
|
let mut changed = false;
|
||||||
|
|
||||||
|
ui.label(label);
|
||||||
|
|
||||||
|
if let Some(value) = field {
|
||||||
|
if ui.text_edit_singleline(value).changed() {
|
||||||
|
changed = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
if ui.button("Remove Override").clicked() {
|
||||||
|
*field = None;
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
} else if ui.button("Override").clicked() {
|
||||||
|
*field = Some(default.to_string());
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
ui.end_row();
|
||||||
|
changed
|
||||||
|
}
|
||||||
|
|
||||||
|
#[allow(unused)]
|
||||||
|
fn config_bool_override(
|
||||||
|
label: &str,
|
||||||
|
field: &mut Option<bool>,
|
||||||
|
default: bool,
|
||||||
|
ui: &mut egui::Ui,
|
||||||
|
) -> bool {
|
||||||
|
let mut changed = false;
|
||||||
|
|
||||||
|
ui.label(label);
|
||||||
|
|
||||||
|
if let Some(value) = field {
|
||||||
|
if ui.checkbox(value, "Enable AI").changed() {
|
||||||
|
changed = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
if ui.button("Remove Override").clicked() {
|
||||||
|
*field = None;
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
} else if ui.button("Override").clicked() {
|
||||||
|
*field = Some(default);
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
ui.end_row();
|
||||||
|
changed
|
||||||
|
}
|
||||||
|
|
||||||
|
#[allow(unused)]
|
||||||
|
fn config_str(field: &mut String, label: &str, ui: &mut egui::Ui) -> bool {
|
||||||
|
let mut changed = false;
|
||||||
|
|
||||||
|
ui.label(label);
|
||||||
|
if ui.text_edit_singleline(field).changed() {
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
ui.end_row();
|
||||||
|
|
||||||
|
changed
|
||||||
|
}
|
||||||
|
|
||||||
|
#[allow(unused)]
|
||||||
|
fn config_bool(label: &str, field: &mut bool, ui: &mut egui::Ui) -> bool {
|
||||||
|
let mut changed = false;
|
||||||
|
|
||||||
|
ui.label(label);
|
||||||
|
if ui.checkbox(field, "Enable AI").changed() {
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
ui.end_row();
|
||||||
|
|
||||||
|
changed
|
||||||
|
}
|
||||||
|
|
||||||
|
#[allow(unused)]
|
||||||
pub fn ui(&mut self, ui: &mut egui::Ui) {
|
pub fn ui(&mut self, ui: &mut egui::Ui) {
|
||||||
// save state
|
// save state
|
||||||
saved_status(ui, self.saved, "N/A", "Project Settings");
|
saved_status(ui, self.saved, "N/A", "Project Settings");
|
||||||
@@ -91,6 +155,10 @@ impl ProjectSettings {
|
|||||||
self.save();
|
self.save();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ui.input(|i| i.key_pressed(egui::Key::S) && i.modifiers.ctrl) {
|
||||||
|
self.save();
|
||||||
|
}
|
||||||
|
|
||||||
ui.separator();
|
ui.separator();
|
||||||
|
|
||||||
// project settings
|
// project settings
|
||||||
@@ -99,80 +167,65 @@ impl ProjectSettings {
|
|||||||
.striped(true)
|
.striped(true)
|
||||||
.num_columns(2)
|
.num_columns(2)
|
||||||
.show(ui, |ui| {
|
.show(ui, |ui| {
|
||||||
ui.label("Project Name");
|
if Self::config_str(&mut self.project_name, "Project Name", ui) { self.saved = false };
|
||||||
ui.text_edit_singleline(&mut self.project_name);
|
if Self::config_str(&mut self.project_author, "Project Author", ui) { self.saved = false };
|
||||||
|
if Self::config_str(&mut self.project_description, "Project Description", ui) { self.saved = false };
|
||||||
ui.end_row();
|
|
||||||
|
|
||||||
ui.label("Project Author");
|
|
||||||
ui.text_edit_singleline(&mut self.project_author);
|
|
||||||
|
|
||||||
ui.end_row();
|
|
||||||
|
|
||||||
ui.label("Project Description");
|
|
||||||
ui.text_edit_singleline(&mut self.project_description);
|
|
||||||
|
|
||||||
ui.end_row();
|
|
||||||
|
|
||||||
ui.label("Date");
|
ui.label("Date");
|
||||||
ui.add(DatePickerButton::new(&mut self.date));
|
if ui.add(DatePickerButton::new(&mut self.date)).changed() { self.saved = false };
|
||||||
|
|
||||||
ui.end_row();
|
ui.end_row();
|
||||||
|
|
||||||
ui.label("AI Context Prompt");
|
#[cfg(feature = "llm")]
|
||||||
ui.add(TextEdit::multiline(&mut self.ai_context)
|
{
|
||||||
.font(egui::TextStyle::Monospace)
|
ui.label("AI Context Prompt");
|
||||||
.interactive(true)
|
if ui.add(TextEdit::multiline(&mut self.ai_context)
|
||||||
.frame(false)
|
.font(egui::TextStyle::Monospace)
|
||||||
.lock_focus(true)
|
.interactive(true)
|
||||||
.hint_text("What is this project about? what should the LLM know when generating content for this project?"));
|
.frame(false)
|
||||||
|
.lock_focus(true)
|
||||||
ui.end_row();
|
.hint_text("What is this project about? what should the LLM know when generating content for this project?")).changed() { self.saved = false };
|
||||||
|
ui.end_row();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
ui.separator();
|
ui.separator();
|
||||||
|
|
||||||
// local settings overrides for editor
|
// local settings overrides for editor
|
||||||
|
|
||||||
ui.heading("Local Overrides");
|
ui.heading("Local Overrides");
|
||||||
egui::Grid::new("local overrides")
|
egui::Grid::new("local overrides")
|
||||||
.striped(true)
|
.striped(true)
|
||||||
.num_columns(2)
|
.num_columns(2)
|
||||||
.show(ui, |ui| {
|
.show(ui, |ui| {
|
||||||
ui.label("Enable AI");
|
#[cfg(feature = "llm")]
|
||||||
if let Some(ai_enabled) = &mut self.local_overrides.ai_enabled {
|
if ProjectSettings::config_str_override(
|
||||||
ui.checkbox(ai_enabled, "Enable AI");
|
"LLM API URI",
|
||||||
if ui.button("Remove Override").clicked() {
|
&mut self.local_overrides.llm_api_uri,
|
||||||
self.local_overrides.ai_enabled = None;
|
"http://localhost:1234",
|
||||||
}
|
ui,
|
||||||
} else if ui.button("Override").clicked() {
|
) {
|
||||||
self.local_overrides.ai_enabled = Some(true);
|
self.saved = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
ui.end_row();
|
#[cfg(feature = "llm")]
|
||||||
|
if ProjectSettings::config_str_override(
|
||||||
ui.label("LLM API URI");
|
"LLM API Key",
|
||||||
if let Some(llm_api_uri) = &mut self.local_overrides.llm_api_uri {
|
&mut self.local_overrides.llm_api_key,
|
||||||
ui.text_edit_singleline(llm_api_uri);
|
"1234",
|
||||||
if ui.button("Remove Override").clicked() {
|
ui,
|
||||||
self.local_overrides.llm_api_uri = None;
|
) {
|
||||||
}
|
self.saved = false;
|
||||||
} else if ui.button("Override").clicked() {
|
|
||||||
self.local_overrides.llm_api_uri = Some("http://localhost:1234".to_string());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ui.end_row();
|
#[cfg(feature = "llm")]
|
||||||
|
if ProjectSettings::config_bool_override(
|
||||||
ui.label("LLM API Key");
|
"Enable AI",
|
||||||
if let Some(llm_api_key) = &mut self.local_overrides.llm_api_key {
|
&mut self.local_overrides.ai_enabled,
|
||||||
ui.text_edit_singleline(llm_api_key);
|
true,
|
||||||
if ui.button("Remove Override").clicked() {
|
ui,
|
||||||
self.local_overrides.llm_api_key = None;
|
) {
|
||||||
}
|
self.saved = false;
|
||||||
} else if ui.button("Override").clicked() {
|
|
||||||
self.local_overrides.llm_api_key = Some("1234".to_string());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ui.end_row();
|
|
||||||
});
|
});
|
||||||
|
|
||||||
ui.separator();
|
ui.separator();
|
||||||
@@ -183,23 +236,37 @@ impl ProjectSettings {
|
|||||||
.striped(true)
|
.striped(true)
|
||||||
.num_columns(2)
|
.num_columns(2)
|
||||||
.show(ui, |ui| {
|
.show(ui, |ui| {
|
||||||
ui.label("Enable AI");
|
#[cfg(feature = "llm")]
|
||||||
ui.checkbox(&mut self.global_settings.ai_enabled.unwrap(), "Enable AI");
|
if Self::config_bool(
|
||||||
|
"Enable AI",
|
||||||
|
self.global_settings.ai_enabled.as_mut().unwrap(),
|
||||||
|
ui,
|
||||||
|
) {
|
||||||
|
self.saved = false;
|
||||||
|
}
|
||||||
|
|
||||||
ui.end_row();
|
#[cfg(feature = "llm")]
|
||||||
|
if Self::config_str(
|
||||||
|
self.global_settings.llm_api_uri.as_mut().unwrap(),
|
||||||
|
"LLM API URI",
|
||||||
|
ui,
|
||||||
|
) {
|
||||||
|
self.saved = false
|
||||||
|
};
|
||||||
|
|
||||||
ui.label("LLM API URI");
|
#[cfg(feature = "llm")]
|
||||||
ui.text_edit_singleline(self.global_settings.llm_api_uri.as_mut().unwrap());
|
if Self::config_str(
|
||||||
|
self.global_settings.llm_api_key.as_mut().unwrap(),
|
||||||
ui.end_row();
|
"LLM API Key",
|
||||||
|
ui,
|
||||||
ui.label("LLM API Key");
|
) {
|
||||||
ui.text_edit_singleline(self.global_settings.llm_api_key.as_mut().unwrap());
|
self.saved = false
|
||||||
|
};
|
||||||
ui.end_row();
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(feature = "llm")]
|
||||||
|
#[allow(unused)]
|
||||||
pub fn ai_enabled(&mut self) -> bool {
|
pub fn ai_enabled(&mut self) -> bool {
|
||||||
let client = reqwest::blocking::Client::new();
|
let client = reqwest::blocking::Client::new();
|
||||||
|
|
||||||
@@ -236,8 +303,9 @@ impl Default for ProjectSettings {
|
|||||||
project_author: "Your Name".to_string(),
|
project_author: "Your Name".to_string(),
|
||||||
project_description: "Description of your project".to_string(),
|
project_description: "Description of your project".to_string(),
|
||||||
|
|
||||||
|
#[cfg(feature = "llm")]
|
||||||
ai_context: "".to_string(),
|
ai_context: "".to_string(),
|
||||||
global_settings: EditorSettings::new(),
|
global_settings: EditorSettings::default(),
|
||||||
local_overrides: EditorSettings::new(),
|
local_overrides: EditorSettings::new(),
|
||||||
|
|
||||||
// window state
|
// window state
|
||||||
@@ -249,11 +317,15 @@ impl Default for ProjectSettings {
|
|||||||
|
|
||||||
#[derive(Serialize, Deserialize, Clone)]
|
#[derive(Serialize, Deserialize, Clone)]
|
||||||
pub struct EditorSettings {
|
pub struct EditorSettings {
|
||||||
pub llm_api_uri: Option<String>,
|
|
||||||
pub llm_api_key: Option<String>,
|
|
||||||
pub ai_enabled: Option<bool>,
|
|
||||||
pub dark_theme: Option<bool>,
|
pub dark_theme: Option<bool>,
|
||||||
|
|
||||||
|
#[cfg(feature = "llm")]
|
||||||
|
pub llm_api_uri: Option<String>,
|
||||||
|
#[cfg(feature = "llm")]
|
||||||
|
pub llm_api_key: Option<String>,
|
||||||
|
#[cfg(feature = "llm")]
|
||||||
|
pub ai_enabled: Option<bool>,
|
||||||
|
|
||||||
#[serde(skip)]
|
#[serde(skip)]
|
||||||
is_global: bool,
|
is_global: bool,
|
||||||
}
|
}
|
||||||
@@ -261,8 +333,11 @@ pub struct EditorSettings {
|
|||||||
impl Default for EditorSettings {
|
impl Default for EditorSettings {
|
||||||
fn default() -> Self {
|
fn default() -> Self {
|
||||||
Self {
|
Self {
|
||||||
|
#[cfg(feature = "llm")]
|
||||||
llm_api_uri: Some("http://localhost:1234".to_string()),
|
llm_api_uri: Some("http://localhost:1234".to_string()),
|
||||||
|
#[cfg(feature = "llm")]
|
||||||
llm_api_key: Some("".to_string()),
|
llm_api_key: Some("".to_string()),
|
||||||
|
#[cfg(feature = "llm")]
|
||||||
ai_enabled: Some(true),
|
ai_enabled: Some(true),
|
||||||
dark_theme: Some(true),
|
dark_theme: Some(true),
|
||||||
|
|
||||||
@@ -275,8 +350,11 @@ impl Default for EditorSettings {
|
|||||||
impl EditorSettings {
|
impl EditorSettings {
|
||||||
pub fn new() -> Self {
|
pub fn new() -> Self {
|
||||||
Self {
|
Self {
|
||||||
|
#[cfg(feature = "llm")]
|
||||||
llm_api_uri: None,
|
llm_api_uri: None,
|
||||||
|
#[cfg(feature = "llm")]
|
||||||
llm_api_key: None,
|
llm_api_key: None,
|
||||||
|
#[cfg(feature = "llm")]
|
||||||
ai_enabled: None,
|
ai_enabled: None,
|
||||||
dark_theme: None,
|
dark_theme: None,
|
||||||
|
|
||||||
@@ -285,43 +363,34 @@ impl EditorSettings {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn load() -> Self {
|
pub fn load() -> Self {
|
||||||
let path = PROJECT_FOLDER.join("settings.json");
|
if let Ok(mut settings) = FILESYSTEM.read::<Self>(Path::new("settings.json")) {
|
||||||
let mut file = if let Ok(file) = std::fs::File::open(path) {
|
settings.is_global = false;
|
||||||
file
|
return settings;
|
||||||
} else {
|
}
|
||||||
return Self::default();
|
|
||||||
};
|
|
||||||
|
|
||||||
let mut contents = String::new();
|
Self::new()
|
||||||
file.read_to_string(&mut contents).unwrap();
|
|
||||||
serde_json::from_str(&contents).unwrap()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn save(&self) {
|
pub fn save(&self) {
|
||||||
let content = serde_json::to_string_pretty(self).unwrap();
|
|
||||||
|
|
||||||
let path = if self.is_global {
|
let path = if self.is_global {
|
||||||
PathBuf::from(GLOBAL_SETTINGS_PATH.clone())
|
FILESYSTEM.config_path()
|
||||||
} else {
|
} else {
|
||||||
PROJECT_FOLDER.join("settings.json")
|
PathBuf::from("settings.json")
|
||||||
};
|
};
|
||||||
|
|
||||||
std::fs::write(path, content).unwrap();
|
FILESYSTEM.write(path.as_path(), self.clone()).unwrap()
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn load_global() -> Self {
|
pub fn load_global() -> Self {
|
||||||
let path = PathBuf::from(GLOBAL_SETTINGS_PATH.clone());
|
let path = FILESYSTEM.config_path();
|
||||||
|
|
||||||
if !path.exists() {
|
if !path.exists() {
|
||||||
std::fs::create_dir_all(path.parent().unwrap()).unwrap();
|
FILESYSTEM.mkdir(path.parent().unwrap()).unwrap();
|
||||||
let content = serde_json::to_string_pretty(&Self::default()).unwrap();
|
FILESYSTEM.write(path.as_path(), Self::default()).unwrap();
|
||||||
std::fs::write(&path, content).unwrap();
|
|
||||||
|
|
||||||
// return a default config
|
|
||||||
return Self::default();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
let content = std::fs::read_to_string(path).unwrap();
|
let mut settings = FILESYSTEM.read::<Self>(path.as_path()).unwrap();
|
||||||
serde_json::from_str(&content).unwrap()
|
settings.is_global = true;
|
||||||
|
settings
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,10 +2,12 @@ use chrono::NaiveDate;
|
|||||||
use core::fmt;
|
use core::fmt;
|
||||||
use egui::ScrollArea;
|
use egui::ScrollArea;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
use std::path::Path;
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
PROJECT_FOLDER, RightPanelContent,
|
RightPanelContent,
|
||||||
editors::object_editor::ObjectInstance,
|
editors::object_editor::ObjectInstance,
|
||||||
|
filesystem::{FILESYSTEM, LegacyFileSystem},
|
||||||
util::{self, Error},
|
util::{self, Error},
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -171,21 +173,14 @@ impl Default for Template {
|
|||||||
|
|
||||||
impl Template {
|
impl Template {
|
||||||
pub fn load(id: &str) -> Result<Self, Box<dyn std::error::Error>> {
|
pub fn load(id: &str) -> Result<Self, Box<dyn std::error::Error>> {
|
||||||
let path = PROJECT_FOLDER.join("templates").join(format!("{id}.json"));
|
let mut template = FILESYSTEM.read::<Self>(Path::new(&format!("templates/{id}.json")))?;
|
||||||
|
|
||||||
let content = std::fs::read_to_string(&path)?;
|
|
||||||
let mut template: Self = serde_json::from_str(&content)?;
|
|
||||||
template.saved = true;
|
template.saved = true;
|
||||||
Ok(template)
|
Ok(template)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn save(&mut self) -> Result<(), Box<dyn std::error::Error>> {
|
pub fn save(&mut self) -> Result<(), Box<dyn std::error::Error>> {
|
||||||
let path = PROJECT_FOLDER
|
let id = &self.id;
|
||||||
.join("templates")
|
FILESYSTEM.write(Path::new(&format!("templates/{id}.json")), self.clone())?;
|
||||||
.join(format!("{}.json", &self.id));
|
|
||||||
|
|
||||||
let content = serde_json::to_string_pretty(self)?;
|
|
||||||
std::fs::write(path, content)?;
|
|
||||||
self.saved = true;
|
self.saved = true;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
@@ -203,16 +198,6 @@ impl Template {
|
|||||||
|
|
||||||
ScrollArea::vertical().show(ui, |ui| {
|
ScrollArea::vertical().show(ui, |ui| {
|
||||||
ui.vertical(|ui| {
|
ui.vertical(|ui| {
|
||||||
// ui.group(|ui| {
|
|
||||||
// ui.horizontal(|ui| {
|
|
||||||
// if self.saved {
|
|
||||||
// ui.label(RichText::new("✓ Saved").color(egui::Color32::GREEN));
|
|
||||||
// } else {
|
|
||||||
// ui.label(RichText::new("* Unsaved").color(egui::Color32::YELLOW));
|
|
||||||
// }
|
|
||||||
// ui.label(format!("id: {}", self.id));
|
|
||||||
// });
|
|
||||||
// });
|
|
||||||
util::saved_status(ui, self.saved, &self.id, &self.name);
|
util::saved_status(ui, self.saved, &self.id, &self.name);
|
||||||
|
|
||||||
// Save/Cancel buttons
|
// Save/Cancel buttons
|
||||||
@@ -231,13 +216,10 @@ impl Template {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ui.button("Delete").clicked() {
|
if ui.button("Delete").clicked() {
|
||||||
std::fs::remove_file(
|
let id = &self.id;
|
||||||
PROJECT_FOLDER
|
FILESYSTEM
|
||||||
.join("templates")
|
.delete(Path::new(&format!("templates/{id}.json")))
|
||||||
.join(format!("{}.json", self.id)),
|
.unwrap();
|
||||||
)
|
|
||||||
.unwrap();
|
|
||||||
|
|
||||||
*new_instance = Some(RightPanelContent::None);
|
*new_instance = Some(RightPanelContent::None);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+60
-104
@@ -1,7 +1,4 @@
|
|||||||
use itertools::Itertools;
|
use std::path::Path;
|
||||||
use std::fs::{self, DirEntry};
|
|
||||||
|
|
||||||
// use walkdir::{DirEntry, WalkDir};
|
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
PROJECT_FOLDER, RightPanelContent,
|
PROJECT_FOLDER, RightPanelContent,
|
||||||
@@ -10,6 +7,7 @@ use crate::{
|
|||||||
asset_editor::Asset, content_editor::ContentSection, object_editor::ObjectInstance,
|
asset_editor::Asset, content_editor::ContentSection, object_editor::ObjectInstance,
|
||||||
tags::Tag, template_editor::Template,
|
tags::Tag, template_editor::Template,
|
||||||
},
|
},
|
||||||
|
filesystem::{FILESYSTEM, FsError, LegacyFileSystem},
|
||||||
note_editor::Note,
|
note_editor::Note,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -165,14 +163,6 @@ impl Explorer {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Recursively renders a tree of documents.
|
|
||||||
///
|
|
||||||
/// Each document is represented by a single element in the `documents` array.
|
|
||||||
/// The `parent_id` parameter is used to filter out documents that do not have the current
|
|
||||||
/// parent. If `parent_id` is `None`, all documents are rendered.
|
|
||||||
///
|
|
||||||
/// `load_doc` is a mutable reference to a `MainEditor`. When a document is clicked, it
|
|
||||||
/// is loaded into the `MainEditor` and returned as `Some`.
|
|
||||||
fn render_doc_branch(
|
fn render_doc_branch(
|
||||||
ui: &mut egui::Ui,
|
ui: &mut egui::Ui,
|
||||||
documents: &[ContentSection],
|
documents: &[ContentSection],
|
||||||
@@ -241,95 +231,64 @@ impl Explorer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn render_assets(&mut self, ui: &mut egui::Ui, to_load: &mut Option<RightPanelContent>) {
|
fn render_assets(&mut self, ui: &mut egui::Ui, to_load: &mut Option<RightPanelContent>) {
|
||||||
|
Self::render_asset_dir(ui, to_load, Path::new("assets"));
|
||||||
|
}
|
||||||
|
|
||||||
|
fn render_asset_dir(ui: &mut egui::Ui, to_load: &mut Option<RightPanelContent>, path: &Path) {
|
||||||
|
let files = FILESYSTEM.lsfiles(path).unwrap();
|
||||||
|
let dirs = FILESYSTEM.lsdirs(path).unwrap();
|
||||||
|
|
||||||
|
let file_name = path.file_name().unwrap().to_str().unwrap().to_string();
|
||||||
|
|
||||||
egui::collapsing_header::CollapsingState::load_with_default_open(
|
egui::collapsing_header::CollapsingState::load_with_default_open(
|
||||||
ui.ctx(),
|
ui.ctx(),
|
||||||
ui.make_persistent_id("assets"),
|
ui.make_persistent_id(&file_name),
|
||||||
true,
|
false,
|
||||||
)
|
)
|
||||||
.show_header(ui, |ui| {
|
.show_header(ui, |ui| {
|
||||||
ui.horizontal(|ui| {
|
ui.horizontal(|ui| {
|
||||||
ui.label("Assets");
|
ui.label(file_name);
|
||||||
|
let _clicked = ui.button("+").on_hover_text("Add new item").clicked();
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
.body(|ui| {
|
.body(|ui| {
|
||||||
let entries = fs::read_dir(PROJECT_FOLDER.join("assets"))
|
// recursive call to render the next level of documents
|
||||||
.unwrap()
|
for dir in dirs.iter() {
|
||||||
.filter_map(Result::ok)
|
Self::render_asset_dir(ui, to_load, dir);
|
||||||
.sorted_by(|a, b| {
|
}
|
||||||
// Directories first, then files
|
|
||||||
let a_is_dir = a.file_type().unwrap().is_dir();
|
|
||||||
let b_is_dir = b.file_type().unwrap().is_dir();
|
|
||||||
if a_is_dir == b_is_dir {
|
|
||||||
a.file_name().cmp(&b.file_name())
|
|
||||||
} else if a_is_dir {
|
|
||||||
std::cmp::Ordering::Less
|
|
||||||
} else {
|
|
||||||
std::cmp::Ordering::Greater
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.collect::<Vec<_>>();
|
|
||||||
|
|
||||||
for entry in entries {
|
for file in files.iter() {
|
||||||
Self::render_entry(ui, to_load, &entry);
|
Self::render_asset(ui, to_load, file);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
fn render_entry(ui: &mut egui::Ui, to_load: &mut Option<RightPanelContent>, entry: &DirEntry) {
|
fn render_asset(ui: &mut egui::Ui, to_load: &mut Option<RightPanelContent>, path: &Path) {
|
||||||
let file_type = entry.file_type().unwrap();
|
let file_name = path.file_name().unwrap().to_str().unwrap().to_string();
|
||||||
let is_dir = file_type.is_dir();
|
|
||||||
let file_name = entry.file_name().to_str().unwrap().to_string();
|
|
||||||
let path = entry.path();
|
|
||||||
|
|
||||||
if is_dir {
|
if ui
|
||||||
let entries = fs::read_dir(path)
|
.selectable_label(false, format!("📄 {file_name}"))
|
||||||
.unwrap()
|
.clicked()
|
||||||
.filter_map(Result::ok)
|
{
|
||||||
.collect::<Vec<_>>();
|
// use asset::load to get the file at the path
|
||||||
|
let asset_path = path.strip_prefix(PROJECT_FOLDER.join("assets")).unwrap();
|
||||||
egui::collapsing_header::CollapsingState::load_with_default_open(
|
let asset = Asset::open(asset_path.to_string_lossy().to_string());
|
||||||
ui.ctx(),
|
*to_load = Some(RightPanelContent::Asset(Box::new(asset)));
|
||||||
ui.make_persistent_id(&file_name),
|
|
||||||
false,
|
|
||||||
)
|
|
||||||
.show_header(ui, |ui| {
|
|
||||||
ui.horizontal(|ui| {
|
|
||||||
ui.label(file_name);
|
|
||||||
let _clicked = ui.button("+").on_hover_text("Add new item").clicked();
|
|
||||||
});
|
|
||||||
})
|
|
||||||
.body(|ui| {
|
|
||||||
// recursive call to render the next level of documents
|
|
||||||
for entry in entries {
|
|
||||||
Self::render_entry(ui, to_load, &entry);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
// Handle file
|
|
||||||
if ui
|
|
||||||
.selectable_label(false, format!("📄 {file_name}"))
|
|
||||||
.clicked()
|
|
||||||
{
|
|
||||||
// use asset::load to get the file at the path
|
|
||||||
let asset_path = path.strip_prefix(PROJECT_FOLDER.join("assets")).unwrap();
|
|
||||||
let asset = Asset::open(asset_path.to_string_lossy().to_string());
|
|
||||||
*to_load = Some(RightPanelContent::Asset(Box::new(asset)));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// load templates from the templates folder
|
// load templates from the templates folder
|
||||||
fn load_templates(&mut self) -> std::io::Result<()> {
|
fn load_templates(&mut self) -> Result<(), FsError> {
|
||||||
let templates_folder = PROJECT_FOLDER.join("templates");
|
let path = Path::new("templates");
|
||||||
if !templates_folder.exists() {
|
|
||||||
std::fs::create_dir_all(&templates_folder)?;
|
if !FILESYSTEM.exists(path) {
|
||||||
|
FILESYSTEM.mkdir(path)?;
|
||||||
}
|
}
|
||||||
let mut templates = Vec::new();
|
let mut templates = Vec::new();
|
||||||
for entry in std::fs::read_dir(&templates_folder).unwrap() {
|
for entry in FILESYSTEM.lsfiles(path)? {
|
||||||
let path = entry.unwrap().path();
|
match FILESYSTEM.read::<Template>(&entry) {
|
||||||
match Template::load(path.file_stem().unwrap().to_str().unwrap()) {
|
|
||||||
Ok(t) => templates.push(t),
|
Ok(t) => templates.push(t),
|
||||||
Err(err) => eprintln!("Could not parse file {path:?}: {err}"),
|
Err(err) => eprintln!("Could not parse file {entry:?}: {err}"),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
self.templates = templates;
|
self.templates = templates;
|
||||||
@@ -338,17 +297,16 @@ impl Explorer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// load objects from the objects folder
|
// load objects from the objects folder
|
||||||
fn load_objects(&mut self) -> std::io::Result<()> {
|
fn load_objects(&mut self) -> Result<(), FsError> {
|
||||||
let objects_folder = PROJECT_FOLDER.join("objects");
|
let path = Path::new("objects");
|
||||||
if !objects_folder.exists() {
|
if !FILESYSTEM.exists(path) {
|
||||||
std::fs::create_dir_all(&objects_folder)?;
|
FILESYSTEM.mkdir(path)?;
|
||||||
}
|
}
|
||||||
let mut objects = Vec::new();
|
let mut objects = Vec::new();
|
||||||
for entry in std::fs::read_dir(&objects_folder).unwrap() {
|
for entry in FILESYSTEM.lsfiles(path)? {
|
||||||
let path = entry.unwrap().path();
|
match FILESYSTEM.read::<ObjectInstance>(&entry) {
|
||||||
match ObjectInstance::load(path.file_stem().unwrap().to_str().unwrap()) {
|
|
||||||
Ok(o) => objects.push(o),
|
Ok(o) => objects.push(o),
|
||||||
Err(err) => eprintln!("Could not parse file {path:?}: {err}"),
|
Err(err) => eprintln!("Could not parse file {entry:?}: {err}"),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
self.objects = objects;
|
self.objects = objects;
|
||||||
@@ -357,16 +315,15 @@ impl Explorer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// load notes from the notes folder
|
// load notes from the notes folder
|
||||||
fn load_notes(&mut self) -> std::io::Result<()> {
|
fn load_notes(&mut self) -> Result<(), FsError> {
|
||||||
let notes_folder = PROJECT_FOLDER.join("notes");
|
let path = Path::new("notes");
|
||||||
if !notes_folder.exists() {
|
if !FILESYSTEM.exists(path) {
|
||||||
std::fs::create_dir_all(¬es_folder)?;
|
FILESYSTEM.mkdir(path)?;
|
||||||
}
|
}
|
||||||
let mut notes = Vec::new();
|
let mut notes = Vec::new();
|
||||||
|
|
||||||
for entry in std::fs::read_dir(¬es_folder).unwrap() {
|
for entry in FILESYSTEM.lsfiles(path)? {
|
||||||
let path = entry.unwrap().path();
|
match FILESYSTEM.read::<Note>(&entry) {
|
||||||
match Note::load(path.file_stem().unwrap().to_str().unwrap()) {
|
|
||||||
Ok(note) => notes.push(note),
|
Ok(note) => notes.push(note),
|
||||||
Err(err) => eprintln!("Could not parse file {path:?}: {err}"),
|
Err(err) => eprintln!("Could not parse file {path:?}: {err}"),
|
||||||
}
|
}
|
||||||
@@ -378,18 +335,17 @@ impl Explorer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// load documents from the documents folder
|
// load documents from the documents folder
|
||||||
fn load_documents(&mut self) -> std::io::Result<()> {
|
fn load_documents(&mut self) -> Result<(), FsError> {
|
||||||
let documents_folder = PROJECT_FOLDER.join("documents");
|
let path = Path::new("documents");
|
||||||
if !documents_folder.exists() {
|
if !FILESYSTEM.exists(path) {
|
||||||
std::fs::create_dir_all(&documents_folder)?;
|
FILESYSTEM.mkdir(path)?;
|
||||||
}
|
}
|
||||||
let mut documents = Vec::new();
|
let mut documents = Vec::new();
|
||||||
|
|
||||||
for entry in std::fs::read_dir(&documents_folder).unwrap() {
|
for entry in FILESYSTEM.lsfiles(path)? {
|
||||||
let path = entry.unwrap().path();
|
match FILESYSTEM.read::<ContentSection>(&entry) {
|
||||||
match ContentSection::load(path.file_stem().unwrap().to_str().unwrap()) {
|
|
||||||
Ok(document) => documents.push(MainEditor::open(document)),
|
Ok(document) => documents.push(MainEditor::open(document)),
|
||||||
Err(err) => eprintln!("Could not parse file {path:?}: {err}"),
|
Err(err) => eprintln!("Could not parse file {entry:?}: {err}"),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -398,7 +354,7 @@ impl Explorer {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn load_tags(&mut self) -> std::io::Result<()> {
|
fn load_tags(&mut self) -> Result<(), FsError> {
|
||||||
self.tags = Tag::load_all();
|
self.tags = Tag::load_all();
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,103 @@
|
|||||||
|
use std::{
|
||||||
|
collections::HashMap,
|
||||||
|
io,
|
||||||
|
path::{Path, PathBuf},
|
||||||
|
sync::LazyLock,
|
||||||
|
};
|
||||||
|
|
||||||
|
use serde::{Serialize, de::DeserializeOwned};
|
||||||
|
|
||||||
|
#[cfg(feature = "native")]
|
||||||
|
use crate::PROJECT_FOLDER;
|
||||||
|
use crate::filesystem::native::NativeFileSystem;
|
||||||
|
|
||||||
|
#[cfg(feature = "native")]
|
||||||
|
pub mod native;
|
||||||
|
|
||||||
|
#[cfg(feature = "web")]
|
||||||
|
pub mod web;
|
||||||
|
|
||||||
|
pub static FILESYSTEM: LazyLock<NativeFileSystem> = LazyLock::new(|| {
|
||||||
|
#[cfg(feature = "native")]
|
||||||
|
return NativeFileSystem::new(PROJECT_FOLDER.clone());
|
||||||
|
#[cfg(feature = "web")]
|
||||||
|
return Box::new(web::WebFileSystem::new());
|
||||||
|
});
|
||||||
|
|
||||||
|
pub trait LegacyFileSystem {
|
||||||
|
fn read<T: DeserializeOwned>(&self, path: &Path) -> Result<T, FsError>;
|
||||||
|
fn read_bytes(&self, path: &Path) -> Result<Vec<u8>, FsError>;
|
||||||
|
fn write<T: Serialize>(&self, path: &Path, data: T) -> Result<(), FsError>;
|
||||||
|
fn delete(&self, path: &Path) -> Result<(), FsError>;
|
||||||
|
fn lsfiles(&self, path: &Path) -> Result<Vec<PathBuf>, FsError>;
|
||||||
|
fn lsdirs(&self, path: &Path) -> Result<Vec<PathBuf>, FsError>;
|
||||||
|
fn mkdir(&self, path: &Path) -> Result<(), FsError>;
|
||||||
|
fn rename(&self, path: &Path, new_path: &Path) -> Result<(), FsError>;
|
||||||
|
#[allow(unused)]
|
||||||
|
fn exists(&self, path: &Path) -> bool;
|
||||||
|
fn config_path(&self) -> PathBuf;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ────────────────────────────────────────────────────────────────
|
||||||
|
// Custom error type
|
||||||
|
// ────────────────────────────────────────────────────────────────
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub enum FsError {
|
||||||
|
Io(io::Error),
|
||||||
|
Serde(serde_json::Error),
|
||||||
|
}
|
||||||
|
|
||||||
|
impl std::fmt::Display for FsError {
|
||||||
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||||
|
match self {
|
||||||
|
FsError::Io(e) => write!(f, "IO error: {e}"),
|
||||||
|
FsError::Serde(e) => write!(f, "Serialization error: {e}"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl std::error::Error for FsError {
|
||||||
|
fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
|
||||||
|
match self {
|
||||||
|
FsError::Io(e) => Some(e),
|
||||||
|
FsError::Serde(e) => Some(e),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Convert the two underlying error types into our own
|
||||||
|
impl From<io::Error> for FsError {
|
||||||
|
fn from(err: io::Error) -> Self {
|
||||||
|
FsError::Io(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
impl From<serde_json::Error> for FsError {
|
||||||
|
fn from(err: serde_json::Error) -> Self {
|
||||||
|
FsError::Serde(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[allow(dead_code)]
|
||||||
|
pub struct Id(String);
|
||||||
|
|
||||||
|
#[allow(dead_code)]
|
||||||
|
pub trait FileSystem {
|
||||||
|
fn load<T: DeserializeOwned>(&self, id: Id) -> Result<T, FsError>;
|
||||||
|
fn save<T: Serialize>(&self, id: Id, data: T) -> Result<(), FsError>;
|
||||||
|
fn mkdir(&self, path: Path) -> Result<(), FsError>;
|
||||||
|
fn exists(&self, path: Path) -> bool;
|
||||||
|
}
|
||||||
|
|
||||||
|
#[allow(dead_code)]
|
||||||
|
pub struct Index {
|
||||||
|
file_cache: HashMap<Id, PathBuf>,
|
||||||
|
project_root: Directory,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[allow(dead_code)]
|
||||||
|
pub struct Directory {
|
||||||
|
name: String,
|
||||||
|
id: Id,
|
||||||
|
children: HashMap<Id, Directory>,
|
||||||
|
files: Vec<Id>,
|
||||||
|
}
|
||||||
@@ -0,0 +1,116 @@
|
|||||||
|
use std::fs;
|
||||||
|
use std::io::{ErrorKind, Read};
|
||||||
|
use std::path::{Path, PathBuf};
|
||||||
|
|
||||||
|
use serde::Serialize;
|
||||||
|
use serde::de::DeserializeOwned;
|
||||||
|
|
||||||
|
use crate::filesystem::{FsError, LegacyFileSystem};
|
||||||
|
|
||||||
|
pub struct NativeFileSystem {
|
||||||
|
project_root: PathBuf,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl NativeFileSystem {
|
||||||
|
/// Create a new instance.
|
||||||
|
pub fn new(root: impl Into<PathBuf>) -> Self {
|
||||||
|
Self {
|
||||||
|
project_root: root.into(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Resolve the user supplied *relative* path against the project root.
|
||||||
|
#[inline]
|
||||||
|
fn full_path(&self, path: &Path) -> PathBuf {
|
||||||
|
self.project_root.join(path)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl LegacyFileSystem for NativeFileSystem {
|
||||||
|
fn read<T: DeserializeOwned>(&self, path: &Path) -> Result<T, FsError> {
|
||||||
|
let full_path = self.full_path(path);
|
||||||
|
let file = fs::File::open(full_path).map_err(FsError::Io)?;
|
||||||
|
serde_json::from_reader(file).map_err(FsError::Serde)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn read_bytes(&self, path: &Path) -> Result<Vec<u8>, FsError> {
|
||||||
|
let full_path = self.full_path(path);
|
||||||
|
let mut contents = Vec::new();
|
||||||
|
fs::File::open(full_path)?.read_to_end(&mut contents)?;
|
||||||
|
Ok(contents)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn write<T: Serialize>(&self, path: &Path, data: T) -> Result<(), FsError> {
|
||||||
|
let full_path = self.full_path(path);
|
||||||
|
|
||||||
|
// Ensure the parent directory exists.
|
||||||
|
if let Some(parent) = full_path.parent() {
|
||||||
|
fs::create_dir_all(parent)?;
|
||||||
|
}
|
||||||
|
|
||||||
|
let file = fs::File::create(full_path)?;
|
||||||
|
serde_json::to_writer(file, &data).map_err(FsError::Serde)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn delete(&self, path: &Path) -> Result<(), FsError> {
|
||||||
|
let full_path = self.full_path(path);
|
||||||
|
match fs::remove_file(&full_path) {
|
||||||
|
Ok(()) => Ok(()),
|
||||||
|
Err(e) if e.kind() == ErrorKind::IsADirectory => {
|
||||||
|
// Remove a directory tree.
|
||||||
|
fs::remove_dir_all(full_path).map_err(FsError::Io)
|
||||||
|
}
|
||||||
|
Err(e) => Err(FsError::Io(e)),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn mkdir(&self, path: &Path) -> Result<(), FsError> {
|
||||||
|
let full_path = self.full_path(path);
|
||||||
|
fs::create_dir_all(full_path).map_err(FsError::Io)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn lsfiles(&self, path: &Path) -> Result<Vec<PathBuf>, FsError> {
|
||||||
|
let full_path = self.full_path(path);
|
||||||
|
let paths = fs::read_dir(full_path)?
|
||||||
|
.filter_map(|res| res.ok())
|
||||||
|
.filter(|entry| entry.file_type().unwrap().is_file())
|
||||||
|
.map(|entry| entry.path())
|
||||||
|
.collect();
|
||||||
|
|
||||||
|
Ok(paths)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn lsdirs(&self, path: &Path) -> Result<Vec<PathBuf>, FsError> {
|
||||||
|
let full_path = self.full_path(path);
|
||||||
|
let paths = fs::read_dir(full_path)?
|
||||||
|
.filter_map(|res| res.ok())
|
||||||
|
.filter(|entry| entry.file_type().unwrap().is_dir())
|
||||||
|
.map(|entry| entry.path())
|
||||||
|
.collect();
|
||||||
|
|
||||||
|
Ok(paths)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn exists(&self, path: &Path) -> bool {
|
||||||
|
let full_path = self.full_path(path);
|
||||||
|
full_path.exists()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn rename(&self, path: &Path, other: &Path) -> Result<(), FsError> {
|
||||||
|
let full_path = self.full_path(path);
|
||||||
|
let full_other = self.full_path(other);
|
||||||
|
fs::rename(full_path, full_other).map_err(FsError::Io)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn config_path(&self) -> PathBuf {
|
||||||
|
match std::env::var("HOME") {
|
||||||
|
Ok(path) => PathBuf::from(path + "/.config/worldcoder/settings.json"),
|
||||||
|
Err(_) => {
|
||||||
|
eprintln!(
|
||||||
|
"XDG_CONFIG_HOME not set, using default path of ~/.config/worldcoder/settings.json"
|
||||||
|
);
|
||||||
|
"~/.config/worldcoder/settings.json".into()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
-125
@@ -1,125 +0,0 @@
|
|||||||
use std::io::{self, Read, Write};
|
|
||||||
use std::path::{Path, PathBuf};
|
|
||||||
|
|
||||||
/// Platform-agnostic file system operations
|
|
||||||
trait FileSystem {
|
|
||||||
fn read_file(&self, path: &Path) -> io::Result<Vec<u8>>;
|
|
||||||
fn write_file(&self, path: &Path, contents: &[u8]) -> io::Result<()>;
|
|
||||||
fn create_dir_all(&self, path: &Path) -> io::Result<()>;
|
|
||||||
fn read_dir(&self, path: &Path) -> io::Result<Vec<PathBuf>>;
|
|
||||||
fn exists(&self, path: &Path) -> bool;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Native filesystem implementation
|
|
||||||
#[cfg(feature = "native")]
|
|
||||||
struct NativeFileSystem;
|
|
||||||
|
|
||||||
#[cfg(feature = "native")]
|
|
||||||
impl FileSystem for NativeFileSystem {
|
|
||||||
fn read_file(&self, path: &Path) -> io::Result<Vec<u8>> {
|
|
||||||
std::fs::read(path)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn write_file(&self, path: &Path, contents: &[u8]) -> io::Result<()> {
|
|
||||||
if let Some(parent) = path.parent() {
|
|
||||||
std::fs::create_dir_all(parent)?;
|
|
||||||
}
|
|
||||||
std::fs::write(path, contents)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn create_dir_all(&self, path: &Path) -> io::Result<()> {
|
|
||||||
std::fs::create_dir_all(path)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn read_dir(&self, path: &Path) -> io::Result<Vec<PathBuf>> {
|
|
||||||
Ok(std::fs::read_dir(path)?
|
|
||||||
.filter_map(Result::ok)
|
|
||||||
.map(|entry| entry.path())
|
|
||||||
.collect())
|
|
||||||
}
|
|
||||||
|
|
||||||
fn exists(&self, path: &Path) -> bool {
|
|
||||||
path.exists()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Web filesystem implementation
|
|
||||||
#[cfg(feature = "web")]
|
|
||||||
struct WebFileSystem;
|
|
||||||
|
|
||||||
#[cfg(feature = "web")]
|
|
||||||
impl WebFileSystem {
|
|
||||||
fn new() -> Self {
|
|
||||||
// Initialize web-specific storage if needed
|
|
||||||
Self
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(feature = "web")]
|
|
||||||
impl FileSystem for WebFileSystem {
|
|
||||||
fn read_file(&self, path: &Path) -> io::Result<Vec<u8>> {
|
|
||||||
// In a real implementation, this would use web_sys and IndexedDB
|
|
||||||
// This is a simplified version that won't actually work
|
|
||||||
Err(io::Error::new(
|
|
||||||
io::ErrorKind::Other,
|
|
||||||
"Web filesystem not implemented",
|
|
||||||
))
|
|
||||||
}
|
|
||||||
|
|
||||||
fn write_file(&self, path: &Path, contents: &[u8]) -> io::Result<()> {
|
|
||||||
// In a real implementation, this would use web_sys and IndexedDB
|
|
||||||
// This is a simplified version that won't actually work
|
|
||||||
Err(io::Error::new(
|
|
||||||
io::ErrorKind::Other,
|
|
||||||
"Web filesystem not implemented",
|
|
||||||
))
|
|
||||||
}
|
|
||||||
|
|
||||||
fn create_dir_all(&self, _path: &Path) -> io::Result<()> {
|
|
||||||
// In web, directories are virtual and created automatically
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
fn read_dir(&self, _path: &Path) -> io::Result<Vec<PathBuf>> {
|
|
||||||
// In a real implementation, this would list files from IndexedDB
|
|
||||||
// This is a simplified version that returns an empty list
|
|
||||||
Ok(Vec::new())
|
|
||||||
}
|
|
||||||
|
|
||||||
fn exists(&self, _path: &Path) -> bool {
|
|
||||||
// In a real implementation, this would check IndexedDB
|
|
||||||
false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(feature = "web")]
|
|
||||||
#[cfg(test)]
|
|
||||||
mod tests {
|
|
||||||
use super::*;
|
|
||||||
use std::fs::File;
|
|
||||||
use tempfile::tempdir;
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_native_fs() {
|
|
||||||
let temp_dir = tempdir().unwrap();
|
|
||||||
let file_path = temp_dir.path().join("test.txt");
|
|
||||||
|
|
||||||
let fs = NativeFileSystem;
|
|
||||||
|
|
||||||
// Test write and read
|
|
||||||
let test_data = b"Hello, world!";
|
|
||||||
fs.write_file(&file_path, test_data).unwrap();
|
|
||||||
let read_data = fs.read_file(&file_path).unwrap();
|
|
||||||
assert_eq!(read_data, test_data);
|
|
||||||
|
|
||||||
// Test exists
|
|
||||||
assert!(fs.exists(&file_path));
|
|
||||||
assert!(!fs.exists(&temp_dir.path().join("nonexistent")));
|
|
||||||
|
|
||||||
// Test create_dir_all and read_dir
|
|
||||||
let dir_path = temp_dir.path().join("subdir");
|
|
||||||
fs.create_dir_all(&dir_path).unwrap();
|
|
||||||
let entries = fs.read_dir(temp_dir.path()).unwrap();
|
|
||||||
assert_eq!(entries.len(), 2); // Should contain both the file and the subdirectory
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -440,6 +440,7 @@ pub struct AIInput {
|
|||||||
pub system_prompt: String,
|
pub system_prompt: String,
|
||||||
pub user_prompt: String,
|
pub user_prompt: String,
|
||||||
pub previous_content: String,
|
pub previous_content: String,
|
||||||
|
#[allow(unused)]
|
||||||
pub structure: Option<String>,
|
pub structure: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+2
-1
@@ -10,9 +10,10 @@ mod explorer;
|
|||||||
#[cfg(feature = "llm")]
|
#[cfg(feature = "llm")]
|
||||||
mod llm_integration;
|
mod llm_integration;
|
||||||
|
|
||||||
mod index;
|
|
||||||
mod util;
|
mod util;
|
||||||
|
|
||||||
|
mod filesystem;
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
editors::{
|
editors::{
|
||||||
asset_editor::Asset, content_editor, note_editor, object_editor::ObjectInstance,
|
asset_editor::Asset, content_editor, note_editor, object_editor::ObjectInstance,
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
{
|
|
||||||
"llm_api_uri": "http://localhost:1234",
|
|
||||||
"llm_api_key": "",
|
|
||||||
"ai_enabled": true,
|
|
||||||
"dark_theme": true
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user