[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>
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
#include <furi.h>
|
||||
#include <api-hal.h>
|
||||
#include <internal-storage/internal-storage.h>
|
||||
#include <storage/storage.h>
|
||||
#include "notification.h"
|
||||
#include "notification-messages.h"
|
||||
#include "notification-app.h"
|
||||
@@ -309,24 +309,30 @@ void notification_process_internal_message(NotificationApp* app, NotificationApp
|
||||
}
|
||||
}
|
||||
|
||||
static void notification_load_settings(NotificationApp* app) {
|
||||
static bool notification_load_settings(NotificationApp* app) {
|
||||
NotificationSettings settings;
|
||||
InternalStorage* internal_storage = furi_record_open("internal-storage");
|
||||
File* file = storage_file_alloc(furi_record_open("storage"));
|
||||
const size_t settings_size = sizeof(NotificationSettings);
|
||||
|
||||
FURI_LOG_I("notification", "Loading state from internal-storage");
|
||||
int ret = internal_storage_read_key(
|
||||
internal_storage, NOTIFICATION_SETTINGS_PATH, (uint8_t*)&settings, settings_size);
|
||||
FURI_LOG_I("notification", "loading settings from \"%s\"", NOTIFICATION_SETTINGS_PATH);
|
||||
bool fs_result =
|
||||
storage_file_open(file, NOTIFICATION_SETTINGS_PATH, FSAM_READ, FSOM_OPEN_EXISTING);
|
||||
|
||||
if(ret != settings_size) {
|
||||
FURI_LOG_E("notification", "Load failed. Storage returned: %d", ret);
|
||||
} else {
|
||||
FURI_LOG_I("notification", "Load success", ret);
|
||||
if(fs_result) {
|
||||
uint16_t bytes_count = storage_file_read(file, &settings, settings_size);
|
||||
|
||||
if(bytes_count != settings_size) {
|
||||
fs_result = false;
|
||||
}
|
||||
}
|
||||
|
||||
if(fs_result) {
|
||||
FURI_LOG_I("notification", "load success");
|
||||
|
||||
if(settings.version != NOTIFICATION_SETTINGS_VERSION) {
|
||||
FURI_LOG_E(
|
||||
"notification",
|
||||
"Version(%d != %d) mismatch",
|
||||
"version(%d != %d) mismatch",
|
||||
app->settings.version,
|
||||
NOTIFICATION_SETTINGS_VERSION);
|
||||
} else {
|
||||
@@ -334,26 +340,50 @@ static void notification_load_settings(NotificationApp* app) {
|
||||
memcpy(&app->settings, &settings, settings_size);
|
||||
osKernelUnlock();
|
||||
}
|
||||
} else {
|
||||
FURI_LOG_E("notification", "load failed, %s", storage_file_get_error_desc(file));
|
||||
}
|
||||
|
||||
furi_record_close("internal-storage");
|
||||
storage_file_close(file);
|
||||
storage_file_free(file);
|
||||
furi_record_close("storage");
|
||||
|
||||
return fs_result;
|
||||
};
|
||||
|
||||
static void notification_save_settings(NotificationApp* app) {
|
||||
InternalStorage* internal_storage = furi_record_open("internal-storage");
|
||||
static bool notification_save_settings(NotificationApp* app) {
|
||||
NotificationSettings settings;
|
||||
File* file = storage_file_alloc(furi_record_open("storage"));
|
||||
const size_t settings_size = sizeof(NotificationSettings);
|
||||
|
||||
FURI_LOG_I("notification", "Saving state to internal-storage");
|
||||
int ret = internal_storage_write_key(
|
||||
internal_storage, NOTIFICATION_SETTINGS_PATH, (uint8_t*)&app->settings, settings_size);
|
||||
FURI_LOG_I("notification", "saving settings to \"%s\"", NOTIFICATION_SETTINGS_PATH);
|
||||
|
||||
if(ret != settings_size) {
|
||||
FURI_LOG_E("notification", "Save failed. Storage returned: %d", ret);
|
||||
} else {
|
||||
FURI_LOG_I("notification", "Saved");
|
||||
osKernelLock();
|
||||
memcpy(&settings, &app->settings, settings_size);
|
||||
osKernelUnlock();
|
||||
|
||||
bool fs_result =
|
||||
storage_file_open(file, NOTIFICATION_SETTINGS_PATH, FSAM_WRITE, FSOM_CREATE_ALWAYS);
|
||||
|
||||
if(fs_result) {
|
||||
uint16_t bytes_count = storage_file_write(file, &settings, settings_size);
|
||||
|
||||
if(bytes_count != settings_size) {
|
||||
fs_result = false;
|
||||
}
|
||||
}
|
||||
|
||||
furi_record_close("internal-storage");
|
||||
if(fs_result) {
|
||||
FURI_LOG_I("notification", "save success");
|
||||
} else {
|
||||
FURI_LOG_E("notification", "save failed, %s", storage_file_get_error_desc(file));
|
||||
}
|
||||
|
||||
storage_file_close(file);
|
||||
storage_file_free(file);
|
||||
furi_record_close("storage");
|
||||
|
||||
return fs_result;
|
||||
};
|
||||
|
||||
static void input_event_callback(const void* value, void* context) {
|
||||
@@ -407,7 +437,9 @@ static NotificationApp* notification_app_alloc() {
|
||||
int32_t notification_app(void* p) {
|
||||
NotificationApp* app = notification_app_alloc();
|
||||
|
||||
notification_load_settings(app);
|
||||
if(!notification_load_settings(app)) {
|
||||
notification_save_settings(app);
|
||||
}
|
||||
|
||||
notification_vibro_off();
|
||||
notification_sound_off();
|
||||
|
@@ -31,7 +31,7 @@ typedef struct {
|
||||
} NotificationLedLayer;
|
||||
|
||||
#define NOTIFICATION_SETTINGS_VERSION 0x01
|
||||
#define NOTIFICATION_SETTINGS_PATH "notification_settings"
|
||||
#define NOTIFICATION_SETTINGS_PATH "/int/notification.settings"
|
||||
|
||||
typedef struct {
|
||||
uint8_t version;
|
||||
|
Reference in New Issue
Block a user