[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:
@@ -5,7 +5,7 @@
|
||||
#include <file-worker-cpp.h>
|
||||
#include <path.h>
|
||||
|
||||
const char* iButtonApp::app_folder = "ibutton";
|
||||
const char* iButtonApp::app_folder = "/any/ibutton";
|
||||
const char* iButtonApp::app_extension = ".ibtn";
|
||||
|
||||
void iButtonApp::run(void* args) {
|
||||
@@ -13,6 +13,8 @@ void iButtonApp::run(void* args) {
|
||||
bool consumed;
|
||||
bool exit = false;
|
||||
|
||||
make_app_folder();
|
||||
|
||||
if(args && load_key((const char*)args)) {
|
||||
current_scene = Scene::SceneEmulate;
|
||||
}
|
||||
@@ -218,15 +220,13 @@ void iButtonApp::generate_random_name(char* name, uint8_t max_name_size) {
|
||||
|
||||
// file managment
|
||||
bool iButtonApp::save_key(const char* key_name) {
|
||||
// Create ibutton directory if necessary
|
||||
make_app_folder();
|
||||
|
||||
FileWorkerCpp file_worker;
|
||||
string_t key_file_name;
|
||||
bool result = false;
|
||||
|
||||
// Create ibutton directory if necessary
|
||||
if(!file_worker.mkdir(app_folder)) {
|
||||
return false;
|
||||
};
|
||||
|
||||
// First remove key if it was saved
|
||||
string_init_printf(key_file_name, "%s/%s%s", app_folder, get_key()->get_name(), app_extension);
|
||||
if(!file_worker.remove(string_get_cstr(key_file_name))) {
|
||||
@@ -370,4 +370,9 @@ bool iButtonApp::delete_key() {
|
||||
string_clear(file_name);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
void iButtonApp::make_app_folder() {
|
||||
FileWorkerCpp file_worker;
|
||||
file_worker.mkdir(app_folder);
|
||||
}
|
@@ -25,9 +25,6 @@
|
||||
|
||||
#include "helpers/key-worker.h"
|
||||
|
||||
#include <sd-card-api.h>
|
||||
#include <filesystem-api.h>
|
||||
|
||||
#include "one_wire_master.h"
|
||||
#include "maxim_crc.h"
|
||||
#include "ibutton-key.h"
|
||||
@@ -142,4 +139,5 @@ private:
|
||||
static const char* app_extension;
|
||||
|
||||
bool load_key_data(string_t key_path);
|
||||
void make_app_folder();
|
||||
};
|
@@ -4,7 +4,6 @@
|
||||
#include "../ibutton-event.h"
|
||||
#include "../ibutton-key.h"
|
||||
#include <callback-connector.h>
|
||||
#include <filesystem-api.h>
|
||||
|
||||
void iButtonSceneSaveName::on_enter(iButtonApp* app) {
|
||||
iButtonAppViewManager* view_manager = app->get_view_manager();
|
||||
|
@@ -3,7 +3,6 @@
|
||||
#include "../ibutton-view-manager.h"
|
||||
#include "../ibutton-event.h"
|
||||
#include <callback-connector.h>
|
||||
#include <filesystem-api.h>
|
||||
|
||||
typedef enum {
|
||||
SubmenuIndexRead,
|
||||
|
Reference in New Issue
Block a user