Merge develop into main (#304)
## 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::notes::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
This commit is contained in:
committed by
GitHub
parent
fbaff8cbac
commit
ee5a5a7181
@@ -0,0 +1,30 @@
|
||||
#include "../TactilityCore/TestFile.h"
|
||||
#include "doctest.h"
|
||||
|
||||
#include <../../Tactility/Include/Tactility/file/PropertiesFile.h>
|
||||
|
||||
using namespace tt;
|
||||
|
||||
TEST_CASE("loadPropertiesFile() should return false when the file does not exist") {
|
||||
std::map<std::string, std::string> properties;
|
||||
CHECK_EQ(file::loadPropertiesFile("does_not_exist.properties", properties), false);
|
||||
}
|
||||
|
||||
TEST_CASE("PropertiesFile should parse a valid file properly") {
|
||||
TestFile file("test.properties");
|
||||
file.writeData(
|
||||
"# Comment\n" // Regular comment
|
||||
" \t# Comment\n" // Prefixed comment
|
||||
"key1=value1\n" // Regular property
|
||||
" \tkey 2\t = \tvalue 2\t " // Property with empty space
|
||||
);
|
||||
|
||||
std::map<std::string, std::string> properties;
|
||||
|
||||
// Load data
|
||||
CHECK_EQ(file::loadPropertiesFile(file.getPath(), properties), true);
|
||||
|
||||
CHECK_EQ(properties.size(), 2);
|
||||
CHECK_EQ(properties["key1"], "value1");
|
||||
CHECK_EQ(properties["key 2"], "value 2");
|
||||
}
|
||||
@@ -9,6 +9,6 @@ TEST_CASE("findOrCreateDirectory can create a directory tree without prefix") {
|
||||
}
|
||||
|
||||
TEST_CASE("findOrCreateDirectory can create a directory tree with prefix") {
|
||||
CHECK_EQ(file::findOrCreateDirectory("/test2/test2", 0777), true);
|
||||
CHECK_EQ(file::findOrCreateDirectory("/tmp/test2", 0777), true);
|
||||
// TODO: delete dirs
|
||||
}
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
#pragma once
|
||||
|
||||
#include "doctest.h"
|
||||
#include <unistd.h>
|
||||
|
||||
#include <Tactility/file/File.h>
|
||||
|
||||
/**
|
||||
* A class for creating test files that can automatically clean themselves up.
|
||||
*/
|
||||
class TestFile {
|
||||
const char* path;
|
||||
bool autoClean;
|
||||
|
||||
public:
|
||||
|
||||
TestFile(const char* path, bool autoClean = true) : path(path), autoClean(autoClean) {
|
||||
if (autoClean && exists()) {
|
||||
remove();
|
||||
}
|
||||
}
|
||||
|
||||
~TestFile() {
|
||||
if (autoClean && exists()) {
|
||||
remove();
|
||||
}
|
||||
}
|
||||
|
||||
const char* getPath() const { return path; }
|
||||
|
||||
void writeData(const char* data) const {
|
||||
CHECK_EQ(tt::file::writeString(path, data), true);
|
||||
}
|
||||
|
||||
bool exists() const {
|
||||
return access(path, F_OK) == 0;
|
||||
}
|
||||
|
||||
void remove() const {
|
||||
::remove(path);
|
||||
}
|
||||
};
|
||||
Reference in New Issue
Block a user