TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-08-12 16:37:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

FileMan support for folder Cut & Paste and Timestamp Rename (#2055)

Browse Source
This commit is contained in:
Mark Thompson
2024-03-29 04:44:37 -05:00
committed by GitHub
parent 90ff1e62ce
commit ba36680a7b
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
firmware/application/apps/ui_fileman.cpp
View File

@@ -514,7 +514,10 @@ void FileManagerView::on_paste() {
fs::filesystem_error result; fs::filesystem_error result;
if (clipboard_mode == ClipboardMode::Cut) if (clipboard_mode == ClipboardMode::Cut)
result = rename_file(clipboard_path, current_path / new_name); if ((current_path / clipboard_path.filename()) == clipboard_path)
result = FR_OK; // Skip paste to avoid renaming if path is unchanged
else
result = rename_file(clipboard_path, current_path / new_name);
else if (clipboard_mode == ClipboardMode::Copy) else if (clipboard_mode == ClipboardMode::Copy)
result = copy_file(clipboard_path, current_path / new_name); result = copy_file(clipboard_path, current_path / new_name);
@@ -639,7 +642,7 @@ FileManagerView::FileManagerView(
}; };
button_cut.on_select = [this]() { button_cut.on_select = [this]() {
if (selected_is_valid() && !get_selected_entry().is_directory) { if (selected_is_valid()) {
clipboard_path = get_selected_full_path(); clipboard_path = get_selected_full_path();
clipboard_mode = ClipboardMode::Cut; clipboard_mode = ClipboardMode::Cut;
} else } else
@@ -658,7 +661,7 @@ FileManagerView::FileManagerView(
if (clipboard_mode != ClipboardMode::None) if (clipboard_mode != ClipboardMode::None)
on_paste(); on_paste();
else else
nav_.display_modal("Paste", "Cut or copy a file first."); nav_.display_modal("Paste", " Cut or copy a file,\n or cut a folder, first.");
}; };
button_new_dir.on_select = [this]() { button_new_dir.on_select = [this]() {
@@ -678,7 +681,7 @@ FileManagerView::FileManagerView(
}; };
button_rename_timestamp.on_select = [this]() { button_rename_timestamp.on_select = [this]() {
if (selected_is_valid() && !get_selected_entry().is_directory) { if (selected_is_valid()) {
on_rename(::truncate(to_string_timestamp(rtc_time::now()), 8)); on_rename(::truncate(to_string_timestamp(rtc_time::now()), 8));
} else } else
nav_.display_modal("Timestamp Rename", "Can't rename that."); nav_.display_modal("Timestamp Rename", "Can't rename that.");