Merge remote-tracking branch 'ofw/dev' into mntm-dev

lib/update_util/int_backup.c

@@ -0,0 +1,51 @@
+#include "int_backup.h"
+
+#include <toolbox/tar/tar_archive.h>
+
+#include <bt/bt_settings_filename.h>
+#include <bt/bt_service/bt_keys_filename.h>
+#include <dolphin/helpers/dolphin_state_filename.h>
+#include <desktop/helpers/slideshow_filename.h>
+#include <desktop/desktop_settings_filename.h>
+#include <notification/notification_settings_filename.h>
+
+#define INT_BACKUP_DEFAULT_LOCATION EXT_PATH(INT_BACKUP_DEFAULT_FILENAME)
+
+static void backup_name_converter(FuriString* filename) {
+    if(furi_string_empty(filename) || (furi_string_get_char(filename, 0) == '.')) {
+        return;
+    }
+
+    /* Filenames are already prefixed with '.' */
+    const char* const names[] = {
+        BT_SETTINGS_FILE_NAME,
+        BT_KEYS_STORAGE_FILE_NAME,
+        DESKTOP_SETTINGS_FILE_NAME,
+        NOTIFICATION_SETTINGS_FILE_NAME,
+        SLIDESHOW_FILE_NAME,
+        DOLPHIN_STATE_FILE_NAME,
+    };
+
+    for(size_t i = 0; i < COUNT_OF(names); i++) {
+        if(furi_string_equal(filename, &names[i][1])) {
+            furi_string_set(filename, names[i]);
+            return;
+        }
+    }
+}
+
+bool int_backup_create(Storage* storage, const char* destination) {
+    const char* final_destination =
+        destination && strlen(destination) ? destination : INT_BACKUP_DEFAULT_LOCATION;
+    return storage_int_backup(storage, final_destination) == FSE_OK;
+}
+
+bool int_backup_exists(Storage* storage, const char* source) {
+    const char* final_source = source && strlen(source) ? source : INT_BACKUP_DEFAULT_LOCATION;
+    return storage_common_stat(storage, final_source, NULL) == FSE_OK;
+}
+
+bool int_backup_unpack(Storage* storage, const char* source) {
+    const char* final_source = source && strlen(source) ? source : INT_BACKUP_DEFAULT_LOCATION;
+    return storage_int_restore(storage, final_source, backup_name_converter) == FSE_OK;
+}

lib/update_util/int_backup.h

@@ -0,0 +1,18 @@
+#pragma once
+
+#include <stdbool.h>
+#include <storage/storage.h>
+
+#define INT_BACKUP_DEFAULT_FILENAME "backup.tar"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+bool int_backup_create(Storage* storage, const char* destination);
+bool int_backup_exists(Storage* storage, const char* source);
+bool int_backup_unpack(Storage* storage, const char* source);
+
+#ifdef __cplusplus
+}
+#endif

lib/update_util/lfs_backup.c

@@ -1,21 +0,0 @@
-#include "lfs_backup.h"
-
-#include <toolbox/tar/tar_archive.h>
-
-#define LFS_BACKUP_DEFAULT_LOCATION EXT_PATH(LFS_BACKUP_DEFAULT_FILENAME)
-
-bool lfs_backup_create(Storage* storage, const char* destination) {
-    const char* final_destination =
-        destination && strlen(destination) ? destination : LFS_BACKUP_DEFAULT_LOCATION;
-    return storage_int_backup(storage, final_destination) == FSE_OK;
-}
-
-bool lfs_backup_exists(Storage* storage, const char* source) {
-    const char* final_source = source && strlen(source) ? source : LFS_BACKUP_DEFAULT_LOCATION;
-    return storage_common_stat(storage, final_source, NULL) == FSE_OK;
-}
-
-bool lfs_backup_unpack(Storage* storage, const char* source) {
-    const char* final_source = source && strlen(source) ? source : LFS_BACKUP_DEFAULT_LOCATION;
-    return storage_int_restore(storage, final_source, NULL) == FSE_OK;
-}

lib/update_util/lfs_backup.h

@@ -1,18 +0,0 @@
-#pragma once
-
-#include <stdbool.h>
-#include <storage/storage.h>
-
-#define LFS_BACKUP_DEFAULT_FILENAME "backup.tar"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-bool lfs_backup_create(Storage* storage, const char* destination);
-bool lfs_backup_exists(Storage* storage, const char* source);
-bool lfs_backup_unpack(Storage* storage, const char* source);
-
-#ifdef __cplusplus
-}
-#endif