Merge pull request 'file-browser' (#71) from file-browser into main
Reviewed-on: https://codeberg.org/cool-tech-zone/tangara-fw/pulls/71 Reviewed-by: cooljqln <cooljqln@noreply.codeberg.org>custom
ailurux
12 months ago
commit
35c6125b25
@ -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 |
||||
|
||||
widgets.InfiniteList(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 |
||||
} |
||||
@ -0,0 +1,87 @@ |
||||
/*
|
||||
* Copyright 2023 ailurux <ailuruxx@gmail.com> |
||||
* |
||||
* SPDX-License-Identifier: GPL-3.0-only |
||||
*/ |
||||
#include "lua/file_iterator.hpp" |
||||
#include "esp_log.h" |
||||
|
||||
#include <string> |
||||
|
||||
#include "ff.h" |
||||
#include "drivers/spi.hpp" |
||||
|
||||
namespace lua { |
||||
|
||||
[[maybe_unused]] static const char* kTag = "FileIterator"; |
||||
|
||||
FileIterator::FileIterator(std::string filepath)
|
||||
: original_path_(filepath), |
||||
current_(), |
||||
offset_(-1) |
||||
{ |
||||
auto lock = drivers::acquire_spi(); |
||||
|
||||
const TCHAR* path = static_cast<const TCHAR*>(filepath.c_str()); |
||||
FRESULT res = f_opendir(&dir_, path); |
||||
if (res != FR_OK) { |
||||
ESP_LOGE(kTag, "Error opening directory: %s", filepath.c_str()); |
||||
} |
||||
} |
||||
|
||||
FileIterator::~FileIterator() { |
||||
auto lock = drivers::acquire_spi(); |
||||
f_closedir(&dir_); |
||||
} |
||||
|
||||
auto FileIterator::value() const -> const std::optional<FileEntry>& { |
||||
return current_; |
||||
} |
||||
|
||||
auto FileIterator::next() -> void { |
||||
iterate(false); |
||||
} |
||||
|
||||
auto FileIterator::prev() -> void { |
||||
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; |
||||
{ |
||||
auto lock = drivers::acquire_spi(); |
||||
auto res = f_readdir(&dir_, &info); |
||||
if (res != FR_OK) { |
||||
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(); |
||||
} else { |
||||
// Update current value
|
||||
offset_++; |
||||
current_ = FileEntry{ |
||||
.index = offset_, |
||||
.isHidden = (info.fattrib & AM_HID) > 0, |
||||
.isDirectory = (info.fattrib & AM_DIR) > 0, |
||||
.isTrack = false, // TODO
|
||||
.filepath = original_path_ + (original_path_.size()>0?"/":"") + info.fname, |
||||
|
||||
}; |
||||
} |
||||
return true; |
||||
} |
||||
|
||||
} // namespace lua
|
||||
@ -0,0 +1,45 @@ |
||||
/*
|
||||
* Copyright 2023 ailurux <ailuruxx@gmail.com> |
||||
* |
||||
* SPDX-License-Identifier: GPL-3.0-only |
||||
*/ |
||||
|
||||
#pragma once |
||||
|
||||
#include <string> |
||||
#include <optional> |
||||
|
||||
#include "ff.h" |
||||
|
||||
namespace lua { |
||||
|
||||
// Note for when reading FILINFO, that we are in LFN mode:
|
||||
// http://elm-chan.org/fsw/ff/doc/sfileinfo.html
|
||||
struct FileEntry { |
||||
int index; |
||||
bool isHidden; |
||||
bool isDirectory; |
||||
bool isTrack; |
||||
std::string filepath; |
||||
}; |
||||
|
||||
class FileIterator { |
||||
public: |
||||
FileIterator(std::string filepath); |
||||
~FileIterator(); |
||||
|
||||
auto value() const -> const std::optional<FileEntry>&; |
||||
auto next() -> void; |
||||
auto prev() -> void; |
||||
|
||||
private:
|
||||
FF_DIR dir_; |
||||
std::string original_path_; |
||||
|
||||
std::optional<FileEntry> current_; |
||||
int offset_; |
||||
|
||||
auto iterate(bool reverse = false) -> bool; |
||||
}; |
||||
|
||||
} // namespace lua
|
||||
@ -0,0 +1,179 @@ |
||||
/*
|
||||
* Copyright 2023 jacqueline <me@jacqueline.id.au> |
||||
* |
||||
* SPDX-License-Identifier: GPL-3.0-only |
||||
*/ |
||||
|
||||
#include "lua/lua_filesystem.hpp" |
||||
#include <string> |
||||
#include <cstring> |
||||
#include "lauxlib.h" |
||||
|
||||
namespace lua { |
||||
|
||||
[[maybe_unused]] static constexpr char kTag[] = "lua_fs"; |
||||
|
||||
static constexpr char kFileEntryMetatable[] = "fs_file_entry"; |
||||
static constexpr char kFileIteratorMetatable[] = "fs_iterator"; |
||||
|
||||
// Todo: Use std::pmr::string for paths/dirs
|
||||
struct LuaFileEntry { |
||||
bool isHidden; |
||||
bool isDirectory; |
||||
bool isTrack; |
||||
size_t path_size; |
||||
char path[]; |
||||
}; |
||||
|
||||
static_assert(std::is_trivially_destructible<LuaFileEntry>()); |
||||
static_assert(std::is_trivially_copy_assignable<LuaFileEntry>()); |
||||
|
||||
static auto push_lua_file_entry(lua_State* L, const lua::FileEntry& r) -> void { |
||||
// Create and init the userdata.
|
||||
LuaFileEntry* file_entry = reinterpret_cast<LuaFileEntry*>( |
||||
lua_newuserdata(L, sizeof(LuaFileEntry) + r.filepath.size())); |
||||
luaL_setmetatable(L, kFileEntryMetatable); |
||||
|
||||
// Init all the fields
|
||||
*file_entry = { |
||||
.isHidden = r.isHidden, |
||||
.isDirectory = r.isDirectory, |
||||
.isTrack = r.isTrack, |
||||
.path_size = r.filepath.size(), |
||||
}; |
||||
|
||||
// Copy the string data across.
|
||||
std::memcpy(file_entry->path, r.filepath.data(), r.filepath.size()); |
||||
} |
||||
|
||||
auto check_file_iterator(lua_State* L, int stack_pos) -> lua::FileIterator* { |
||||
lua::FileIterator* it = *reinterpret_cast<lua::FileIterator**>( |
||||
luaL_checkudata(L, stack_pos, kFileIteratorMetatable)); |
||||
return it; |
||||
} |
||||
|
||||
static auto push_iterator(lua_State* state, const lua::FileIterator& it) |
||||
-> void { |
||||
lua::FileIterator** data = reinterpret_cast<lua::FileIterator**>( |
||||
lua_newuserdata(state, sizeof(uintptr_t))); |
||||
*data = new lua::FileIterator(it); // TODO...
|
||||
luaL_setmetatable(state, kFileIteratorMetatable); |
||||
} |
||||
|
||||
static auto fs_iterate_prev(lua_State* state) -> int { |
||||
lua::FileIterator* it = check_file_iterator(state, 1); |
||||
it->prev(); |
||||
std::optional<lua::FileEntry> res = it->value(); |
||||
|
||||
if (res) { |
||||
push_lua_file_entry(state, *res); |
||||
} else { |
||||
lua_pushnil(state); |
||||
} |
||||
|
||||
return 1; |
||||
} |
||||
|
||||
static auto fs_iterate(lua_State* state) -> int { |
||||
lua::FileIterator* it = check_file_iterator(state, 1); |
||||
it->next(); |
||||
std::optional<lua::FileEntry> res = it->value(); |
||||
|
||||
if (res) { |
||||
push_lua_file_entry(state, *res); |
||||
} else { |
||||
lua_pushnil(state); |
||||
} |
||||
|
||||
return 1; |
||||
} |
||||
|
||||
static auto fs_iterator_clone(lua_State* state) -> int { |
||||
lua::FileIterator* it = check_file_iterator(state, 1); |
||||
push_iterator(state, *it); |
||||
return 1; |
||||
} |
||||
|
||||
static auto fs_iterator_gc(lua_State* state) -> int { |
||||
lua::FileIterator* it = check_file_iterator(state, 1); |
||||
delete it; |
||||
return 0; |
||||
} |
||||
|
||||
static const struct luaL_Reg kFileIteratorFuncs[] = {{"next", fs_iterate}, |
||||
{"prev", fs_iterate_prev}, |
||||
{"clone", fs_iterator_clone}, |
||||
{"__call", fs_iterate}, |
||||
{"__gc", fs_iterator_gc}, |
||||
{NULL, NULL}}; |
||||
|
||||
static auto file_entry_path(lua_State* state) -> int { |
||||
LuaFileEntry* data = reinterpret_cast<LuaFileEntry*>( |
||||
luaL_checkudata(state, 1, kFileEntryMetatable)); |
||||
lua_pushlstring(state, data->path, data->path_size); |
||||
return 1; |
||||
} |
||||
|
||||
static auto file_entry_is_dir(lua_State* state) -> int { |
||||
LuaFileEntry* data = reinterpret_cast<LuaFileEntry*>( |
||||
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<LuaFileEntry*>( |
||||
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<LuaFileEntry*>( |
||||
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}}; |
||||
|
||||
static auto fs_new_iterator(lua_State* state) -> int { |
||||
// Takes a filepath as a string and returns a new FileIterator
|
||||
// on that directory
|
||||
std::string filepath = luaL_checkstring(state, -1); |
||||
lua::FileIterator iter(filepath); |
||||
push_iterator(state, iter); |
||||
return 1; |
||||
} |
||||
|
||||
static const struct luaL_Reg kFilesystemFuncs[] = {{"iterator", fs_new_iterator}, |
||||
{NULL, NULL}}; |
||||
|
||||
static auto lua_filesystem(lua_State* state) -> int { |
||||
luaL_newmetatable(state, kFileIteratorMetatable); |
||||
lua_pushliteral(state, "__index"); |
||||
lua_pushvalue(state, -2); |
||||
lua_settable(state, -3); // metatable.__index = metatable
|
||||
luaL_setfuncs(state, kFileIteratorFuncs, 0); |
||||
|
||||
luaL_newmetatable(state, kFileEntryMetatable); |
||||
lua_pushliteral(state, "__index"); |
||||
lua_pushvalue(state, -2); |
||||
lua_settable(state, -3); // metatable.__index = metatable
|
||||
luaL_setfuncs(state, kFileEntryFuncs, 0); |
||||
|
||||
luaL_newlib(state, kFilesystemFuncs); |
||||
return 1; |
||||
} |
||||
|
||||
auto RegisterFileSystemModule(lua_State* s) -> void { |
||||
luaL_requiref(s, "filesystem", lua_filesystem, true); |
||||
lua_pop(s, 1); |
||||
} |
||||
|
||||
} // namespace lua
|
||||
@ -0,0 +1,17 @@ |
||||
/*
|
||||
* Copyright 2023 ailurux <ailuruxx@gmail.com> |
||||
* |
||||
* SPDX-License-Identifier: GPL-3.0-only |
||||
*/ |
||||
#pragma once |
||||
|
||||
#include "lua.hpp" |
||||
#include "lua/file_iterator.hpp" |
||||
|
||||
namespace lua { |
||||
|
||||
auto check_file_iterator(lua_State*, int stack_pos) -> lua::FileIterator*; |
||||
|
||||
auto RegisterFileSystemModule(lua_State*) -> void; |
||||
|
||||
} // namespace lua
|
||||
Loading…
Reference in new issue