Mirrors/unleashed-firmware
2
0
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware synced 2024-11-27 06:50:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FL-3441] faploader: always create app dir, even if it doesn't have subdirs (#2901)

Browse source 
Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
hedger 2023-08-01 18:43:14 +03:00 committed by GitHub
parent 1536f7a643
commit 17bcfee224
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
lib/flipper_application/application_assets.c
View file

@ -157,14 +157,6 @@ static bool flipper_application_assets_process_dirs(
FuriString* full_path = flipper_application_assets_alloc_app_full_path(app_name); FuriString* full_path = flipper_application_assets_alloc_app_full_path(app_name);
do { do {
if(!storage_simply_mkdir(storage, APPS_ASSETS_PATH)) {
break;
}
if(!storage_simply_mkdir(storage, furi_string_get_cstr(full_path))) {
break;
}
FuriString* dir_path = furi_string_alloc(); FuriString* dir_path = furi_string_alloc();
char* path = NULL; char* path = NULL;
@ -279,6 +271,8 @@ bool flipper_application_assets_load(File* file, const char* elf_path, size_t of
FURI_LOG_D(TAG, "Loading assets for %s", furi_string_get_cstr(app_name)); FURI_LOG_D(TAG, "Loading assets for %s", furi_string_get_cstr(app_name));
FuriString* full_path = flipper_application_assets_alloc_app_full_path(app_name);
do { do {
if(!storage_file_seek(file, offset, true)) { if(!storage_file_seek(file, offset, true)) {
break; break;
@ -319,13 +313,23 @@ bool flipper_application_assets_load(File* file, const char* elf_path, size_t of
FURI_LOG_D(TAG, "Assets removed"); FURI_LOG_D(TAG, "Assets removed");
} }
if(!storage_simply_mkdir(storage, APPS_ASSETS_PATH)) {
break;
}
if(!storage_simply_mkdir(storage, furi_string_get_cstr(full_path))) {
break;
}
// process directories // process directories
if(!flipper_application_assets_process_dirs(storage, file, app_name, header.dirs_count)) { if(header.dirs_count &&
!flipper_application_assets_process_dirs(storage, file, app_name, header.dirs_count)) {
break; break;
} }
// process files // process files
if(!flipper_application_assets_process_files(storage, file, app_name, header.files_count)) { if(header.files_count && !flipper_application_assets_process_files(
storage, file, app_name, header.files_count)) {
break; break;
} }
@ -353,6 +357,7 @@ bool flipper_application_assets_load(File* file, const char* elf_path, size_t of
} }
furi_record_close(RECORD_STORAGE); furi_record_close(RECORD_STORAGE);
furi_string_free(full_path);
furi_string_free(app_name); furi_string_free(app_name);
FURI_LOG_D(TAG, "Assets loading %s", result ? "success" : "failed"); FURI_LOG_D(TAG, "Assets loading %s", result ? "success" : "failed");