liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FL-1465] Archive application bug fixes. Gui: update TextInput API. (#530)

Browse Source 
* Update MLib to latest master.
* Archive: update string_t usage, add unsafe usage TODO, change model type to blocking and fix invalid usage.
* Gui: update text_input API and it's usage.
* fix blocking model issues
* fix  unsafe string_t usage

Co-authored-by: Igor Baranov <bedtimeposts@gmail.com>
Co-authored-by: its your bedtime <23366927+itsyourbedtime@users.noreply.github.com>
This commit is contained in:
あく
2021-06-24 00:46:52 +03:00
committed by GitHub
parent ed75bc2c39
commit 4cf000f270
12 changed files with 220 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

313
applications/archive/archive.c
View File

@@ -5,30 +5,29 @@ static bool archive_get_filenames(ArchiveApp* archive);
static void update_offset(ArchiveApp* archive) {
furi_assert(archive);
ArchiveViewModel* model = view_get_model(archive->view_archive_main);
size_t array_size = files_array_size(model->files);
uint16_t bounds = array_size > 3 ? 2 : array_size;
if(model->list_offset < model->idx - bounds) {
model->list_offset = CLAMP(model->list_offset + 1, array_size - (bounds + 2), 0);
} else if(model->list_offset > model->idx - bounds) {
model->list_offset = CLAMP(model->idx - 1, array_size - (bounds), 0);
}
view_commit_model(archive->view_archive_main, true);
with_view_model(
archive->view_archive_main, (ArchiveViewModel * model) {
size_t array_size = files_array_size(model->files);
uint16_t bounds = array_size > 3 ? 2 : array_size;
if(model->list_offset < model->idx - bounds) {
model->list_offset = CLAMP(model->list_offset + 1, array_size - (bounds + 2), 0);
} else if(model->list_offset > model->idx - bounds) {
model->list_offset = CLAMP(model->idx - 1, array_size - (bounds), 0);
}
return true;
});
}
static void archive_update_last_idx(ArchiveApp* archive) {
furi_assert(archive);
ArchiveViewModel* model = view_get_model(archive->view_archive_main);
archive->browser.last_idx[archive->browser.depth] =
CLAMP(model->idx, files_array_size(model->files) - 1, 0);
model->idx = 0;
view_commit_model(archive->view_archive_main, true);
model = NULL;
with_view_model(
archive->view_archive_main, (ArchiveViewModel * model) {
archive->browser.last_idx[archive->browser.depth] =
CLAMP(model->idx, files_array_size(model->files) - 1, 0);
model->idx = 0;
return true;
});
}
static void archive_switch_dir(ArchiveApp* archive, const char* path) {
@@ -42,13 +41,12 @@ static void archive_switch_dir(ArchiveApp* archive, const char* path) {
static void archive_switch_tab(ArchiveApp* archive) {
furi_assert(archive);
ArchiveViewModel* model = view_get_model(archive->view_archive_main);
model->tab_idx = archive->browser.tab_id;
model->idx = 0;
view_commit_model(archive->view_archive_main, true);
model = NULL;
with_view_model(
archive->view_archive_main, (ArchiveViewModel * model) {
model->tab_idx = archive->browser.tab_id;
model->idx = 0;
return true;
});
archive->browser.depth = 0;
archive_switch_dir(archive, tab_default_paths[archive->browser.tab_id]);
@@ -59,23 +57,23 @@ static void archive_switch_tab(ArchiveApp* archive) {
static void archive_leave_dir(ArchiveApp* archive) {
furi_assert(archive);
char* path_ptr = stringi_get_cstr(archive->browser.path);
char* last_char = strrchr(path_ptr, '/');
if(last_char) path_ptr[last_char - path_ptr] = '\0';
size_t last_char =
string_search_rchar(archive->browser.path, '/', string_size(archive->browser.path));
if(last_char) {
string_right(archive->browser.path, last_char);
}
archive->browser.depth = CLAMP(archive->browser.depth - 1, MAX_DEPTH, 0);
ArchiveViewModel* model = view_get_model(archive->view_archive_main);
model->idx = archive->browser.last_idx[archive->browser.depth];
view_commit_model(archive->view_archive_main, true);
with_view_model(
archive->view_archive_main, (ArchiveViewModel * model) {
model->idx = archive->browser.last_idx[archive->browser.depth];
return true;
});
archive_switch_dir(archive, string_get_cstr(archive->browser.path));
update_offset(archive);
model = NULL;
path_ptr = NULL;
last_char = NULL;
}
static void archive_enter_dir(ArchiveApp* archive, string_t name) {
@@ -93,7 +91,7 @@ static void archive_enter_dir(ArchiveApp* archive, string_t name) {
update_offset(archive);
}
static bool filter_by_extension(ArchiveApp* archive, FileInfo* file_info, char* name) {
static bool filter_by_extension(ArchiveApp* archive, FileInfo* file_info, const char* name) {
furi_assert(archive);
furi_assert(file_info);
furi_assert(name);
@@ -134,54 +132,62 @@ static bool archive_get_filenames(ArchiveApp* archive) {
ArchiveFile_t item;
FileInfo file_info;
File directory;
string_t name;
char name[MAX_NAME_LEN];
bool result;
string_init_printf(name, "%0*d\n", MAX_NAME_LEN, 0);
result = dir_api->open(&directory, string_get_cstr(archive->browser.path));
ArchiveViewModel* model = view_get_model(archive->view_archive_main);
files_array_clear(model->files);
with_view_model(
archive->view_archive_main, (ArchiveViewModel * model) {
files_array_clean(model->files);
return true;
});
if(!result) {
dir_api->close(&directory);
string_clear(name);
return false;
}
while(1) {
char* name_ptr = stringi_get_cstr(name);
result = dir_api->read(&directory, &file_info, name_ptr, MAX_NAME_LEN);
result = dir_api->read(&directory, &file_info, name, MAX_NAME_LEN);
if(directory.error_id == FSE_NOT_EXIST || name_ptr[0] == 0) {
view_commit_model(archive->view_archive_main, true);
if(directory.error_id == FSE_NOT_EXIST || name[0] == 0) {
break;
}
if(result) {
if(directory.error_id == FSE_OK) {
if(filter_by_extension(archive, &file_info, name_ptr)) {
uint16_t files_cnt;
with_view_model(
archive->view_archive_main, (ArchiveViewModel * model) {
files_cnt = files_array_size(model->files);
return true;
});
if(files_cnt > MAX_FILES) {
break;
} else if(directory.error_id == FSE_OK) {
if(filter_by_extension(archive, &file_info, name)) {
ArchiveFile_t_init(&item);
string_init_set(item.name, name);
set_file_type(&item, &file_info);
files_array_push_back(model->files, item);
with_view_model(
archive->view_archive_main, (ArchiveViewModel * model) {
files_array_push_back(model->files, item);
return true;
});
ArchiveFile_t_clear(&item);
}
} else {
dir_api->close(&directory);
string_clear(name);
view_commit_model(archive->view_archive_main, true);
return false;
}
}
}
view_commit_model(archive->view_archive_main, true);
model = NULL;
dir_api->close(&directory);
string_clear(name);
return true;
}
@@ -219,9 +225,8 @@ static void archive_add_to_favourites(ArchiveApp* archive) {
string_clear(buffer_dst);
}
static void archive_text_input_callback(void* context, char* text) {
static void archive_text_input_callback(void* context) {
furi_assert(context);
furi_assert(text);
ArchiveApp* archive = (ArchiveApp*)context;
FS_Common_Api* common_api = &archive->fs_api->common;
@@ -236,17 +241,20 @@ static void archive_text_input_callback(void* context, char* text) {
string_cat(buffer_dst, "/");
string_cat(buffer_src, archive->browser.name);
string_cat_str(buffer_dst, text);
string_cat_str(buffer_dst, archive->browser.text_input_buffer);
// append extension
ArchiveViewModel* model = view_get_model(archive->view_archive_main);
ArchiveFile_t* file =
files_array_get(model->files, CLAMP(model->idx, files_array_size(model->files) - 1, 0));
string_cat(buffer_src, known_ext[file->type]);
string_cat(buffer_dst, known_ext[file->type]);
model = NULL;
file = NULL;
ArchiveFile_t* file;
with_view_model(
archive->view_archive_main, (ArchiveViewModel * model) {
file = files_array_get(
model->files, CLAMP(model->idx, files_array_size(model->files) - 1, 0));
return true;
});
string_cat(buffer_dst, known_ext[file->type]);
common_api->rename(string_get_cstr(buffer_src), string_get_cstr(buffer_dst));
view_dispatcher_switch_to_view(archive->view_dispatcher, ArchiveViewMain);
@@ -256,22 +264,25 @@ static void archive_text_input_callback(void* context, char* text) {
archive_get_filenames(archive);
}
static void archive_enter_text_input(ArchiveApp* archive) {
furi_assert(archive);
*archive->browser.text_input_buffer = '\0';
string_set(archive->browser.text_input_buffer, archive->browser.name);
strlcpy(
archive->browser.text_input_buffer,
string_get_cstr(archive->browser.name),
string_size(archive->browser.name));
archive_trim_file_ext(archive->browser.text_input_buffer);
char* text_input_buffer_ptr = stringi_get_cstr(archive->browser.text_input_buffer);
text_input_set_header_text(archive->text_input, "Rename:");
text_input_set_result_callback(
archive->text_input,
archive_text_input_callback,
archive,
text_input_buffer_ptr,
archive->browser.text_input_buffer,
MAX_NAME_LEN);
view_dispatcher_switch_to_view(archive->view_dispatcher, ArchiveViewTextInput);
@@ -282,10 +293,12 @@ static void archive_show_file_menu(ArchiveApp* archive) {
archive->browser.menu = true;
ArchiveViewModel* model = view_get_model(archive->view_archive_main);
model->menu = true;
model->menu_idx = 0;
view_commit_model(archive->view_archive_main, true);
with_view_model(
archive->view_archive_main, (ArchiveViewModel * model) {
model->menu = true;
model->menu_idx = 0;
return true;
});
}
static void archive_close_file_menu(ArchiveApp* archive) {
@@ -293,10 +306,12 @@ static void archive_close_file_menu(ArchiveApp* archive) {
archive->browser.menu = false;
ArchiveViewModel* model = view_get_model(archive->view_archive_main);
model->menu = false;
model->menu_idx = 0;
view_commit_model(archive->view_archive_main, true);
with_view_model(
archive->view_archive_main, (ArchiveViewModel * model) {
model->menu = false;
model->menu_idx = 0;
return true;
});
}
static void archive_open_app(ArchiveApp* archive, const char* app_name, const char* args) {
@@ -324,18 +339,27 @@ static void archive_delete_file(ArchiveApp* archive, string_t name) {
update_offset(archive);
ArchiveViewModel* model = view_get_model(archive->view_archive_main);
model->idx = CLAMP(model->idx, files_array_size(model->files) - 1, 0);
view_commit_model(archive->view_archive_main, true);
with_view_model(
archive->view_archive_main, (ArchiveViewModel * model) {
model->idx = CLAMP(model->idx, files_array_size(model->files) - 1, 0);
return true;
});
}
static void archive_file_menu_callback(ArchiveApp* archive) {
furi_assert(archive);
ArchiveViewModel* model = view_get_model(archive->view_archive_main);
ArchiveFile_t* selected = files_array_get(model->files, model->idx);
ArchiveFile_t* selected;
uint8_t idx = 0;
switch(model->menu_idx) {
with_view_model(
archive->view_archive_main, (ArchiveViewModel * model) {
selected = files_array_get(model->files, model->idx);
idx = model->menu_idx;
return true;
});
switch(idx) {
case 0:
if((selected->type != ArchiveFileTypeFolder && selected->type != ArchiveFileTypeUnknown)) {
string_t full_path;
@@ -369,8 +393,6 @@ static void archive_file_menu_callback(ArchiveApp* archive) {
archive_close_file_menu(archive);
break;
}
model = NULL;
selected = NULL;
}
@@ -378,19 +400,25 @@ static void menu_input_handler(ArchiveApp* archive, InputEvent* event) {
furi_assert(archive);
furi_assert(archive);
ArchiveViewModel* model = view_get_model(archive->view_archive_main);
if(event->type == InputTypeShort) {
if(event->key == InputKeyUp) {
model->menu_idx = CLAMP(model->menu_idx - 1, MENU_ITEMS - 1, 0);
} else if(event->key == InputKeyDown) {
model->menu_idx = CLAMP(model->menu_idx + 1, MENU_ITEMS - 1, 0);
} else if(event->key == InputKeyOk) {
if(event->key == InputKeyUp || event->key == InputKeyDown) {
with_view_model(
archive->view_archive_main, (ArchiveViewModel * model) {
if(event->key == InputKeyUp) {
model->menu_idx = CLAMP(model->menu_idx - 1, MENU_ITEMS - 1, 0);
} else if(event->key == InputKeyDown) {
model->menu_idx = CLAMP(model->menu_idx + 1, MENU_ITEMS - 1, 0);
}
return true;
});
}
if(event->key == InputKeyOk) {
archive_file_menu_callback(archive);
} else if(event->key == InputKeyBack) {
archive_close_file_menu(archive);
}
}
view_commit_model(archive->view_archive_main, true);
}
/* main controls */
@@ -400,7 +428,6 @@ static bool archive_view_input(InputEvent* event, void* context) {
furi_assert(context);
ArchiveApp* archive = context;
ArchiveViewModel* model = view_get_model(archive->view_archive_main);
bool in_menu = archive->browser.menu;
if(in_menu) {
@@ -429,72 +456,77 @@ static bool archive_view_input(InputEvent* event, void* context) {
return true;
}
}
size_t num_elements = files_array_size(model->files) - 1;
if((event->type == InputTypeShort || event->type == InputTypeRepeat)) {
if(event->key == InputKeyUp) {
model->idx = CLAMP(model->idx - 1, num_elements, 0);
update_offset(archive);
return true;
} else if(event->key == InputKeyDown) {
model->idx = CLAMP(model->idx + 1, num_elements, 0);
update_offset(archive);
return true;
}
if(event->key == InputKeyUp || event->key == InputKeyDown) {
with_view_model(
archive->view_archive_main, (ArchiveViewModel * model) {
size_t num_elements = files_array_size(model->files) - 1;
if((event->type == InputTypeShort || event->type == InputTypeRepeat)) {
if(event->key == InputKeyUp) {
model->idx = CLAMP(model->idx - 1, num_elements, 0);
} else if(event->key == InputKeyDown) {
model->idx = CLAMP(model->idx + 1, num_elements, 0);
}
}
return true;
});
update_offset(archive);
}
if(event->key == InputKeyOk) {
if(files_array_size(model->files) > 0) {
ArchiveFile_t* selected = files_array_get(model->files, model->idx);
string_set(archive->browser.name, selected->name);
model = NULL;
ArchiveFile_t* selected;
with_view_model(
archive->view_archive_main, (ArchiveViewModel * model) {
if(files_array_size(model->files) > 0) {
selected = files_array_get(model->files, model->idx);
}
if(selected->type == ArchiveFileTypeFolder) {
if(event->type == InputTypeShort) {
archive_enter_dir(archive, archive->browser.name);
} else if(event->type == InputTypeLong) {
archive_show_file_menu(archive);
}
} else {
if(event->type == InputTypeShort) {
archive_show_file_menu(archive);
}
return true;
});
string_set(archive->browser.name, selected->name);
if(selected->type == ArchiveFileTypeFolder) {
if(event->type == InputTypeShort) {
archive_enter_dir(archive, archive->browser.name);
} else if(event->type == InputTypeLong) {
archive_show_file_menu(archive);
}
} else {
if(event->type == InputTypeShort) {
archive_show_file_menu(archive);
}
}
}
update_offset(archive);
return true;
}
void archive_free(ArchiveApp* archive) {
furi_assert(archive);
ArchiveViewModel* model = view_get_model(archive->view_archive_main);
files_array_clear(model->files);
model = NULL;
view_dispatcher_remove_view(archive->view_dispatcher, ArchiveViewMain);
view_dispatcher_remove_view(archive->view_dispatcher, ArchiveViewTextInput);
view_dispatcher_free(archive->view_dispatcher);
with_view_model(
archive->view_archive_main, (ArchiveViewModel * model) {
files_array_clear(model->files);
return false;
});
view_free(archive->view_archive_main);
string_clear(archive->browser.name);
string_clear(archive->browser.path);
string_clear(archive->browser.text_input_buffer);
text_input_free(archive->text_input);
furi_record_close("sdcard");
archive->fs_api = NULL;
view_free(archive->view_archive_main);
view_dispatcher_remove_view(archive->view_dispatcher, ArchiveViewMain);
view_dispatcher_remove_view(archive->view_dispatcher, ArchiveViewTextInput);
view_dispatcher_free(archive->view_dispatcher);
furi_record_close("gui");
archive->gui = NULL;
furi_thread_free(archive->app_thread);
furi_check(osMessageQueueDelete(archive->event_queue) == osOK);
free(archive);
@@ -503,10 +535,9 @@ void archive_free(ArchiveApp* archive) {
ArchiveApp* archive_alloc() {
ArchiveApp* archive = furi_alloc(sizeof(ArchiveApp));
archive->event_queue = osMessageQueueNew(2, sizeof(AppEvent), NULL);
archive->event_queue = osMessageQueueNew(8, sizeof(AppEvent), NULL);
archive->app_thread = furi_thread_alloc();
archive->gui = furi_record_open("gui");
archive->view_dispatcher = view_dispatcher_alloc();
archive->fs_api = furi_record_open("sdcard");
archive->text_input = text_input_alloc();
archive->view_archive_main = view_alloc();
@@ -514,13 +545,21 @@ ArchiveApp* archive_alloc() {
furi_check(archive->event_queue);
view_allocate_model(
archive->view_archive_main, ViewModelTypeLockFree, sizeof(ArchiveViewModel));
archive->view_archive_main, ViewModelTypeLocking, sizeof(ArchiveViewModel));
with_view_model(
archive->view_archive_main, (ArchiveViewModel * model) {
files_array_init(model->files);
return false;
});
view_set_context(archive->view_archive_main, archive);
view_set_draw_callback(archive->view_archive_main, archive_view_render);
view_set_input_callback(archive->view_archive_main, archive_view_input);
view_set_previous_callback(
text_input_get_view(archive->text_input), archive_previous_callback);
// View Dispatcher
archive->view_dispatcher = view_dispatcher_alloc();
view_dispatcher_add_view(
archive->view_dispatcher, ArchiveViewMain, archive->view_archive_main);
view_dispatcher_add_view(