Files
crosspoint-reader-mod/lib/hal/HalStorage.h

110 lines
3.6 KiB
C
Raw Normal View History

#pragma once
#include <Print.h>
#include <common/FsApiConstants.h> // for oflag_t
#include <freertos/semphr.h>
#include <memory>
#include <string>
#include <vector>
class HalFile;
class HalStorage {
public:
HalStorage();
bool begin();
bool ready() const;
std::vector<String> listFiles(const char* path = "/", int maxFiles = 200);
// Read the entire file at `path` into a String. Returns empty string on failure.
String readFile(const char* path);
// Low-memory helpers:
// Stream the file contents to a `Print` (e.g. `Serial`, or any `Print`-derived object).
// Returns true on success, false on failure.
bool readFileToStream(const char* path, Print& out, size_t chunkSize = 256);
// Read up to `bufferSize-1` bytes into `buffer`, null-terminating it. Returns bytes read.
size_t readFileToBuffer(const char* path, char* buffer, size_t bufferSize, size_t maxBytes = 0);
// Write a string to `path` on the SD card. Overwrites existing file.
// Returns true on success.
bool writeFile(const char* path, const String& content);
// Ensure a directory exists, creating it if necessary. Returns true on success.
bool ensureDirectoryExists(const char* path);
HalFile open(const char* path, const oflag_t oflag = O_RDONLY);
bool mkdir(const char* path, const bool pFlag = true);
bool exists(const char* path);
bool remove(const char* path);
feat: Migrate binary settings to json (#920) ## Summary * This PR introduces a migration from binary file storage to JSON-based storage for application settings, state, and various credential stores. This improves readability, maintainability, and allows for easier manual configuration editing. * Benefits: - Settings files are now JSON and can be easily read/edited manually - Easier to inspect application state and settings during development - JSON structure is more flexible for future changes * Drawback: around 15k of additional flash usage * Compatibility: Seamless migration preserves existing user data ## Additional Context 1. New JSON I/O Infrastructure files: - JsonSettingsIO: Core JSON serialization/deserialization logic using ArduinoJson library - ObfuscationUtils: XOR-based password obfuscation for sensitive data 2. Migrated Components (now use JSON storage with automatic binary migration): - CrossPointSettings (settings.json): Main application settings - CrossPointState (state.json): Application state (open book, sleep mode, etc.) - WifiCredentialStore (wifi.json): WiFi network credentials (Password Obfuscation: Sensitive data like WiFi passwords, uses XOR encryption with fixed keys. Note: This is obfuscation, not cryptographic security - passwords can be recovered with the key) - KOReaderCredentialStore (koreader.json): KOReader sync credentials - RecentBooksStore (recent.json): Recently opened books list 3. Migration Logic - Forward Compatibility: New installations use JSON format - Backward Compatibility: Existing binary files are automatically migrated to JSON on first load - Backup Safety: Original binary files are renamed with .bak extension after successful migration - Fallback Handling: If JSON parsing fails, system falls back to binary loading 4. Infrastructure Updates - HalStorage: Added rename() method for backup operations --- ### AI Usage While CrossPoint doesn't have restrictions on AI tools in contributing, please be transparent about their usage as it helps set the right context for reviewers. Did you use AI tools to help write this code? _** YES**_ --------- Co-authored-by: Dave Allie <dave@daveallie.com>
2026-02-22 07:18:25 +01:00
bool rename(const char* oldPath, const char* newPath);
bool rmdir(const char* path);
bool openFileForRead(const char* moduleName, const char* path, HalFile& file);
bool openFileForRead(const char* moduleName, const std::string& path, HalFile& file);
bool openFileForRead(const char* moduleName, const String& path, HalFile& file);
bool openFileForWrite(const char* moduleName, const char* path, HalFile& file);
bool openFileForWrite(const char* moduleName, const std::string& path, HalFile& file);
bool openFileForWrite(const char* moduleName, const String& path, HalFile& file);
bool removeDir(const char* path);
static HalStorage& getInstance() { return instance; }
class StorageLock; // private class, used internally
private:
static HalStorage instance;
bool initialized = false;
SemaphoreHandle_t storageMutex = nullptr;
};
#define Storage HalStorage::getInstance()
class HalFile : public Print {
friend class HalStorage;
class Impl;
std::unique_ptr<Impl> impl;
explicit HalFile(std::unique_ptr<Impl> impl);
public:
HalFile();
~HalFile();
HalFile(HalFile&&);
HalFile& operator=(HalFile&&);
HalFile(const HalFile&) = delete;
HalFile& operator=(const HalFile&) = delete;
void flush();
size_t getName(char* name, size_t len);
size_t size();
size_t fileSize();
// Get modification date/time (FAT format: packed 16-bit date and time). Returns false if unavailable.
bool getModifyDateTime(uint16_t* pdate, uint16_t* ptime);
bool seek(size_t pos);
bool seekCur(int64_t offset);
bool seekSet(size_t offset);
int available() const;
size_t position() const;
int read(void* buf, size_t count);
int read(); // read a single byte
size_t write(const void* buf, size_t count);
size_t write(uint8_t b) override;
bool rename(const char* newPath);
bool isDirectory() const;
void rewindDirectory();
bool close();
HalFile openNextFile();
bool isOpen() const;
operator bool() const;
};
// Only do renaming FsFile to HalFile if this header is included by downstream code
// The renaming is to allow using the thread-safe HalFile instead of the raw FsFile, without needing to change the
// downstream code
#ifndef HAL_STORAGE_IMPL
using FsFile = HalFile;
#endif
// Downstream code must use Storage instead of SdMan
#ifdef SdMan
#undef SdMan
#endif