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

Archive: fix delete from favorites tab (#752)

Browse Source 
* archive_delete_file vargs, fix wrong path when deleting item from favorites tab
* use string_t for archive vargs funcs
* favorites manual sorting

Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
its your bedtime
2021-10-12 16:09:34 +03:00
committed by GitHub
parent b85a50f912
commit 5cb5d15376
15 changed files with 483 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
applications/archive/helpers/archive_favorites.c
View File

@@ -34,7 +34,7 @@ uint16_t archive_favorites_count(void* context) {
bool archive_favorites_read(void* context) {
furi_assert(context);
ArchiveBrowserView* archive_view = context;
ArchiveBrowserView* browser = context;
FileWorker* file_worker = file_worker_alloc(true);
string_t buffer;
@@ -52,7 +52,7 @@ bool archive_favorites_read(void* context) {
break;
}
archive_add_item(archive_view, &file_info, string_get_cstr(buffer));
archive_add_item(browser, &file_info, string_get_cstr(buffer));
string_clean(buffer);
}
}
@@ -63,17 +63,15 @@ bool archive_favorites_read(void* context) {
}
bool archive_favorites_delete(const char* format, ...) {
string_t buffer;
string_t filename;
va_list args;
va_start(args, format);
uint8_t len = vsnprintf(NULL, 0, format, args);
char filename[len + 1];
vsnprintf(filename, len + 1, format, args);
string_init_vprintf(filename, format, args);
va_end(args);
FileWorker* file_worker = file_worker_alloc(true);
string_t buffer;
string_init(buffer);
FileWorker* file_worker = file_worker_alloc(true);
bool result = file_worker_open(file_worker, ARCHIVE_FAV_PATH, FSAM_READ, FSOM_OPEN_EXISTING);
if(result) {
@@ -85,13 +83,14 @@ bool archive_favorites_delete(const char* format, ...) {
break;
}
if(string_search_str(buffer, filename)) {
archive_file_append(ARCHIVE_FAV_TEMP_PATH, "%s\r\n", string_get_cstr(buffer));
if(string_search(buffer, filename)) {
archive_file_append(ARCHIVE_FAV_TEMP_PATH, "%s\n", string_get_cstr(buffer));
}
}
}
string_clear(buffer);
string_clear(filename);
file_worker_close(file_worker);
file_worker_remove(file_worker, ARCHIVE_FAV_PATH);
@@ -103,16 +102,15 @@ bool archive_favorites_delete(const char* format, ...) {
}
bool archive_is_favorite(const char* format, ...) {
string_t buffer;
string_t filename;
va_list args;
va_start(args, format);
uint8_t len = vsnprintf(NULL, 0, format, args);
char filename[len + 1];
vsnprintf(filename, len + 1, format, args);
string_init_vprintf(filename, format, args);
va_end(args);
FileWorker* file_worker = file_worker_alloc(true);
string_t buffer;
string_init(buffer);
FileWorker* file_worker = file_worker_alloc(true);
bool found = false;
bool result = file_worker_open(file_worker, ARCHIVE_FAV_PATH, FSAM_READ, FSOM_OPEN_EXISTING);
@@ -125,7 +123,7 @@ bool archive_is_favorite(const char* format, ...) {
if(!string_size(buffer)) {
break;
}
if(!string_search_str(buffer, filename)) {
if(!string_search(buffer, filename)) {
found = true;
break;
}
@@ -133,6 +131,7 @@ bool archive_is_favorite(const char* format, ...) {
}
string_clear(buffer);
string_clear(filename);
file_worker_close(file_worker);
file_worker_free(file_worker);
@@ -166,7 +165,7 @@ bool archive_favorites_rename(const char* file_path, const char* src, const char
archive_file_append(
ARCHIVE_FAV_TEMP_PATH,
"%s\r\n",
"%s\n",
string_search(buffer, path) ? string_get_cstr(buffer) : dst);
}
}
@@ -186,5 +185,22 @@ bool archive_favorites_rename(const char* file_path, const char* src, const char
void archive_add_to_favorites(const char* file_path) {
furi_assert(file_path);
archive_file_append(ARCHIVE_FAV_PATH, "%s\r\n", file_path);
archive_file_append(ARCHIVE_FAV_PATH, "%s\n", file_path);
}
void archive_favorites_save(void* context) {
furi_assert(context);
ArchiveBrowserView* browser = context;
FileWorker* file_worker = file_worker_alloc(true);
for(size_t i = 0; i < archive_file_array_size(browser); i++) {
ArchiveFile_t* item = archive_get_file_at(browser, i);
archive_file_append(ARCHIVE_FAV_TEMP_PATH, "%s\n", string_get_cstr(item->name));
}
file_worker_remove(file_worker, ARCHIVE_FAV_PATH);
file_worker_rename(file_worker, ARCHIVE_FAV_TEMP_PATH, ARCHIVE_FAV_PATH);
file_worker_free(file_worker);
}