From bf4ed416bd72b8d2f8a30112624fd3a54dcdcaae Mon Sep 17 00:00:00 2001 From: Kyle Reed Date: Sun, 30 Apr 2023 22:42:28 -0700 Subject: [PATCH 1/4] Remove expensive path.string() calls, UI changes --- firmware/application/apps/ui_fileman.cpp | 266 +++++++++++++---------- firmware/application/apps/ui_fileman.hpp | 64 +++--- firmware/application/file.cpp | 20 ++ firmware/application/file.hpp | 10 + firmware/application/ui/ui_menu.cpp | 2 +- firmware/application/ui/ui_menu.hpp | 2 +- firmware/application/ui/ui_textentry.cpp | 22 +- firmware/application/ui/ui_textentry.hpp | 15 +- 8 files changed, 254 insertions(+), 147 deletions(-) diff --git a/firmware/application/apps/ui_fileman.cpp b/firmware/application/apps/ui_fileman.cpp index ed40ddf80..e40886110 100644 --- a/firmware/application/apps/ui_fileman.cpp +++ b/firmware/application/apps/ui_fileman.cpp @@ -20,6 +20,7 @@ * Boston, MA 02110-1301, USA. */ +#include #include "ui_fileman.hpp" #include "string_format.hpp" #include "portapack.hpp" @@ -27,65 +28,92 @@ using namespace portapack; +namespace { +using namespace ui; + +bool is_hidden_file(const std::filesystem::path& path) { + return !path.empty() && path.native()[0] == u'.'; +} + +// Gets a truncated name from a path for display. +std::string truncate(const std::filesystem::path& path, size_t max_length = 25) { + auto name = path.string(); + return name.length() <= max_length ? name : name.substr(0, max_length); +} + +// Case insensitive path equality on underlying "native" string. +bool iequal( + const std::filesystem::path& lhs, + const std::filesystem::path& rhs +) { + const auto& lhs_str = lhs.native(); + const auto& rhs_str = rhs.native(); + + // NB: Not correct for Unicode/locales. + if (lhs_str.length() == rhs_str.length()) { + for (size_t i = 0; i < lhs_str.length(); ++i) + if (towupper(lhs_str[i]) != towupper(rhs_str[i])) + return false; + + return true; + } + + return false; +} + +// Inserts the entry into the entry list sorted directories first then by file name. +void insert_sorted(std::vector& entries, fileman_entry&& entry) { + auto it = std::lower_bound(std::begin(entries), std::end(entries), entry, + [](const fileman_entry& lhs, const fileman_entry& rhs) { + if (lhs.is_directory && !rhs.is_directory) + return true; + else if (rhs.is_directory) + return false; + else + return lhs.path < rhs.path; + }); + + entries.insert(it, std::move(entry)); +} + +} + namespace ui { void FileManBaseView::load_directory_contents(const std::filesystem::path& dir_path) { current_path = dir_path; - - text_current.set(dir_path.string().length()? dir_path.string().substr(0, 30 - 6):"(sd root)"); - entry_list.clear(); - - auto filtering = (bool)extension_filter.size(); - - // List directories and files, put directories up top - if (dir_path.string().length()) - entry_list.push_back({ u"..", 0, true }); + auto filtering = !extension_filter.empty(); + text_current.set(dir_path.empty() ? "(sd root)" : truncate(dir_path)); + for (const auto& entry : std::filesystem::directory_iterator(dir_path, u"*")) { + // Hide files starting with '.' (hidden / tmp). + if (is_hidden_file(entry.path())) + continue; - // do not display dir / files starting with '.' (hidden / tmp) - if (entry.path().string().length() && entry.path().filename().string()[0] != '.') { - if (std::filesystem::is_regular_file(entry.status())) { - bool matched = true; - if (filtering) { - auto entry_extension = entry.path().extension().string(); - - for (auto &c: entry_extension) - c = toupper(c); - - if (entry_extension != extension_filter) - matched = false; - } - - if (matched) - entry_list.push_back({ entry.path(), (uint32_t)entry.size(), false }); - } else if (std::filesystem::is_directory(entry.status())) { - entry_list.insert(entry_list.begin(), { entry.path(), 0, true }); - } + if (std::filesystem::is_regular_file(entry.status())) { + if (!filtering || iequal(entry.path().extension(), extension_filter)) + insert_sorted(entry_list, { entry.path(), (uint32_t)entry.size(), false }); + } else if (std::filesystem::is_directory(entry.status())) { + insert_sorted(entry_list, { entry.path(), 0, true }); } } + + // Add "parent" directory if not at the root. + if (!dir_path.empty()) + entry_list.insert(entry_list.begin(), { u"..", 0, true }); } -std::filesystem::path FileManBaseView::get_selected_path() { - auto selected_path_str = current_path.string(); - auto entry_path = entry_list[menu_view.highlighted_index()].entry_path.string(); - - if (entry_path == "..") { - selected_path_str = get_parent_dir().string(); - } else { - if (selected_path_str.back() != '/') - selected_path_str += '/'; - - selected_path_str += entry_path; - } - - return selected_path_str; +std::filesystem::path FileManBaseView::get_selected_full_path() const { + if (get_selected_entry().path == std::filesystem::path(u"..")) + return current_path.parent_path(); + + return current_path / get_selected_entry().path; } -std::filesystem::path FileManBaseView::get_parent_dir() { - auto current_path_str = current_path.string(); - return current_path.string().substr(0, current_path_str.find_last_of('/')); +const fileman_entry& FileManBaseView::get_selected_entry() const { + return entry_list[menu_view.highlighted_index()]; } FileManBaseView::FileManBaseView( @@ -105,20 +133,21 @@ FileManBaseView::FileManBaseView( }; if (!sdcIsCardInserted(&SDCD1)) { - empty_root=true; + empty_root = true; text_current.set("NO SD CARD!"); + return; + } + + load_directory_contents(current_path); + + if (!entry_list.size()) { + empty_root = true; + text_current.set("EMPTY SD CARD!"); } else { - load_directory_contents(current_path); - if (!entry_list.size()) - { - empty_root = true; - text_current.set("EMPTY SD CARD!"); - } else { - menu_view.on_left = [&nav, this]() { - load_directory_contents(get_parent_dir()); - refresh_list(); - }; - } + menu_view.on_left = [&nav, this]() { + load_directory_contents(current_path.parent_path()); + refresh_list(); + }; } } @@ -131,66 +160,67 @@ void FileManBaseView::focus() { } void FileManBaseView::refresh_list() { + // TODO: stash previous selected so scroll isn't reset. if (on_refresh_widgets) on_refresh_widgets(false); menu_view.clear(); - for (size_t n = 0; n < entry_list.size(); n++) { - auto entry = &entry_list[n]; - auto entry_name = entry->entry_path.filename().string().substr(0, 20); - - if (entry->is_directory) { - + for (const auto& entry : entry_list) { + auto entry_name = truncate(entry.path, 20); + + if (entry.is_directory) { menu_view.add_item({ entry_name, ui::Color::yellow(), &bitmap_icon_dir, - [this](){ + [this]() { if (on_select_entry) on_select_entry(); } }); - + } else { - - auto file_size = entry->size; + auto file_size = entry.size; size_t suffix_index = 0; while (file_size >= 1024) { file_size /= 1024; suffix_index++; } + if (suffix_index > 4) suffix_index = 4; std::string size_str = to_string_dec_uint(file_size) + suffix[suffix_index]; - - auto entry_extension = entry->entry_path.extension().string(); - for (auto &c: entry_extension) - c = toupper(c); - - // Associate extension to icon and color - size_t c; - for (c = 0; c < file_types.size() - 1; c++) { - if (entry_extension == file_types[c].extension) - break; - } + const auto& assoc = get_assoc(entry.path.extension()); menu_view.add_item({ entry_name + std::string(21 - entry_name.length(), ' ') + size_str, - file_types[c].color, - file_types[c].icon, - [this](){ + assoc.color, + assoc.icon, + [this]() { if (on_select_entry) on_select_entry(); } }); - } } - menu_view.set_highlighted(0); // Refresh + menu_view.set_highlighted(0); // Refresh +} + +const FileManBaseView::file_assoc_t& FileManBaseView::get_assoc( + const std::filesystem::path& ext) const +{ + size_t index = 0; + + for (; index < file_types.size() - 1; ++index) + if (iequal(ext, file_types[index].extension)) + return file_types[index]; + + // Default to last entry in the list. + return file_types[index]; } /*void FileSaveView::on_save_name() { @@ -215,8 +245,7 @@ FileSaveView::FileSaveView( }; }*/ -void FileLoadView::refresh_widgets(const bool v) { - (void)v; //avoid unused warning +void FileLoadView::refresh_widgets(const bool) { set_dirty(); } @@ -239,37 +268,39 @@ FileLoadView::FileLoadView( refresh_list(); on_select_entry = [&nav, this]() { - if (entry_list[menu_view.highlighted_index()].is_directory) { - load_directory_contents(get_selected_path()); + if (get_selected_entry().is_directory) { + load_directory_contents(get_selected_full_path()); refresh_list(); } else { nav_.pop(); if (on_changed) - on_changed(current_path.string() + '/' + entry_list[menu_view.highlighted_index()].entry_path.string()); + on_changed(get_selected_full_path()); } }; } void FileManagerView::on_rename(NavigationView& nav) { + auto& entry = get_selected_entry(); + text_prompt(nav, name_buffer, max_filename_length, [this](std::string& buffer) { std::string destination_path = current_path.string(); if (destination_path.back() != '/') destination_path += '/'; destination_path = destination_path + buffer; - rename_file(get_selected_path(), destination_path); + rename_file(get_selected_full_path(), destination_path); load_directory_contents(current_path); refresh_list(); }); } -void FileManagerView::on_refactor(NavigationView& nav) { +/*void FileManagerView::on_refactor(NavigationView& nav) { text_prompt(nav, name_buffer, max_filename_length, [this](std::string& buffer) { std::string destination_path = current_path.string(); if (destination_path.back() != '/')//if the path is not ended with '/', add '/' destination_path += '/'; - auto selected_path = get_selected_path(); + auto selected_path = get_selected_full_path(); auto extension = selected_path.extension().string(); if(extension.empty()){// Is Dir @@ -279,7 +310,7 @@ void FileManagerView::on_refactor(NavigationView& nav) { destination_path = destination_path + buffer + extension_buffer; } - rename_file(get_selected_path(), destination_path); //rename the selected file + rename_file(get_selected_full_path(), destination_path); //rename the selected file if (!extension.empty() && selected_path.string().back() != '/' && extension.substr(1) == "C16") { //substr(1) is for ignore the dot // Rename its partner ( C16 <-> TXT ) file. @@ -298,19 +329,19 @@ void FileManagerView::on_refactor(NavigationView& nav) { }); -} +}*/ void FileManagerView::on_delete() { - delete_file(get_selected_path()); + delete_file(get_selected_full_path()); load_directory_contents(current_path); refresh_list(); } void FileManagerView::refresh_widgets(const bool v) { button_rename.hidden(v); - button_new_dir.hidden(v); - button_refactor.hidden(v); + //button_refactor.hidden(v); button_delete.hidden(v); + button_new_dir.hidden(v); set_dirty(); } @@ -332,42 +363,33 @@ FileManagerView::FileManagerView( &labels, &text_date, &button_rename, - &button_refactor, + //&button_copy, + //&button_move, + &button_delete, + //&button_new_file, &button_new_dir, - &button_delete }); menu_view.on_highlight = [this]() { - text_date.set(to_string_FAT_timestamp(file_created_date(get_selected_path()))); + text_date.set(to_string_FAT_timestamp(file_created_date(get_selected_full_path()))); }; refresh_list(); on_select_entry = [this]() { - if (entry_list[menu_view.highlighted_index()].is_directory) { - load_directory_contents(get_selected_path()); + if (get_selected_entry().is_directory) { + load_directory_contents(get_selected_full_path()); refresh_list(); } else button_rename.focus(); }; - button_new_dir.on_select = [this, &nav](Button&) { - name_buffer.clear(); - - text_prompt(nav, name_buffer, max_filename_length, [this](std::string& buffer) { - make_new_directory(current_path.string() + '/' + buffer); - load_directory_contents(current_path); - refresh_list(); - }); - }; - button_rename.on_select = [this, &nav](Button&) { - name_buffer = entry_list[menu_view.highlighted_index()].entry_path.filename().string().substr(0, max_filename_length); on_rename(nav); }; - button_refactor.on_select = [this, &nav](Button&) { - name_buffer = entry_list[menu_view.highlighted_index()].entry_path.filename().string().substr(0, max_filename_length); + /*button_refactor.on_select = [this, &nav](Button&) { + name_buffer = entry_list[menu_view.highlighted_index()].path.filename().string().substr(0, max_filename_length); size_t pos = name_buffer.find_last_of("."); if (pos != std::string::npos) { @@ -376,17 +398,27 @@ FileManagerView::FileManagerView( } on_refactor(nav); - }; + };*/ button_delete.on_select = [this, &nav](Button&) { - // Use display_modal ? - nav.push("Delete", "Delete " + entry_list[menu_view.highlighted_index()].entry_path.filename().string() + "\nAre you sure?", YESNO, + auto name = get_selected_entry().path.filename().string(); + nav.push("Delete", "Delete " + name + "\nAre you sure?", YESNO, [this](bool choice) { if (choice) on_delete(); } ); }; + + button_new_dir.on_select = [this, &nav](Button&) { + name_buffer.clear(); + + text_prompt(nav, name_buffer, max_filename_length, [this](std::string& buffer) { + make_new_directory(current_path / buffer); + load_directory_contents(current_path); + refresh_list(); + }); + }; } } diff --git a/firmware/application/apps/ui_fileman.hpp b/firmware/application/apps/ui_fileman.hpp index a0ec96b0a..cfc94d652 100644 --- a/firmware/application/apps/ui_fileman.hpp +++ b/firmware/application/apps/ui_fileman.hpp @@ -31,7 +31,7 @@ namespace ui { struct fileman_entry { - std::filesystem::path entry_path { }; + std::filesystem::path path { }; uint32_t size { }; bool is_directory { }; }; @@ -46,47 +46,49 @@ public: void focus() override; void load_directory_contents(const std::filesystem::path& dir_path); - std::filesystem::path get_selected_path(); + std::filesystem::path get_selected_full_path() const; + const fileman_entry& get_selected_entry() const; std::string title() const override { return "Fileman"; }; protected: - NavigationView& nav_; - - static constexpr size_t max_filename_length = 30 - 2; - - const std::string suffix[5] = { "B", "kB", "MB", "GB", "??" }; - + static constexpr size_t max_filename_length = 64 - 2; // Necessary? + struct file_assoc_t { - std::string extension; + std::filesystem::path extension; const Bitmap* icon; ui::Color color; }; + + const std::string suffix[5] = { "B", "kB", "MB", "GB", "??" }; const std::vector file_types = { - { ".TXT", &bitmap_icon_file_text, ui::Color::white() }, - { ".PNG", &bitmap_icon_file_image, ui::Color::green() }, - { ".BMP", &bitmap_icon_file_image, ui::Color::green() }, - { ".C8", &bitmap_icon_file_iq, ui::Color::dark_cyan() }, - { ".C16", &bitmap_icon_file_iq, ui::Color::dark_cyan() }, - { ".WAV", &bitmap_icon_file_wav, ui::Color::dark_magenta() }, - { "", &bitmap_icon_file, ui::Color::light_grey() } + { u".TXT", &bitmap_icon_file_text, ui::Color::white() }, + { u".PNG", &bitmap_icon_file_image, ui::Color::green() }, + { u".BMP", &bitmap_icon_file_image, ui::Color::green() }, + { u".C8", &bitmap_icon_file_iq, ui::Color::dark_cyan() }, + { u".C16", &bitmap_icon_file_iq, ui::Color::dark_cyan() }, + { u".WAV", &bitmap_icon_file_wav, ui::Color::dark_magenta() }, + { u"", &bitmap_icon_file, ui::Color::light_grey() } // NB: Must be last. }; - + + void refresh_list(); + const file_assoc_t& get_assoc(const std::filesystem::path& ext) const; + + NavigationView& nav_; + bool empty_root { false }; std::function on_select_entry { nullptr }; std::function on_refresh_widgets { nullptr }; + std::vector entry_list { }; std::filesystem::path current_path { u"" }; - std::string extension_filter { "" }; - - void change_category(int32_t category_id); - std::filesystem::path get_parent_dir(); - void refresh_list(); + std::filesystem::path extension_filter { u"" }; Labels labels { { { 0, 0 }, "Path:", Color::light_grey() } }; + Text text_current { { 6 * 8, 0 * 8, 24 * 8, 16 }, "", @@ -147,7 +149,7 @@ private: void refresh_widgets(const bool v); void on_rename(NavigationView& nav); - void on_refactor(NavigationView& nav); + //void on_refactor(NavigationView& nav); void on_delete(); Labels labels { @@ -164,9 +166,14 @@ private: "Rename" }; - Button button_refactor{ + Button button_copy { { 10 * 8, 29 * 8, 10 * 8, 32 }, - "Refactor" + "Copy" + }; + + Button button_move { + { 10 * 8, 29 * 8, 10 * 8, 32 }, + "Move" }; Button button_delete { @@ -174,9 +181,14 @@ private: "Delete" }; + /*Button button_new_file { + { 0 * 8, 34 * 8, 14 * 8, 32 }, + "New File" + };*/ + Button button_new_dir { { 0 * 8, 34 * 8, 14 * 8, 32 }, - "New dir" + "New Dir" }; }; diff --git a/firmware/application/file.cpp b/firmware/application/file.cpp index a16d1c98b..a47a0a64e 100644 --- a/firmware/application/file.cpp +++ b/firmware/application/file.cpp @@ -250,6 +250,16 @@ std::string filesystem_error::what() const { } } +path path::parent_path() const { + const auto t = filename().native(); + const auto index = t.find_last_of(preferred_separator); + if( index == t.npos ) { + return *this; + } else { + return t.substr(0, index); + } +} + path path::extension() const { const auto t = filename().native(); const auto index = t.find_last_of(u'.'); @@ -296,6 +306,10 @@ path& path::replace_extension(const path& replacement) { return *this; } +bool operator==(const path& lhs, const path& rhs) { + return lhs.native() == rhs.native(); +} + bool operator<(const path& lhs, const path& rhs) { return lhs.native() < rhs.native(); } @@ -304,6 +318,12 @@ bool operator>(const path& lhs, const path& rhs) { return lhs.native() > rhs.native(); } +path operator/(const path& lhs, const path& rhs) { + path result = lhs; + result /= rhs; + return result; +} + directory_iterator::directory_iterator( std::filesystem::path path, std::filesystem::path wild diff --git a/firmware/application/file.hpp b/firmware/application/file.hpp index 815c247b7..7dd35e3d2 100644 --- a/firmware/application/file.hpp +++ b/firmware/application/file.hpp @@ -123,6 +123,7 @@ struct path { return *this; } + path parent_path() const; path extension() const; path filename() const; path stem() const; @@ -151,14 +152,23 @@ struct path { return *this; } + path& operator/=(const path& p) { + if (_s.back() != preferred_separator) + _s + preferred_separator; + _s += p._s; + return *this; + } + path& replace_extension(const path& replacement = path()); private: string_type _s; }; +bool operator==(const path& lhs, const path& rhs); bool operator<(const path& lhs, const path& rhs); bool operator>(const path& lhs, const path& rhs); +path operator/(const path& lhs, const path& rhs); using file_status = BYTE; diff --git a/firmware/application/ui/ui_menu.cpp b/firmware/application/ui/ui_menu.cpp index cac18c04f..c6999a505 100644 --- a/firmware/application/ui/ui_menu.cpp +++ b/firmware/application/ui/ui_menu.cpp @@ -238,7 +238,7 @@ bool MenuView::set_highlighted(int32_t new_value) { return true; } -uint32_t MenuView::highlighted_index() { +uint32_t MenuView::highlighted_index() const { return highlighted_item; } diff --git a/firmware/application/ui/ui_menu.hpp b/firmware/application/ui/ui_menu.hpp index e3526057b..1f7a7016d 100644 --- a/firmware/application/ui/ui_menu.hpp +++ b/firmware/application/ui/ui_menu.hpp @@ -87,7 +87,7 @@ public: MenuItemView* item_view(size_t index) const; bool set_highlighted(int32_t new_value); - uint32_t highlighted_index(); + uint32_t highlighted_index() const; void set_parent_rect(const Rect new_parent_rect) override; void on_focus() override; diff --git a/firmware/application/ui/ui_textentry.cpp b/firmware/application/ui/ui_textentry.cpp index d867ae620..dcc012948 100644 --- a/firmware/application/ui/ui_textentry.cpp +++ b/firmware/application/ui/ui_textentry.cpp @@ -29,9 +29,25 @@ using namespace portapack; namespace ui { -void text_prompt(NavigationView& nav, std::string& str, const size_t max_length, const std::function on_done) { +void text_prompt( + NavigationView& nav, + std::string& str, + const size_t max_length, + const std::function on_done +) { + text_prompt(nav, str, str.length(), max_length, on_done); +} + +void text_prompt( + NavigationView& nav, + std::string& str, + uint32_t cursor_pos, + const size_t max_length, + const std::function on_done +) { //if (persistent_memory::ui_config_textentry() == 0) { auto te_view = nav.push(str, max_length); + te_view->set_cursor(cursor_pos); te_view->on_changed = [on_done](std::string& value) { if (on_done) on_done(value); @@ -211,6 +227,10 @@ void TextEntryView::char_add(const char c) { text_input.char_add(c); } +void TextEntryView::set_cursor(uint32_t pos) { + text_input.set_cursor(pos); +} + void TextEntryView::focus() { text_input.focus(); } diff --git a/firmware/application/ui/ui_textentry.hpp b/firmware/application/ui/ui_textentry.hpp index 3641f2bee..e42fb000e 100644 --- a/firmware/application/ui/ui_textentry.hpp +++ b/firmware/application/ui/ui_textentry.hpp @@ -82,6 +82,8 @@ public: void focus() override; std::string title() const override { return "Text entry"; }; + + void set_cursor(uint32_t pos); protected: TextEntryView(NavigationView& nav, std::string& str, size_t max_length); @@ -101,7 +103,18 @@ protected: }; }; -void text_prompt(NavigationView& nav, std::string& str, size_t max_length, const std::function on_done = nullptr); +void text_prompt( + NavigationView& nav, + std::string& str, + size_t max_length, + const std::function on_done = nullptr); + +void text_prompt( + NavigationView& nav, + std::string& str, + uint32_t cursor_pos, + size_t max_length, + const std::function on_done = nullptr); } /* namespace ui */ From 2cba96ff365bac5ba6eb76d030b3bbcb44569be2 Mon Sep 17 00:00:00 2001 From: Kyle Reed Date: Mon, 1 May 2023 09:25:32 -0700 Subject: [PATCH 2/4] Support for partner file rename/delete --- firmware/application/apps/ui_fileman.cpp | 205 +++++++++++++---------- firmware/application/apps/ui_fileman.hpp | 14 +- firmware/application/file.cpp | 22 ++- firmware/application/file.hpp | 4 + 4 files changed, 139 insertions(+), 106 deletions(-) diff --git a/firmware/application/apps/ui_fileman.cpp b/firmware/application/apps/ui_fileman.cpp index e40886110..eb34cc92d 100644 --- a/firmware/application/apps/ui_fileman.cpp +++ b/firmware/application/apps/ui_fileman.cpp @@ -41,6 +41,22 @@ std::string truncate(const std::filesystem::path& path, size_t max_length = 25) return name.length() <= max_length ? name : name.substr(0, max_length); } +// Gets a human readable size string. +std::string get_pretty_size(uint32_t file_size) { + static const std::string suffix[5] = { "B", "kB", "MB", "GB", "??" }; + size_t suffix_index = 0; + + while (file_size >= 1024) { + file_size /= 1024; + suffix_index++; + } + + if (suffix_index > 4) + suffix_index = 4; + + return to_string_dec_uint(file_size) + suffix[suffix_index]; +} + // Case insensitive path equality on underlying "native" string. bool iequal( const std::filesystem::path& lhs, @@ -67,7 +83,7 @@ void insert_sorted(std::vector& entries, fileman_entry&& entry) { [](const fileman_entry& lhs, const fileman_entry& rhs) { if (lhs.is_directory && !rhs.is_directory) return true; - else if (rhs.is_directory) + else if (!lhs.is_directory && rhs.is_directory) return false; else return lhs.path < rhs.path; @@ -76,6 +92,41 @@ void insert_sorted(std::vector& entries, fileman_entry&& entry) { entries.insert(it, std::move(entry)); } +// Returns the partner file path or an empty path if no partner is found. +std::filesystem::path get_partner_file(std::filesystem::path path) { + const auto txt_path = std::filesystem::path{ u".TXT" }; + const auto c16_path = std::filesystem::path{ u".C16" }; + auto ext = path.extension(); + + if (iequal(ext, txt_path)) + ext = c16_path; + else if (iequal(ext, c16_path)) + ext = txt_path; + else + return { }; + + path.replace_extension(ext); + return file_exists(path) ? path : std::filesystem::path{ }; +} + +// Modal prompt to update the partner file. +// Returns true if user wants to update the partner file too. +bool partner_file_prompt(NavigationView& nav, const std::filesystem::path& partner) { + bool result = false; + + if (partner.empty()) + return result; + + nav.push( + "Partner File Exists", + partner.filename().string() + "\nUpdate this file too?", + YESNO, + [&result](bool choice) { result = choice; } + ); + + return result; +} + } namespace ui { @@ -102,11 +153,11 @@ void FileManBaseView::load_directory_contents(const std::filesystem::path& dir_p // Add "parent" directory if not at the root. if (!dir_path.empty()) - entry_list.insert(entry_list.begin(), { u"..", 0, true }); + entry_list.insert(entry_list.begin(), { parent_dir_path, 0, true }); } std::filesystem::path FileManBaseView::get_selected_full_path() const { - if (get_selected_entry().path == std::filesystem::path(u"..")) + if (get_selected_entry().path == parent_dir_path) return current_path.parent_path(); return current_path / get_selected_entry().path; @@ -160,7 +211,6 @@ void FileManBaseView::focus() { } void FileManBaseView::refresh_list() { - // TODO: stash previous selected so scroll isn't reset. if (on_refresh_widgets) on_refresh_widgets(false); @@ -181,19 +231,8 @@ void FileManBaseView::refresh_list() { }); } else { - auto file_size = entry.size; - size_t suffix_index = 0; - - while (file_size >= 1024) { - file_size /= 1024; - suffix_index++; - } - - if (suffix_index > 4) - suffix_index = 4; - - std::string size_str = to_string_dec_uint(file_size) + suffix[suffix_index]; const auto& assoc = get_assoc(entry.path.extension()); + auto size_str = get_pretty_size(entry.size); menu_view.add_item({ entry_name + std::string(21 - entry_name.length(), ' ') + size_str, @@ -267,7 +306,7 @@ FileLoadView::FileLoadView( refresh_list(); - on_select_entry = [&nav, this]() { + on_select_entry = [this]() { if (get_selected_entry().is_directory) { load_directory_contents(get_selected_full_path()); refresh_list(); @@ -279,67 +318,71 @@ FileLoadView::FileLoadView( }; } -void FileManagerView::on_rename(NavigationView& nav) { - auto& entry = get_selected_entry(); +void FileManagerView::on_rename() { + // Don't allow rename of ".." + if (get_selected_entry().path == parent_dir_path) + return; - text_prompt(nav, name_buffer, max_filename_length, [this](std::string& buffer) { - std::string destination_path = current_path.string(); - if (destination_path.back() != '/') - destination_path += '/'; - destination_path = destination_path + buffer; - rename_file(get_selected_full_path(), destination_path); - load_directory_contents(current_path); - refresh_list(); - }); + auto& entry = get_selected_entry(); + auto name = entry.path.filename().string(); + auto orig_ext = entry.path.extension(); + + uint32_t cursor_pos = (uint32_t)name.length(); + if (auto pos = name.find_last_of("."); pos != name.npos) + cursor_pos = pos; + + text_prompt(nav_, name, cursor_pos, max_filename_length, + [this, &entry, &orig_ext](std::string& renamed) { + auto renamed_path = std::filesystem::path{ renamed }; + rename_file(get_selected_full_path(), current_path / renamed_path); + + if (iequal(renamed_path.extension(), orig_ext)) { + auto partner = get_partner_file(current_path / entry.path); + if (partner_file_prompt(nav_, partner)) { + auto new_name = renamed_path.replace_extension(partner.extension()); + rename_file(partner, current_path / new_name); + } + } + + load_directory_contents(current_path); + refresh_list(); + }); } -/*void FileManagerView::on_refactor(NavigationView& nav) { - text_prompt(nav, name_buffer, max_filename_length, [this](std::string& buffer) { +void FileManagerView::on_delete() { + // Don't allow delete of ".." + if (get_selected_entry().path == parent_dir_path) + return; - std::string destination_path = current_path.string(); - if (destination_path.back() != '/')//if the path is not ended with '/', add '/' - destination_path += '/'; + auto& entry = get_selected_entry(); + auto name = entry.path.filename().string(); + nav_.push("Delete", "Delete " + name + "\nAre you sure?", YESNO, + [this, &entry](bool choice) { + if (choice) { + delete_file(get_selected_full_path()); - auto selected_path = get_selected_full_path(); - auto extension = selected_path.extension().string(); + auto partner = get_partner_file(current_path / entry.path); + if (partner_file_prompt(nav_, partner)) + delete_file(partner); - if(extension.empty()){// Is Dir - destination_path = destination_path + buffer; - extension_buffer = ""; - }else{//is File - destination_path = destination_path + buffer + extension_buffer; - } - - rename_file(get_selected_full_path(), destination_path); //rename the selected file - - if (!extension.empty() && selected_path.string().back() != '/' && extension.substr(1) == "C16") { //substr(1) is for ignore the dot - // Rename its partner ( C16 <-> TXT ) file. - auto partner_file_path = selected_path.string().substr(0, selected_path.string().size() - 4) + ".TXT"; - destination_path = destination_path.substr(0, destination_path.size() - 4) + ".TXT"; - rename_file(partner_file_path, destination_path); - } else if (!extension.empty() && selected_path.string().back() != '/' && extension.substr(1) == "TXT") { - // If the file user choose is a TXT file. - auto partner_file_path = selected_path.string().substr(0, selected_path.string().size() - 4) + ".C16"; - destination_path = destination_path.substr(0, destination_path.size() - 4) + ".C16"; - rename_file(partner_file_path, destination_path); + load_directory_contents(current_path); + refresh_list(); + } } + ); +} +void FileManagerView::on_new_dir() { + std::string name; + text_prompt(nav_, name, max_filename_length, [this](std::string& dir_name) { + make_new_directory(current_path / dir_name); load_directory_contents(current_path); refresh_list(); - }); - -}*/ - -void FileManagerView::on_delete() { - delete_file(get_selected_full_path()); - load_directory_contents(current_path); - refresh_list(); } void FileManagerView::refresh_widgets(const bool v) { button_rename.hidden(v); - //button_refactor.hidden(v); button_delete.hidden(v); button_new_dir.hidden(v); set_dirty(); @@ -384,40 +427,16 @@ FileManagerView::FileManagerView( button_rename.focus(); }; - button_rename.on_select = [this, &nav](Button&) { - on_rename(nav); + button_rename.on_select = [this](Button&) { + on_rename(); }; - /*button_refactor.on_select = [this, &nav](Button&) { - name_buffer = entry_list[menu_view.highlighted_index()].path.filename().string().substr(0, max_filename_length); - size_t pos = name_buffer.find_last_of("."); - - if (pos != std::string::npos) { - extension_buffer = name_buffer.substr(pos); - name_buffer = name_buffer.substr(0, pos); - } - - on_refactor(nav); - };*/ - - button_delete.on_select = [this, &nav](Button&) { - auto name = get_selected_entry().path.filename().string(); - nav.push("Delete", "Delete " + name + "\nAre you sure?", YESNO, - [this](bool choice) { - if (choice) - on_delete(); - } - ); + button_delete.on_select = [this](Button&) { + on_delete(); }; - button_new_dir.on_select = [this, &nav](Button&) { - name_buffer.clear(); - - text_prompt(nav, name_buffer, max_filename_length, [this](std::string& buffer) { - make_new_directory(current_path / buffer); - load_directory_contents(current_path); - refresh_list(); - }); + button_new_dir.on_select = [this](Button&) { + on_new_dir(); }; } } diff --git a/firmware/application/apps/ui_fileman.hpp b/firmware/application/apps/ui_fileman.hpp index cfc94d652..41707b798 100644 --- a/firmware/application/apps/ui_fileman.hpp +++ b/firmware/application/apps/ui_fileman.hpp @@ -52,15 +52,13 @@ public: std::string title() const override { return "Fileman"; }; protected: - static constexpr size_t max_filename_length = 64 - 2; // Necessary? + static constexpr size_t max_filename_length = 64; // Necessary? struct file_assoc_t { std::filesystem::path extension; const Bitmap* icon; ui::Color color; }; - - const std::string suffix[5] = { "B", "kB", "MB", "GB", "??" }; const std::vector file_types = { { u".TXT", &bitmap_icon_file_text, ui::Color::white() }, @@ -82,6 +80,7 @@ protected: std::function on_refresh_widgets { nullptr }; std::vector entry_list { }; + const std::filesystem::path parent_dir_path { u".." }; std::filesystem::path current_path { u"" }; std::filesystem::path extension_filter { u"" }; @@ -148,9 +147,9 @@ private: std::string extension_buffer { }; void refresh_widgets(const bool v); - void on_rename(NavigationView& nav); - //void on_refactor(NavigationView& nav); + void on_rename(); void on_delete(); + void on_new_dir(); Labels labels { { { 0, 26 * 8 }, "Created ", Color::light_grey() } @@ -166,7 +165,7 @@ private: "Rename" }; - Button button_copy { + /*Button button_copy { { 10 * 8, 29 * 8, 10 * 8, 32 }, "Copy" }; @@ -174,7 +173,7 @@ private: Button button_move { { 10 * 8, 29 * 8, 10 * 8, 32 }, "Move" - }; + };*/ Button button_delete { { 21 * 8, 29 * 8, 9 * 8, 32 }, @@ -190,7 +189,6 @@ private: { 0 * 8, 34 * 8, 14 * 8, 32 }, "New Dir" }; - }; } /* namespace ui */ diff --git a/firmware/application/file.cpp b/firmware/application/file.cpp index a47a0a64e..6dfc25829 100644 --- a/firmware/application/file.cpp +++ b/firmware/application/file.cpp @@ -197,6 +197,13 @@ std::vector scan_root_directories(const std::filesystem:: return directory_list; } +bool file_exists(const std::filesystem::path& file_path) { + FILINFO filinfo; + auto fr = f_stat(reinterpret_cast(file_path.c_str()), &filinfo); + + return fr == FR_OK; +} + uint32_t delete_file(const std::filesystem::path& file_path) { return f_unlink(reinterpret_cast(file_path.c_str())); } @@ -251,12 +258,11 @@ std::string filesystem_error::what() const { } path path::parent_path() const { - const auto t = filename().native(); - const auto index = t.find_last_of(preferred_separator); - if( index == t.npos ) { - return *this; + const auto index = _s.find_last_of(preferred_separator); + if( index == _s.npos ) { + return { }; // NB: Deviation from STL. } else { - return t.substr(0, index); + return _s.substr(0, index); } } @@ -318,6 +324,12 @@ bool operator>(const path& lhs, const path& rhs) { return lhs.native() > rhs.native(); } +path operator+(const path& lhs, const path& rhs) { + path result = lhs; + result += rhs; + return result; +} + path operator/(const path& lhs, const path& rhs) { path result = lhs; result /= rhs; diff --git a/firmware/application/file.hpp b/firmware/application/file.hpp index 7dd35e3d2..4fd99af27 100644 --- a/firmware/application/file.hpp +++ b/firmware/application/file.hpp @@ -168,6 +168,7 @@ private: bool operator==(const path& lhs, const path& rhs); bool operator<(const path& lhs, const path& rhs); bool operator>(const path& lhs, const path& rhs); +path operator+(const path& lhs, const path& rhs); path operator/(const path& lhs, const path& rhs); using file_status = BYTE; @@ -248,6 +249,7 @@ struct FATTimestamp { uint16_t FAT_time; }; +bool file_exists(const std::filesystem::path& file_path); uint32_t delete_file(const std::filesystem::path& file_path); uint32_t rename_file(const std::filesystem::path& file_path, const std::filesystem::path& new_name); FATTimestamp file_created_date(const std::filesystem::path& file_path); @@ -255,6 +257,8 @@ uint32_t make_new_directory(const std::filesystem::path& dir_path); std::vector scan_root_files(const std::filesystem::path& directory, const std::filesystem::path& extension); std::vector scan_root_directories(const std::filesystem::path& directory); + +/* Gets an auto incrementing filename. */ std::filesystem::path next_filename_stem_matching_pattern(std::filesystem::path filename_stem_pattern); /* Values added to FatFs FRESULT enum, values outside the FRESULT data type */ From 11f4edc89267c7988d2c6cfcde3c55d521620cf0 Mon Sep 17 00:00:00 2001 From: Kyle Reed Date: Tue, 2 May 2023 09:38:08 -0700 Subject: [PATCH 3/4] Modal dialog for partner file action, fix lifetime --- firmware/application/apps/soundboard_app.cpp | 2 +- firmware/application/apps/ui_fileman.cpp | 173 ++++++++++-------- firmware/application/apps/ui_fileman.hpp | 39 ++-- .../application/apps/ui_flash_utility.cpp | 2 +- firmware/application/apps/ui_freqman.cpp | 2 +- firmware/application/ui/ui_menu.cpp | 2 +- firmware/application/ui/ui_menu.hpp | 2 +- firmware/application/ui/ui_textentry.cpp | 36 +--- firmware/application/ui/ui_textentry.hpp | 10 +- firmware/application/ui_navigation.hpp | 9 + 10 files changed, 138 insertions(+), 139 deletions(-) diff --git a/firmware/application/apps/soundboard_app.cpp b/firmware/application/apps/soundboard_app.cpp index 344afd35b..898d95cc9 100644 --- a/firmware/application/apps/soundboard_app.cpp +++ b/firmware/application/apps/soundboard_app.cpp @@ -206,7 +206,7 @@ void SoundBoardView::refresh_list() { file_list[n].string().substr(0, 30), ui::Color::white(), nullptr, - [this](){ + [this](KeyEvent){ on_select_entry(); } }); diff --git a/firmware/application/apps/ui_fileman.cpp b/firmware/application/apps/ui_fileman.cpp index eb34cc92d..7c1fcfbe4 100644 --- a/firmware/application/apps/ui_fileman.cpp +++ b/firmware/application/apps/ui_fileman.cpp @@ -20,6 +20,11 @@ * Boston, MA 02110-1301, USA. */ +/* BUGS: + * - OOM/paging menu items + * - Using UI with empty SD card + */ + #include #include "ui_fileman.hpp" #include "string_format.hpp" @@ -27,21 +32,22 @@ #include "event_m0.hpp" using namespace portapack; +namespace fs = std::filesystem; namespace { using namespace ui; -bool is_hidden_file(const std::filesystem::path& path) { +bool is_hidden_file(const fs::path& path) { return !path.empty() && path.native()[0] == u'.'; } // Gets a truncated name from a path for display. -std::string truncate(const std::filesystem::path& path, size_t max_length = 25) { +std::string truncate(const fs::path& path, size_t max_length) { auto name = path.string(); return name.length() <= max_length ? name : name.substr(0, max_length); } -// Gets a human readable size string. +// Gets a human readable file size string. std::string get_pretty_size(uint32_t file_size) { static const std::string suffix[5] = { "B", "kB", "MB", "GB", "??" }; size_t suffix_index = 0; @@ -59,8 +65,8 @@ std::string get_pretty_size(uint32_t file_size) { // Case insensitive path equality on underlying "native" string. bool iequal( - const std::filesystem::path& lhs, - const std::filesystem::path& rhs + const fs::path& lhs, + const fs::path& rhs ) { const auto& lhs_str = lhs.native(); const auto& rhs_str = rhs.native(); @@ -93,9 +99,9 @@ void insert_sorted(std::vector& entries, fileman_entry&& entry) { } // Returns the partner file path or an empty path if no partner is found. -std::filesystem::path get_partner_file(std::filesystem::path path) { - const auto txt_path = std::filesystem::path{ u".TXT" }; - const auto c16_path = std::filesystem::path{ u".C16" }; +fs::path get_partner_file(fs::path path) { + const fs::path txt_path{ u".TXT" }; + const fs::path c16_path{ u".C16" }; auto ext = path.extension(); if (iequal(ext, txt_path)) @@ -106,47 +112,56 @@ std::filesystem::path get_partner_file(std::filesystem::path path) { return { }; path.replace_extension(ext); - return file_exists(path) ? path : std::filesystem::path{ }; + return file_exists(path) ? path : fs::path{ }; } -// Modal prompt to update the partner file. -// Returns true if user wants to update the partner file too. -bool partner_file_prompt(NavigationView& nav, const std::filesystem::path& partner) { - bool result = false; +// Modal prompt to update the partner file if it exists. +// Runs continuation on_partner_action to update the partner file. +// Returns true is a partner is found, otherwise false. +bool partner_file_prompt( + NavigationView& nav, + const fs::path& path, + std::string action_name, + std::function on_partner_action +) { + auto partner = get_partner_file(path); if (partner.empty()) - return result; + return false; - nav.push( - "Partner File Exists", - partner.filename().string() + "\nUpdate this file too?", + nav.push_under_current( + "Partner File", + partner.filename().string() + "\n" + action_name + " this file too?", YESNO, - [&result](bool choice) { result = choice; } + [&nav, partner, on_partner_action](bool choice) { + if (on_partner_action) + on_partner_action(partner, choice); + } ); - return result; + return true; } } namespace ui { -void FileManBaseView::load_directory_contents(const std::filesystem::path& dir_path) { +void FileManBaseView::load_directory_contents(const fs::path& dir_path) { current_path = dir_path; entry_list.clear(); auto filtering = !extension_filter.empty(); - text_current.set(dir_path.empty() ? "(sd root)" : truncate(dir_path)); + text_current.set(dir_path.empty() ? "(sd root)" : truncate(dir_path, 24)); - for (const auto& entry : std::filesystem::directory_iterator(dir_path, u"*")) { + for (const auto& entry : fs::directory_iterator(dir_path, u"*")) { // Hide files starting with '.' (hidden / tmp). if (is_hidden_file(entry.path())) continue; - if (std::filesystem::is_regular_file(entry.status())) { + if (fs::is_regular_file(entry.status())) { if (!filtering || iequal(entry.path().extension(), extension_filter)) insert_sorted(entry_list, { entry.path(), (uint32_t)entry.size(), false }); - } else if (std::filesystem::is_directory(entry.status())) { + } else if (fs::is_directory(entry.status())) { insert_sorted(entry_list, { entry.path(), 0, true }); } } @@ -156,7 +171,7 @@ void FileManBaseView::load_directory_contents(const std::filesystem::path& dir_p entry_list.insert(entry_list.begin(), { parent_dir_path, 0, true }); } -std::filesystem::path FileManBaseView::get_selected_full_path() const { +fs::path FileManBaseView::get_selected_full_path() const { if (get_selected_entry().path == parent_dir_path) return current_path.parent_path(); @@ -195,9 +210,9 @@ FileManBaseView::FileManBaseView( empty_root = true; text_current.set("EMPTY SD CARD!"); } else { - menu_view.on_left = [&nav, this]() { - load_directory_contents(current_path.parent_path()); - refresh_list(); + menu_view.on_left = [this]() { + current_path = current_path.parent_path(); + reload_current(); }; } } @@ -224,9 +239,9 @@ void FileManBaseView::refresh_list() { entry_name, ui::Color::yellow(), &bitmap_icon_dir, - [this]() { + [this](KeyEvent key) { if (on_select_entry) - on_select_entry(); + on_select_entry(key); } }); @@ -238,9 +253,9 @@ void FileManBaseView::refresh_list() { entry_name + std::string(21 - entry_name.length(), ' ') + size_str, assoc.color, assoc.icon, - [this]() { + [this](KeyEvent key) { if (on_select_entry) - on_select_entry(); + on_select_entry(key); } }); } @@ -249,8 +264,13 @@ void FileManBaseView::refresh_list() { menu_view.set_highlighted(0); // Refresh } +void FileManBaseView::reload_current() { + load_directory_contents(current_path); + refresh_list(); +} + const FileManBaseView::file_assoc_t& FileManBaseView::get_assoc( - const std::filesystem::path& ext) const + const fs::path& ext) const { size_t index = 0; @@ -306,10 +326,10 @@ FileLoadView::FileLoadView( refresh_list(); - on_select_entry = [this]() { + on_select_entry = [this](KeyEvent) { if (get_selected_entry().is_directory) { - load_directory_contents(get_selected_full_path()); - refresh_list(); + current_path /= get_selected_entry().path; + reload_current(); } else { nav_.pop(); if (on_changed) @@ -319,65 +339,75 @@ FileLoadView::FileLoadView( } void FileManagerView::on_rename() { - // Don't allow rename of ".." - if (get_selected_entry().path == parent_dir_path) + auto& entry = get_selected_entry(); + + // Don't rename ".." + if (entry.path == parent_dir_path) return; - auto& entry = get_selected_entry(); - auto name = entry.path.filename().string(); - auto orig_ext = entry.path.extension(); + name_buffer = entry.path.filename().string(); - uint32_t cursor_pos = (uint32_t)name.length(); - if (auto pos = name.find_last_of("."); pos != name.npos) + uint32_t cursor_pos = (uint32_t)name_buffer.length(); + if (auto pos = name_buffer.find_last_of("."); pos != name_buffer.npos) cursor_pos = pos; - text_prompt(nav_, name, cursor_pos, max_filename_length, - [this, &entry, &orig_ext](std::string& renamed) { - auto renamed_path = std::filesystem::path{ renamed }; + text_prompt(nav_, name_buffer, cursor_pos, max_filename_length, + [this, &entry](std::string& renamed) { + auto renamed_path = fs::path{ renamed }; + bool has_partner = false; rename_file(get_selected_full_path(), current_path / renamed_path); - if (iequal(renamed_path.extension(), orig_ext)) { - auto partner = get_partner_file(current_path / entry.path); - if (partner_file_prompt(nav_, partner)) { - auto new_name = renamed_path.replace_extension(partner.extension()); - rename_file(partner, current_path / new_name); - } + if (iequal(renamed_path.extension(), entry.path.extension())) { + has_partner = partner_file_prompt(nav_, entry.path, "Rename", + [this, renamed_path](const fs::path& partner, bool should_rename) mutable { + if (should_rename) { + auto new_name = renamed_path.replace_extension(partner.extension()); + rename_file(current_path / partner, current_path / new_name); + } + reload_current(); + } + ); } - load_directory_contents(current_path); - refresh_list(); + if (!has_partner) + reload_current(); }); } void FileManagerView::on_delete() { - // Don't allow delete of ".." - if (get_selected_entry().path == parent_dir_path) + auto& entry = get_selected_entry(); + + // Don't delete ".." + if (entry.path == parent_dir_path) return; - auto& entry = get_selected_entry(); auto name = entry.path.filename().string(); nav_.push("Delete", "Delete " + name + "\nAre you sure?", YESNO, [this, &entry](bool choice) { if (choice) { delete_file(get_selected_full_path()); - auto partner = get_partner_file(current_path / entry.path); - if (partner_file_prompt(nav_, partner)) - delete_file(partner); + auto has_partner = partner_file_prompt( + nav_, entry.path, "Delete", + [this](const fs::path& partner, bool should_delete) { + if (should_delete) + delete_file(current_path / partner); + reload_current(); + } + ); - load_directory_contents(current_path); - refresh_list(); + if (!has_partner) + reload_current(); } } ); } void FileManagerView::on_new_dir() { - std::string name; - text_prompt(nav_, name, max_filename_length, [this](std::string& dir_name) { + name_buffer = ""; + text_prompt(nav_, name_buffer, max_filename_length, [this](std::string& dir_name) { make_new_directory(current_path / dir_name); - load_directory_contents(current_path); - refresh_list(); + reload_current(); }); } @@ -389,7 +419,6 @@ void FileManagerView::refresh_widgets(const bool v) { } FileManagerView::~FileManagerView() { - // Flush ? } FileManagerView::FileManagerView( @@ -406,10 +435,7 @@ FileManagerView::FileManagerView( &labels, &text_date, &button_rename, - //&button_copy, - //&button_move, &button_delete, - //&button_new_file, &button_new_dir, }); @@ -419,12 +445,13 @@ FileManagerView::FileManagerView( refresh_list(); - on_select_entry = [this]() { - if (get_selected_entry().is_directory) { + on_select_entry = [this](KeyEvent key) { + if (key == KeyEvent::Select && get_selected_entry().is_directory) { load_directory_contents(get_selected_full_path()); refresh_list(); - } else + } else { button_rename.focus(); + } }; button_rename.on_select = [this](Button&) { diff --git a/firmware/application/apps/ui_fileman.hpp b/firmware/application/apps/ui_fileman.hpp index 41707b798..d0894b53f 100644 --- a/firmware/application/apps/ui_fileman.hpp +++ b/firmware/application/apps/ui_fileman.hpp @@ -43,16 +43,11 @@ public: std::string filter ); - void focus() override; - - void load_directory_contents(const std::filesystem::path& dir_path); - std::filesystem::path get_selected_full_path() const; - const fileman_entry& get_selected_entry() const; - + void focus() override; std::string title() const override { return "Fileman"; }; protected: - static constexpr size_t max_filename_length = 64; // Necessary? + static constexpr size_t max_filename_length = 50; struct file_assoc_t { std::filesystem::path extension; @@ -70,19 +65,26 @@ protected: { u"", &bitmap_icon_file, ui::Color::light_grey() } // NB: Must be last. }; + + std::filesystem::path get_selected_full_path() const; + const fileman_entry& get_selected_entry() const; + void refresh_list(); + void reload_current(); + void load_directory_contents(const std::filesystem::path& dir_path); const file_assoc_t& get_assoc(const std::filesystem::path& ext) const; NavigationView& nav_; bool empty_root { false }; - std::function on_select_entry { nullptr }; + std::function on_select_entry { nullptr }; std::function on_refresh_widgets { nullptr }; - - std::vector entry_list { }; + const std::filesystem::path parent_dir_path { u".." }; std::filesystem::path current_path { u"" }; std::filesystem::path extension_filter { u"" }; + + std::vector entry_list { }; Labels labels { { { 0, 0 }, "Path:", Color::light_grey() } @@ -143,8 +145,8 @@ public: ~FileManagerView(); private: + // Passed by ref to other views needing lifetime extension. std::string name_buffer { }; - std::string extension_buffer { }; void refresh_widgets(const bool v); void on_rename(); @@ -165,25 +167,10 @@ private: "Rename" }; - /*Button button_copy { - { 10 * 8, 29 * 8, 10 * 8, 32 }, - "Copy" - }; - - Button button_move { - { 10 * 8, 29 * 8, 10 * 8, 32 }, - "Move" - };*/ - Button button_delete { { 21 * 8, 29 * 8, 9 * 8, 32 }, "Delete" }; - - /*Button button_new_file { - { 0 * 8, 34 * 8, 14 * 8, 32 }, - "New File" - };*/ Button button_new_dir { { 0 * 8, 34 * 8, 14 * 8, 32 }, diff --git a/firmware/application/apps/ui_flash_utility.cpp b/firmware/application/apps/ui_flash_utility.cpp index 4dcd2c32f..0f0eb8fb9 100644 --- a/firmware/application/apps/ui_flash_utility.cpp +++ b/firmware/application/apps/ui_flash_utility.cpp @@ -44,7 +44,7 @@ FlashUtilityView::FlashUtilityView(NavigationView& nav) : nav_ (nav) { filename.string().substr(0, max_filename_length), ui::Color::red(), &bitmap_icon_temperature, - [this, path]() { + [this, path](KeyEvent) { this->firmware_selected(path); } }); diff --git a/firmware/application/apps/ui_freqman.cpp b/firmware/application/apps/ui_freqman.cpp index 2fe3fdc28..3b52d308a 100644 --- a/firmware/application/apps/ui_freqman.cpp +++ b/firmware/application/apps/ui_freqman.cpp @@ -120,7 +120,7 @@ void FreqManBaseView::refresh_list() { freqman_item_string(database[n], 30), ui::Color::white(), nullptr, - [this](){ + [this](KeyEvent){ if (on_select_frequency) on_select_frequency(); } diff --git a/firmware/application/ui/ui_menu.cpp b/firmware/application/ui/ui_menu.cpp index c6999a505..eb6063f04 100644 --- a/firmware/application/ui/ui_menu.cpp +++ b/firmware/application/ui/ui_menu.cpp @@ -262,7 +262,7 @@ bool MenuView::on_key(const KeyEvent key) { case KeyEvent::Select: case KeyEvent::Right: if( menu_items[highlighted_item].on_select ) { - menu_items[highlighted_item].on_select(); + menu_items[highlighted_item].on_select(key); } return true; diff --git a/firmware/application/ui/ui_menu.hpp b/firmware/application/ui/ui_menu.hpp index 1f7a7016d..9aa1c6cd9 100644 --- a/firmware/application/ui/ui_menu.hpp +++ b/firmware/application/ui/ui_menu.hpp @@ -39,7 +39,7 @@ struct MenuItem { std::string text; ui::Color color; const Bitmap* bitmap; - std::function on_select; + std::function on_select; // TODO: Prevent default-constructed MenuItems. // I managed to construct a menu with three extra, unspecified menu items diff --git a/firmware/application/ui/ui_textentry.cpp b/firmware/application/ui/ui_textentry.cpp index dcc012948..71e1639bc 100644 --- a/firmware/application/ui/ui_textentry.cpp +++ b/firmware/application/ui/ui_textentry.cpp @@ -32,8 +32,8 @@ namespace ui { void text_prompt( NavigationView& nav, std::string& str, - const size_t max_length, - const std::function on_done + size_t max_length, + std::function on_done ) { text_prompt(nav, str, str.length(), max_length, on_done); } @@ -42,8 +42,8 @@ void text_prompt( NavigationView& nav, std::string& str, uint32_t cursor_pos, - const size_t max_length, - const std::function on_done + size_t max_length, + std::function on_done ) { //if (persistent_memory::ui_config_textentry() == 0) { auto te_view = nav.push(str, max_length); @@ -70,7 +70,7 @@ TextField::TextField( uint32_t length ) : Widget{ { position, { 8 * static_cast(length), 16 } } }, text_{ str }, - max_length_{ std::max(max_length, 1) }, + max_length_{ std::max(max_length, str.length()) }, char_count_{ std::max(length, 1) }, cursor_pos_{ text_.length() }, insert_mode_{ true } @@ -82,36 +82,11 @@ const std::string& TextField::value() const { return text_; } -void TextField::set(const std::string& str) { - // Assume that setting the string implies we want the whole thing. - max_length_ = std::max(max_length_, str.length()); - - text_ = str; - cursor_pos_ = str.length(); - set_cursor(str.length()); -} - void TextField::set_cursor(uint32_t pos) { cursor_pos_ = std::min(pos, text_.length()); set_dirty(); } -void TextField::set_max_length(size_t max_length) { - // Doesn't make sense, ignore. - if (max_length == 0) - return; - - if (max_length < text_.length()) { - text_.erase(max_length - 1); - text_.shrink_to_fit(); - } else { - text_.reserve(max_length); - } - - max_length_ = max_length; - set_cursor(cursor_pos_); -} - void TextField::set_insert_mode() { insert_mode_ = true; } @@ -247,7 +222,6 @@ TextEntryView::TextEntryView( }); button_ok.on_select = [this, &str, &nav](Button&) { - str.shrink_to_fit(); // NB: str is the TextField string. if (on_changed) on_changed(str); nav.pop(); diff --git a/firmware/application/ui/ui_textentry.hpp b/firmware/application/ui/ui_textentry.hpp index e42fb000e..f948aedf7 100644 --- a/firmware/application/ui/ui_textentry.hpp +++ b/firmware/application/ui/ui_textentry.hpp @@ -53,9 +53,7 @@ public: const std::string& value() const; - void set(const std::string& str); void set_cursor(uint32_t pos); - void set_max_length(size_t max_length); void set_insert_mode(); void set_overwrite_mode(); @@ -103,18 +101,22 @@ protected: }; }; +// Show the TextEntry view to receive keyboard input. +// NB: This function returns immediately. 'str' is taken +// by reference and its lifetime must be ensured by the +// caller until the TextEntry view is dismissed. void text_prompt( NavigationView& nav, std::string& str, size_t max_length, - const std::function on_done = nullptr); + std::function on_done = nullptr); void text_prompt( NavigationView& nav, std::string& str, uint32_t cursor_pos, size_t max_length, - const std::function on_done = nullptr); + std::function on_done = nullptr); } /* namespace ui */ diff --git a/firmware/application/ui_navigation.hpp b/firmware/application/ui_navigation.hpp index 6a8d9b8f8..da827ec14 100644 --- a/firmware/application/ui_navigation.hpp +++ b/firmware/application/ui_navigation.hpp @@ -76,6 +76,15 @@ namespace ui { return reinterpret_cast(push_view(std::unique_ptr(new T(*this, std::forward(args)...)))); } + + // Pushes a new view under the current on the stack so the current view returns into this new one. + template + void push_under_current(Args &&...args) + { + auto new_view = std::unique_ptr(new T(*this, std::forward(args)...)); + view_stack.insert(view_stack.end() - 1, std::move(new_view)); + } + template T *replace(Args &&...args) { From 3fc23354ce1c5e5323d320f9e6b81cc7fe11df57 Mon Sep 17 00:00:00 2001 From: Kyle Reed Date: Tue, 2 May 2023 20:49:41 -0700 Subject: [PATCH 4/4] Fix path separator, revert UI --- firmware/application/apps/ui_fileman.cpp | 28 +++++++++++------------- firmware/application/apps/ui_fileman.hpp | 4 ++-- firmware/application/file.hpp | 2 +- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/firmware/application/apps/ui_fileman.cpp b/firmware/application/apps/ui_fileman.cpp index 7c1fcfbe4..1787b70a9 100644 --- a/firmware/application/apps/ui_fileman.cpp +++ b/firmware/application/apps/ui_fileman.cpp @@ -20,9 +20,10 @@ * Boston, MA 02110-1301, USA. */ -/* BUGS: - * - OOM/paging menu items - * - Using UI with empty SD card +/* TODO: + * - Paging menu items + * - UI with empty SD card + * - Copy/Move */ #include @@ -328,7 +329,7 @@ FileLoadView::FileLoadView( on_select_entry = [this](KeyEvent) { if (get_selected_entry().is_directory) { - current_path /= get_selected_entry().path; + current_path = get_selected_full_path(); reload_current(); } else { nav_.pop(); @@ -354,20 +355,17 @@ void FileManagerView::on_rename() { text_prompt(nav_, name_buffer, cursor_pos, max_filename_length, [this, &entry](std::string& renamed) { auto renamed_path = fs::path{ renamed }; - bool has_partner = false; rename_file(get_selected_full_path(), current_path / renamed_path); - if (iequal(renamed_path.extension(), entry.path.extension())) { - has_partner = partner_file_prompt(nav_, entry.path, "Rename", - [this, renamed_path](const fs::path& partner, bool should_rename) mutable { - if (should_rename) { - auto new_name = renamed_path.replace_extension(partner.extension()); - rename_file(current_path / partner, current_path / new_name); - } - reload_current(); + auto has_partner = partner_file_prompt(nav_, entry.path, "Rename", + [this, renamed_path](const fs::path& partner, bool should_rename) mutable { + if (should_rename) { + auto new_name = renamed_path.replace_extension(partner.extension()); + rename_file(current_path / partner, current_path / new_name); } - ); - } + reload_current(); + } + ); if (!has_partner) reload_current(); diff --git a/firmware/application/apps/ui_fileman.hpp b/firmware/application/apps/ui_fileman.hpp index d0894b53f..87cc8d115 100644 --- a/firmware/application/apps/ui_fileman.hpp +++ b/firmware/application/apps/ui_fileman.hpp @@ -163,12 +163,12 @@ private: }; Button button_rename { - { 0 * 8, 29 * 8, 9 * 8, 32 }, + { 0 * 8, 29 * 8, 14 * 8, 32 }, "Rename" }; Button button_delete { - { 21 * 8, 29 * 8, 9 * 8, 32 }, + { 16 * 8, 29 * 8, 14 * 8, 32 }, "Delete" }; diff --git a/firmware/application/file.hpp b/firmware/application/file.hpp index 4fd99af27..a023c7b3d 100644 --- a/firmware/application/file.hpp +++ b/firmware/application/file.hpp @@ -154,7 +154,7 @@ struct path { path& operator/=(const path& p) { if (_s.back() != preferred_separator) - _s + preferred_separator; + _s += preferred_separator; _s += p._s; return *this; }