[FL-1791] Flipper file format (#740)

* Lib: new flipper file format library
* Lib: flipper file format cpp wrapper
* Storage: simple function for remove file and check error
* iButton app: remove file worker, use new flipper file format instead
* Dialogs: storage error message
* Storage: simple function for mkdir and check error
* iButton app: error messages
* Libs: update makefile
* RFID app: remove file worker, use new flipper file format instead
* Flipper File: library documentation

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>

applications/dialogs/dialogs-api.c

@@ -60,3 +60,14 @@ DialogMessageButton dialog_message_show(DialogsApp* context, const DialogMessage
 
     return return_data.dialog_value;
 }
+
+/****************** Storage error ******************/
+
+void dialog_message_show_storage_error(DialogsApp* context, const char* error_text) {
+    DialogMessage* message = dialog_message_alloc();
+    dialog_message_set_text(message, error_text, 88, 32, AlignCenter, AlignCenter);
+    dialog_message_set_icon(message, &I_SDQuestion_35x43, 5, 6);
+    dialog_message_set_buttons(message, "Back", NULL, NULL);
+    dialog_message_show(context, message);
+    dialog_message_free(message);
+}

applications/dialogs/dialogs.h

@@ -123,6 +123,13 @@ void dialog_message_set_buttons(
  */
 DialogMessageButton dialog_message_show(DialogsApp* context, const DialogMessage* message);
 
+/**
+ * Show SD error message (with question sign)
+ * @param context 
+ * @param error_text 
+ */
+void dialog_message_show_storage_error(DialogsApp* context, const char* error_text);
+
 #ifdef __cplusplus
 }
 #endif

applications/ibutton/ibutton-app.cpp

@@ -2,11 +2,12 @@
 #include <stdarg.h>
 #include <callback-connector.h>
 #include <m-string.h>
-#include <file-worker-cpp.h>
-#include <lib/toolbox/path.h>
+#include <toolbox/path.h>
+#include <toolbox/flipper-file-cpp.h>
 
 const char* iButtonApp::app_folder = "/any/ibutton";
 const char* iButtonApp::app_extension = ".ibtn";
+const char* iButtonApp::app_filetype = "Flipper iButton key";
 
 void iButtonApp::run(void* args) {
     iButtonEvent event;
@@ -37,7 +38,9 @@ void iButtonApp::run(void* args) {
 }
 
 iButtonApp::iButtonApp()
-    : notification{"notification"} {
+    : notification{"notification"}
+    , storage{"storage"}
+    , dialogs{"dialogs"} {
     furi_hal_power_insomnia_enter();
     key_worker = new KeyWorker(&ibutton_gpio);
 }
@@ -188,102 +191,90 @@ bool iButtonApp::save_key(const char* key_name) {
     // Create ibutton directory if necessary
     make_app_folder();
 
-    FileWorkerCpp file_worker;
+    FlipperFileCpp file(storage);
     string_t key_file_name;
     bool result = false;
+    string_init(key_file_name);
 
-    // 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))) {
-        string_clear(key_file_name);
-        return false;
-    };
+    do {
+        // First remove key if it was saved (we rename the key)
+        if(!delete_key()) break;
 
-    // Save the key
-    get_key()->set_name(key_name);
-    string_printf(key_file_name, "%s/%s%s", app_folder, get_key()->get_name(), app_extension);
+        // Save the key
+        key.set_name(key_name);
 
-    bool res = file_worker.open(string_get_cstr(key_file_name), FSAM_WRITE, FSOM_CREATE_ALWAYS);
+        // Set full file name, for new key
+        string_printf(key_file_name, "%s/%s%s", app_folder, key.get_name(), app_extension);
+
+        // Open file for write
+        if(!file.new_write(string_get_cstr(key_file_name))) break;
+
+        // Write header
+        if(!file.write_header_cstr(iButtonApp::app_filetype, 1)) break;
+
+        // Write key type
+        if(!file.write_comment_cstr("Key type can be Cyfral, Dallas or Metakom")) break;
+        const char* key_type = key.get_key_type_string_by_type(key.get_key_type());
+        if(!file.write_string_cstr("Key type", key_type)) break;
+
+        // Write data
+        if(!file.write_comment_cstr(
+               "Data size for Cyfral is 2, for Metakom is 4, for Dallas is 8"))
+            break;
+
+        if(!file.write_hex_array("Data", key.get_data(), key.get_type_data_size())) break;
+        result = true;
+
+    } while(false);
+
+    file.close();
     string_clear(key_file_name);
 
-    if(res) {
-        // type header
-        const char* key_type = "E ";
-
-        switch(get_key()->get_key_type()) {
-        case iButtonKeyType::KeyCyfral:
-            key_type = "C ";
-            break;
-        case iButtonKeyType::KeyDallas:
-            key_type = "D ";
-            break;
-        case iButtonKeyType::KeyMetakom:
-            key_type = "M ";
-            break;
-        }
-
-        if(!file_worker.write(key_type, 2)) {
-            file_worker.close();
-            return false;
-        }
-
-        if(!file_worker.write_hex(get_key()->get_data(), get_key()->get_type_data_size())) {
-            file_worker.close();
-            return false;
-        }
-        result = true;
+    if(!result) {
+        dialog_message_show_storage_error(dialogs, "Cannot save\nkey file");
     }
 
-    file_worker.close();
-
     return result;
 }
 
 bool iButtonApp::load_key_data(string_t key_path) {
-    FileWorkerCpp file_worker;
+    FlipperFileCpp file(storage);
+    bool result = false;
+    string_t data;
+    string_init(data);
 
-    // Open key file
-    if(!file_worker.open(string_get_cstr(key_path), FSAM_READ, FSOM_OPEN_EXISTING)) {
-        file_worker.close();
-        return false;
+    do {
+        if(!file.open_read(string_get_cstr(key_path))) break;
+
+        // header
+        uint32_t version;
+        if(!file.read_header(data, &version)) break;
+        if(string_cmp_str(data, iButtonApp::app_filetype) != 0) break;
+        if(version != 1) break;
+
+        // key type
+        iButtonKeyType type;
+        if(!file.read_string("Key type", data)) break;
+        if(!key.get_key_type_by_type_string(string_get_cstr(data), &type)) break;
+
+        // key data
+        uint8_t key_data[IBUTTON_KEY_DATA_SIZE] = {0};
+        if(!file.read_hex_array("Data", key_data, key.get_type_data_size_by_type(type))) break;
+
+        key.set_type(type);
+        key.set_data(key_data, IBUTTON_KEY_DATA_SIZE);
+
+        result = true;
+    } while(false);
+
+    file.close();
+    string_clear(data);
+
+    if(!result) {
+        dialog_message_show_storage_error(dialogs, "Cannot load\nkey file");
     }
 
-    const uint8_t byte_text_size = 4;
-    char byte_text[byte_text_size] = {0, 0, 0, 0};
-
-    // Load type header
-    if(!file_worker.read(byte_text, 2)) {
-        file_worker.close();
-        return false;
-    }
-
-    iButtonKeyType key_type = iButtonKeyType::KeyCyfral;
-    if(strcmp(byte_text, "C ") == 0) {
-        key_type = iButtonKeyType::KeyCyfral;
-    } else if(strcmp(byte_text, "M ") == 0) {
-        key_type = iButtonKeyType::KeyMetakom;
-    } else if(strcmp(byte_text, "D ") == 0) {
-        key_type = iButtonKeyType::KeyDallas;
-    } else {
-        file_worker.show_error("Cannot parse\nkey file");
-        file_worker.close();
-        return false;
-    }
-
-    iButtonKeyType old_type = get_key()->get_key_type();
-    get_key()->set_type(key_type);
-
-    uint8_t key_data[IBUTTON_KEY_DATA_SIZE] = {0, 0, 0, 0, 0, 0, 0, 0};
-    if(!file_worker.read_hex(key_data, get_key()->get_type_data_size())) {
-        get_key()->set_type(old_type);
-        file_worker.close();
-        return false;
-    }
-
-    file_worker.close();
-    get_key()->set_data(key_data, IBUTTON_KEY_DATA_SIZE);
-
-    return true;
+    return result;
 }
 
 bool iButtonApp::load_key(const char* key_name) {
@@ -303,11 +294,15 @@ bool iButtonApp::load_key(const char* key_name) {
 
 bool iButtonApp::load_key() {
     bool result = false;
-    FileWorkerCpp file_worker;
 
     // Input events and views are managed by file_select
-    bool res = file_worker.file_select(
-        app_folder, app_extension, get_file_name(), get_file_name_size(), get_key()->get_name());
+    bool res = dialog_file_select_show(
+        dialogs,
+        app_folder,
+        app_extension,
+        get_file_name(),
+        get_file_name_size(),
+        get_key()->get_name());
 
     if(res) {
         string_t key_str;
@@ -328,16 +323,16 @@ bool iButtonApp::load_key() {
 bool iButtonApp::delete_key() {
     string_t file_name;
     bool result = false;
-    FileWorkerCpp file_worker;
 
     string_init_printf(file_name, "%s/%s%s", app_folder, get_key()->get_name(), app_extension);
-    result = file_worker.remove(string_get_cstr(file_name));
+    result = storage_simply_remove(storage, string_get_cstr(file_name));
     string_clear(file_name);
 
     return result;
 }
 
 void iButtonApp::make_app_folder() {
-    FileWorkerCpp file_worker;
-    file_worker.mkdir(app_folder);
+    if(!storage_simply_mkdir(storage, app_folder)) {
+        dialog_message_show_storage_error(dialogs, "Cannot create\napp folder");
+    }
 }

applications/ibutton/ibutton-app.h

@@ -30,6 +30,8 @@
 #include "ibutton-key.h"
 
 #include <notification/notification-messages.h>
+#include <storage/storage.h>
+#include <dialogs/dialogs.h>
 
 #include <record-controller.hpp>
 
@@ -126,6 +128,8 @@ private:
     iButtonKey key;
 
     RecordController<NotificationApp> notification;
+    RecordController<Storage> storage;
+    RecordController<DialogsApp> dialogs;
 
     static const uint8_t file_name_size = 100;
     char file_name[file_name_size];
@@ -135,6 +139,7 @@ private:
 
     static const char* app_folder;
     static const char* app_extension;
+    static const char* app_filetype;
 
     bool load_key_data(string_t key_path);
     void make_app_folder();

applications/ibutton/ibutton-key.cpp

@@ -22,21 +22,7 @@ uint8_t* iButtonKey::get_data() {
 }
 
 uint8_t iButtonKey::get_type_data_size() {
-    uint8_t size = 0;
-
-    switch(type) {
-    case iButtonKeyType::KeyCyfral:
-        size = 2;
-        break;
-    case iButtonKeyType::KeyMetakom:
-        size = 4;
-        break;
-    case iButtonKeyType::KeyDallas:
-        size = 8;
-        break;
-    }
-
-    return size;
+    return get_type_data_size_by_type(type);
 }
 
 void iButtonKey::set_name(const char* _name) {
@@ -55,5 +41,55 @@ iButtonKeyType iButtonKey::get_key_type() {
     return type;
 }
 
+const char* iButtonKey::get_key_type_string_by_type(iButtonKeyType key_type) {
+    switch(key_type) {
+    case iButtonKeyType::KeyCyfral:
+        return "Cyfral";
+        break;
+    case iButtonKeyType::KeyMetakom:
+        return "Metakom";
+        break;
+    case iButtonKeyType::KeyDallas:
+        return "Dallas";
+        break;
+    default:
+        furi_crash("Invalid iButton type");
+        return "";
+        break;
+    }
+}
+
+bool iButtonKey::get_key_type_by_type_string(const char* type_string, iButtonKeyType* key_type) {
+    if(strcmp(type_string, get_key_type_string_by_type(iButtonKeyType::KeyCyfral)) == 0) {
+        *key_type = iButtonKeyType::KeyCyfral;
+    } else if(strcmp(type_string, get_key_type_string_by_type(iButtonKeyType::KeyMetakom)) == 0) {
+        *key_type = iButtonKeyType::KeyMetakom;
+    } else if(strcmp(type_string, get_key_type_string_by_type(iButtonKeyType::KeyDallas)) == 0) {
+        *key_type = iButtonKeyType::KeyDallas;
+    } else {
+        return false;
+    }
+
+    return true;
+}
+
+uint8_t iButtonKey::get_type_data_size_by_type(iButtonKeyType key_type) {
+    uint8_t size = 0;
+
+    switch(key_type) {
+    case iButtonKeyType::KeyCyfral:
+        size = 2;
+        break;
+    case iButtonKeyType::KeyMetakom:
+        size = 4;
+        break;
+    case iButtonKeyType::KeyDallas:
+        size = 8;
+        break;
+    }
+
+    return size;
+}
+
 iButtonKey::iButtonKey() {
 }

applications/ibutton/ibutton-key.h

@@ -17,6 +17,10 @@ public:
     void set_type(iButtonKeyType key_type);
     iButtonKeyType get_key_type();
 
+    const char* get_key_type_string_by_type(iButtonKeyType key_type);
+    bool get_key_type_by_type_string(const char* type_string, iButtonKeyType* key_type);
+    uint8_t get_type_data_size_by_type(iButtonKeyType key_type);
+
     iButtonKey();
 
 private:

applications/lfrfid/lfrfid-app.cpp

@@ -16,15 +16,18 @@
 #include "scene/lfrfid-app-scene-delete-confirm.h"
 #include "scene/lfrfid-app-scene-delete-success.h"
 
-#include <file-worker-cpp.h>
 #include <lib/toolbox/path.h>
+#include <lib/toolbox/flipper-file-cpp.h>
 
 const char* LfRfidApp::app_folder = "/any/lfrfid";
 const char* LfRfidApp::app_extension = ".rfid";
+const char* LfRfidApp::app_filetype = "Flipper RFID key";
 
 LfRfidApp::LfRfidApp()
     : scene_controller{this}
     , notification{"notification"}
+    , storage{"storage"}
+    , dialogs{"dialogs"}
     , text_store(40) {
     furi_hal_power_insomnia_enter();
 }
@@ -77,20 +80,20 @@ bool LfRfidApp::save_key(RfidKey* key) {
 }
 
 bool LfRfidApp::load_key_from_file_select(bool need_restore) {
-    FileWorkerCpp file_worker;
     TextStore* filename_ts = new TextStore(64);
-    bool result;
+    bool result = false;
 
     if(need_restore) {
-        result = file_worker.file_select(
+        result = dialog_file_select_show(
+            dialogs,
             app_folder,
             app_extension,
             filename_ts->text,
             filename_ts->text_size,
             worker.key.get_name());
     } else {
-        result = file_worker.file_select(
-            app_folder, app_extension, filename_ts->text, filename_ts->text_size, NULL);
+        result = dialog_file_select_show(
+            dialogs, app_folder, app_extension, filename_ts->text, filename_ts->text_size, NULL);
     }
 
     if(result) {
@@ -105,86 +108,87 @@ bool LfRfidApp::load_key_from_file_select(bool need_restore) {
 }
 
 bool LfRfidApp::delete_key(RfidKey* key) {
-    FileWorkerCpp file_worker;
     string_t file_name;
     bool result = false;
 
     string_init_printf(file_name, "%s/%s%s", app_folder, key->get_name(), app_extension);
-    result = file_worker.remove(string_get_cstr(file_name));
+    result = storage_simply_remove(storage, string_get_cstr(file_name));
     string_clear(file_name);
 
     return result;
 }
 
 bool LfRfidApp::load_key_data(const char* path, RfidKey* key) {
-    FileWorkerCpp file_worker;
+    FlipperFileCpp file(storage);
     bool result = false;
+    string_t str_result;
+    string_init(str_result);
 
-    bool res = file_worker.open(path, FSAM_READ, FSOM_OPEN_EXISTING);
+    do {
+        if(!file.open_read(path)) break;
 
-    if(res) {
-        string_t str_result;
-        string_init(str_result);
+        // header
+        uint32_t version;
+        if(!file.read_header(str_result, &version)) break;
+        if(string_cmp_str(str_result, app_filetype) != 0) break;
+        if(version != 1) break;
 
-        do {
-            RfidKey loaded_key;
-            LfrfidKeyType loaded_type;
+        // key type
+        LfrfidKeyType type;
+        RfidKey loaded_key;
 
-            // load type
-            if(!file_worker.read_until(str_result, ' ')) break;
-            if(!lfrfid_key_get_string_type(string_get_cstr(str_result), &loaded_type)) {
-                file_worker.show_error("Cannot parse\nfile");
-                break;
-            }
-            loaded_key.set_type(loaded_type);
+        if(!file.read_string("Key type", str_result)) break;
+        if(!lfrfid_key_get_string_type(string_get_cstr(str_result), &type)) break;
+        loaded_key.set_type(type);
 
-            // load data
-            uint8_t tmp_data[loaded_key.get_type_data_count()];
-            if(!file_worker.read_hex(tmp_data, loaded_key.get_type_data_count())) break;
-            loaded_key.set_data(tmp_data, loaded_key.get_type_data_count());
+        // key data
+        uint8_t key_data[loaded_key.get_type_data_count()] = {};
+        if(!file.read_hex_array("Data", key_data, loaded_key.get_type_data_count())) break;
+        loaded_key.set_data(key_data, loaded_key.get_type_data_count());
 
-            *key = loaded_key;
-            result = true;
-        } while(0);
-
-        // load name
         path_extract_filename_no_ext(path, str_result);
-        key->set_name(string_get_cstr(str_result));
+        loaded_key.set_name(string_get_cstr(str_result));
 
-        string_clear(str_result);
+        *key = loaded_key;
+        result = true;
+    } while(0);
+
+    file.close();
+    string_clear(str_result);
+
+    if(!result) {
+        dialog_message_show_storage_error(dialogs, "Cannot load\nkey file");
     }
 
-    file_worker.close();
-
     return result;
 }
 
 bool LfRfidApp::save_key_data(const char* path, RfidKey* key) {
-    FileWorkerCpp file_worker;
+    FlipperFileCpp file(storage);
     bool result = false;
 
-    bool res = file_worker.open(path, FSAM_WRITE, FSOM_CREATE_ALWAYS);
+    do {
+        if(!file.new_write(path)) break;
+        if(!file.write_header_cstr(app_filetype, 1)) break;
+        if(!file.write_comment_cstr("Key type can be EM4100, H10301 or I40134")) break;
+        if(!file.write_string_cstr("Key type", lfrfid_key_get_type_string(key->get_type()))) break;
+        if(!file.write_comment_cstr("Data size for EM4100 is 5, for H10301 is 3, for I40134 is 3"))
+            break;
+        if(!file.write_hex_array("Data", key->get_data(), key->get_type_data_count())) break;
+        result = true;
+    } while(0);
 
-    if(res) {
-        do {
-            // type header
-            const char* key_type = lfrfid_key_get_type_string(key->get_type());
-            char delimeter = ' ';
+    file.close();
 
-            if(!file_worker.write(key_type, strlen(key_type))) break;
-            if(!file_worker.write(&delimeter)) break;
-            if(!file_worker.write_hex(key->get_data(), key->get_type_data_count())) break;
-
-            result = true;
-        } while(0);
+    if(!result) {
+        dialog_message_show_storage_error(dialogs, "Cannot save\nkey file");
     }
 
-    file_worker.close();
-
     return result;
 }
 
 void LfRfidApp::make_app_folder() {
-    FileWorkerCpp file_worker;
-    file_worker.mkdir(app_folder);
+    if(!storage_simply_mkdir(storage, app_folder)) {
+        dialog_message_show_storage_error(dialogs, "Cannot create\napp folder");
+    }
 }

applications/lfrfid/lfrfid-app.h

@@ -16,6 +16,8 @@
 #include "view/container-vm.h"
 
 #include <notification/notification-messages.h>
+#include <storage/storage.h>
+#include <dialogs/dialogs.h>
 
 #include "helpers/rfid-worker.h"
 
@@ -63,6 +65,8 @@ public:
     LfRfidApp();
 
     RecordController<NotificationApp> notification;
+    RecordController<Storage> storage;
+    RecordController<DialogsApp> dialogs;
 
     RfidWorker worker;
 
@@ -72,6 +76,7 @@ public:
 
     static const char* app_folder;
     static const char* app_extension;
+    static const char* app_filetype;
 
     bool save_key(RfidKey* key);
     bool load_key_from_file_select(bool need_restore);

applications/storage/storage-external-api.c

@@ -380,4 +380,16 @@ void storage_file_free(File* file) {
     }
 
     free(file);
+}
+
+bool storage_simply_remove(Storage* storage, const char* path) {
+    FS_Error result;
+    result = storage_common_remove(storage, path);
+    return result == FSE_OK || result == FSE_NOT_EXIST;
+}
+
+bool storage_simply_mkdir(Storage* storage, const char* path) {
+    FS_Error result;
+    result = storage_common_mkdir(storage, path);
+    return result == FSE_OK || result == FSE_EXIST;
 }

applications/storage/storage.h

@@ -230,6 +230,24 @@ FS_Error storage_sd_info(Storage* api, SDInfo* info);
  */
 FS_Error storage_sd_status(Storage* api);
 
+/***************** Simplified Functions ******************/
+
+/**
+ * Removes a file/directory from the repository, the directory must be empty and the file/directory must not be open
+ * @param storage pointer to the api
+ * @param path 
+ * @return true on success or if file/dir is not exist
+ */
+bool storage_simply_remove(Storage* storage, const char* path);
+
+/**
+ * Creates a directory
+ * @param storage 
+ * @param path 
+ * @return true on success or if directory is already exist
+ */
+bool storage_simply_mkdir(Storage* storage, const char* path);
+
 #ifdef __cplusplus
 }
 #endif