## 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
125 lines
3.8 KiB
C++
125 lines
3.8 KiB
C++
#include "../../Include/Tactility/file/ObjectFile.h"
|
|
#include "Tactility/file/ObjectFilePrivate.h"
|
|
|
|
#include <cstring>
|
|
#include <Tactility/Log.h>
|
|
#include <unistd.h>
|
|
|
|
namespace tt::file {
|
|
|
|
constexpr auto* TAG = "ObjectFileWriter";
|
|
|
|
bool ObjectFileWriter::open() {
|
|
bool edit_existing = append && access(filePath.c_str(), F_OK) == 0;
|
|
if (append && !edit_existing) {
|
|
TT_LOG_W(TAG, "access() to %s failed: %s", filePath.c_str(), strerror(errno));
|
|
}
|
|
|
|
// Edit existing or create a new file
|
|
auto* mode = edit_existing ? "r+" : "w";
|
|
auto opening_file = std::unique_ptr<FILE, FileCloser>(std::fopen(filePath.c_str(), mode));
|
|
if (opening_file == nullptr) {
|
|
TT_LOG_E(TAG, "Failed to open file %s in %s mode", filePath.c_str(), mode);
|
|
return false;
|
|
}
|
|
|
|
auto file_size = getSize(opening_file.get());
|
|
if (file_size > 0 && edit_existing) {
|
|
|
|
// Read and parse file header
|
|
|
|
FileHeader file_header;
|
|
if (fread(&file_header, sizeof(FileHeader), 1, opening_file.get()) != 1) {
|
|
TT_LOG_E(TAG, "Failed to read file header from %s", filePath.c_str());
|
|
return false;
|
|
}
|
|
|
|
if (file_header.identifier != OBJECT_FILE_IDENTIFIER) {
|
|
TT_LOG_E(TAG, "Invalid file type for %s", filePath.c_str());
|
|
return false;
|
|
}
|
|
|
|
if (file_header.version != OBJECT_FILE_VERSION) {
|
|
TT_LOG_E(TAG, "Unknown version for %s: %lu", filePath.c_str(), file_header.identifier);
|
|
return false;
|
|
}
|
|
|
|
// Read and parse content header
|
|
|
|
ContentHeader content_header;
|
|
if (fread(&content_header, sizeof(ContentHeader), 1, opening_file.get()) != 1) {
|
|
TT_LOG_E(TAG, "Failed to read content header from %s", filePath.c_str());
|
|
return false;
|
|
}
|
|
|
|
if (recordSize != content_header.recordSize) {
|
|
TT_LOG_E(TAG, "Record size mismatch for %s: expected %lu, got %lu", filePath.c_str(), recordSize, content_header.recordSize);
|
|
return false;
|
|
}
|
|
|
|
if (recordVersion != content_header.recordVersion) {
|
|
TT_LOG_E(TAG, "Version mismatch for %s: expected %lu, got %lu", filePath.c_str(), recordVersion, content_header.recordVersion);
|
|
return false;
|
|
}
|
|
|
|
recordsWritten = content_header.recordCount;
|
|
fseek(opening_file.get(), 0, SEEK_END);
|
|
} else {
|
|
FileHeader file_header;
|
|
if (fwrite(&file_header, sizeof(FileHeader), 1, opening_file.get()) != 1) {
|
|
TT_LOG_E(TAG, "Failed to write file header for %s", filePath.c_str());
|
|
return false;
|
|
}
|
|
|
|
// Seek forward (skip ContentHeader that will be written later)
|
|
fseek(opening_file.get(), sizeof(ContentHeader), SEEK_CUR);
|
|
}
|
|
|
|
|
|
file = std::move(opening_file);
|
|
return true;
|
|
}
|
|
|
|
void ObjectFileWriter::close() {
|
|
if (file == nullptr) {
|
|
TT_LOG_E(TAG, "File not opened: %s", filePath.c_str());
|
|
return;
|
|
}
|
|
|
|
if (fseek(file.get(), sizeof(FileHeader), SEEK_SET) != 0) {
|
|
TT_LOG_E(TAG, "File seek failed: %s", filePath.c_str());
|
|
return;
|
|
}
|
|
|
|
ContentHeader content_header = {
|
|
.recordVersion = this->recordVersion,
|
|
.recordSize = this->recordSize,
|
|
.recordCount = this->recordsWritten
|
|
};
|
|
|
|
if (fwrite(&content_header, sizeof(ContentHeader), 1, file.get()) != 1) {
|
|
TT_LOG_E(TAG, "Failed to write content header to %s", filePath.c_str());
|
|
}
|
|
|
|
file = nullptr;
|
|
}
|
|
|
|
bool ObjectFileWriter::write(void* data) {
|
|
if (file == nullptr) {
|
|
TT_LOG_E(TAG, "File not opened: %s", filePath.c_str());
|
|
return false;
|
|
}
|
|
|
|
if (fwrite(data, recordSize, 1, file.get()) != 1) {
|
|
TT_LOG_E(TAG, "Failed to write record to %s", filePath.c_str());
|
|
return false;
|
|
}
|
|
|
|
recordsWritten++;
|
|
|
|
return true;
|
|
}
|
|
|
|
// endregion Writer
|
|
|
|
} |