From ee5657cb447fcd7721385c957784705699ca0cdb Mon Sep 17 00:00:00 2001 From: ailurux Date: Fri, 10 May 2024 13:07:12 +1000 Subject: Fix imports after merge --- src/tangara/lua/bridge.cpp | 2 ++ src/tangara/lua/file_iterator.cpp | 4 ++-- src/tangara/lua/lua_filesystem.cpp | 2 +- src/tangara/lua/lua_filesystem.hpp | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src/tangara/lua') diff --git a/src/tangara/lua/bridge.cpp b/src/tangara/lua/bridge.cpp index 07c299a7..f1b17636 100644 --- a/src/tangara/lua/bridge.cpp +++ b/src/tangara/lua/bridge.cpp @@ -18,6 +18,7 @@ #include "lua.hpp" #include "lua/lua_controls.hpp" #include "lua/lua_database.hpp" +#include "lua/lua_filesystem.hpp" #include "lua/lua_queue.hpp" #include "lua/lua_screen.hpp" #include "lua/lua_theme.hpp" @@ -86,6 +87,7 @@ auto Bridge::installBaseModules(lua_State* L) -> void { RegisterControlsModule(L); RegisterDatabaseModule(L); RegisterQueueModule(L); + RegisterFileSystemModule(L); RegisterVersionModule(L); RegisterThemeModule(L); RegisterScreenModule(L); diff --git a/src/tangara/lua/file_iterator.cpp b/src/tangara/lua/file_iterator.cpp index 194859a6..3afc57aa 100644 --- a/src/tangara/lua/file_iterator.cpp +++ b/src/tangara/lua/file_iterator.cpp @@ -3,13 +3,13 @@ * * SPDX-License-Identifier: GPL-3.0-only */ -#include "file_iterator.hpp" +#include "lua/file_iterator.hpp" #include "esp_log.h" #include #include "ff.h" -#include "spi.hpp" +#include "drivers/spi.hpp" namespace database { diff --git a/src/tangara/lua/lua_filesystem.cpp b/src/tangara/lua/lua_filesystem.cpp index f0dbaf9a..ea08ca48 100644 --- a/src/tangara/lua/lua_filesystem.cpp +++ b/src/tangara/lua/lua_filesystem.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -#include "lua_filesystem.hpp" +#include "lua/lua_filesystem.hpp" #include #include #include "lauxlib.h" diff --git a/src/tangara/lua/lua_filesystem.hpp b/src/tangara/lua/lua_filesystem.hpp index 2a829405..cb7170bd 100644 --- a/src/tangara/lua/lua_filesystem.hpp +++ b/src/tangara/lua/lua_filesystem.hpp @@ -6,7 +6,7 @@ #pragma once #include "lua.hpp" -#include "file_iterator.hpp" +#include "lua/file_iterator.hpp" namespace lua { -- cgit v1.2.3 From e06610f3a6d2bf034a20cc1b59fb25dc5efdda0a Mon Sep 17 00:00:00 2001 From: ailurux Date: Fri, 10 May 2024 13:27:01 +1000 Subject: Minor fixes before PR --- src/tangara/lua/file_iterator.cpp | 4 ++-- src/tangara/lua/file_iterator.hpp | 4 ++-- src/tangara/lua/lua_filesystem.cpp | 30 +++++++++++++++--------------- src/tangara/lua/lua_filesystem.hpp | 2 +- 4 files changed, 20 insertions(+), 20 deletions(-) (limited to 'src/tangara/lua') diff --git a/src/tangara/lua/file_iterator.cpp b/src/tangara/lua/file_iterator.cpp index 3afc57aa..d0eb0bae 100644 --- a/src/tangara/lua/file_iterator.cpp +++ b/src/tangara/lua/file_iterator.cpp @@ -11,7 +11,7 @@ #include "ff.h" #include "drivers/spi.hpp" -namespace database { +namespace lua { [[maybe_unused]] static const char* kTag = "FileIterator"; @@ -84,4 +84,4 @@ auto FileIterator::iterate(bool reverse) -> bool { return true; } -} // namespace database \ No newline at end of file +} // namespace lua \ No newline at end of file diff --git a/src/tangara/lua/file_iterator.hpp b/src/tangara/lua/file_iterator.hpp index 82d6f397..b803062c 100644 --- a/src/tangara/lua/file_iterator.hpp +++ b/src/tangara/lua/file_iterator.hpp @@ -11,7 +11,7 @@ #include "ff.h" -namespace database { +namespace lua { // Note for when reading FILINFO, that we are in LFN mode: // http://elm-chan.org/fsw/ff/doc/sfileinfo.html @@ -42,4 +42,4 @@ class FileIterator { auto iterate(bool reverse = false) -> bool; }; -} // namespace database \ No newline at end of file +} // namespace lua \ No newline at end of file diff --git a/src/tangara/lua/lua_filesystem.cpp b/src/tangara/lua/lua_filesystem.cpp index ea08ca48..de51f555 100644 --- a/src/tangara/lua/lua_filesystem.cpp +++ b/src/tangara/lua/lua_filesystem.cpp @@ -28,7 +28,7 @@ struct LuaFileEntry { static_assert(std::is_trivially_destructible()); static_assert(std::is_trivially_copy_assignable()); -static auto push_lua_file_entry(lua_State* L, const database::FileEntry& r) -> void { +static auto push_lua_file_entry(lua_State* L, const lua::FileEntry& r) -> void { // Create and init the userdata. LuaFileEntry* file_entry = reinterpret_cast( lua_newuserdata(L, sizeof(LuaFileEntry) + r.filepath.size())); @@ -46,24 +46,24 @@ static auto push_lua_file_entry(lua_State* L, const database::FileEntry& r) -> v std::memcpy(file_entry->path, r.filepath.data(), r.filepath.size()); } -auto check_file_iterator(lua_State* L, int stack_pos) -> database::FileIterator* { - database::FileIterator* it = *reinterpret_cast( +auto check_file_iterator(lua_State* L, int stack_pos) -> lua::FileIterator* { + lua::FileIterator* it = *reinterpret_cast( luaL_checkudata(L, stack_pos, kFileIteratorMetatable)); return it; } -static auto push_iterator(lua_State* state, const database::FileIterator& it) +static auto push_iterator(lua_State* state, const lua::FileIterator& it) -> void { - database::FileIterator** data = reinterpret_cast( + lua::FileIterator** data = reinterpret_cast( lua_newuserdata(state, sizeof(uintptr_t))); - *data = new database::FileIterator(it); // TODO... + *data = new lua::FileIterator(it); // TODO... luaL_setmetatable(state, kFileIteratorMetatable); } static auto fs_iterate_prev(lua_State* state) -> int { - database::FileIterator* it = check_file_iterator(state, 1); + lua::FileIterator* it = check_file_iterator(state, 1); it->prev(); - std::optional res = it->value(); + std::optional res = it->value(); if (res) { push_lua_file_entry(state, *res); @@ -75,9 +75,9 @@ static auto fs_iterate_prev(lua_State* state) -> int { } static auto fs_iterate(lua_State* state) -> int { - database::FileIterator* it = check_file_iterator(state, 1); + lua::FileIterator* it = check_file_iterator(state, 1); it->next(); - std::optional res = it->value(); + std::optional res = it->value(); if (res) { push_lua_file_entry(state, *res); @@ -89,13 +89,13 @@ static auto fs_iterate(lua_State* state) -> int { } static auto fs_iterator_clone(lua_State* state) -> int { - database::FileIterator* it = check_file_iterator(state, 1); + lua::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); + lua::FileIterator* it = check_file_iterator(state, 1); delete it; return 0; } @@ -146,12 +146,12 @@ 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); - database::FileIterator iter(filepath); + lua::FileIterator iter(filepath); push_iterator(state, iter); return 1; } -static const struct luaL_Reg kDatabaseFuncs[] = {{"iterator", fs_new_iterator}, +static const struct luaL_Reg kFilesystemFuncs[] = {{"iterator", fs_new_iterator}, {NULL, NULL}}; static auto lua_filesystem(lua_State* state) -> int { @@ -167,7 +167,7 @@ static auto lua_filesystem(lua_State* state) -> int { lua_settable(state, -3); // metatable.__index = metatable luaL_setfuncs(state, kFileEntryFuncs, 0); - luaL_newlib(state, kDatabaseFuncs); + luaL_newlib(state, kFilesystemFuncs); return 1; } diff --git a/src/tangara/lua/lua_filesystem.hpp b/src/tangara/lua/lua_filesystem.hpp index cb7170bd..d0f51498 100644 --- a/src/tangara/lua/lua_filesystem.hpp +++ b/src/tangara/lua/lua_filesystem.hpp @@ -10,7 +10,7 @@ namespace lua { -auto check_file_iterator(lua_State*, int stack_pos) -> database::FileIterator*; +auto check_file_iterator(lua_State*, int stack_pos) -> lua::FileIterator*; auto RegisterFileSystemModule(lua_State*) -> void; -- cgit v1.2.3