Added abillity to edit profiles, Also color choice on the profile icon
Moorly CI / windows-build (push) Successful in 2m49s
Moorly CI / linux-build (push) Successful in 3m33s

This commit is contained in:
Squid committed 2026-11-07 23:09:05 +01:00
1 parent dadf0d5b4d
commit 46b35567c5
1 file changed
+453 -20
+453 -20
View File
@@ -518,6 +518,50 @@ impl ProfileKind {
}
}
/// Icon shown next to a profile, in the profile list and command palette.
fn profile_glyph(kind: ProfileKind, color: Color) -> Element<'static, Message> {
match kind {
ProfileKind::Ssh => container(text(">_").size(9).font(Font::MONOSPACE).color(color))
.width(18)
.height(16)
.align_x(Alignment::Center)
.align_y(Alignment::Center)
.style(move |_| container::Style {
border: Border {
color,
width: 1.0,
radius: 3.0.into(),
},
..container::Style::default()
})
.into(),
ProfileKind::Terminal => column![
container(space::horizontal())
.width(16)
.height(10)
.style(move |_| container::Style {
border: Border {
color,
width: 1.5,
radius: 2.0.into(),
},
..container::Style::default()
}),
container(space::horizontal())
.width(6)
.height(2)
.style(move |_| container::Style {
background: Some(color.into()),
..container::Style::default()
}),
]
.spacing(1)
.align_x(Alignment::Center)
.into(),
ProfileKind::PowerShell => text("👤").size(13).into(),
}
}
#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, Serialize, Deserialize)]
#[serde(rename_all = "lowercase")]
enum SessionEnd {
@@ -592,11 +636,12 @@ struct Profile {
password: String,
start_path: String,
private_key: String,
glyph_color: Color,
/// File this profile was loaded from or saved to.
file: Option<PathBuf>,
}
/// Editable state of the "add profile" dialog.
/// Editable state of the add/edit profile dialog.
#[derive(Debug, Clone)]
struct ProfileDraft {
name: String,
@@ -611,6 +656,10 @@ struct ProfileDraft {
password_visible: bool,
start_path: String,
private_key: String,
glyph_color: Color,
color_picker_open: bool,
/// Folder and index of the profile being edited.
editing: Option<(usize, usize)>,
}
impl ProfileDraft {
@@ -628,6 +677,29 @@ impl ProfileDraft {
password_visible: false,
start_path: default_start_path(),
private_key: String::new(),
glyph_color: Color::WHITE,
color_picker_open: false,
editing: None,
}
}
fn from_profile(folder: usize, profile: &Profile, profile_index: usize) -> Self {
Self {
name: profile.name.clone(),
folder,
kind: profile.kind,
session_end: profile.session_end,
host: profile.host.clone(),
port: profile.port.clone(),
username: profile.username.clone(),
auth: profile.auth,
password: profile.password.clone(),
password_visible: false,
start_path: profile.start_path.clone(),
private_key: profile.private_key.clone(),
glyph_color: profile.glyph_color,
color_picker_open: false,
editing: Some((folder, profile_index)),
}
}
@@ -851,10 +923,16 @@ struct ProfileFile {
start_path: String,
#[serde(default)]
private_key: String,
#[serde(default = "default_profile_glyph_color")]
glyph_color: String,
#[serde(default, skip_serializing_if = "Option::is_none")]
trash: Option<TrashInfo>,
}
fn default_profile_glyph_color() -> String {
color_to_hex(Color::WHITE)
}
/// Metadata added to a profile file after it is moved to `.trash`.
#[derive(Debug, Clone, Default, Serialize, Deserialize)]
struct TrashInfo {
@@ -935,6 +1013,7 @@ impl ProfileFile {
password: profile.password.clone(),
start_path: profile.start_path.clone(),
private_key: profile.private_key.clone(),
glyph_color: color_to_hex(profile.glyph_color),
trash: None,
}
}
@@ -951,6 +1030,7 @@ impl ProfileFile {
password: self.password,
start_path: self.start_path,
private_key: self.private_key,
glyph_color: color_from_hex(&self.glyph_color).unwrap_or(Color::WHITE),
file: None,
}
}
@@ -1003,6 +1083,7 @@ enum Command {
MoveToWindow(window::Id),
FocusWindow(window::Id),
FocusTab(window::Id, Tab),
SelectProfile { folder: usize, profile: usize },
Exit,
}
@@ -1016,6 +1097,12 @@ impl Command {
Self::Move => "Move".to_owned(),
Self::MoveToWindow(id) | Self::FocusWindow(id) => window_title(state, *id),
Self::FocusTab(_, tab) => tab.title(),
Self::SelectProfile { folder, profile } => state
.profile_folders
.get(*folder)
.and_then(|folder| folder.profiles.get(*profile))
.map(|profile| profile.name.clone())
.unwrap_or_default(),
Self::Exit => "Exit".to_owned(),
}
}
@@ -1032,16 +1119,50 @@ impl Command {
Self::FocusTab(id, _) => {
format!("Focuses this tab in {}", window_title(state, *id))
}
Self::SelectProfile { folder, .. } => {
let folder = state
.profile_folders
.get(*folder)
.map(|folder| folder.path.as_str())
.unwrap_or_default();
format!("Profile in {folder}")
}
Self::Exit => "Quits the program".to_owned(),
}
}
fn profile_glyph(&self, state: &Moorly) -> Option<(ProfileKind, Color)> {
match self {
Self::SelectProfile { folder, profile } => state
.profile_folders
.get(*folder)
.and_then(|folder| folder.profiles.get(*profile))
.map(|profile| (profile.kind, profile.glyph_color)),
_ => None,
}
}
fn matching(state: &Moorly, source: window::Id, query: &str) -> Vec<Self> {
let mut commands: Vec<Self> = Self::ALL
.into_iter()
.filter(|command| fuzzy_match(&command.label(state), query))
.collect();
for (folder_index, folder) in state.profile_folders.iter().enumerate() {
commands.extend(
folder
.profiles
.iter()
.enumerate()
.filter(|(_, profile)| fuzzy_match(&profile.name, query))
.map(|(profile_index, _)| Self::SelectProfile {
folder: folder_index,
profile: profile_index,
}),
);
}
for id in &state.window_order {
let Some(window_state) = state.windows.get(id) else {
continue;
@@ -1202,6 +1323,7 @@ struct Moorly {
trash_checked: HashSet<usize>,
transfer: Option<TransferDialog>,
confirm_delete: bool,
confirm_purge_trash: bool,
hovered_folder: Option<usize>,
add_menu_open: bool,
folder_dialog: Option<String>,
@@ -2624,6 +2746,52 @@ fn restore_trash_items(state: &mut Moorly) {
);
}
fn purge_trash_items(state: &mut Moorly) {
if state.trash_checked.is_empty() {
return;
}
let entries = state.trash_entries.clone();
let checked = state.trash_checked.clone();
let mut remaining_folders = Vec::new();
let mut removed = 0usize;
for (index, entry) in entries.iter().enumerate() {
if checked.contains(&index) {
if let TrashEntry::Profile { file, .. } = entry
&& !cfg!(test)
{
let _ = std::fs::remove_file(file);
}
removed += 1;
} else if let TrashEntry::Folder(folder) = entry {
remaining_folders.push(folder.clone());
}
}
save_trash_folders(&remaining_folders);
state.trash_entries = entries
.into_iter()
.enumerate()
.filter(|(index, _)| !checked.contains(index))
.map(|(_, entry)| entry)
.collect();
state.trash_checked.clear();
state.confirm_purge_trash = false;
let message = if removed == 1 {
"Deleted 1 item permanently.".to_owned()
} else {
format!("Deleted {removed} items permanently.")
};
state.notifications.add(
notifications::Notification::new(notifications::NotificationKind::Success, message)
.title("Deleted"),
);
}
fn apply_theme_choice(state: &mut Moorly, choice: ThemeChoice) {
match &choice {
ThemeChoice::BuiltIn(preference) => {
@@ -3003,6 +3171,7 @@ impl Default for Moorly {
trash_checked: HashSet::new(),
transfer: None,
confirm_delete: false,
confirm_purge_trash: false,
hovered_folder: None,
add_menu_open: false,
folder_dialog: None,
@@ -3076,11 +3245,18 @@ enum Message {
folder: usize,
profile: usize,
},
EditProfile {
folder: usize,
profile: usize,
},
ToggleChecked(Selection),
DeselectAll,
RestoreFromTrash,
ToggleTrashChecked(usize),
RestoreSelected,
PurgeTrashSelected,
ConfirmPurgeTrash,
CancelPurgeTrash,
CloseTrash,
CopyChecked,
MoveChecked,
@@ -3103,6 +3279,9 @@ enum Message {
TogglePasswordVisibility,
ProfileStartPathChanged(String),
ProfilePrivateKeyChanged(String),
OpenProfileColorPicker,
SubmitProfileColor(Color),
CancelProfileColorPicker,
OpenDirectoryPicker,
OpenPrivateKeyPicker,
DirPickerEnter(PathBuf),
@@ -3355,6 +3534,15 @@ fn update(state: &mut Moorly, message: Message) -> Task<Message> {
window::gain_focus(id),
]);
}
Command::SelectProfile { folder, profile } => {
if let Some(folder_state) = state.profile_folders.get_mut(folder)
&& folder_state.profiles.get(profile).is_some()
{
folder_state.expanded = true;
state.selected = Some(Selection::Profile { folder, profile });
return update(state, Message::SelectTab(window, Tab::Start));
}
}
Command::Exit => {
return update(state, Message::Quit);
}
@@ -3728,6 +3916,19 @@ fn update(state: &mut Moorly, message: Message) -> Task<Message> {
Message::SelectProfile { folder, profile } => {
state.selected = Some(Selection::Profile { folder, profile });
}
Message::EditProfile { folder, profile } => {
let Some(existing) = state
.profile_folders
.get(folder)
.and_then(|folder| folder.profiles.get(profile))
else {
return Task::none();
};
state.selected = Some(Selection::Profile { folder, profile });
state.profile_dialog = Some(ProfileDraft::from_profile(folder, existing, profile));
return operation::focus(PROFILE_NAME_INPUT);
}
Message::ToggleChecked(item) => {
if !state.checked.remove(&item) {
state.checked.insert(item);
@@ -3745,9 +3946,17 @@ fn update(state: &mut Moorly, message: Message) -> Task<Message> {
}
}
Message::RestoreSelected => restore_trash_items(state),
Message::PurgeTrashSelected => {
if !state.trash_checked.is_empty() {
state.confirm_purge_trash = true;
}
}
Message::ConfirmPurgeTrash => purge_trash_items(state),
Message::CancelPurgeTrash => state.confirm_purge_trash = false,
Message::CloseTrash => {
state.trash_open = false;
state.trash_checked.clear();
state.confirm_purge_trash = false;
}
Message::CopyChecked => {
if !state.checked.is_empty() {
@@ -3876,6 +4085,22 @@ fn update(state: &mut Moorly, message: Message) -> Task<Message> {
draft.private_key = value;
}
}
Message::OpenProfileColorPicker => {
if let Some(draft) = state.profile_dialog.as_mut() {
draft.color_picker_open = true;
}
}
Message::SubmitProfileColor(color) => {
if let Some(draft) = state.profile_dialog.as_mut() {
draft.glyph_color = color;
draft.color_picker_open = false;
}
}
Message::CancelProfileColorPicker => {
if let Some(draft) = state.profile_dialog.as_mut() {
draft.color_picker_open = false;
}
}
Message::OpenDirectoryPicker => {
let path = state
.profile_dialog
@@ -3940,7 +4165,7 @@ fn update(state: &mut Moorly, message: Message) -> Task<Message> {
}
Message::CancelDirectoryPicker => state.dir_picker = None,
Message::ConfirmProfile => {
let Some(draft) = state.profile_dialog.as_ref() else {
let Some(draft) = state.profile_dialog.clone() else {
return Task::none();
};
@@ -3958,6 +4183,14 @@ fn update(state: &mut Moorly, message: Message) -> Task<Message> {
else {
return Task::none();
};
let existing_file = draft.editing.and_then(|(folder, profile)| {
state
.profile_folders
.get(folder)?
.profiles
.get(profile)
.and_then(|profile| profile.file.clone())
});
let mut profile = Profile {
name: draft.name.trim().to_owned(),
kind: draft.kind,
@@ -3969,11 +4202,22 @@ fn update(state: &mut Moorly, message: Message) -> Task<Message> {
password: draft.password.clone(),
start_path: draft.start_path.clone(),
private_key: draft.private_key.clone(),
file: None,
glyph_color: draft.glyph_color,
file: existing_file,
};
if let Some((old_folder, old_profile)) = draft.editing
&& let Some(folder) = state.profile_folders.get_mut(old_folder)
&& old_profile < folder.profiles.len()
{
folder.profiles.remove(old_profile);
}
if profile.file.is_some() {
save_profile(&mut profile, &folder_path);
} else {
profile.file = write_profile(&profile, &folder_path);
save_folders(&state.profile_folders);
}
let Some(folder) = state.profile_folders.get_mut(folder_index) else {
return Task::none();
@@ -3985,6 +4229,7 @@ fn update(state: &mut Moorly, message: Message) -> Task<Message> {
folder: folder_index,
profile: folder.profiles.len() - 1,
});
save_folders(&state.profile_folders);
state.profile_dialog = None;
}
Message::CancelProfile => state.profile_dialog = None,
@@ -5519,6 +5764,7 @@ fn profiles_panel(state: &Moorly, show_add: bool) -> Element<'_, Message> {
|| state.transfer.is_some()
|| state.trash_open
|| state.confirm_delete
|| state.confirm_purge_trash
|| state.dir_picker.is_some();
if !show_add && !dialog_open {
@@ -5537,6 +5783,8 @@ fn profiles_panel(state: &Moorly, show_add: bool) -> Element<'_, Message> {
)
.on_press(if state.dir_picker.is_some() {
Message::CancelDirectoryPicker
} else if state.confirm_purge_trash {
Message::CancelPurgeTrash
} else if state.trash_open {
Message::CloseTrash
} else if state.folder_dialog.is_some() {
@@ -5650,6 +5898,44 @@ fn profiles_panel(state: &Moorly, show_add: bool) -> Element<'_, Message> {
layers = layers.push(dialog_layer);
}
if state.confirm_purge_trash {
let dialog = container(
column![
text("Delete selected items permanently?").size(14),
text(format!(
"{} selected item(s) will be permanently deleted. This cannot be undone.",
state.trash_checked.len()
))
.size(12),
row![
space::horizontal(),
button("Cancel")
.on_press(Message::CancelPurgeTrash)
.style(theme::outlined_option),
button("Delete permanently")
.on_press(Message::ConfirmPurgeTrash)
.style(theme::danger_option),
]
.spacing(8),
]
.spacing(10)
.width(Length::Fill),
)
.width(400)
.padding(12)
.style(theme::menu);
let dialog = mouse_area(dialog).on_press(Message::Ignore);
let dialog_layer = container(dialog)
.width(Length::Fill)
.height(Length::Fill)
.align_x(Alignment::Center)
.align_y(Alignment::Center);
layers = layers.push(dialog_layer);
}
if let Some(transfer) = &state.transfer {
let dialog = transfer_dialog_view(transfer, &state.profile_folders);
let dialog = mouse_area(dialog).on_press(Message::Ignore);
@@ -5826,11 +6112,14 @@ fn directory_picker_view(picker: &DirPicker) -> Element<'_, Message> {
/// The add-profile dialog: details on the left, type-specific view on the right.
/// Dialog listing everything currently in the `.trash` folder.
fn trash_dialog_view(state: &Moorly) -> Element<'_, Message> {
let restore_enabled = !state.trash_checked.is_empty();
let selected = !state.trash_checked.is_empty();
let header = row![
button("Restore selected")
.on_press_maybe(restore_enabled.then_some(Message::RestoreSelected))
.on_press_maybe(selected.then_some(Message::RestoreSelected))
.style(theme::positive_option),
button("Delete selected permanently")
.on_press_maybe(selected.then_some(Message::PurgeTrashSelected))
.style(theme::danger_option),
space::horizontal(),
button("Close")
.on_press(Message::CloseTrash)
@@ -5945,7 +6234,9 @@ fn profile_dialog_view<'a>(
draft: &'a ProfileDraft,
folders: &'a [ProfileFolder],
) -> Element<'a, Message> {
let title = if draft.name.trim().is_empty() {
let title = if draft.editing.is_some() {
"Edit profile"
} else if draft.name.trim().is_empty() {
"New profile"
} else {
draft.name.as_str()
@@ -5961,6 +6252,30 @@ fn profile_dialog_view<'a>(
.collect();
let selected_folder = choices.get(draft.folder).cloned();
let swatch = container(space::horizontal())
.width(24)
.height(24)
.style(move |_| container::Style {
background: Some(draft.glyph_color.into()),
border: Border {
color: theme::ADVANCED_BORDER,
width: 1.0,
radius: 3.0.into(),
},
..container::Style::default()
});
let swatch_button = button(swatch)
.on_press(Message::OpenProfileColorPicker)
.padding(3)
.style(button::text);
let color_picker = iced_aw::color_picker(
draft.color_picker_open,
draft.glyph_color,
swatch_button,
Message::CancelProfileColorPicker,
Message::SubmitProfileColor,
);
let left = column![
text(title).size(18),
column![
@@ -5978,6 +6293,7 @@ fn profile_dialog_view<'a>(
pick_list(choices, selected_folder, Message::ProfileFolderSelected).width(Length::Fill),
]
.spacing(4),
row![text("Glyph color"), space::horizontal(), color_picker].align_y(Alignment::Center),
row![
column![
text("When a session ends").size(13),
@@ -6025,7 +6341,11 @@ fn profile_dialog_view<'a>(
button("Cancel")
.on_press(Message::CancelProfile)
.style(theme::danger_option),
button("Add")
button(if draft.editing.is_some() {
"Save"
} else {
"Add"
})
.on_press_maybe(draft.valid().then_some(Message::ConfirmProfile))
.style(theme::positive_option),
]
@@ -6295,9 +6615,11 @@ fn profile_folder_row<'a>(
if is_selected || hovered == Some(index) {
heading_content = heading_content.push(
button(text("⋮").size(16))
button(text("⋮").size(14))
.on_press(Message::Ignore)
.padding([2, 6])
.padding(0)
.width(20)
.height(14)
.style(button::text),
);
}
@@ -6373,14 +6695,13 @@ fn profile_folder_row<'a>(
profile: profile_index,
});
let profile_row = button(
row![text("👤").size(13), text(profile.name.as_str()).size(13)]
row![
profile_glyph(profile.kind, profile.glyph_color),
text(profile.name.as_str()).size(13)
]
.spacing(8)
.align_y(Alignment::Center),
)
.on_press(Message::SelectProfile {
folder: index,
profile: profile_index,
})
.width(Length::Fill)
.padding(Padding {
top: 4.0,
@@ -6389,6 +6710,15 @@ fn profile_folder_row<'a>(
left: if show_checks { 0.0 } else { 26.0 + indent },
})
.style(move |theme, status| theme::selectable_row(theme, status, profile_selected));
let profile_row = mouse_area(profile_row)
.on_press(Message::SelectProfile {
folder: index,
profile: profile_index,
})
.on_double_click(Message::EditProfile {
folder: index,
profile: profile_index,
});
if show_checks {
let profile_checkbox =
@@ -7052,11 +7382,13 @@ fn command_palette_item(
command: Command,
selected: bool,
) -> Element<'static, Message> {
let details = column![
text(command.label(state)).size(16),
text(command.description(state)).size(12),
]
.spacing(2);
let mut title = row![].spacing(8).align_y(Alignment::Center);
if let Some((kind, color)) = command.profile_glyph(state) {
title = title.push(profile_glyph(kind, color));
}
title = title.push(text(command.label(state)).size(16));
let details = column![title, text(command.description(state)).size(12)].spacing(2);
let mut content = row![details.width(Length::Fill)]
.align_y(Alignment::Center)
@@ -7241,6 +7573,7 @@ mod tests {
trash_checked: super::HashSet::new(),
transfer: None,
confirm_delete: false,
confirm_purge_trash: false,
hovered_folder: None,
add_menu_open: false,
folder_dialog: None,
@@ -7263,6 +7596,7 @@ mod tests {
password: String::new(),
start_path: String::new(),
private_key: String::new(),
glyph_color: iced::Color::WHITE,
file: None,
}
}
@@ -8076,6 +8410,39 @@ mod tests {
assert_eq!(state.windows[&destination].active_tab, Some(Tab::Settings));
}
#[test]
fn command_palette_selects_a_matching_profile() {
let mut state = state();
let window = test_window();
state.profile_folders[0].profiles.push(profile("Alpha"));
state.profile_folders[0].expanded = false;
assert_eq!(
super::Command::matching(&state, window, "alph"),
vec![super::Command::SelectProfile {
folder: 0,
profile: 0
}]
);
let _ = update(&mut state, Message::ToggleCommandPalette(window));
let _ = update(
&mut state,
Message::CommandPaletteChanged(window, "alph".to_owned()),
);
let _ = update(&mut state, Message::RunSelectedCommand(window));
assert_eq!(
state.selected,
Some(super::Selection::Profile {
folder: 0,
profile: 0
})
);
assert!(state.profile_folders[0].expanded);
assert_eq!(window_state(&state).active_tab, Some(Tab::Start));
}
fn press(key: keyboard::Key, modifiers: keyboard::Modifiers) -> Message {
Message::CaptureKey { key, modifiers }
}
@@ -8306,6 +8673,42 @@ mod tests {
);
}
#[test]
fn editing_a_profile_updates_it_in_place() {
let mut state = state();
state.profile_folders[0].profiles.push(profile("Old"));
let color = iced::Color::from_rgb8(0x12, 0x34, 0x56);
let _ = update(
&mut state,
Message::EditProfile {
folder: 0,
profile: 0,
},
);
assert_eq!(state.profile_dialog.as_ref().unwrap().name, "Old");
let _ = update(&mut state, Message::ProfileNameChanged("New".to_owned()));
let _ = update(
&mut state,
Message::ProfileHostChanged("new.example".to_owned()),
);
let _ = update(
&mut state,
Message::ProfileKindSelected(super::ProfileKind::Terminal),
);
let _ = update(&mut state, Message::SubmitProfileColor(color));
let _ = update(&mut state, Message::ConfirmProfile);
assert!(state.profile_dialog.is_none());
assert_eq!(state.profile_folders[0].profiles.len(), 1);
let profile = &state.profile_folders[0].profiles[0];
assert_eq!(profile.name, "New");
assert_eq!(profile.host, "new.example");
assert_eq!(profile.kind, super::ProfileKind::Terminal);
assert_eq!(profile.glyph_color, color);
}
#[test]
fn profile_dialog_stores_the_entered_details() {
let mut state = state();
@@ -8633,6 +9036,34 @@ mod tests {
assert!(work.profiles.is_empty());
}
#[test]
fn trash_purge_deletes_only_checked_entries() {
let mut state = state();
state.trash_entries = vec![
super::TrashEntry::Folder(super::TrashFolder {
name: "Keep".to_owned(),
previous_path: String::new(),
deleted: "2026-11-07 12:00:00".to_owned(),
}),
super::TrashEntry::Folder(super::TrashFolder {
name: "Remove".to_owned(),
previous_path: String::new(),
deleted: "2026-11-07 12:00:00".to_owned(),
}),
];
state.trash_checked.insert(1);
let _ = update(&mut state, Message::PurgeTrashSelected);
assert!(state.confirm_purge_trash);
let _ = update(&mut state, Message::ConfirmPurgeTrash);
assert_eq!(state.trash_entries.len(), 1);
assert_eq!(state.trash_entries[0].name(), "Keep");
assert!(state.trash_checked.is_empty());
assert!(!state.confirm_purge_trash);
}
#[test]
fn moving_a_folder_moves_its_subtree() {
let mut state = state();
@@ -8806,6 +9237,7 @@ mod tests {
password: "secret".to_owned(),
start_path: "/tmp".to_owned(),
private_key: "/keys/id".to_owned(),
glyph_color: iced::Color::WHITE,
file: None,
};
@@ -8818,6 +9250,7 @@ mod tests {
assert!(text.contains("session_end = \"reconnect\""));
assert!(text.contains("host = \"example.com\""));
assert!(text.contains("private_key = \"/keys/id\""));
assert!(text.contains("glyph_color = \"#FFFFFF\""));
let duplicate = super::write_profile_to(&root, &profile, "Work/Production").unwrap();
assert_eq!(duplicate.file_name().unwrap(), "Server_Test-2.toml");