From eeb3f2d406a951b423b83f559fe749df0b4f745a Mon Sep 17 00:00:00 2001 From: ailurux Date: Mon, 6 May 2024 12:36:16 +1000 Subject: [PATCH] WIP: File browser, needs bug fixes --- lua/file_browser.lua | 73 +++++++++++++++++++++++++++++++ lua/main_menu.lua | 10 +++++ src/lua/file_iterator.cpp | 31 +++++++------ src/lua/include/file_iterator.hpp | 1 + src/lua/lua_filesystem.cpp | 36 ++++++++++++--- 5 files changed, 132 insertions(+), 19 deletions(-) create mode 100644 lua/file_browser.lua diff --git a/lua/file_browser.lua b/lua/file_browser.lua new file mode 100644 index 00000000..57ebde58 --- /dev/null +++ b/lua/file_browser.lua @@ -0,0 +1,73 @@ +local lvgl = require("lvgl") +local widgets = require("widgets") +local backstack = require("backstack") +local font = require("font") +local queue = require("queue") +local playing = require("playing") +local styles = require("styles") +local playback = require("playback") +local theme = require("theme") +local screen = require("screen") +local filesystem = require("filesystem") + +return screen:new{ + createUi = function(self) + self.root = lvgl.Object(nil, { + flex = { + flex_direction = "column", + flex_wrap = "wrap", + justify_content = "flex-start", + align_items = "flex-start", + align_content = "flex-start" + }, + w = lvgl.HOR_RES(), + h = lvgl.VER_RES() + }) + self.root:center() + + self.status_bar = widgets.StatusBar(self, { + back_cb = backstack.pop, + title = self.title + }) + + local header = self.root:Object{ + flex = { + flex_direction = "column", + flex_wrap = "wrap", + justify_content = "flex-start", + align_items = "flex-start", + align_content = "flex-start" + }, + w = lvgl.HOR_RES(), + h = lvgl.SIZE_CONTENT, + pad_left = 4, + pad_right = 4, + pad_bottom = 2, + bg_opa = lvgl.OPA(100), + scrollbar_mode = lvgl.SCROLLBAR_MODE.OFF + } + theme.set_style(header, "header") + + if self.breadcrumb then + header:Label{ + text = self.breadcrumb, + text_font = font.fusion_10 + } + end + + local recycle_list = widgets.RecyclerList(self.root, self.iterator, { + callback = function(item) + return function() + local is_dir = item:is_directory() + if is_dir then + backstack.push(require("file_browser"):new{ + title = self.title, + iterator = filesystem.iterator(tostring(item)), + breadcrumb = tostring(item) + }) + end + end + end + }) + end +} diff --git a/lua/main_menu.lua b/lua/main_menu.lua index 5fd6417f..9c52340b 100644 --- a/lua/main_menu.lua +++ b/lua/main_menu.lua @@ -5,6 +5,7 @@ local backstack = require("backstack") local browser = require("browser") local playing = require("playing") local styles = require("styles") +local filesystem = require("filesystem") local screen = require("screen") return widgets.MenuScreen:new { @@ -35,6 +36,15 @@ return widgets.MenuScreen:new { btn:add_style(styles.list_item) end + local files = list:add_btn(nil, "Files") + files:onClicked(function() + backstack.push(require("file_browser"):new { + title = "Files", + iterator = filesystem.iterator(""), + }) + end) + files:add_style(styles.list_item) + local settings = list:add_btn(nil, "Settings") settings:onClicked(function() backstack.push(require("settings"):new()) diff --git a/src/lua/file_iterator.cpp b/src/lua/file_iterator.cpp index 8de1a923..58b256b2 100644 --- a/src/lua/file_iterator.cpp +++ b/src/lua/file_iterator.cpp @@ -17,12 +17,13 @@ namespace database { FileIterator::FileIterator(std::string filepath) : original_path_(filepath), - current_() + current_(), + offset_(-1) { auto lock = drivers::acquire_spi(); - const TCHAR* next_path = static_cast(filepath.c_str()); - FRESULT res = f_opendir(&dir_, next_path); + const TCHAR* path = static_cast(filepath.c_str()); + FRESULT res = f_opendir(&dir_, path); if (res != FR_OK) { ESP_LOGE(kTag, "Error opening directory: %s", filepath.c_str()); } @@ -42,36 +43,40 @@ auto FileIterator::next() -> void { } auto FileIterator::prev() -> void { - iterate(true); + if (offset_ == 0) { + current_.reset(); + return; + } + f_rewinddir(&dir_); + auto new_offset = offset_-1; + offset_ = -1; + for (int i = 0; i < new_offset; i++) { + iterate(false); + } } auto FileIterator::iterate(bool reverse) -> bool { FILINFO info; - if (reverse) { - f_rewinddir(&dir_); - } { auto lock = drivers::acquire_spi(); auto res = f_readdir(&dir_, &info); if (res != FR_OK) { - ESP_LOGI(kTag, "AAAAAAAAAAAAAAAAAAA"); - ESP_LOGI(kTag, "%d", res); + ESP_LOGE(kTag, "Error reading directory. Error: %d", res); return false; } } if (info.fname[0] == 0) { // End of directory + // Set value to nil current_.reset(); - ESP_LOGI(kTag, "End of dir"); - } else { // Update current value - ESP_LOGI(kTag, "File: %s", info.fname); + offset_++; current_ = FileEntry{ .isHidden = (info.fattrib & AM_HID) > 0, .isDirectory = (info.fattrib & AM_DIR) > 0, .isTrack = false, // TODO - .filepath = original_path_ + info.fname, + .filepath = original_path_ + (original_path_.size()>0?"/":"") + info.fname, }; } diff --git a/src/lua/include/file_iterator.hpp b/src/lua/include/file_iterator.hpp index 1632949e..da1a6eeb 100644 --- a/src/lua/include/file_iterator.hpp +++ b/src/lua/include/file_iterator.hpp @@ -36,6 +36,7 @@ class FileIterator { std::string original_path_; std::optional current_; + int offset_; auto iterate(bool reverse = false) -> bool; }; diff --git a/src/lua/lua_filesystem.cpp b/src/lua/lua_filesystem.cpp index 5c690c16..f0dbaf9a 100644 --- a/src/lua/lua_filesystem.cpp +++ b/src/lua/lua_filesystem.cpp @@ -88,11 +88,11 @@ static auto fs_iterate(lua_State* state) -> int { return 1; } -// static auto db_iterator_clone(lua_State* state) -> int { -// database::Iterator* it = db_check_iterator(state, 1); -// push_iterator(state, *it); -// return 1; -// } +static auto fs_iterator_clone(lua_State* state) -> int { + database::FileIterator* it = check_file_iterator(state, 1); + push_iterator(state, *it); + return 1; +} static auto fs_iterator_gc(lua_State* state) -> int { database::FileIterator* it = check_file_iterator(state, 1); @@ -102,7 +102,7 @@ static auto fs_iterator_gc(lua_State* state) -> int { static const struct luaL_Reg kFileIteratorFuncs[] = {{"next", fs_iterate}, {"prev", fs_iterate_prev}, - // {"clone", db_iterator_clone}, + {"clone", fs_iterator_clone}, {"__call", fs_iterate}, {"__gc", fs_iterator_gc}, {NULL, NULL}}; @@ -114,7 +114,31 @@ static auto file_entry_path(lua_State* state) -> int { return 1; } +static auto file_entry_is_dir(lua_State* state) -> int { + LuaFileEntry* data = reinterpret_cast( + luaL_checkudata(state, 1, kFileEntryMetatable)); + lua_pushboolean(state, data->isDirectory); + return 1; +} + +static auto file_entry_is_hidden(lua_State* state) -> int { + LuaFileEntry* data = reinterpret_cast( + luaL_checkudata(state, 1, kFileEntryMetatable)); + lua_pushboolean(state, data->isHidden); + return 1; +} + +static auto file_entry_is_track(lua_State* state) -> int { + LuaFileEntry* data = reinterpret_cast( + luaL_checkudata(state, 1, kFileEntryMetatable)); + lua_pushboolean(state, data->isTrack); + return 1; +} + static const struct luaL_Reg kFileEntryFuncs[] = {{"filepath", file_entry_path}, + {"is_directory", file_entry_is_dir}, + {"is_hidden", file_entry_is_hidden}, + {"is_track", file_entry_is_track}, {"__tostring", file_entry_path}, {NULL, NULL}};