mirror of
https://github.com/torlando-tech/pyxis.git
synced 2026-08-15 23:30:01 +00:00
torlando-tech
02ceeda75b
relocate shim to lib/; pyxis lib API renames Compile-tier graft progress on top of40e561f. Key changes: - Re-vendor lib/microreticulum-shim/ (was src-shim/) from the *actual* ca355e5 commit content rather than the stale "feat/t-deck HEAD" /tmp clone the previous commit pulled from. Recovers process_sync() on LXMRouter and MEMORY_MONITOR_POLL macro that were missing. - Move src-shim/ → lib/microreticulum-shim/ + add library.json so PlatformIO discovers the .cpp files and links them. Was previously only on the include path; the .cpps weren't in the build. (This unblocks the 30+ undefined-reference linker errors for LXMF and Instrumentation symbols.) - Drop -Isrc-shim/Utilities (/Cryptography/Instrumentation) from build_flags — they were over-broad and put our Stream.h on the GLOBAL header path, breaking Arduino's Wire.cpp which has `class TwoWire: public Stream`. -Ilib/microreticulum-shim alone resolves subdir lookups via <Cryptography/X.h>, <Utilities/Y.h>. - UniversalFileSystem migrated to microStore::Adapters::SPIFFSFileSystem (activated by -DUSTORE_USE_SPIFFS). Vanilla upstream microReticulum @ 0.3.0 deleted RNS::FileSystem in favor of microStore. Pyxis's lib/universal_filesystem/ is now dead code on this build path. - pyxis lib API renames for the post-graft world: SDLogger.cpp: RNS::setLogCallback -> RNS::set_log_callback AnnounceListScreen: Transport::get_destination_table -> Transport::get_path_table Transport::DestinationEntry -> RNS::Persistence::DestinationEntry UIManager.cpp: _lxst_destination ctor explicit RNS::Type::NONE (vanilla Destination has no default ctor) Identity::mark_persistent calls disabled w/ restoration TODO ConversationListScreen: Interface::get_rssi/get_stats calls disabled (the methods are non-virtual on BLEInterface/SX1262Interface post de-virtualization ina0ff631) Compile is clean against the fixed-cryptography submodule pin; current failure layer is fork-only Type::Channel constants referenced by the vendored shim's Buffer/ChannelData files. That's the next session's problem — see pyxis_microReticulum_graft_spike_findings.md for the plan options (most likely: remove Channel/Buffer/ChannelData/Ratchet from the shim, since LXMF doesn't use Channel anyway per the 2026-05-04 investigation).
130 lines
5.1 KiB
C++
130 lines
5.1 KiB
C++
#pragma once
|
|
|
|
#include "FileStream.h"
|
|
#include "Log.h"
|
|
#include "Bytes.h"
|
|
#include "Type.h"
|
|
|
|
#include <list>
|
|
#include <memory>
|
|
#include <cassert>
|
|
#include <stdint.h>
|
|
|
|
namespace RNS {
|
|
|
|
class FileSystemImpl {
|
|
|
|
protected:
|
|
FileSystemImpl() { MEMF("FileSystem::FileSystemImpl object created, this: 0x%X", this); }
|
|
public:
|
|
virtual ~FileSystemImpl() { MEMF("FileSystem::FileSystemImpl object destroyed, this: 0x%X", this); }
|
|
|
|
protected:
|
|
virtual bool init() { return true; }
|
|
virtual void loop() {}
|
|
virtual bool file_exists(const char* file_path) = 0;
|
|
virtual size_t read_file(const char* file_path, Bytes& data) = 0;
|
|
virtual size_t write_file(const char* file_path, const Bytes& data) = 0;
|
|
virtual FileStream open_file(const char* file_path, FileStream::MODE file_mode) = 0;
|
|
virtual bool remove_file(const char* file_path) = 0;
|
|
virtual bool rename_file(const char* from_file_path, const char* to_file_path) = 0;
|
|
virtual bool directory_exists(const char* directory_path) = 0;
|
|
virtual bool create_directory(const char* directory_path) = 0;
|
|
virtual bool remove_directory(const char* directory_path) = 0;
|
|
virtual std::list<std::string> list_directory(const char* directory_path) = 0;
|
|
virtual size_t storage_size() = 0;
|
|
virtual size_t storage_available() = 0;
|
|
|
|
friend class FileSystem;
|
|
};
|
|
|
|
class FileSystem {
|
|
|
|
public:
|
|
FileSystem(Type::NoneConstructor none) {
|
|
MEMF("FileSystem NONE object created, this: 0x%X, impl: 0x%X", this, _impl.get());
|
|
}
|
|
FileSystem(const FileSystem& obj) : _impl(obj._impl) {
|
|
MEMF("FileSystem object copy created, this: 0x%X, impl: 0x%X", this, _impl.get());
|
|
}
|
|
FileSystem(FileSystemImpl* impl) : _impl(impl) {
|
|
MEMF("FileSystem object impl created, this: 0x%X, impl: 0x%X", this, _impl.get());
|
|
}
|
|
virtual ~FileSystem() {
|
|
MEMF("FileSystem object destroyed, this: 0x%X, impl: 0x%X", this, _impl.get());
|
|
}
|
|
|
|
inline FileSystem& operator = (const FileSystem& obj) {
|
|
_impl = obj._impl;
|
|
MEMF("FileSystem object copy created by assignment, this: 0x%X, impl: 0x%X", this, _impl.get());
|
|
return *this;
|
|
}
|
|
inline FileSystem& operator = (FileSystemImpl* impl) {
|
|
_impl.reset(impl);
|
|
MEMF("FileSystem object copy created by impl assignment, this: 0x%X, impl: 0x%X", this, _impl.get());
|
|
return *this;
|
|
}
|
|
inline operator bool() const {
|
|
MEMF("FileSystem object bool, this: 0x%X, impl: 0x%X", this, _impl.get());
|
|
return _impl.get() != nullptr;
|
|
}
|
|
inline bool operator < (const FileSystem& obj) const {
|
|
MEMF("FileSystem object <, this: 0x%X, impl: 0x%X", this, _impl.get());
|
|
return _impl.get() < obj._impl.get();
|
|
}
|
|
inline bool operator > (const FileSystem& obj) const {
|
|
MEMF("FileSystem object <, this: 0x%X, impl: 0x%X", this, _impl.get());
|
|
return _impl.get() > obj._impl.get();
|
|
}
|
|
inline bool operator == (const FileSystem& obj) const {
|
|
MEMF("FileSystem object ==, this: 0x%X, impl: 0x%X", this, _impl.get());
|
|
return _impl.get() == obj._impl.get();
|
|
}
|
|
inline bool operator != (const FileSystem& obj) const {
|
|
MEMF("FileSystem object !=, this: 0x%X, impl: 0x%X", this, _impl.get());
|
|
return _impl.get() != obj._impl.get();
|
|
}
|
|
inline FileSystemImpl* get() {
|
|
return _impl.get();
|
|
}
|
|
inline void clear() {
|
|
_impl.reset();
|
|
}
|
|
|
|
public:
|
|
inline bool init() { assert(_impl); return _impl->init(); }
|
|
inline void loop() { assert(_impl); return _impl->loop(); }
|
|
inline bool file_exists(const char* file_path) { assert(_impl); return _impl->file_exists(file_path); }
|
|
inline size_t read_file(const char* file_path, Bytes& data) { assert(_impl); return _impl->read_file(file_path, data); }
|
|
inline size_t write_file(const char* file_path, const Bytes& data) { assert(_impl); return _impl->write_file(file_path, data); }
|
|
inline FileStream open_file(const char* file_path, FileStream::MODE file_mode) { return _impl->open_file(file_path, file_mode); }
|
|
inline bool remove_file(const char* file_path) { assert(_impl); return _impl->remove_file(file_path); }
|
|
inline bool rename_file(const char* from_file_path, const char* to_file_path) { assert(_impl); return _impl->rename_file(from_file_path, to_file_path); }
|
|
inline bool directory_exists(const char* directory_path) { assert(_impl); return _impl->directory_exists(directory_path); }
|
|
inline bool create_directory(const char* directory_path) { assert(_impl); return _impl->create_directory(directory_path); }
|
|
inline bool remove_directory(const char* directory_path) { assert(_impl); return _impl->remove_directory(directory_path); }
|
|
inline std::list<std::string> list_directory(const char* directory_path) { assert(_impl); return _impl->list_directory(directory_path); }
|
|
inline size_t storage_size() { assert(_impl); return _impl->storage_size(); }
|
|
inline size_t storage_available() { assert(_impl); return _impl->storage_available(); }
|
|
|
|
private:
|
|
std::list<std::string> _empty;
|
|
|
|
// getters/setters
|
|
protected:
|
|
public:
|
|
|
|
#ifndef NDEBUG
|
|
inline std::string debugString() const {
|
|
std::string dump;
|
|
dump = "FileSystem object, this: " + std::to_string((uintptr_t)this) + ", data: " + std::to_string((uintptr_t)_impl.get());
|
|
return dump;
|
|
}
|
|
#endif
|
|
|
|
protected:
|
|
std::shared_ptr<FileSystemImpl> _impl;
|
|
};
|
|
|
|
}
|