ee5a5a7181
## New
- Read property files with `PropertiesFile`
- Support `boot.properties` so the user can specify the launcher app and an optional app to start after the launcher finishes. (see `BootProperties.cpp`)
- Create registry for CPU affinity and update code to make use of it
- `AppRegistration` and `ServiceRegistration` now also ensure that the `/data` directories always exist for all apps
- `Notes` is now the default app for opening text files. `TextViewer` is removed entirely. Created `tt::app:🎶:start(path)` function.
- WiFi settings moved from NVS to properties file.
- Specify `*.ap.properties` file on the SD card for automatic WiFi settings import on start-up.
- Added `file::getLock(path)` and `file::withLock(path, function)` to do safe file operations on SD cards
## Improvements
- Update TinyUSB to `1.7.6~1`
- Improved `Boot.cpp` code. General code quality fixes and some restructuring to improve readability.
- `tt::string` functionality improvements
- Rename `AppRegistry` to `AppRegistration`
- Rename `ServiceRegistry` to `ServiceRegistration`
- Cleanup in `Notes.cpp`
- `FileTest.cpp` fix for PC
- Created `TestFile` helper class for tests, which automatically deletes files after the test.
- Renamed `Partitions.h` to `MountPoints.h`
- Created `std::string getMountPoints()` function for easy re-use
- Other code quality improvements
- `SdCardDevice`'s `getState()` and `isMounted()` now have a timeout argument
## Fixes
- ELF loading now has a lock so to avoid a bug when 2 ELF apps are loaded in parallel
92 lines
2.7 KiB
C++
92 lines
2.7 KiB
C++
#include "Tactility/app/fileselection/State.h"
|
|
|
|
#include <Tactility/file/File.h>
|
|
#include "Tactility/hal/sdcard/SdCardDevice.h"
|
|
#include <Tactility/Log.h>
|
|
#include <Tactility/MountPoints.h>
|
|
#include <Tactility/kernel/Kernel.h>
|
|
|
|
#include <cstring>
|
|
#include <unistd.h>
|
|
#include <vector>
|
|
#include <dirent.h>
|
|
|
|
namespace tt::app::fileselection {
|
|
|
|
constexpr auto* TAG = "FileSelection";
|
|
|
|
State::State() {
|
|
if (kernel::getPlatform() == kernel::PlatformSimulator) {
|
|
char cwd[PATH_MAX];
|
|
if (getcwd(cwd, sizeof(cwd)) != nullptr) {
|
|
setEntriesForPath(cwd);
|
|
} else {
|
|
TT_LOG_E(TAG, "Failed to get current work directory files");
|
|
setEntriesForPath("/");
|
|
}
|
|
} else {
|
|
setEntriesForPath("/");
|
|
}
|
|
}
|
|
|
|
std::string State::getSelectedChildPath() const {
|
|
return file::getChildPath(current_path, selected_child_entry);
|
|
}
|
|
|
|
bool State::setEntriesForPath(const std::string& path) {
|
|
auto lock = mutex.asScopedLock();
|
|
if (!lock.lock(100)) {
|
|
TT_LOG_E(TAG, LOG_MESSAGE_MUTEX_LOCK_FAILED_FMT, "setEntriesForPath");
|
|
return false;
|
|
}
|
|
|
|
TT_LOG_I(TAG, "Changing path: %s -> %s", current_path.c_str(), path.c_str());
|
|
|
|
/**
|
|
* ESP32 does not have a root directory, so we have to create it manually.
|
|
* We'll add the NVS Flash partitions and the binding for the sdcard.
|
|
*/
|
|
bool show_custom_root = (kernel::getPlatform() == kernel::PlatformEsp) && (path == "/");
|
|
if (show_custom_root) {
|
|
TT_LOG_I(TAG, "Setting custom root");
|
|
dir_entries = file::getMountPoints();
|
|
current_path = path;
|
|
selected_child_entry = "";
|
|
return true;
|
|
} else {
|
|
dir_entries.clear();
|
|
int count = file::scandir(path, dir_entries, &file::direntFilterDotEntries, file::direntSortAlphaAndType);
|
|
if (count >= 0) {
|
|
TT_LOG_I(TAG, "%s has %u entries", path.c_str(), count);
|
|
current_path = path;
|
|
selected_child_entry = "";
|
|
return true;
|
|
} else {
|
|
TT_LOG_E(TAG, "Failed to fetch entries for %s", path.c_str());
|
|
return false;
|
|
}
|
|
}
|
|
}
|
|
|
|
bool State::setEntriesForChildPath(const std::string& childPath) {
|
|
auto path = file::getChildPath(current_path, childPath);
|
|
TT_LOG_I(TAG, "Navigating from %s to %s", current_path.c_str(), path.c_str());
|
|
return setEntriesForPath(path);
|
|
}
|
|
|
|
bool State::getDirent(uint32_t index, dirent& dirent) {
|
|
auto lock = mutex.asScopedLock();
|
|
if (!lock.lock(50 / portTICK_PERIOD_MS)) {
|
|
return false;
|
|
}
|
|
|
|
if (index < dir_entries.size()) {
|
|
dirent = dir_entries[index];
|
|
return true;
|
|
} else {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
}
|