cleaned up
This commit is contained in:
parent
899ebf37b0
commit
96d803a870
537
src/calcifer.rs
537
src/calcifer.rs
|
@ -1,6 +1,6 @@
|
|||
use eframe::egui;
|
||||
use egui::{text::CCursor, text_edit::CCursorRange, Rangef};
|
||||
use std::{cmp::max, env, path::PathBuf};// path::Path,
|
||||
use std::{cmp::max, env, path::PathBuf}; // path::Path,
|
||||
|
||||
use crate::tools;
|
||||
use crate::Calcifer;
|
||||
|
@ -14,288 +14,291 @@ use code_editor::CodeEditor;
|
|||
mod app_base;
|
||||
|
||||
impl Calcifer {
|
||||
pub fn draw_settings(&mut self, ctx: &egui::Context) {
|
||||
egui::SidePanel::left("settings")
|
||||
.resizable(false)
|
||||
.exact_width(self.font_size * 1.8)
|
||||
.show(ctx, |ui| {
|
||||
ui.vertical(|ui| {
|
||||
if ui.add(egui::Button::new("📁")).clicked() {
|
||||
if let Some(path) = rfd::FileDialog::new()
|
||||
.set_directory(self.home.as_path())
|
||||
.pick_file()
|
||||
{
|
||||
self.open_file(Some(&path));
|
||||
}
|
||||
}
|
||||
ui.separator();
|
||||
self.tree_visible = self.toggle(ui, self.tree_visible, "🗐");
|
||||
ui.separator();
|
||||
self.terminal_visible = self.toggle(ui, self.terminal_visible, "🖵");
|
||||
ui.separator();
|
||||
self.search_menu.visible = self.toggle(ui, self.search_menu.visible, "🔍");
|
||||
ui.separator();
|
||||
self.settings_menu.visible = self.toggle(ui, self.settings_menu.visible, "⚙");
|
||||
ui.separator();
|
||||
self.shortcuts_menu.visible = self.toggle(ui, self.shortcuts_menu.visible, "⌨");
|
||||
ui.separator();
|
||||
self.profiler_visible = self.toggle(ui, self.profiler_visible, "⚡");
|
||||
pub fn draw_settings(&mut self, ctx: &egui::Context) {
|
||||
egui::SidePanel::left("settings")
|
||||
.resizable(false)
|
||||
.exact_width(self.font_size * 1.8)
|
||||
.show(ctx, |ui| {
|
||||
ui.vertical(|ui| {
|
||||
if ui.add(egui::Button::new("📁")).clicked() {
|
||||
if let Some(path) = rfd::FileDialog::new()
|
||||
.set_directory(self.home.as_path())
|
||||
.pick_file()
|
||||
{
|
||||
self.open_file(Some(&path));
|
||||
}
|
||||
}
|
||||
ui.separator();
|
||||
self.tree_visible = self.toggle(ui, self.tree_visible, "🗐");
|
||||
ui.separator();
|
||||
self.terminal_visible = self.toggle(ui, self.terminal_visible, "🖵");
|
||||
ui.separator();
|
||||
self.search_menu.visible = self.toggle(ui, self.search_menu.visible, "🔍");
|
||||
ui.separator();
|
||||
self.settings_menu.visible = self.toggle(ui, self.settings_menu.visible, "⚙");
|
||||
ui.separator();
|
||||
self.shortcuts_menu.visible = self.toggle(ui, self.shortcuts_menu.visible, "⌨");
|
||||
ui.separator();
|
||||
self.profiler_visible = self.toggle(ui, self.profiler_visible, "⚡");
|
||||
|
||||
if self.tabs[self.selected_tab.to_index()].language == PROJECT_EXTENSION {
|
||||
ui.separator();
|
||||
self.project_mode = self.toggle(ui, self.project_mode, "🛠");
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
if self.tabs[self.selected_tab.to_index()].language == PROJECT_EXTENSION {
|
||||
ui.separator();
|
||||
self.project_mode = self.toggle(ui, self.project_mode, "🛠");
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
pub fn draw_tree_panel(&mut self, ctx: &egui::Context) {
|
||||
if !self.tree_visible {
|
||||
return;
|
||||
}
|
||||
egui::SidePanel::left("file_tree_panel").show(ctx, |ui| {
|
||||
ui.horizontal(|ui| {
|
||||
ui.label("Bookshelf ");
|
||||
if ui.add(egui::Button::new("📖")).clicked() {
|
||||
self.file_tree = tools::file_tree::generate_file_tree(self.home.as_path(), 7);
|
||||
}
|
||||
});
|
||||
ui.separator();
|
||||
let mut n_files : usize = 0;
|
||||
if let Some(file_tree) = self.file_tree.clone() {
|
||||
self.list_files(ui, &file_tree, 1, &mut n_files);
|
||||
} else {
|
||||
ui.label("No book on the Bookshelf");
|
||||
}
|
||||
ui.separator();
|
||||
ui.label(format!("{} files displayed", n_files));
|
||||
});
|
||||
}
|
||||
pub fn draw_tree_panel(&mut self, ctx: &egui::Context) {
|
||||
if !self.tree_visible {
|
||||
return;
|
||||
}
|
||||
egui::SidePanel::left("file_tree_panel").show(ctx, |ui| {
|
||||
ui.horizontal(|ui| {
|
||||
ui.label("Bookshelf ");
|
||||
if ui.add(egui::Button::new("📖")).clicked() {
|
||||
self.file_tree = tools::file_tree::generate_file_tree(self.home.as_path(), 7);
|
||||
}
|
||||
});
|
||||
ui.separator();
|
||||
let mut n_files: usize = 0;
|
||||
if let Some(file_tree) = self.file_tree.clone() {
|
||||
self.list_files(ui, &file_tree, 1, &mut n_files);
|
||||
} else {
|
||||
ui.label("No book on the Bookshelf");
|
||||
}
|
||||
ui.separator();
|
||||
ui.label(format!("{} files displayed", n_files));
|
||||
});
|
||||
}
|
||||
|
||||
pub fn draw_bottom_tray(&mut self, ctx: &egui::Context) {
|
||||
egui::TopBottomPanel::bottom("tray")
|
||||
.default_height(self.font_size * 1.2)
|
||||
.resizable(false)
|
||||
.show(ctx, |ui| {
|
||||
ui.label(self.profiler());
|
||||
});
|
||||
}
|
||||
pub fn draw_bottom_tray(&mut self, ctx: &egui::Context) {
|
||||
egui::TopBottomPanel::bottom("tray")
|
||||
.default_height(self.font_size * 1.2)
|
||||
.resizable(false)
|
||||
.show(ctx, |ui| {
|
||||
ui.label(self.profiler());
|
||||
});
|
||||
}
|
||||
|
||||
pub fn draw_terminal_panel(&mut self, ctx: &egui::Context) {
|
||||
if !self.terminal_visible {
|
||||
return;
|
||||
}
|
||||
egui::TopBottomPanel::bottom("terminal")
|
||||
.default_height(super::TERMINAL_HEIGHT)
|
||||
.height_range(Rangef::new(
|
||||
super::TERMINAL_RANGE.start,
|
||||
super::TERMINAL_RANGE.end,
|
||||
))
|
||||
.resizable(true)
|
||||
.show(ctx, |ui| {
|
||||
ui.with_layout(egui::Layout::bottom_up(egui::Align::LEFT), |ui| {
|
||||
let command_color = hex_str_to_color(self.theme.functions);
|
||||
let entry_color = hex_str_to_color(self.theme.literals);
|
||||
let bg_color = hex_str_to_color(self.theme.bg);
|
||||
|
||||
ui.label("");
|
||||
pub fn draw_terminal_panel(&mut self, ctx: &egui::Context) {
|
||||
if !self.terminal_visible {
|
||||
return;
|
||||
}
|
||||
egui::TopBottomPanel::bottom("terminal")
|
||||
.default_height(super::TERMINAL_HEIGHT)
|
||||
.height_range(Rangef::new(
|
||||
super::TERMINAL_RANGE.start,
|
||||
super::TERMINAL_RANGE.end,
|
||||
))
|
||||
.resizable(true)
|
||||
.show(ctx, |ui| {
|
||||
ui.with_layout(egui::Layout::bottom_up(egui::Align::LEFT), |ui| {
|
||||
let command_color = hex_str_to_color(self.theme.functions);
|
||||
let entry_color = hex_str_to_color(self.theme.literals);
|
||||
let bg_color = hex_str_to_color(self.theme.bg);
|
||||
|
||||
ui.horizontal(|ui| {
|
||||
if ui.add(egui::Button::new("⟳")).clicked() {
|
||||
self.command_history = vec![];
|
||||
}
|
||||
ui.style_mut().visuals.extreme_bg_color = bg_color;
|
||||
let Self { command, .. } = self;
|
||||
ui.colored_label(
|
||||
command_color,
|
||||
tools::format_path(
|
||||
&env::current_dir().unwrap_or_else(|_| PathBuf::from("/")),
|
||||
),
|
||||
);
|
||||
let response = ui.add(
|
||||
egui::TextEdit::singleline(command)
|
||||
.desired_width(f32::INFINITY)
|
||||
.lock_focus(true),
|
||||
);
|
||||
ui.label("");
|
||||
|
||||
if response.lost_focus() && ctx.input(|i| i.key_pressed(egui::Key::Enter)) {
|
||||
self.command_history
|
||||
.push(tools::send_command(self.command.clone()));
|
||||
self.command = "".into();
|
||||
response.request_focus();
|
||||
}
|
||||
});
|
||||
ui.separator();
|
||||
egui::ScrollArea::vertical()
|
||||
.stick_to_bottom(true)
|
||||
.show(ui, |ui| {
|
||||
ui.with_layout(egui::Layout::top_down(egui::Align::LEFT), |ui| {
|
||||
ui.separator();
|
||||
ui.horizontal_wrapped(|ui| {
|
||||
ui.spacing_mut().item_spacing.y = 0.0;
|
||||
for entry in &mut self.command_history {
|
||||
entry.update();
|
||||
ui.colored_label(
|
||||
command_color,
|
||||
format!("\n{} {}", entry.env, entry.command),
|
||||
);
|
||||
ui.end_row();
|
||||
for line in &entry.result {
|
||||
let color =
|
||||
if line.error { super::RED } else { entry_color };
|
||||
ui.colored_label(color, &line.text);
|
||||
ui.end_row();
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
ui.horizontal(|ui| {
|
||||
if ui.add(egui::Button::new("⟳")).clicked() {
|
||||
self.command_history = vec![];
|
||||
}
|
||||
ui.style_mut().visuals.extreme_bg_color = bg_color;
|
||||
let Self { command, .. } = self;
|
||||
ui.colored_label(
|
||||
command_color,
|
||||
tools::format_path(
|
||||
&env::current_dir().unwrap_or_else(|_| PathBuf::from("/")),
|
||||
),
|
||||
);
|
||||
let response = ui.add(
|
||||
egui::TextEdit::singleline(command)
|
||||
.desired_width(f32::INFINITY)
|
||||
.lock_focus(true),
|
||||
);
|
||||
|
||||
pub fn draw_tab_panel(&mut self, ctx: &egui::Context) {
|
||||
egui::TopBottomPanel::top("tabs")
|
||||
.resizable(false)
|
||||
.show(ctx, |ui| {
|
||||
ui.horizontal(|ui| {
|
||||
ui.style_mut().visuals.selection.bg_fill =
|
||||
hex_str_to_color(self.theme.functions);
|
||||
ui.style_mut().visuals.hyperlink_color = hex_str_to_color(self.theme.functions);
|
||||
for (index, tab) in self.tabs.clone().iter().enumerate() {
|
||||
let mut title = tab.get_name();
|
||||
if !tab.saved {
|
||||
title += " ~";
|
||||
}
|
||||
if self.selected_tab == tools::TabNumber::from_index(index) {
|
||||
ui.style_mut().visuals.override_text_color =
|
||||
Some(hex_str_to_color(self.theme.bg));
|
||||
}
|
||||
ui.selectable_value(
|
||||
&mut self.selected_tab,
|
||||
tools::TabNumber::from_index(index),
|
||||
title,
|
||||
);
|
||||
if response.lost_focus() && ctx.input(|i| i.key_pressed(egui::Key::Enter)) {
|
||||
self.command_history
|
||||
.push(tools::send_command(self.command.clone()));
|
||||
self.command = "".into();
|
||||
response.request_focus();
|
||||
}
|
||||
});
|
||||
ui.separator();
|
||||
egui::ScrollArea::vertical()
|
||||
.stick_to_bottom(true)
|
||||
.show(ui, |ui| {
|
||||
ui.with_layout(egui::Layout::top_down(egui::Align::LEFT), |ui| {
|
||||
ui.separator();
|
||||
ui.horizontal_wrapped(|ui| {
|
||||
ui.spacing_mut().item_spacing.y = 0.0;
|
||||
for entry in &mut self.command_history {
|
||||
entry.update();
|
||||
ui.colored_label(
|
||||
command_color,
|
||||
format!("\n{} {}", entry.env, entry.command),
|
||||
);
|
||||
ui.end_row();
|
||||
for line in &entry.result {
|
||||
let color =
|
||||
if line.error { super::RED } else { entry_color };
|
||||
ui.colored_label(color, &line.text);
|
||||
ui.end_row();
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
ui.style_mut().visuals.override_text_color = None;
|
||||
pub fn draw_tab_panel(&mut self, ctx: &egui::Context) {
|
||||
egui::TopBottomPanel::top("tabs")
|
||||
.resizable(false)
|
||||
.show(ctx, |ui| {
|
||||
ui.horizontal(|ui| {
|
||||
ui.style_mut().visuals.selection.bg_fill =
|
||||
hex_str_to_color(self.theme.functions);
|
||||
ui.style_mut().visuals.hyperlink_color = hex_str_to_color(self.theme.functions);
|
||||
for (index, tab) in self.tabs.clone().iter().enumerate() {
|
||||
let mut title = tab.get_name();
|
||||
if !tab.saved {
|
||||
title += " ~";
|
||||
}
|
||||
if self.selected_tab == tools::TabNumber::from_index(index) {
|
||||
ui.style_mut().visuals.override_text_color =
|
||||
Some(hex_str_to_color(self.theme.bg));
|
||||
}
|
||||
ui.selectable_value(
|
||||
&mut self.selected_tab,
|
||||
tools::TabNumber::from_index(index),
|
||||
title,
|
||||
);
|
||||
|
||||
if ui.link("X").clicked() && !self.close_tab_confirm.visible {
|
||||
if self.tabs.len() > 1 {
|
||||
if tab.saved {
|
||||
self.delete_tab(index);
|
||||
} else {
|
||||
self.close_tab_confirm.ask();
|
||||
self.tab_to_close = index;
|
||||
}
|
||||
} else {
|
||||
egui::Context::send_viewport_cmd(ctx, egui::ViewportCommand::Close);
|
||||
}
|
||||
}
|
||||
ui.separator();
|
||||
}
|
||||
if self.tabs.len() < MAX_TABS {
|
||||
ui.selectable_value(&mut self.selected_tab, tools::TabNumber::Open, "+");
|
||||
}
|
||||
if self.selected_tab == tools::TabNumber::Open {
|
||||
self.open_file(None);
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
ui.style_mut().visuals.override_text_color = None;
|
||||
|
||||
pub fn draw_content_panel(&mut self, ctx: &egui::Context) {
|
||||
egui::CentralPanel::default().show(ctx, |ui| {
|
||||
ui.horizontal(|ui| {
|
||||
if ui.add(egui::Button::new("open directory in terminal")).clicked() {
|
||||
let mut path = self.tabs[self.selected_tab.to_index()].path.clone();
|
||||
path.pop();
|
||||
tools::send_command(format!("cd {}", path.display()));
|
||||
}
|
||||
if ui.link("X").clicked() && !self.close_tab_confirm.visible {
|
||||
if self.tabs.len() > 1 {
|
||||
if tab.saved {
|
||||
self.delete_tab(index);
|
||||
} else {
|
||||
self.close_tab_confirm.ask();
|
||||
self.tab_to_close = index;
|
||||
}
|
||||
} else {
|
||||
egui::Context::send_viewport_cmd(ctx, egui::ViewportCommand::Close);
|
||||
}
|
||||
}
|
||||
ui.separator();
|
||||
}
|
||||
if self.tabs.len() < MAX_TABS {
|
||||
ui.selectable_value(&mut self.selected_tab, tools::TabNumber::Open, "+");
|
||||
}
|
||||
if self.selected_tab == tools::TabNumber::Open {
|
||||
self.open_file(None);
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
ui.label("Picked file:");
|
||||
ui.monospace(
|
||||
self.tabs[self.selected_tab.to_index()]
|
||||
.path
|
||||
.to_string_lossy()
|
||||
.to_string(),
|
||||
);
|
||||
});
|
||||
pub fn draw_content_panel(&mut self, ctx: &egui::Context) {
|
||||
egui::CentralPanel::default().show(ctx, |ui| {
|
||||
ui.horizontal(|ui| {
|
||||
if ui
|
||||
.add(egui::Button::new("open directory in terminal"))
|
||||
.clicked()
|
||||
{
|
||||
let mut path = self.tabs[self.selected_tab.to_index()].path.clone();
|
||||
path.pop();
|
||||
tools::send_command(format!("cd {}", path.display()));
|
||||
}
|
||||
|
||||
ui.separator();
|
||||
if self.project_mode
|
||||
&& self.tabs[self.selected_tab.to_index()].language == PROJECT_EXTENSION
|
||||
{
|
||||
self.draw_project_file(ui);
|
||||
} else {
|
||||
self.draw_code_file(ui);
|
||||
}
|
||||
});
|
||||
}
|
||||
ui.label("Picked file:");
|
||||
ui.monospace(
|
||||
self.tabs[self.selected_tab.to_index()]
|
||||
.path
|
||||
.to_string_lossy()
|
||||
.to_string(),
|
||||
);
|
||||
});
|
||||
|
||||
fn draw_code_file(&mut self, ui: &mut egui::Ui) {
|
||||
let current_tab = &mut self.tabs[self.selected_tab.to_index()];
|
||||
let lines = current_tab.code.chars().filter(|&c| c == '\n').count() + 1;
|
||||
let mut override_cursor: Option<CCursorRange> = None;
|
||||
ui.separator();
|
||||
if self.project_mode
|
||||
&& self.tabs[self.selected_tab.to_index()].language == PROJECT_EXTENSION
|
||||
{
|
||||
self.draw_project_file(ui);
|
||||
} else {
|
||||
self.draw_code_file(ui);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
if !self.search_menu.result_selected {
|
||||
override_cursor = Some(CCursorRange::two(
|
||||
CCursor::new(self.search_menu.get_cursor_start()),
|
||||
CCursor::new(self.search_menu.get_cursor_end()),
|
||||
));
|
||||
self.search_menu.result_selected = true;
|
||||
}
|
||||
fn draw_code_file(&mut self, ui: &mut egui::Ui) {
|
||||
let current_tab = &mut self.tabs[self.selected_tab.to_index()];
|
||||
let lines = current_tab.code.chars().filter(|&c| c == '\n').count() + 1;
|
||||
let mut override_cursor: Option<CCursorRange> = None;
|
||||
|
||||
CodeEditor::default()
|
||||
.id_source("code editor")
|
||||
.with_rows(max(45, lines))
|
||||
.with_fontsize(self.font_size)
|
||||
.with_theme(self.theme)
|
||||
.with_syntax(tools::to_syntax(¤t_tab.language))
|
||||
.with_numlines(true)
|
||||
.show(
|
||||
ui,
|
||||
&mut current_tab.code,
|
||||
&mut current_tab.saved,
|
||||
&mut current_tab.last_cursor,
|
||||
&mut current_tab.scroll_offset,
|
||||
override_cursor,
|
||||
);
|
||||
}
|
||||
if !self.search_menu.result_selected {
|
||||
override_cursor = Some(CCursorRange::two(
|
||||
CCursor::new(self.search_menu.get_cursor_start()),
|
||||
CCursor::new(self.search_menu.get_cursor_end()),
|
||||
));
|
||||
self.search_menu.result_selected = true;
|
||||
}
|
||||
|
||||
fn draw_project_file(&mut self, ui: &mut egui::Ui) {
|
||||
ui.label("project mode");
|
||||
}
|
||||
CodeEditor::default()
|
||||
.id_source("code editor")
|
||||
.with_rows(max(45, lines))
|
||||
.with_fontsize(self.font_size)
|
||||
.with_theme(self.theme)
|
||||
.with_syntax(tools::to_syntax(¤t_tab.language))
|
||||
.with_numlines(true)
|
||||
.show(
|
||||
ui,
|
||||
&mut current_tab.code,
|
||||
&mut current_tab.saved,
|
||||
&mut current_tab.last_cursor,
|
||||
&mut current_tab.scroll_offset,
|
||||
override_cursor,
|
||||
);
|
||||
}
|
||||
|
||||
pub fn draw_windows(&mut self, ctx: &egui::Context) {
|
||||
if self.search_menu.visible {
|
||||
self.search_menu
|
||||
.show(ctx, &mut self.tabs, &mut self.selected_tab);
|
||||
}
|
||||
if self.close_tab_confirm.visible {
|
||||
self.close_tab_confirm.show(ctx);
|
||||
}
|
||||
if self.refresh_confirm.visible {
|
||||
self.refresh_confirm.show(ctx);
|
||||
}
|
||||
if self.exit_confirm.visible {
|
||||
self.exit_confirm.show(ctx);
|
||||
}
|
||||
if self.exit_confirm.proceed {
|
||||
for tab in self.tabs.iter_mut() {
|
||||
tab.saved = true;
|
||||
}
|
||||
egui::Context::send_viewport_cmd(ctx, egui::ViewportCommand::Close);
|
||||
}
|
||||
if self.shortcuts_menu.visible {
|
||||
self.shortcuts_menu.show(ctx);
|
||||
}
|
||||
if self.settings_menu.visible {
|
||||
self.settings_menu.show(ctx);
|
||||
}
|
||||
if self.settings_menu.updated {
|
||||
self.theme = self.settings_menu.theme;
|
||||
}
|
||||
fn draw_project_file(&mut self, ui: &mut egui::Ui) {
|
||||
ui.label("project mode");
|
||||
}
|
||||
|
||||
self.handle_confirm();
|
||||
}
|
||||
pub fn draw_windows(&mut self, ctx: &egui::Context) {
|
||||
if self.search_menu.visible {
|
||||
self.search_menu
|
||||
.show(ctx, &mut self.tabs, &mut self.selected_tab);
|
||||
}
|
||||
if self.close_tab_confirm.visible {
|
||||
self.close_tab_confirm.show(ctx);
|
||||
}
|
||||
if self.refresh_confirm.visible {
|
||||
self.refresh_confirm.show(ctx);
|
||||
}
|
||||
if self.exit_confirm.visible {
|
||||
self.exit_confirm.show(ctx);
|
||||
}
|
||||
if self.exit_confirm.proceed {
|
||||
for tab in self.tabs.iter_mut() {
|
||||
tab.saved = true;
|
||||
}
|
||||
egui::Context::send_viewport_cmd(ctx, egui::ViewportCommand::Close);
|
||||
}
|
||||
if self.shortcuts_menu.visible {
|
||||
self.shortcuts_menu.show(ctx);
|
||||
}
|
||||
if self.settings_menu.visible {
|
||||
self.settings_menu.show(ctx);
|
||||
}
|
||||
if self.settings_menu.updated {
|
||||
self.theme = self.settings_menu.theme;
|
||||
}
|
||||
|
||||
self.handle_confirm();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2,14 +2,14 @@ use eframe::egui;
|
|||
use egui::Color32;
|
||||
use std::{cmp::min, fs, path::Path, path::PathBuf};
|
||||
|
||||
use crate::save_path;
|
||||
use crate::tools;
|
||||
use crate::Calcifer;
|
||||
use crate::DEFAULT_THEMES;
|
||||
use crate::MAX_TABS;
|
||||
use crate::TIME_LABELS;
|
||||
use crate::save_path;
|
||||
use tools::hex_str_to_color;
|
||||
use tools::file_tree;
|
||||
use tools::hex_str_to_color;
|
||||
|
||||
impl Calcifer {
|
||||
pub fn handle_confirm(&mut self) {
|
||||
|
@ -123,7 +123,7 @@ impl Calcifer {
|
|||
}
|
||||
|
||||
pub fn open_file(&mut self, path_option: Option<&Path>) {
|
||||
if let Some(path) = path_option.clone() {
|
||||
if let Some(path) = path_option {
|
||||
for (index, tab) in self.tabs.clone().iter().enumerate() {
|
||||
if tab.path == path {
|
||||
self.selected_tab = tools::TabNumber::from_index(index);
|
||||
|
@ -185,32 +185,34 @@ impl Calcifer {
|
|||
));
|
||||
result
|
||||
}
|
||||
|
||||
pub fn list_files(&mut self, ui: &mut egui::Ui, file: &file_tree::File, depth: isize, n_files: &mut usize) {
|
||||
|
||||
pub fn list_files(
|
||||
&mut self,
|
||||
ui: &mut egui::Ui,
|
||||
file: &file_tree::File,
|
||||
depth: isize,
|
||||
n_files: &mut usize,
|
||||
) {
|
||||
*n_files += 1;
|
||||
|
||||
|
||||
if let Some(folder_content) = &file.folder_content {
|
||||
let collapsing_response = egui::CollapsingHeader::new(file.name.clone())
|
||||
.default_open(depth > 0)
|
||||
.show(ui, |ui| {
|
||||
if !self.tree_dir_opened.contains(&file.name) {
|
||||
return
|
||||
return;
|
||||
}
|
||||
for deeper_file in folder_content {
|
||||
self.list_files(ui, &deeper_file, depth - 1, n_files);
|
||||
self.list_files(ui, deeper_file, depth - 1, n_files);
|
||||
}
|
||||
});
|
||||
if collapsing_response.fully_closed() {
|
||||
self.tree_dir_opened.retain(|s| s != &file.name);
|
||||
} else {
|
||||
if !self.tree_dir_opened.contains(&file.name) {
|
||||
self.tree_dir_opened.push(file.name.clone());
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if ui.button(&file.name).clicked() {
|
||||
self.open_file(Some(&file.path));
|
||||
} else if !self.tree_dir_opened.contains(&file.name) {
|
||||
self.tree_dir_opened.push(file.name.clone());
|
||||
}
|
||||
} else if ui.button(&file.name).clicked() {
|
||||
self.open_file(Some(&file.path));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
375
src/main.rs
375
src/main.rs
|
@ -6,8 +6,8 @@ use eframe::egui;
|
|||
use egui::FontFamily::Proportional;
|
||||
use egui::FontId;
|
||||
use egui::TextStyle::{Body, Button, Heading, Monospace, Small};
|
||||
use std::{ops::Range, path::PathBuf, sync::Arc, thread, time};
|
||||
use homedir::get_my_home;
|
||||
use std::{ops::Range, path::PathBuf, sync::Arc, thread, time};
|
||||
|
||||
use calcifer::code_editor::themes::DEFAULT_THEMES;
|
||||
|
||||
|
@ -17,248 +17,257 @@ const TITLE: &str = " debug";
|
|||
#[cfg(not(debug_assertions))]
|
||||
const TITLE: &str = "";
|
||||
|
||||
|
||||
const ALLOWED_FILE_EXTENSIONS: [&str; 6] = [
|
||||
"", "rs", "toml", "txt", "project", "sh",
|
||||
];
|
||||
const ALLOWED_FILE_EXTENSIONS: [&str; 6] = ["", "rs", "toml", "txt", "project", "sh"];
|
||||
const PROJECT_EXTENSION: &str = "project";
|
||||
const TERMINAL_HEIGHT: f32 = 200.0;
|
||||
const TERMINAL_RANGE: Range<f32> = 100.0..500.0;
|
||||
const RED: egui::Color32 = egui::Color32::from_rgb(235, 108, 99);
|
||||
const TIME_LABELS: [&str; 7] = [
|
||||
"input", "settings", "tree", "terminal", "tabs", "content", "windows",
|
||||
"input", "settings", "tree", "terminal", "tabs", "content", "windows",
|
||||
];
|
||||
const MAX_FPS: f32 = 30.0;
|
||||
const DISPLAY_PATH_DEPTH: usize = 3;
|
||||
const MAX_TABS: usize = 20;
|
||||
|
||||
fn main() -> Result<(), eframe::Error> {
|
||||
let icon_data = tools::load_icon().unwrap_or_default();
|
||||
let icon_data = tools::load_icon().unwrap_or_default();
|
||||
|
||||
let options = eframe::NativeOptions {
|
||||
viewport: egui::ViewportBuilder::default()
|
||||
.with_inner_size([1200.0, 800.0])
|
||||
.with_icon(Arc::new(icon_data)),
|
||||
..Default::default()
|
||||
};
|
||||
let options = eframe::NativeOptions {
|
||||
viewport: egui::ViewportBuilder::default()
|
||||
.with_inner_size([1200.0, 800.0])
|
||||
.with_icon(Arc::new(icon_data)),
|
||||
..Default::default()
|
||||
};
|
||||
|
||||
// Attempt to load previous state
|
||||
let app_state: tools::AppState = if save_path().exists() {
|
||||
match tools::load_state(save_path().as_path()) {
|
||||
Ok(app_state) => app_state,
|
||||
Err(_) => tools::AppState::default(),
|
||||
}
|
||||
} else {
|
||||
tools::AppState::default()
|
||||
};
|
||||
// Attempt to load previous state
|
||||
let app_state: tools::AppState = if save_path().exists() {
|
||||
match tools::load_state(save_path().as_path()) {
|
||||
Ok(app_state) => app_state,
|
||||
Err(_) => tools::AppState::default(),
|
||||
}
|
||||
} else {
|
||||
tools::AppState::default()
|
||||
};
|
||||
|
||||
eframe::run_native(
|
||||
&format!("Calcifer{}", TITLE),
|
||||
options,
|
||||
Box::new(move |_cc| Box::from(Calcifer::from_app_state(app_state))),
|
||||
)
|
||||
eframe::run_native(
|
||||
&format!("Calcifer{}", TITLE),
|
||||
options,
|
||||
Box::new(move |_cc| Box::from(Calcifer::from_app_state(app_state))),
|
||||
)
|
||||
}
|
||||
|
||||
struct Calcifer {
|
||||
selected_tab: tools::TabNumber,
|
||||
tabs: Vec<tools::Tab>,
|
||||
selected_tab: tools::TabNumber,
|
||||
tabs: Vec<tools::Tab>,
|
||||
|
||||
command: String,
|
||||
command_history: Vec<tools::CommandEntry>,
|
||||
command: String,
|
||||
command_history: Vec<tools::CommandEntry>,
|
||||
|
||||
theme: ColorTheme,
|
||||
font_size: f32,
|
||||
theme: ColorTheme,
|
||||
font_size: f32,
|
||||
|
||||
project_mode: bool,
|
||||
|
||||
home: PathBuf,
|
||||
tree_dir_opened: Vec<String>,
|
||||
file_tree: Option<tools::file_tree::File>,
|
||||
|
||||
tree_visible: bool,
|
||||
profiler_visible: bool,
|
||||
terminal_visible: bool,
|
||||
project_mode: bool,
|
||||
|
||||
close_tab_confirm: tools::confirm::ConfirmWindow,
|
||||
tab_to_close: usize,
|
||||
refresh_confirm: tools::confirm::ConfirmWindow,
|
||||
exit_confirm: tools::confirm::ConfirmWindow,
|
||||
home: PathBuf,
|
||||
tree_dir_opened: Vec<String>,
|
||||
file_tree: Option<tools::file_tree::File>,
|
||||
|
||||
search_menu: tools::search::SearchWindow,
|
||||
settings_menu: tools::settings::SettingsWindow,
|
||||
shortcuts_menu: tools::shortcuts::ShortcutsWindow,
|
||||
tree_visible: bool,
|
||||
profiler_visible: bool,
|
||||
terminal_visible: bool,
|
||||
|
||||
time_watch: Vec<f32>,
|
||||
next_frame: time::Instant,
|
||||
close_tab_confirm: tools::confirm::ConfirmWindow,
|
||||
tab_to_close: usize,
|
||||
refresh_confirm: tools::confirm::ConfirmWindow,
|
||||
exit_confirm: tools::confirm::ConfirmWindow,
|
||||
|
||||
search_menu: tools::search::SearchWindow,
|
||||
settings_menu: tools::settings::SettingsWindow,
|
||||
shortcuts_menu: tools::shortcuts::ShortcutsWindow,
|
||||
|
||||
time_watch: Vec<f32>,
|
||||
next_frame: time::Instant,
|
||||
}
|
||||
|
||||
impl Default for Calcifer {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
selected_tab: tools::TabNumber::from_index(0),
|
||||
tabs: vec![tools::Tab::default()],
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
selected_tab: tools::TabNumber::from_index(0),
|
||||
tabs: vec![tools::Tab::default()],
|
||||
|
||||
command: String::new(),
|
||||
command_history: Vec::new(),
|
||||
command: String::new(),
|
||||
command_history: Vec::new(),
|
||||
|
||||
theme: DEFAULT_THEMES[0],
|
||||
font_size: 14.0,
|
||||
theme: DEFAULT_THEMES[0],
|
||||
font_size: 14.0,
|
||||
|
||||
project_mode: true,
|
||||
|
||||
home: get_my_home().unwrap().unwrap(),
|
||||
tree_dir_opened: vec![],
|
||||
file_tree: None,
|
||||
|
||||
tree_visible: false,
|
||||
profiler_visible: false,
|
||||
terminal_visible: false,
|
||||
project_mode: true,
|
||||
|
||||
close_tab_confirm: tools::confirm::ConfirmWindow::new(
|
||||
"You have some unsaved changes, Do you still want to close this document ?",
|
||||
"Confirm Close",
|
||||
),
|
||||
tab_to_close: 0,
|
||||
refresh_confirm: tools::confirm::ConfirmWindow::new(
|
||||
"You have some unsaved changes, Do you still want to refresh this document ?",
|
||||
"Confirm Refresh",
|
||||
),
|
||||
exit_confirm: tools::confirm::ConfirmWindow::new("", "Confirm Exit"),
|
||||
home: get_my_home().unwrap().unwrap(),
|
||||
tree_dir_opened: vec![],
|
||||
file_tree: None,
|
||||
|
||||
search_menu: tools::search::SearchWindow::default(),
|
||||
settings_menu: tools::settings::SettingsWindow::new(DEFAULT_THEMES[0]),
|
||||
shortcuts_menu: tools::shortcuts::ShortcutsWindow::new(),
|
||||
tree_visible: false,
|
||||
profiler_visible: false,
|
||||
terminal_visible: false,
|
||||
|
||||
time_watch: vec![0.0; TIME_LABELS.len()],
|
||||
next_frame: time::Instant::now(),
|
||||
}
|
||||
}
|
||||
close_tab_confirm: tools::confirm::ConfirmWindow::new(
|
||||
"You have some unsaved changes, Do you still want to close this document ?",
|
||||
"Confirm Close",
|
||||
),
|
||||
tab_to_close: 0,
|
||||
refresh_confirm: tools::confirm::ConfirmWindow::new(
|
||||
"You have some unsaved changes, Do you still want to refresh this document ?",
|
||||
"Confirm Refresh",
|
||||
),
|
||||
exit_confirm: tools::confirm::ConfirmWindow::new("", "Confirm Exit"),
|
||||
|
||||
search_menu: tools::search::SearchWindow::default(),
|
||||
settings_menu: tools::settings::SettingsWindow::new(DEFAULT_THEMES[0]),
|
||||
shortcuts_menu: tools::shortcuts::ShortcutsWindow::new(),
|
||||
|
||||
time_watch: vec![0.0; TIME_LABELS.len()],
|
||||
next_frame: time::Instant::now(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl eframe::App for Calcifer {
|
||||
fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
|
||||
thread::sleep(time::Duration::from_secs_f32(
|
||||
((1.0 / MAX_FPS) - self.next_frame.elapsed().as_secs_f32()).max(0.0),
|
||||
));
|
||||
self.next_frame = time::Instant::now();
|
||||
fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
|
||||
thread::sleep(time::Duration::from_secs_f32(
|
||||
((1.0 / MAX_FPS) - self.next_frame.elapsed().as_secs_f32()).max(0.0),
|
||||
));
|
||||
self.next_frame = time::Instant::now();
|
||||
|
||||
let mut watch = time::Instant::now();
|
||||
let mut watch = time::Instant::now();
|
||||
|
||||
let mut style = (*ctx.style()).clone();
|
||||
style.text_styles = [
|
||||
(Heading, FontId::new(self.font_size * 1.6, Proportional)),
|
||||
(Body, FontId::new(self.font_size, Proportional)),
|
||||
(Monospace, FontId::new(self.font_size, Proportional)),
|
||||
(Button, FontId::new(self.font_size, Proportional)),
|
||||
(Small, FontId::new(self.font_size, Proportional)),
|
||||
]
|
||||
.into();
|
||||
ctx.set_style(style);
|
||||
let mut style = (*ctx.style()).clone();
|
||||
style.text_styles = [
|
||||
(Heading, FontId::new(self.font_size * 1.6, Proportional)),
|
||||
(Body, FontId::new(self.font_size, Proportional)),
|
||||
(Monospace, FontId::new(self.font_size, Proportional)),
|
||||
(Button, FontId::new(self.font_size, Proportional)),
|
||||
(Small, FontId::new(self.font_size, Proportional)),
|
||||
]
|
||||
.into();
|
||||
ctx.set_style(style);
|
||||
|
||||
if ctx.input(|i| i.key_pressed(egui::Key::R) && i.modifiers.ctrl)
|
||||
&& !self.refresh_confirm.visible
|
||||
{
|
||||
if self.tabs[self.selected_tab.to_index()].saved {
|
||||
self.tabs[self.selected_tab.to_index()].refresh();
|
||||
} else {
|
||||
self.refresh_confirm.ask();
|
||||
}
|
||||
}
|
||||
if ctx.input(|i| i.key_pressed(egui::Key::R) && i.modifiers.ctrl)
|
||||
&& !self.refresh_confirm.visible
|
||||
{
|
||||
if self.tabs[self.selected_tab.to_index()].saved {
|
||||
self.tabs[self.selected_tab.to_index()].refresh();
|
||||
} else {
|
||||
self.refresh_confirm.ask();
|
||||
}
|
||||
}
|
||||
|
||||
if ctx.input(|i| i.key_pressed(egui::Key::S) && i.modifiers.ctrl) {
|
||||
self.handle_save_file(self.save_tab());
|
||||
}
|
||||
if ctx.input(|i| i.key_pressed(egui::Key::S) && i.modifiers.ctrl) {
|
||||
self.handle_save_file(self.save_tab());
|
||||
}
|
||||
|
||||
if ctx.input(|i| i.key_pressed(egui::Key::S) && i.modifiers.ctrl && i.modifiers.shift) {
|
||||
self.handle_save_file(self.save_tab_as());
|
||||
}
|
||||
if ctx.input(|i| i.key_pressed(egui::Key::S) && i.modifiers.ctrl && i.modifiers.shift) {
|
||||
self.handle_save_file(self.save_tab_as());
|
||||
}
|
||||
|
||||
if ctx.input(|i| i.key_pressed(egui::Key::ArrowLeft) && i.modifiers.alt) {
|
||||
self.move_through_tabs(false);
|
||||
}
|
||||
if ctx.input(|i| i.key_pressed(egui::Key::ArrowLeft) && i.modifiers.alt) {
|
||||
self.move_through_tabs(false);
|
||||
}
|
||||
|
||||
if ctx.input(|i| i.key_pressed(egui::Key::ArrowRight) && i.modifiers.alt) {
|
||||
self.move_through_tabs(true);
|
||||
}
|
||||
if ctx.input(|i| i.key_pressed(egui::Key::ArrowRight) && i.modifiers.alt) {
|
||||
self.move_through_tabs(true);
|
||||
}
|
||||
|
||||
if ctx.input(|i| i.zoom_delta() > 1.0) {
|
||||
self.font_size = (self.font_size * 1.1).min(30.0);
|
||||
}
|
||||
if ctx.input(|i| i.zoom_delta() > 1.0) {
|
||||
self.font_size = (self.font_size * 1.1).min(30.0);
|
||||
}
|
||||
|
||||
if ctx.input(|i| i.zoom_delta() < 1.0) {
|
||||
self.font_size = (self.font_size / 1.1).max(10.0);
|
||||
}
|
||||
if ctx.input(|i| i.zoom_delta() < 1.0) {
|
||||
self.font_size = (self.font_size / 1.1).max(10.0);
|
||||
}
|
||||
|
||||
if ctx.input(|i| i.key_pressed(egui::Key::F) && i.modifiers.ctrl) {
|
||||
self.search_menu.visible = !self.search_menu.visible;
|
||||
self.search_menu.initialized = !self.search_menu.visible;
|
||||
}
|
||||
if ctx.input(|i| i.key_pressed(egui::Key::F) && i.modifiers.ctrl) {
|
||||
self.search_menu.visible = !self.search_menu.visible;
|
||||
self.search_menu.initialized = !self.search_menu.visible;
|
||||
}
|
||||
|
||||
if ctx.input(|i| i.viewport().close_requested()) {
|
||||
let mut unsaved_tabs: Vec<usize> = vec![];
|
||||
for (index, tab) in self.tabs.iter().enumerate() {
|
||||
if !tab.saved {
|
||||
unsaved_tabs.push(index);
|
||||
}
|
||||
}
|
||||
if !unsaved_tabs.is_empty() {
|
||||
let mut unsaved_tabs_names: String = "".to_string();
|
||||
for index in unsaved_tabs.iter() {
|
||||
unsaved_tabs_names.push_str(&self.tabs[*index].get_name());
|
||||
}
|
||||
egui::Context::send_viewport_cmd(ctx, egui::ViewportCommand::CancelClose);
|
||||
self.exit_confirm.prompt = format!(
|
||||
"You have some unsaved changes :\n{}\nDo you still want to exit ?",
|
||||
unsaved_tabs_names
|
||||
);
|
||||
self.exit_confirm.ask();
|
||||
}
|
||||
}
|
||||
if ctx.input(|i| i.viewport().close_requested()) {
|
||||
let mut unsaved_tabs: Vec<usize> = vec![];
|
||||
for (index, tab) in self.tabs.iter().enumerate() {
|
||||
if !tab.saved {
|
||||
unsaved_tabs.push(index);
|
||||
}
|
||||
}
|
||||
if !unsaved_tabs.is_empty() {
|
||||
let mut unsaved_tabs_names: String = "".to_string();
|
||||
for index in unsaved_tabs.iter() {
|
||||
unsaved_tabs_names.push_str(&self.tabs[*index].get_name());
|
||||
}
|
||||
egui::Context::send_viewport_cmd(ctx, egui::ViewportCommand::CancelClose);
|
||||
self.exit_confirm.prompt = format!(
|
||||
"You have some unsaved changes :\n{}\nDo you still want to exit ?",
|
||||
unsaved_tabs_names
|
||||
);
|
||||
self.exit_confirm.ask();
|
||||
}
|
||||
}
|
||||
|
||||
self.time_watch[0] = watch.elapsed().as_micros() as f32 / 1000.0;
|
||||
watch = time::Instant::now();
|
||||
self.time_watch[0] = watch.elapsed().as_micros() as f32 / 1000.0;
|
||||
watch = time::Instant::now();
|
||||
|
||||
self.draw_settings(ctx);
|
||||
self.draw_settings(ctx);
|
||||
|
||||
self.time_watch[1] = watch.elapsed().as_micros() as f32 / 1000.0;
|
||||
watch = time::Instant::now();
|
||||
self.time_watch[1] = watch.elapsed().as_micros() as f32 / 1000.0;
|
||||
watch = time::Instant::now();
|
||||
|
||||
self.draw_tree_panel(ctx);
|
||||
self.draw_tree_panel(ctx);
|
||||
|
||||
self.time_watch[2] = watch.elapsed().as_micros() as f32 / 1000.0;
|
||||
watch = time::Instant::now();
|
||||
self.time_watch[2] = watch.elapsed().as_micros() as f32 / 1000.0;
|
||||
watch = time::Instant::now();
|
||||
|
||||
self.draw_bottom_tray(ctx);
|
||||
self.draw_terminal_panel(ctx);
|
||||
self.draw_bottom_tray(ctx);
|
||||
self.draw_terminal_panel(ctx);
|
||||
|
||||
self.time_watch[3] = watch.elapsed().as_micros() as f32 / 1000.0;
|
||||
watch = time::Instant::now();
|
||||
self.time_watch[3] = watch.elapsed().as_micros() as f32 / 1000.0;
|
||||
watch = time::Instant::now();
|
||||
|
||||
self.draw_tab_panel(ctx);
|
||||
self.draw_tab_panel(ctx);
|
||||
|
||||
self.time_watch[4] = watch.elapsed().as_micros() as f32 / 1000.0;
|
||||
watch = time::Instant::now();
|
||||
self.time_watch[4] = watch.elapsed().as_micros() as f32 / 1000.0;
|
||||
watch = time::Instant::now();
|
||||
|
||||
self.draw_content_panel(ctx);
|
||||
self.draw_content_panel(ctx);
|
||||
|
||||
self.time_watch[5] = watch.elapsed().as_micros() as f32 / 1000.0;
|
||||
watch = time::Instant::now();
|
||||
self.time_watch[5] = watch.elapsed().as_micros() as f32 / 1000.0;
|
||||
watch = time::Instant::now();
|
||||
|
||||
self.draw_windows(ctx);
|
||||
self.draw_windows(ctx);
|
||||
|
||||
self.time_watch[6] = watch.elapsed().as_micros() as f32 / 1000.0;
|
||||
}
|
||||
self.time_watch[6] = watch.elapsed().as_micros() as f32 / 1000.0;
|
||||
}
|
||||
|
||||
fn on_exit(&mut self, _gl: std::option::Option<&eframe::glow::Context>) {
|
||||
self.save_state();
|
||||
}
|
||||
fn on_exit(&mut self, _gl: std::option::Option<&eframe::glow::Context>) {
|
||||
self.save_state();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
fn save_path() -> PathBuf {
|
||||
if TITLE.is_empty() {
|
||||
get_my_home().unwrap().unwrap().as_path().join(".calcifer").join("save.json").to_path_buf()
|
||||
} else {
|
||||
get_my_home().unwrap().unwrap().as_path().join(".calcifer").join("debug").join("save.json").to_path_buf()
|
||||
}
|
||||
}
|
||||
if TITLE.is_empty() {
|
||||
get_my_home()
|
||||
.unwrap()
|
||||
.unwrap()
|
||||
.as_path()
|
||||
.join(".calcifer")
|
||||
.join("save.json")
|
||||
.to_path_buf()
|
||||
} else {
|
||||
get_my_home()
|
||||
.unwrap()
|
||||
.unwrap()
|
||||
.as_path()
|
||||
.join(".calcifer")
|
||||
.join("debug")
|
||||
.join("save.json")
|
||||
.to_path_buf()
|
||||
}
|
||||
}
|
||||
|
|
|
@ -14,7 +14,6 @@ pub struct File {
|
|||
pub folder_open: bool,
|
||||
}
|
||||
|
||||
|
||||
impl File {
|
||||
pub fn new_file(name: String, path: PathBuf) -> Self {
|
||||
Self {
|
||||
|
@ -26,7 +25,6 @@ impl File {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
pub fn generate_file_tree(path: &Path, depth: isize) -> Option<File> {
|
||||
if let Some(file_name) = path.file_name() {
|
||||
if file_name.to_string_lossy().starts_with('.') {
|
||||
|
@ -52,7 +50,10 @@ pub fn generate_file_tree(path: &Path, depth: isize) -> Option<File> {
|
|||
|
||||
match fs::read_dir(path) {
|
||||
Err(err) => {
|
||||
return Some(File::new_file(format!("Error reading directory: {}", err), path.to_path_buf()));
|
||||
Some(File::new_file(
|
||||
format!("Error reading directory: {}", err),
|
||||
path.to_path_buf(),
|
||||
))
|
||||
}
|
||||
Ok(entries) => {
|
||||
let mut paths: Vec<Result<fs::DirEntry, io::Error>> = entries
|
||||
|
@ -60,7 +61,7 @@ pub fn generate_file_tree(path: &Path, depth: isize) -> Option<File> {
|
|||
.collect();
|
||||
|
||||
paths.sort_by(|a, b| match (a, b) {
|
||||
(Ok(entry_a), Ok(entry_b)) => tools::sort_directories_first(&entry_a, &entry_b),
|
||||
(Ok(entry_a), Ok(entry_b)) => tools::sort_directories_first(entry_a, entry_b),
|
||||
(Err(_), Ok(_)) => std::cmp::Ordering::Greater,
|
||||
(Ok(_), Err(_)) => std::cmp::Ordering::Less,
|
||||
(Err(_), Err(_)) => std::cmp::Ordering::Equal,
|
||||
|
@ -83,17 +84,17 @@ pub fn generate_file_tree(path: &Path, depth: isize) -> Option<File> {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if folder_content.is_empty() {
|
||||
return None;
|
||||
}
|
||||
|
||||
return Some(File {
|
||||
Some(File {
|
||||
name,
|
||||
path: path.to_path_buf(),
|
||||
folder_content: Some(folder_content),
|
||||
folder_open: false,
|
||||
});
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
132
src/tools/mod.rs
132
src/tools/mod.rs
|
@ -5,16 +5,16 @@ use egui::Color32;
|
|||
use image::GenericImageView;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::{
|
||||
cmp::Ordering, error::Error, ffi::OsStr, fs, fs::read_to_string, fs::OpenOptions, io::Write,
|
||||
path::Component, path::Path, path::PathBuf,
|
||||
cmp::Ordering, error::Error, ffi::OsStr, fs, fs::read_to_string, fs::OpenOptions, io::Write,
|
||||
path::Component, path::Path, path::PathBuf,
|
||||
};
|
||||
|
||||
//my tools;
|
||||
pub mod confirm;
|
||||
pub mod file_tree;
|
||||
pub mod search;
|
||||
pub mod settings;
|
||||
pub mod shortcuts;
|
||||
pub mod file_tree;
|
||||
|
||||
#[cfg(target_os = "linux")]
|
||||
pub mod terminal;
|
||||
|
@ -31,99 +31,99 @@ pub use tabs::*;
|
|||
|
||||
#[derive(Serialize, Deserialize, Debug, PartialEq, Default)]
|
||||
pub struct AppState {
|
||||
pub tabs: Vec<PathBuf>,
|
||||
pub theme: usize,
|
||||
pub tabs: Vec<PathBuf>,
|
||||
pub theme: usize,
|
||||
}
|
||||
|
||||
pub fn save_state(state: &AppState, file_path: &Path) -> Result<(), std::io::Error> {
|
||||
let serialized_state = serde_json::to_string(state)?;
|
||||
let serialized_state = serde_json::to_string(state)?;
|
||||
|
||||
if let Some(parent_dir) = file_path.parent() {
|
||||
fs::create_dir_all(parent_dir)?;
|
||||
}
|
||||
if let Some(parent_dir) = file_path.parent() {
|
||||
fs::create_dir_all(parent_dir)?;
|
||||
}
|
||||
|
||||
let mut file = OpenOptions::new()
|
||||
.write(true)
|
||||
.create(true)
|
||||
.truncate(true)
|
||||
.open(file_path)?;
|
||||
let mut file = OpenOptions::new()
|
||||
.write(true)
|
||||
.create(true)
|
||||
.truncate(true)
|
||||
.open(file_path)?;
|
||||
|
||||
file.write_all(serialized_state.as_bytes())?;
|
||||
file.write_all(serialized_state.as_bytes())?;
|
||||
|
||||
println!("Saved state at {}", file_path.display());
|
||||
println!("Saved state at {}", file_path.display());
|
||||
|
||||
Ok(())
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn load_state(file_path: &Path) -> Result<AppState, std::io::Error> {
|
||||
let serialized_state = read_to_string(file_path)?;
|
||||
let serialized_state = read_to_string(file_path)?;
|
||||
|
||||
Ok(serde_json::from_str(&serialized_state)?)
|
||||
Ok(serde_json::from_str(&serialized_state)?)
|
||||
}
|
||||
|
||||
pub fn load_icon() -> Result<egui::IconData, Box<dyn Error>> {
|
||||
let (icon_rgba, icon_width, icon_height) = {
|
||||
let icon = include_bytes!("../../assets/icon.png");
|
||||
let image = image::load_from_memory(icon)?;
|
||||
let rgba = image.clone().into_rgba8().to_vec();
|
||||
let (width, height) = image.dimensions();
|
||||
(rgba, width, height)
|
||||
};
|
||||
let (icon_rgba, icon_width, icon_height) = {
|
||||
let icon = include_bytes!("../../assets/icon.png");
|
||||
let image = image::load_from_memory(icon)?;
|
||||
let rgba = image.clone().into_rgba8().to_vec();
|
||||
let (width, height) = image.dimensions();
|
||||
(rgba, width, height)
|
||||
};
|
||||
|
||||
Ok(egui::IconData {
|
||||
rgba: icon_rgba,
|
||||
width: icon_width,
|
||||
height: icon_height,
|
||||
})
|
||||
Ok(egui::IconData {
|
||||
rgba: icon_rgba,
|
||||
width: icon_width,
|
||||
height: icon_height,
|
||||
})
|
||||
}
|
||||
|
||||
pub fn to_syntax(language: &str) -> Syntax {
|
||||
match language {
|
||||
"py" => Syntax::python(),
|
||||
"rs" => Syntax::rust(),
|
||||
_ => Syntax::shell(),
|
||||
}
|
||||
match language {
|
||||
"py" => Syntax::python(),
|
||||
"rs" => Syntax::rust(),
|
||||
_ => Syntax::shell(),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn sort_directories_first(a: &std::fs::DirEntry, b: &std::fs::DirEntry) -> Ordering {
|
||||
let a_is_dir = a.path().is_dir();
|
||||
let b_is_dir = b.path().is_dir();
|
||||
let a_is_dir = a.path().is_dir();
|
||||
let b_is_dir = b.path().is_dir();
|
||||
|
||||
// Directories come first, then files
|
||||
if a_is_dir && !b_is_dir {
|
||||
Ordering::Less
|
||||
} else if !a_is_dir && b_is_dir {
|
||||
Ordering::Greater
|
||||
} else {
|
||||
// Both are either directories or files, sort alphabetically
|
||||
a.path().cmp(&b.path())
|
||||
}
|
||||
// Directories come first, then files
|
||||
if a_is_dir && !b_is_dir {
|
||||
Ordering::Less
|
||||
} else if !a_is_dir && b_is_dir {
|
||||
Ordering::Greater
|
||||
} else {
|
||||
// Both are either directories or files, sort alphabetically
|
||||
a.path().cmp(&b.path())
|
||||
}
|
||||
}
|
||||
|
||||
pub fn format_path(path: &Path) -> String {
|
||||
let components: Vec<&OsStr> = path
|
||||
.components()
|
||||
.rev()
|
||||
.take(DISPLAY_PATH_DEPTH)
|
||||
.filter_map(|component| match component {
|
||||
Component::RootDir | Component::CurDir => None,
|
||||
_ => Some(component.as_os_str()),
|
||||
})
|
||||
.collect();
|
||||
let components: Vec<&OsStr> = path
|
||||
.components()
|
||||
.rev()
|
||||
.take(DISPLAY_PATH_DEPTH)
|
||||
.filter_map(|component| match component {
|
||||
Component::RootDir | Component::CurDir => None,
|
||||
_ => Some(component.as_os_str()),
|
||||
})
|
||||
.collect();
|
||||
|
||||
format!(
|
||||
"{}>",
|
||||
components
|
||||
.iter()
|
||||
.rev()
|
||||
.map(|&c| c.to_string_lossy())
|
||||
.collect::<Vec<_>>()
|
||||
.join("/")
|
||||
)
|
||||
format!(
|
||||
"{}>",
|
||||
components
|
||||
.iter()
|
||||
.rev()
|
||||
.map(|&c| c.to_string_lossy())
|
||||
.collect::<Vec<_>>()
|
||||
.join("/")
|
||||
)
|
||||
}
|
||||
|
||||
pub fn hex_str_to_color(hex_str: &str) -> Color32 {
|
||||
Color32::from_hex(hex_str).unwrap_or_else(|_| Color32::BLACK)
|
||||
Color32::from_hex(hex_str).unwrap_or_else(|_| Color32::BLACK)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
|
|
|
@ -1,57 +1,50 @@
|
|||
// Placeholder
|
||||
|
||||
pub struct Line {
|
||||
pub text: String,
|
||||
pub error: bool,
|
||||
pub text: String,
|
||||
pub error: bool,
|
||||
}
|
||||
|
||||
impl Line {
|
||||
fn output(text: String) -> Self {
|
||||
Self {
|
||||
text: remove_line_break(text),
|
||||
error: false,
|
||||
}
|
||||
}
|
||||
fn error(text: String) -> Self {
|
||||
Self {
|
||||
text: remove_line_break(text),
|
||||
error: true,
|
||||
}
|
||||
}
|
||||
fn error(text: String) -> Self {
|
||||
Self {
|
||||
text: remove_line_break(text),
|
||||
error: true,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub struct CommandEntry {
|
||||
pub env: String,
|
||||
pub command: String,
|
||||
pub result: Vec<Line>,
|
||||
pub env: String,
|
||||
pub command: String,
|
||||
pub result: Vec<Line>,
|
||||
}
|
||||
|
||||
impl CommandEntry {
|
||||
pub fn new(env: String, command: String) -> Self {
|
||||
CommandEntry {
|
||||
env,
|
||||
command,
|
||||
result: vec![Line::error("General Kenobi".to_string())],
|
||||
}
|
||||
}
|
||||
pub fn new(env: String, command: String) -> Self {
|
||||
CommandEntry {
|
||||
env,
|
||||
command,
|
||||
result: vec![Line::error("General Kenobi".to_string())],
|
||||
}
|
||||
}
|
||||
|
||||
pub fn update(&mut self) {
|
||||
return
|
||||
}
|
||||
pub fn update(&mut self) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
pub fn send_command(command: String) -> CommandEntry {
|
||||
return CommandEntry::new("windows>".to_string(), "hello there".to_string());
|
||||
pub fn send_command(_command: String) -> CommandEntry {
|
||||
return CommandEntry::new("windows>".to_string(), "hello there".to_string());
|
||||
}
|
||||
|
||||
|
||||
fn remove_line_break(input: String) -> String {
|
||||
let mut text = input.clone();
|
||||
while text.ends_with('\n') {
|
||||
text.pop();
|
||||
if text.ends_with('\r') {
|
||||
text.pop();
|
||||
}
|
||||
}
|
||||
text
|
||||
let mut text = input.clone();
|
||||
while text.ends_with('\n') {
|
||||
text.pop();
|
||||
if text.ends_with('\r') {
|
||||
text.pop();
|
||||
}
|
||||
}
|
||||
text
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue