Added Delete file
Added FS Stat.
This commit is contained in:
parent
eabbbfa373
commit
3a8e66a52f
|
@ -63,9 +63,60 @@ int FSService::FSCommandHandler(uint16_t connectionHandle, os_mbuf* om) {
|
|||
NRF_LOG_INFO("[FS_S] -> FSCommandHandler");
|
||||
|
||||
switch (command) {
|
||||
case commands::DELETE: {
|
||||
NRF_LOG_INFO("[FS_S] -> Delete");
|
||||
auto* header = (DelHeader*)om->om_data;
|
||||
uint16_t plen = header->pathlen;
|
||||
char path[plen + 1] = {0};
|
||||
struct lfs_info info = {};
|
||||
DelResponse resp = {};
|
||||
resp.command = commands::DELETE_STATUS;
|
||||
int res = fs.Stat(path, &info);
|
||||
// Get Info about path
|
||||
// branch for DirDel of FileDelete
|
||||
if (info.type == LFS_TYPE_DIR) {
|
||||
res = fs.DirDelete(path);
|
||||
} else {
|
||||
res = fs.FileDelete(path);
|
||||
}
|
||||
switch (res) {
|
||||
case LFS_ERR_OK:
|
||||
resp.status = 0x01;
|
||||
break;
|
||||
default:
|
||||
resp.status = 0x02;
|
||||
break;
|
||||
}
|
||||
auto* om = ble_hs_mbuf_from_flat(&resp, sizeof(DelResponse));
|
||||
ble_gattc_notify_custom(connectionHandle, transferCharacteristicHandle, om);
|
||||
break;
|
||||
}
|
||||
case commands::MKDIR: {
|
||||
NRF_LOG_INFO("[FS_S] -> MKDir");
|
||||
auto* header = (MKDirHeader*) om->om_data;
|
||||
uint16_t plen = header->pathlen;
|
||||
char path[plen + 1] = {0};
|
||||
memcpy(path, header->pathstr, plen);
|
||||
NRF_LOG_INFO("[FS_S] -> MKDIR %.10s", path);
|
||||
MKDirResponse resp = {};
|
||||
resp.command = commands::MKDIR_STATUS;
|
||||
int res = fs.DirCreate(path);
|
||||
switch (res) {
|
||||
case LFS_ERR_OK:
|
||||
resp.status = 0x01;
|
||||
break;
|
||||
default:
|
||||
resp.status = 0x02;
|
||||
break;
|
||||
}
|
||||
resp.modification_time = 0; // We should timestamp..but no
|
||||
auto* om = ble_hs_mbuf_from_flat(&resp, sizeof(MKDirResponse));
|
||||
ble_gattc_notify_custom(connectionHandle, transferCharacteristicHandle, om);
|
||||
break;
|
||||
}
|
||||
case commands::LISTDIR: {
|
||||
NRF_LOG_INFO("[FS_S] -> ListDir");
|
||||
ListDirHeader *header = (ListDirHeader *)&om->om_data[0];
|
||||
ListDirHeader* header = (ListDirHeader*)om->om_data;
|
||||
uint16_t plen = header->pathlen;
|
||||
char path[plen + 1] = {0};
|
||||
memcpy(path, header->pathstr, plen);
|
||||
|
@ -74,7 +125,7 @@ int FSService::FSCommandHandler(uint16_t connectionHandle, os_mbuf* om) {
|
|||
struct lfs_info info = {};
|
||||
|
||||
ListDirResponse resp = {};
|
||||
resp.command = 0x51; // LISTDIR_ENTRY;
|
||||
resp.command = commands::LISTDIR_ENTRY;
|
||||
resp.status = 1; // TODO actually use res above!
|
||||
resp.totalentries = 0;
|
||||
resp.entry = 0;
|
||||
|
@ -84,7 +135,6 @@ int FSService::FSCommandHandler(uint16_t connectionHandle, os_mbuf* om) {
|
|||
NRF_LOG_INFO("[FS_S] ->diropen %d ", res);
|
||||
while (fs.DirRead(&dir, &info)) {
|
||||
resp.totalentries++;
|
||||
|
||||
}
|
||||
NRF_LOG_INFO("[FS_S] -> %d ", resp.totalentries);
|
||||
|
||||
|
@ -92,14 +142,12 @@ int FSService::FSCommandHandler(uint16_t connectionHandle, os_mbuf* om) {
|
|||
|
||||
while (fs.DirRead(&dir, &info)) {
|
||||
switch (info.type) {
|
||||
case LFS_TYPE_REG:
|
||||
{
|
||||
case LFS_TYPE_REG: {
|
||||
resp.flags = 0;
|
||||
resp.file_size = info.size;
|
||||
break;
|
||||
}
|
||||
case LFS_TYPE_DIR:
|
||||
{
|
||||
case LFS_TYPE_DIR: {
|
||||
resp.flags = 1;
|
||||
resp.file_size = 0;
|
||||
break;
|
||||
|
@ -118,7 +166,7 @@ int FSService::FSCommandHandler(uint16_t connectionHandle, os_mbuf* om) {
|
|||
resp.file_size = 0;
|
||||
resp.path_length = 0;
|
||||
resp.flags = 0;
|
||||
//Todo this better
|
||||
// TODO Handle Size of response better.
|
||||
auto* om = ble_hs_mbuf_from_flat(&resp, sizeof(ListDirResponse) - 70 + resp.path_length);
|
||||
ble_gattc_notify_custom(connectionHandle, transferCharacteristicHandle, om);
|
||||
NRF_LOG_INFO("[FS_S] -> done ");
|
||||
|
|
|
@ -66,14 +66,14 @@ namespace Pinetime {
|
|||
};
|
||||
|
||||
using ListDirHeader = struct __attribute__((packed)) {
|
||||
uint8_t command;
|
||||
commands command;
|
||||
uint8_t padding;
|
||||
uint16_t pathlen;
|
||||
char pathstr[70];
|
||||
};
|
||||
|
||||
using ListDirResponse = struct __attribute__((packed)) {
|
||||
uint8_t command;
|
||||
commands command;
|
||||
uint8_t status;
|
||||
uint16_t path_length;
|
||||
uint32_t entry;
|
||||
|
@ -85,7 +85,7 @@ namespace Pinetime {
|
|||
};
|
||||
|
||||
using MKDirHeader = struct __attribute__((packed)) {
|
||||
uint8_t command;
|
||||
commands command;
|
||||
uint8_t padding;
|
||||
uint16_t pathlen;
|
||||
uint32_t padding2;
|
||||
|
@ -94,13 +94,25 @@ namespace Pinetime {
|
|||
};
|
||||
|
||||
using MKDirResponse = struct __attribute__((packed)) {
|
||||
uint8_t command;
|
||||
commands command;
|
||||
uint8_t status;
|
||||
uint32_t padding1;
|
||||
uint16_t padding2;
|
||||
uint64_t modification_time;
|
||||
};
|
||||
|
||||
using DelHeader = struct __attribute__((packed)) {
|
||||
commands command;
|
||||
uint8_t padding;
|
||||
uint16_t pathlen;
|
||||
char pathstr[70];
|
||||
};
|
||||
|
||||
using DelResponse = struct __attribute__((packed)) {
|
||||
commands command;
|
||||
uint8_t status;
|
||||
};
|
||||
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
@ -96,6 +96,10 @@ int FS::DirCreate(const char* path) {
|
|||
return lfs_mkdir(&lfs, path);
|
||||
}
|
||||
|
||||
int FS::Stat(const char* path, lfs_info* info){
|
||||
return lfs_stat(&lfs,path,info);
|
||||
}
|
||||
|
||||
// Delete directory and all files inside
|
||||
int FS::DirDelete(const char* path) {
|
||||
|
||||
|
|
|
@ -28,6 +28,7 @@ namespace Pinetime {
|
|||
int DirCreate(const char* path);
|
||||
int DirDelete(const char* path);
|
||||
|
||||
int Stat(const char* path, lfs_info* info);
|
||||
void VerifyResource();
|
||||
|
||||
private:
|
||||
|
|
Loading…
Reference in New Issue
Block a user