2022-01-05 19:10:18 +03:00
|
|
|
#include "storage_processing.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
|
|
|
|
|
|
|
#define FS_CALL(_storage, _fn) \
|
|
|
|
storage_data_lock(_storage); \
|
|
|
|
ret = _storage->fs_api._fn; \
|
|
|
|
storage_data_unlock(_storage);
|
|
|
|
|
|
|
|
#define ST_CALL(_storage, _fn) \
|
|
|
|
storage_data_lock(_storage); \
|
|
|
|
ret = _storage->api._fn; \
|
|
|
|
storage_data_unlock(_storage);
|
|
|
|
|
|
|
|
static StorageData* storage_get_storage_by_type(Storage* app, StorageType type) {
|
|
|
|
StorageData* storage;
|
|
|
|
|
|
|
|
if(type == ST_ANY) {
|
|
|
|
type = ST_INT;
|
|
|
|
StorageData* ext_storage = &app->storage[ST_EXT];
|
|
|
|
|
|
|
|
if(storage_data_status(ext_storage) == StorageStatusOK) {
|
|
|
|
type = ST_EXT;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
storage = &app->storage[type];
|
|
|
|
|
|
|
|
return storage;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool storage_type_is_not_valid(StorageType type) {
|
|
|
|
return type >= ST_ERROR;
|
|
|
|
}
|
|
|
|
|
|
|
|
static StorageData* get_storage_by_file(File* file, StorageData* storages) {
|
|
|
|
StorageData* storage_data = NULL;
|
|
|
|
|
|
|
|
for(uint8_t i = 0; i < STORAGE_COUNT; i++) {
|
|
|
|
if(storage_has_file(file, &storages[i])) {
|
|
|
|
storage_data = &storages[i];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return storage_data;
|
|
|
|
}
|
|
|
|
|
|
|
|
const char* remove_vfs(const char* path) {
|
|
|
|
return path + MIN(4, strlen(path));
|
|
|
|
}
|
|
|
|
|
|
|
|
/******************* File Functions *******************/
|
|
|
|
|
|
|
|
bool storage_process_file_open(
|
|
|
|
Storage* app,
|
|
|
|
File* file,
|
|
|
|
const char* path,
|
|
|
|
FS_AccessMode access_mode,
|
|
|
|
FS_OpenMode open_mode) {
|
|
|
|
bool ret = false;
|
|
|
|
StorageType type = storage_get_type_by_path(path);
|
|
|
|
StorageData* storage;
|
|
|
|
file->error_id = FSE_OK;
|
|
|
|
|
|
|
|
if(storage_type_is_not_valid(type)) {
|
|
|
|
file->error_id = FSE_INVALID_NAME;
|
|
|
|
} else {
|
|
|
|
storage = storage_get_storage_by_type(app, type);
|
|
|
|
if(storage_path_already_open(path, storage->files)) {
|
|
|
|
file->error_id = FSE_ALREADY_OPEN;
|
|
|
|
} else {
|
|
|
|
storage_push_storage_file(file, path, type, storage);
|
|
|
|
FS_CALL(storage, file.open(storage, file, remove_vfs(path), access_mode, open_mode));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool storage_process_file_close(Storage* app, File* file) {
|
|
|
|
bool ret = false;
|
|
|
|
StorageData* storage = get_storage_by_file(file, app->storage);
|
|
|
|
|
|
|
|
if(storage == NULL) {
|
|
|
|
file->error_id = FSE_INVALID_PARAMETER;
|
|
|
|
} else {
|
|
|
|
FS_CALL(storage, file.close(storage, file));
|
|
|
|
storage_pop_storage_file(file, storage);
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static uint16_t
|
|
|
|
storage_process_file_read(Storage* app, File* file, void* buff, uint16_t const bytes_to_read) {
|
|
|
|
uint16_t ret = 0;
|
|
|
|
StorageData* storage = get_storage_by_file(file, app->storage);
|
|
|
|
|
|
|
|
if(storage == NULL) {
|
|
|
|
file->error_id = FSE_INVALID_PARAMETER;
|
|
|
|
} else {
|
|
|
|
FS_CALL(storage, file.read(storage, file, buff, bytes_to_read));
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static uint16_t storage_process_file_write(
|
|
|
|
Storage* app,
|
|
|
|
File* file,
|
|
|
|
const void* buff,
|
|
|
|
uint16_t const bytes_to_write) {
|
|
|
|
uint16_t ret = 0;
|
|
|
|
StorageData* storage = get_storage_by_file(file, app->storage);
|
|
|
|
|
|
|
|
if(storage == NULL) {
|
|
|
|
file->error_id = FSE_INVALID_PARAMETER;
|
|
|
|
} else {
|
|
|
|
FS_CALL(storage, file.write(storage, file, buff, bytes_to_write));
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool storage_process_file_seek(
|
|
|
|
Storage* app,
|
|
|
|
File* file,
|
|
|
|
const uint32_t offset,
|
|
|
|
const bool from_start) {
|
|
|
|
bool ret = false;
|
|
|
|
StorageData* storage = get_storage_by_file(file, app->storage);
|
|
|
|
|
|
|
|
if(storage == NULL) {
|
|
|
|
file->error_id = FSE_INVALID_PARAMETER;
|
|
|
|
} else {
|
|
|
|
FS_CALL(storage, file.seek(storage, file, offset, from_start));
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static uint64_t storage_process_file_tell(Storage* app, File* file) {
|
|
|
|
uint64_t ret = 0;
|
|
|
|
StorageData* storage = get_storage_by_file(file, app->storage);
|
|
|
|
|
|
|
|
if(storage == NULL) {
|
|
|
|
file->error_id = FSE_INVALID_PARAMETER;
|
|
|
|
} else {
|
|
|
|
FS_CALL(storage, file.tell(storage, file));
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool storage_process_file_truncate(Storage* app, File* file) {
|
|
|
|
bool ret = false;
|
|
|
|
StorageData* storage = get_storage_by_file(file, app->storage);
|
|
|
|
|
|
|
|
if(storage == NULL) {
|
|
|
|
file->error_id = FSE_INVALID_PARAMETER;
|
|
|
|
} else {
|
|
|
|
FS_CALL(storage, file.truncate(storage, file));
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool storage_process_file_sync(Storage* app, File* file) {
|
|
|
|
bool ret = false;
|
|
|
|
StorageData* storage = get_storage_by_file(file, app->storage);
|
|
|
|
|
|
|
|
if(storage == NULL) {
|
|
|
|
file->error_id = FSE_INVALID_PARAMETER;
|
|
|
|
} else {
|
|
|
|
FS_CALL(storage, file.sync(storage, file));
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static uint64_t storage_process_file_size(Storage* app, File* file) {
|
|
|
|
uint64_t ret = 0;
|
|
|
|
StorageData* storage = get_storage_by_file(file, app->storage);
|
|
|
|
|
|
|
|
if(storage == NULL) {
|
|
|
|
file->error_id = FSE_INVALID_PARAMETER;
|
|
|
|
} else {
|
|
|
|
FS_CALL(storage, file.size(storage, file));
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool storage_process_file_eof(Storage* app, File* file) {
|
|
|
|
bool ret = false;
|
|
|
|
StorageData* storage = get_storage_by_file(file, app->storage);
|
|
|
|
|
|
|
|
if(storage == NULL) {
|
|
|
|
file->error_id = FSE_INVALID_PARAMETER;
|
|
|
|
} else {
|
|
|
|
FS_CALL(storage, file.eof(storage, file));
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/******************* Dir Functions *******************/
|
|
|
|
|
|
|
|
bool storage_process_dir_open(Storage* app, File* file, const char* path) {
|
|
|
|
bool ret = false;
|
|
|
|
StorageType type = storage_get_type_by_path(path);
|
|
|
|
StorageData* storage;
|
|
|
|
file->error_id = FSE_OK;
|
|
|
|
|
|
|
|
if(storage_type_is_not_valid(type)) {
|
|
|
|
file->error_id = FSE_INVALID_NAME;
|
|
|
|
} else {
|
|
|
|
storage = storage_get_storage_by_type(app, type);
|
|
|
|
if(storage_path_already_open(path, storage->files)) {
|
|
|
|
file->error_id = FSE_ALREADY_OPEN;
|
|
|
|
} else {
|
|
|
|
storage_push_storage_file(file, path, type, storage);
|
|
|
|
FS_CALL(storage, dir.open(storage, file, remove_vfs(path)));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool storage_process_dir_close(Storage* app, File* file) {
|
|
|
|
bool ret = false;
|
|
|
|
StorageData* storage = get_storage_by_file(file, app->storage);
|
|
|
|
|
|
|
|
if(storage == NULL) {
|
|
|
|
file->error_id = FSE_INVALID_PARAMETER;
|
|
|
|
} else {
|
|
|
|
FS_CALL(storage, dir.close(storage, file));
|
|
|
|
storage_pop_storage_file(file, storage);
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool storage_process_dir_read(
|
|
|
|
Storage* app,
|
|
|
|
File* file,
|
|
|
|
FileInfo* fileinfo,
|
|
|
|
char* name,
|
|
|
|
const uint16_t name_length) {
|
|
|
|
bool ret = false;
|
|
|
|
StorageData* storage = get_storage_by_file(file, app->storage);
|
|
|
|
|
|
|
|
if(storage == NULL) {
|
|
|
|
file->error_id = FSE_INVALID_PARAMETER;
|
|
|
|
} else {
|
|
|
|
FS_CALL(storage, dir.read(storage, file, fileinfo, name, name_length));
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool storage_process_dir_rewind(Storage* app, File* file) {
|
|
|
|
bool ret = false;
|
|
|
|
StorageData* storage = get_storage_by_file(file, app->storage);
|
|
|
|
|
|
|
|
if(storage == NULL) {
|
|
|
|
file->error_id = FSE_INVALID_PARAMETER;
|
|
|
|
} else {
|
|
|
|
FS_CALL(storage, dir.rewind(storage, file));
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/******************* Common FS Functions *******************/
|
|
|
|
|
|
|
|
static FS_Error storage_process_common_stat(Storage* app, const char* path, FileInfo* fileinfo) {
|
|
|
|
FS_Error ret = FSE_OK;
|
|
|
|
StorageType type = storage_get_type_by_path(path);
|
|
|
|
|
|
|
|
if(storage_type_is_not_valid(type)) {
|
|
|
|
ret = FSE_INVALID_NAME;
|
|
|
|
} else {
|
|
|
|
StorageData* storage = storage_get_storage_by_type(app, type);
|
|
|
|
FS_CALL(storage, common.stat(storage, remove_vfs(path), fileinfo));
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static FS_Error storage_process_common_remove(Storage* app, const char* path) {
|
|
|
|
FS_Error ret = FSE_OK;
|
|
|
|
StorageType type = storage_get_type_by_path(path);
|
|
|
|
|
|
|
|
do {
|
|
|
|
if(storage_type_is_not_valid(type)) {
|
|
|
|
ret = FSE_INVALID_NAME;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
StorageData* storage = storage_get_storage_by_type(app, type);
|
|
|
|
if(storage_path_already_open(path, storage->files)) {
|
|
|
|
ret = FSE_ALREADY_OPEN;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
FS_CALL(storage, common.remove(storage, remove_vfs(path)));
|
|
|
|
} while(false);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2021-08-19 01:06:18 +03:00
|
|
|
static FS_Error storage_process_common_mkdir(Storage* app, const char* path) {
|
|
|
|
FS_Error ret = FSE_OK;
|
|
|
|
StorageType type = storage_get_type_by_path(path);
|
|
|
|
|
|
|
|
if(storage_type_is_not_valid(type)) {
|
|
|
|
ret = FSE_INVALID_NAME;
|
|
|
|
} else {
|
|
|
|
StorageData* storage = storage_get_storage_by_type(app, type);
|
|
|
|
FS_CALL(storage, common.mkdir(storage, remove_vfs(path)));
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
[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
|
|
|
static FS_Error storage_process_common_copy(Storage* app, const char* old, const char* new) {
|
|
|
|
FS_Error ret = FSE_INTERNAL;
|
|
|
|
File file_old;
|
|
|
|
File file_new;
|
|
|
|
|
2021-08-19 01:06:18 +03:00
|
|
|
FileInfo fileinfo;
|
|
|
|
ret = storage_process_common_stat(app, old, &fileinfo);
|
[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
|
|
|
|
2021-08-19 01:06:18 +03:00
|
|
|
if(ret == FSE_OK) {
|
|
|
|
if(fileinfo.flags & FSF_DIRECTORY) {
|
|
|
|
ret = storage_process_common_mkdir(app, new);
|
|
|
|
} else {
|
|
|
|
do {
|
|
|
|
if(!storage_process_file_open(app, &file_old, old, FSAM_READ, FSOM_OPEN_EXISTING)) {
|
|
|
|
ret = storage_file_get_error(&file_old);
|
|
|
|
storage_process_file_close(app, &file_old);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(!storage_process_file_open(app, &file_new, new, FSAM_WRITE, FSOM_CREATE_NEW)) {
|
|
|
|
ret = storage_file_get_error(&file_new);
|
|
|
|
storage_process_file_close(app, &file_new);
|
|
|
|
storage_process_file_close(app, &file_old);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
const uint16_t buffer_size = 64;
|
|
|
|
uint8_t* buffer = malloc(buffer_size);
|
|
|
|
uint16_t readed_size = 0;
|
|
|
|
uint16_t writed_size = 0;
|
|
|
|
|
|
|
|
while(true) {
|
|
|
|
readed_size = storage_process_file_read(app, &file_old, buffer, buffer_size);
|
|
|
|
ret = storage_file_get_error(&file_old);
|
|
|
|
if(readed_size == 0) break;
|
|
|
|
|
|
|
|
writed_size = storage_process_file_write(app, &file_new, buffer, readed_size);
|
|
|
|
ret = storage_file_get_error(&file_new);
|
|
|
|
if(writed_size < readed_size) break;
|
|
|
|
}
|
|
|
|
|
|
|
|
free(buffer);
|
|
|
|
storage_process_file_close(app, &file_old);
|
|
|
|
storage_process_file_close(app, &file_new);
|
|
|
|
} while(false);
|
[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
|
|
|
}
|
2021-08-19 01:06:18 +03:00
|
|
|
}
|
[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 ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static FS_Error storage_process_common_rename(Storage* app, const char* old, const char* new) {
|
|
|
|
FS_Error ret = FSE_INTERNAL;
|
|
|
|
StorageType type_old = storage_get_type_by_path(old);
|
|
|
|
StorageType type_new = storage_get_type_by_path(new);
|
|
|
|
|
2021-12-05 14:47:02 +03:00
|
|
|
if(storage_type_is_not_valid(type_old) || storage_type_is_not_valid(type_new)) {
|
[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
|
|
|
ret = FSE_INVALID_NAME;
|
|
|
|
} else {
|
|
|
|
if(type_old != type_new) {
|
|
|
|
ret = storage_process_common_copy(app, old, new);
|
|
|
|
if(ret == FSE_OK) {
|
|
|
|
ret = storage_process_common_remove(app, old);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
StorageData* storage = storage_get_storage_by_type(app, type_old);
|
|
|
|
FS_CALL(storage, common.rename(storage, remove_vfs(old), remove_vfs(new)));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static FS_Error storage_process_common_fs_info(
|
|
|
|
Storage* app,
|
|
|
|
const char* fs_path,
|
|
|
|
uint64_t* total_space,
|
|
|
|
uint64_t* free_space) {
|
|
|
|
FS_Error ret = FSE_OK;
|
|
|
|
StorageType type = storage_get_type_by_path(fs_path);
|
|
|
|
|
|
|
|
if(storage_type_is_not_valid(type)) {
|
|
|
|
ret = FSE_INVALID_NAME;
|
|
|
|
} else {
|
|
|
|
StorageData* storage = storage_get_storage_by_type(app, type);
|
|
|
|
FS_CALL(storage, common.fs_info(storage, remove_vfs(fs_path), total_space, free_space));
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/****************** Raw SD API ******************/
|
|
|
|
// TODO think about implementing a custom storage API to split that kind of api linkage
|
2022-01-05 19:10:18 +03:00
|
|
|
#include "storages/storage_ext.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
|
|
|
|
|
|
|
static FS_Error storage_process_sd_format(Storage* app) {
|
|
|
|
FS_Error ret = FSE_OK;
|
|
|
|
|
|
|
|
if(storage_data_status(&app->storage[ST_EXT]) == StorageStatusNotReady) {
|
|
|
|
ret = FSE_NOT_READY;
|
|
|
|
} else {
|
|
|
|
ret = sd_format_card(&app->storage[ST_EXT]);
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static FS_Error storage_process_sd_unmount(Storage* app) {
|
|
|
|
FS_Error ret = FSE_OK;
|
|
|
|
|
|
|
|
if(storage_data_status(&app->storage[ST_EXT]) == StorageStatusNotReady) {
|
|
|
|
ret = FSE_NOT_READY;
|
|
|
|
} else {
|
|
|
|
sd_unmount_card(&app->storage[ST_EXT]);
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static FS_Error storage_process_sd_info(Storage* app, SDInfo* info) {
|
|
|
|
FS_Error ret = FSE_OK;
|
|
|
|
|
|
|
|
if(storage_data_status(&app->storage[ST_EXT]) == StorageStatusNotReady) {
|
|
|
|
ret = FSE_NOT_READY;
|
|
|
|
} else {
|
|
|
|
ret = sd_card_info(&app->storage[ST_EXT], info);
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static FS_Error storage_process_sd_status(Storage* app) {
|
|
|
|
FS_Error ret;
|
|
|
|
StorageStatus status = storage_data_status(&app->storage[ST_EXT]);
|
|
|
|
|
|
|
|
switch(status) {
|
|
|
|
case StorageStatusOK:
|
|
|
|
ret = FSE_OK;
|
|
|
|
break;
|
|
|
|
case StorageStatusNotReady:
|
|
|
|
ret = FSE_NOT_READY;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
ret = FSE_INTERNAL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/****************** API calls processing ******************/
|
|
|
|
|
|
|
|
void storage_process_message(Storage* app, StorageMessage* message) {
|
|
|
|
switch(message->command) {
|
|
|
|
case StorageCommandFileOpen:
|
|
|
|
message->return_data->bool_value = storage_process_file_open(
|
|
|
|
app,
|
|
|
|
message->data->fopen.file,
|
|
|
|
message->data->fopen.path,
|
|
|
|
message->data->fopen.access_mode,
|
|
|
|
message->data->fopen.open_mode);
|
|
|
|
break;
|
|
|
|
case StorageCommandFileClose:
|
|
|
|
message->return_data->bool_value =
|
|
|
|
storage_process_file_close(app, message->data->fopen.file);
|
|
|
|
break;
|
|
|
|
case StorageCommandFileRead:
|
|
|
|
message->return_data->uint16_value = storage_process_file_read(
|
|
|
|
app,
|
|
|
|
message->data->fread.file,
|
|
|
|
message->data->fread.buff,
|
|
|
|
message->data->fread.bytes_to_read);
|
|
|
|
break;
|
|
|
|
case StorageCommandFileWrite:
|
|
|
|
message->return_data->uint16_value = storage_process_file_write(
|
|
|
|
app,
|
|
|
|
message->data->fwrite.file,
|
|
|
|
message->data->fwrite.buff,
|
|
|
|
message->data->fwrite.bytes_to_write);
|
|
|
|
break;
|
|
|
|
case StorageCommandFileSeek:
|
|
|
|
message->return_data->bool_value = storage_process_file_seek(
|
|
|
|
app,
|
|
|
|
message->data->fseek.file,
|
|
|
|
message->data->fseek.offset,
|
|
|
|
message->data->fseek.from_start);
|
|
|
|
break;
|
|
|
|
case StorageCommandFileTell:
|
|
|
|
message->return_data->uint64_value =
|
|
|
|
storage_process_file_tell(app, message->data->file.file);
|
|
|
|
break;
|
|
|
|
case StorageCommandFileTruncate:
|
|
|
|
message->return_data->bool_value =
|
|
|
|
storage_process_file_truncate(app, message->data->file.file);
|
|
|
|
break;
|
|
|
|
case StorageCommandFileSync:
|
|
|
|
message->return_data->bool_value =
|
|
|
|
storage_process_file_sync(app, message->data->file.file);
|
|
|
|
break;
|
|
|
|
case StorageCommandFileSize:
|
|
|
|
message->return_data->uint64_value =
|
|
|
|
storage_process_file_size(app, message->data->file.file);
|
|
|
|
break;
|
|
|
|
case StorageCommandFileEof:
|
|
|
|
message->return_data->bool_value = storage_process_file_eof(app, message->data->file.file);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case StorageCommandDirOpen:
|
|
|
|
message->return_data->bool_value =
|
|
|
|
storage_process_dir_open(app, message->data->dopen.file, message->data->dopen.path);
|
|
|
|
break;
|
|
|
|
case StorageCommandDirClose:
|
|
|
|
message->return_data->bool_value =
|
|
|
|
storage_process_dir_close(app, message->data->file.file);
|
|
|
|
break;
|
|
|
|
case StorageCommandDirRead:
|
|
|
|
message->return_data->bool_value = storage_process_dir_read(
|
|
|
|
app,
|
|
|
|
message->data->dread.file,
|
|
|
|
message->data->dread.fileinfo,
|
|
|
|
message->data->dread.name,
|
|
|
|
message->data->dread.name_length);
|
|
|
|
break;
|
|
|
|
case StorageCommandDirRewind:
|
|
|
|
message->return_data->bool_value =
|
|
|
|
storage_process_dir_rewind(app, message->data->file.file);
|
|
|
|
break;
|
|
|
|
case StorageCommandCommonStat:
|
|
|
|
message->return_data->error_value = storage_process_common_stat(
|
|
|
|
app, message->data->cstat.path, message->data->cstat.fileinfo);
|
|
|
|
break;
|
|
|
|
case StorageCommandCommonRemove:
|
|
|
|
message->return_data->error_value =
|
|
|
|
storage_process_common_remove(app, message->data->path.path);
|
|
|
|
break;
|
|
|
|
case StorageCommandCommonRename:
|
|
|
|
message->return_data->error_value = storage_process_common_rename(
|
|
|
|
app, message->data->cpaths.old, message->data->cpaths.new);
|
|
|
|
break;
|
|
|
|
case StorageCommandCommonCopy:
|
|
|
|
message->return_data->error_value =
|
|
|
|
storage_process_common_copy(app, message->data->cpaths.old, message->data->cpaths.new);
|
|
|
|
break;
|
|
|
|
case StorageCommandCommonMkDir:
|
|
|
|
message->return_data->error_value =
|
|
|
|
storage_process_common_mkdir(app, message->data->path.path);
|
|
|
|
break;
|
|
|
|
case StorageCommandCommonFSInfo:
|
|
|
|
message->return_data->error_value = storage_process_common_fs_info(
|
|
|
|
app,
|
|
|
|
message->data->cfsinfo.fs_path,
|
|
|
|
message->data->cfsinfo.total_space,
|
|
|
|
message->data->cfsinfo.free_space);
|
|
|
|
break;
|
|
|
|
case StorageCommandSDFormat:
|
|
|
|
message->return_data->error_value = storage_process_sd_format(app);
|
|
|
|
break;
|
|
|
|
case StorageCommandSDUnmount:
|
|
|
|
message->return_data->error_value = storage_process_sd_unmount(app);
|
|
|
|
break;
|
|
|
|
case StorageCommandSDInfo:
|
|
|
|
message->return_data->error_value =
|
|
|
|
storage_process_sd_info(app, message->data->sdinfo.info);
|
|
|
|
break;
|
|
|
|
case StorageCommandSDStatus:
|
|
|
|
message->return_data->error_value = storage_process_sd_status(app);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
osSemaphoreRelease(message->semaphore);
|
|
|
|
}
|