[FL-1191][FL-1524] Filesystem rework (#568)
* FS-Api: removed datetime manipulation functions and most of the file flags
* Filesystem: common proxy api
* Filesystem: renamed to Storage. Work has begun on a glue layer. Added functions for reentrance.
* Storage: sd mount and sd file open
* Storage: sd file close
* Storage: temporary test app
* Storage: free filedata on close
* Storage: sd file read and write
* Storage: added internal storage (LittleFS)
* Storage: renamed internal commands
* Storage: seek, tell, truncate, size, sync, eof
* Storage: error descriptions
* Storage: directory management api (open, close, read, rewind)
* Storage: common management api (stat, fs_stat, remove, rename, mkdir)
* Dolphin app and Notifications app now use raw storage.
* Storage: storage statuses renamed. Implemented sd card icon.
* Storage: added raw sd-card api.
* Storage settings: work started
* Assets: use new icons approach
* Storage settings: working storage settings
* Storage: completely redesigned api, no longer sticking out FS_Api
* Storage: more simplified api, getting error_id from file is hidden from user, pointer to api is hidden inside file
* Storage: cli info and format commands
* Storage-cli: file list
* Storage: a simpler and more reliable api
* FatFS: slightly lighter and faster config. Also disabled reentrancy and file locking functions. They moved to a storage service.
* Storage-cli: accommodate to the new cli api.
* Storage: filesystem api is separated into internal and common api.
* Cli: added the ability to print the list of free heap blocks
* Storage: uses a list instead of an array to store the StorageFile. Rewrote api calls to use semaphores instead of thread flags.
* Storage settings: added the ability to benchmark the SD card.
* Gui module file select: uses new storage api
* Apps: removed deprecated sd_card_test application
* Args lib: support for enquoted arguments
* Dialogs: a new gui app for simple non-asynchronous apps
* Dialogs: view holder for easy single view work
* File worker: use new storage api
* IButton and lfrrfid apps: save keys to any storage
* Apps: fix ibutton and lfrfid stack, remove sd_card_test.
* SD filesystem: app removed
* File worker: fixed api pointer type
* Subghz: loading assets using the new storage api
* NFC: use the new storage api
* Dialogs: the better api for the message element
* Archive: use new storage api
* Irda: changed assest path, changed app path
* FileWorker: removed unused file_buf_cnt
* Storage: copying and renaming files now works between storages
* Storage cli: read, copy, remove, rename commands
* Archive: removed commented code
* Storage cli: write command
* Applications: add SRV_STORAGE and SRV_DIALOGS
* Internal-storage: removed
* Storage: improved api
* Storage app: changed api pointer from StorageApp to Storage
* Storage: better file_id handling
* Storage: more consistent errors
* Loader: support for NULL icons
* Storage: do nothing with the lfs file or directory if it is not open
* Storage: fix typo
* Storage: minor float usage cleanup, rename some symbols.
* Storage: compact doxygen comments.
Co-authored-by: あく <alleteam@gmail.com>
2021-07-23 15:20:19 +03:00
|
|
|
#include "storage-glue.h"
|
2021-08-08 21:03:25 +03:00
|
|
|
#include <furi-hal.h>
|
[FL-1191][FL-1524] Filesystem rework (#568)
* FS-Api: removed datetime manipulation functions and most of the file flags
* Filesystem: common proxy api
* Filesystem: renamed to Storage. Work has begun on a glue layer. Added functions for reentrance.
* Storage: sd mount and sd file open
* Storage: sd file close
* Storage: temporary test app
* Storage: free filedata on close
* Storage: sd file read and write
* Storage: added internal storage (LittleFS)
* Storage: renamed internal commands
* Storage: seek, tell, truncate, size, sync, eof
* Storage: error descriptions
* Storage: directory management api (open, close, read, rewind)
* Storage: common management api (stat, fs_stat, remove, rename, mkdir)
* Dolphin app and Notifications app now use raw storage.
* Storage: storage statuses renamed. Implemented sd card icon.
* Storage: added raw sd-card api.
* Storage settings: work started
* Assets: use new icons approach
* Storage settings: working storage settings
* Storage: completely redesigned api, no longer sticking out FS_Api
* Storage: more simplified api, getting error_id from file is hidden from user, pointer to api is hidden inside file
* Storage: cli info and format commands
* Storage-cli: file list
* Storage: a simpler and more reliable api
* FatFS: slightly lighter and faster config. Also disabled reentrancy and file locking functions. They moved to a storage service.
* Storage-cli: accommodate to the new cli api.
* Storage: filesystem api is separated into internal and common api.
* Cli: added the ability to print the list of free heap blocks
* Storage: uses a list instead of an array to store the StorageFile. Rewrote api calls to use semaphores instead of thread flags.
* Storage settings: added the ability to benchmark the SD card.
* Gui module file select: uses new storage api
* Apps: removed deprecated sd_card_test application
* Args lib: support for enquoted arguments
* Dialogs: a new gui app for simple non-asynchronous apps
* Dialogs: view holder for easy single view work
* File worker: use new storage api
* IButton and lfrrfid apps: save keys to any storage
* Apps: fix ibutton and lfrfid stack, remove sd_card_test.
* SD filesystem: app removed
* File worker: fixed api pointer type
* Subghz: loading assets using the new storage api
* NFC: use the new storage api
* Dialogs: the better api for the message element
* Archive: use new storage api
* Irda: changed assest path, changed app path
* FileWorker: removed unused file_buf_cnt
* Storage: copying and renaming files now works between storages
* Storage cli: read, copy, remove, rename commands
* Archive: removed commented code
* Storage cli: write command
* Applications: add SRV_STORAGE and SRV_DIALOGS
* Internal-storage: removed
* Storage: improved api
* Storage app: changed api pointer from StorageApp to Storage
* Storage: better file_id handling
* Storage: more consistent errors
* Loader: support for NULL icons
* Storage: do nothing with the lfs file or directory if it is not open
* Storage: fix typo
* Storage: minor float usage cleanup, rename some symbols.
* Storage: compact doxygen comments.
Co-authored-by: あく <alleteam@gmail.com>
2021-07-23 15:20:19 +03:00
|
|
|
|
|
|
|
/****************** storage file ******************/
|
|
|
|
|
|
|
|
void storage_file_init(StorageFile* obj) {
|
|
|
|
obj->file = NULL;
|
|
|
|
obj->type = ST_ERROR;
|
|
|
|
obj->file_data = NULL;
|
|
|
|
string_init(obj->path);
|
|
|
|
}
|
|
|
|
|
|
|
|
void storage_file_init_set(StorageFile* obj, const StorageFile* src) {
|
|
|
|
obj->file = src->file;
|
|
|
|
obj->type = src->type;
|
|
|
|
obj->file_data = src->file_data;
|
|
|
|
string_init_set(obj->path, src->path);
|
|
|
|
}
|
|
|
|
|
|
|
|
void storage_file_set(StorageFile* obj, const StorageFile* src) {
|
|
|
|
obj->file = src->file;
|
|
|
|
obj->type = src->type;
|
|
|
|
obj->file_data = src->file_data;
|
|
|
|
string_set(obj->path, src->path);
|
|
|
|
}
|
|
|
|
|
|
|
|
void storage_file_clear(StorageFile* obj) {
|
|
|
|
string_clear(obj->path);
|
|
|
|
}
|
|
|
|
|
|
|
|
/****************** storage data ******************/
|
|
|
|
|
|
|
|
void storage_data_init(StorageData* storage) {
|
|
|
|
storage->mutex = osMutexNew(NULL);
|
|
|
|
furi_check(storage->mutex != NULL);
|
|
|
|
storage->data = NULL;
|
|
|
|
storage->status = StorageStatusNotReady;
|
|
|
|
StorageFileList_init(storage->files);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool storage_data_lock(StorageData* storage) {
|
2021-08-08 21:03:25 +03:00
|
|
|
furi_hal_power_insomnia_enter();
|
[FL-1191][FL-1524] Filesystem rework (#568)
* FS-Api: removed datetime manipulation functions and most of the file flags
* Filesystem: common proxy api
* Filesystem: renamed to Storage. Work has begun on a glue layer. Added functions for reentrance.
* Storage: sd mount and sd file open
* Storage: sd file close
* Storage: temporary test app
* Storage: free filedata on close
* Storage: sd file read and write
* Storage: added internal storage (LittleFS)
* Storage: renamed internal commands
* Storage: seek, tell, truncate, size, sync, eof
* Storage: error descriptions
* Storage: directory management api (open, close, read, rewind)
* Storage: common management api (stat, fs_stat, remove, rename, mkdir)
* Dolphin app and Notifications app now use raw storage.
* Storage: storage statuses renamed. Implemented sd card icon.
* Storage: added raw sd-card api.
* Storage settings: work started
* Assets: use new icons approach
* Storage settings: working storage settings
* Storage: completely redesigned api, no longer sticking out FS_Api
* Storage: more simplified api, getting error_id from file is hidden from user, pointer to api is hidden inside file
* Storage: cli info and format commands
* Storage-cli: file list
* Storage: a simpler and more reliable api
* FatFS: slightly lighter and faster config. Also disabled reentrancy and file locking functions. They moved to a storage service.
* Storage-cli: accommodate to the new cli api.
* Storage: filesystem api is separated into internal and common api.
* Cli: added the ability to print the list of free heap blocks
* Storage: uses a list instead of an array to store the StorageFile. Rewrote api calls to use semaphores instead of thread flags.
* Storage settings: added the ability to benchmark the SD card.
* Gui module file select: uses new storage api
* Apps: removed deprecated sd_card_test application
* Args lib: support for enquoted arguments
* Dialogs: a new gui app for simple non-asynchronous apps
* Dialogs: view holder for easy single view work
* File worker: use new storage api
* IButton and lfrrfid apps: save keys to any storage
* Apps: fix ibutton and lfrfid stack, remove sd_card_test.
* SD filesystem: app removed
* File worker: fixed api pointer type
* Subghz: loading assets using the new storage api
* NFC: use the new storage api
* Dialogs: the better api for the message element
* Archive: use new storage api
* Irda: changed assest path, changed app path
* FileWorker: removed unused file_buf_cnt
* Storage: copying and renaming files now works between storages
* Storage cli: read, copy, remove, rename commands
* Archive: removed commented code
* Storage cli: write command
* Applications: add SRV_STORAGE and SRV_DIALOGS
* Internal-storage: removed
* Storage: improved api
* Storage app: changed api pointer from StorageApp to Storage
* Storage: better file_id handling
* Storage: more consistent errors
* Loader: support for NULL icons
* Storage: do nothing with the lfs file or directory if it is not open
* Storage: fix typo
* Storage: minor float usage cleanup, rename some symbols.
* Storage: compact doxygen comments.
Co-authored-by: あく <alleteam@gmail.com>
2021-07-23 15:20:19 +03:00
|
|
|
return (osMutexAcquire(storage->mutex, osWaitForever) == osOK);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool storage_data_unlock(StorageData* storage) {
|
2021-08-08 21:03:25 +03:00
|
|
|
furi_hal_power_insomnia_exit();
|
[FL-1191][FL-1524] Filesystem rework (#568)
* FS-Api: removed datetime manipulation functions and most of the file flags
* Filesystem: common proxy api
* Filesystem: renamed to Storage. Work has begun on a glue layer. Added functions for reentrance.
* Storage: sd mount and sd file open
* Storage: sd file close
* Storage: temporary test app
* Storage: free filedata on close
* Storage: sd file read and write
* Storage: added internal storage (LittleFS)
* Storage: renamed internal commands
* Storage: seek, tell, truncate, size, sync, eof
* Storage: error descriptions
* Storage: directory management api (open, close, read, rewind)
* Storage: common management api (stat, fs_stat, remove, rename, mkdir)
* Dolphin app and Notifications app now use raw storage.
* Storage: storage statuses renamed. Implemented sd card icon.
* Storage: added raw sd-card api.
* Storage settings: work started
* Assets: use new icons approach
* Storage settings: working storage settings
* Storage: completely redesigned api, no longer sticking out FS_Api
* Storage: more simplified api, getting error_id from file is hidden from user, pointer to api is hidden inside file
* Storage: cli info and format commands
* Storage-cli: file list
* Storage: a simpler and more reliable api
* FatFS: slightly lighter and faster config. Also disabled reentrancy and file locking functions. They moved to a storage service.
* Storage-cli: accommodate to the new cli api.
* Storage: filesystem api is separated into internal and common api.
* Cli: added the ability to print the list of free heap blocks
* Storage: uses a list instead of an array to store the StorageFile. Rewrote api calls to use semaphores instead of thread flags.
* Storage settings: added the ability to benchmark the SD card.
* Gui module file select: uses new storage api
* Apps: removed deprecated sd_card_test application
* Args lib: support for enquoted arguments
* Dialogs: a new gui app for simple non-asynchronous apps
* Dialogs: view holder for easy single view work
* File worker: use new storage api
* IButton and lfrrfid apps: save keys to any storage
* Apps: fix ibutton and lfrfid stack, remove sd_card_test.
* SD filesystem: app removed
* File worker: fixed api pointer type
* Subghz: loading assets using the new storage api
* NFC: use the new storage api
* Dialogs: the better api for the message element
* Archive: use new storage api
* Irda: changed assest path, changed app path
* FileWorker: removed unused file_buf_cnt
* Storage: copying and renaming files now works between storages
* Storage cli: read, copy, remove, rename commands
* Archive: removed commented code
* Storage cli: write command
* Applications: add SRV_STORAGE and SRV_DIALOGS
* Internal-storage: removed
* Storage: improved api
* Storage app: changed api pointer from StorageApp to Storage
* Storage: better file_id handling
* Storage: more consistent errors
* Loader: support for NULL icons
* Storage: do nothing with the lfs file or directory if it is not open
* Storage: fix typo
* Storage: minor float usage cleanup, rename some symbols.
* Storage: compact doxygen comments.
Co-authored-by: あく <alleteam@gmail.com>
2021-07-23 15:20:19 +03:00
|
|
|
return (osMutexRelease(storage->mutex) == osOK);
|
|
|
|
}
|
|
|
|
|
|
|
|
StorageStatus storage_data_status(StorageData* storage) {
|
|
|
|
StorageStatus status;
|
|
|
|
|
|
|
|
storage_data_lock(storage);
|
|
|
|
status = storage->status;
|
|
|
|
storage_data_unlock(storage);
|
|
|
|
|
|
|
|
return status;
|
|
|
|
}
|
|
|
|
|
|
|
|
const char* storage_data_status_text(StorageData* storage) {
|
|
|
|
const char* result = "unknown";
|
|
|
|
switch(storage->status) {
|
|
|
|
case StorageStatusOK:
|
|
|
|
result = "ok";
|
|
|
|
break;
|
|
|
|
case StorageStatusNotReady:
|
|
|
|
result = "not ready";
|
|
|
|
break;
|
|
|
|
case StorageStatusNotMounted:
|
|
|
|
result = "not mounted";
|
|
|
|
break;
|
|
|
|
case StorageStatusNoFS:
|
|
|
|
result = "no filesystem";
|
|
|
|
break;
|
|
|
|
case StorageStatusNotAccessible:
|
|
|
|
result = "not accessible";
|
|
|
|
break;
|
|
|
|
case StorageStatusErrorInternal:
|
|
|
|
result = "internal";
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
/****************** storage glue ******************/
|
|
|
|
|
|
|
|
bool storage_has_file(const File* file, StorageData* storage_data) {
|
|
|
|
bool result = false;
|
|
|
|
|
|
|
|
StorageFileList_it_t it;
|
|
|
|
for(StorageFileList_it(it, storage_data->files); !StorageFileList_end_p(it);
|
|
|
|
StorageFileList_next(it)) {
|
|
|
|
const StorageFile* storage_file = StorageFileList_cref(it);
|
|
|
|
|
|
|
|
if(storage_file->file->file_id == file->file_id) {
|
|
|
|
result = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
StorageType storage_get_type_by_path(const char* path) {
|
|
|
|
StorageType type = ST_ERROR;
|
|
|
|
|
|
|
|
const char* ext_path = "/ext";
|
|
|
|
const char* int_path = "/int";
|
|
|
|
const char* any_path = "/any";
|
|
|
|
|
|
|
|
if(strlen(path) >= strlen(ext_path) && memcmp(path, ext_path, strlen(ext_path)) == 0) {
|
|
|
|
type = ST_EXT;
|
|
|
|
} else if(strlen(path) >= strlen(int_path) && memcmp(path, int_path, strlen(int_path)) == 0) {
|
|
|
|
type = ST_INT;
|
|
|
|
} else if(strlen(path) >= strlen(any_path) && memcmp(path, any_path, strlen(any_path)) == 0) {
|
|
|
|
type = ST_ANY;
|
|
|
|
}
|
|
|
|
|
|
|
|
return type;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool storage_path_already_open(const char* path, StorageFileList_t array) {
|
|
|
|
bool open = false;
|
|
|
|
|
|
|
|
StorageFileList_it_t it;
|
|
|
|
|
|
|
|
for(StorageFileList_it(it, array); !StorageFileList_end_p(it); StorageFileList_next(it)) {
|
|
|
|
const StorageFile* storage_file = StorageFileList_cref(it);
|
|
|
|
|
|
|
|
if(string_cmp(storage_file->path, path) == 0) {
|
|
|
|
open = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return open;
|
|
|
|
}
|
|
|
|
|
|
|
|
void storage_set_storage_file_data(const File* file, void* file_data, StorageData* storage) {
|
|
|
|
StorageFile* founded_file = NULL;
|
|
|
|
|
|
|
|
StorageFileList_it_t it;
|
|
|
|
|
|
|
|
for(StorageFileList_it(it, storage->files); !StorageFileList_end_p(it);
|
|
|
|
StorageFileList_next(it)) {
|
|
|
|
StorageFile* storage_file = StorageFileList_ref(it);
|
|
|
|
|
|
|
|
if(storage_file->file->file_id == file->file_id) {
|
|
|
|
founded_file = storage_file;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
furi_check(founded_file != NULL);
|
|
|
|
|
|
|
|
founded_file->file_data = file_data;
|
|
|
|
}
|
|
|
|
|
|
|
|
void* storage_get_storage_file_data(const File* file, StorageData* storage) {
|
|
|
|
const StorageFile* founded_file = NULL;
|
|
|
|
|
|
|
|
StorageFileList_it_t it;
|
|
|
|
|
|
|
|
for(StorageFileList_it(it, storage->files); !StorageFileList_end_p(it);
|
|
|
|
StorageFileList_next(it)) {
|
|
|
|
const StorageFile* storage_file = StorageFileList_cref(it);
|
|
|
|
|
|
|
|
if(storage_file->file->file_id == file->file_id) {
|
|
|
|
founded_file = storage_file;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
furi_check(founded_file != NULL);
|
|
|
|
|
|
|
|
return founded_file->file_data;
|
|
|
|
}
|
|
|
|
|
|
|
|
void storage_push_storage_file(
|
|
|
|
File* file,
|
|
|
|
const char* path,
|
|
|
|
StorageType type,
|
|
|
|
StorageData* storage) {
|
|
|
|
StorageFile* storage_file = StorageFileList_push_new(storage->files);
|
|
|
|
furi_check(storage_file != NULL);
|
|
|
|
|
|
|
|
file->file_id = (uint32_t)storage_file;
|
|
|
|
storage_file->file = file;
|
|
|
|
storage_file->type = type;
|
|
|
|
string_set(storage_file->path, path);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool storage_pop_storage_file(File* file, StorageData* storage) {
|
|
|
|
StorageFileList_it_t it;
|
|
|
|
bool result = false;
|
|
|
|
|
|
|
|
for(StorageFileList_it(it, storage->files); !StorageFileList_end_p(it);
|
|
|
|
StorageFileList_next(it)) {
|
|
|
|
if(StorageFileList_cref(it)->file->file_id == file->file_id) {
|
|
|
|
result = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if(result) {
|
|
|
|
StorageFileList_remove(storage->files, it);
|
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|