mirrors/unleashed-firmware
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2025-12-12 12:42:30 +04:00
Code Issues Activity

Merge remote-tracking branch 'OFW/nm/js_archive_fixes' into dev

Browse Source
This commit is contained in:
MX
2024-02-13 16:29:15 +03:00
parent dd87afcbde d75f2c62ca
commit 71a93e8cc3
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/main/archive/helpers/archive_files.c
View File

@@ -15,7 +15,7 @@ void archive_set_file_type(ArchiveFile_t* file, const char* path, bool is_folder
} else { } else {
for(size_t i = 0; i < COUNT_OF(known_ext); i++) { for(size_t i = 0; i < COUNT_OF(known_ext); i++) {
if((known_ext[i][0] == '?') || (known_ext[i][0] == '*')) continue; if((known_ext[i][0] == '?') || (known_ext[i][0] == '*')) continue;
if(furi_string_search(file->path, known_ext[i], 0) != FURI_STRING_FAILURE) { if(furi_string_end_with(file->path, known_ext[i])) {
if(i == ArchiveFileTypeBadUsb) { if(i == ArchiveFileTypeBadUsb) {
if(furi_string_search( if(furi_string_search(
file->path, archive_get_default_path(ArchiveTabBadUsb)) == 0) { file->path, archive_get_default_path(ArchiveTabBadUsb)) == 0) {

1
applications/services/gui/modules/file_browser_worker.c
View File

@@ -80,6 +80,7 @@ static bool browser_path_trim(FuriString* path) {
return is_root; return is_root;
} }
static void browser_parse_ext_filter(ExtFilterArray_t ext_filter, const char* filter_str) { static void browser_parse_ext_filter(ExtFilterArray_t ext_filter, const char* filter_str) {
ExtFilterArray_reset(ext_filter);
if(!filter_str) { if(!filter_str) {
return; return;
} }

4
applications/system/js_app/js_thread.c
View File

@@ -210,6 +210,7 @@ static void js_global_to_hex_string(struct mjs* mjs) {
mjs_return(mjs, ret); mjs_return(mjs, ret);
} }
#ifdef JS_DEBUG
static void js_dump_write_callback(void* ctx, const char* format, ...) { static void js_dump_write_callback(void* ctx, const char* format, ...) {
File* file = ctx; File* file = ctx;
furi_assert(ctx); furi_assert(ctx);
@@ -225,6 +226,7 @@ static void js_dump_write_callback(void* ctx, const char* format, ...) {
storage_file_write(file, furi_string_get_cstr(str), furi_string_size(str)); storage_file_write(file, furi_string_get_cstr(str), furi_string_size(str));
furi_string_free(str); furi_string_free(str);
} }
#endif
static int32_t js_thread(void* arg) { static int32_t js_thread(void* arg) {
JsThread* worker = arg; JsThread* worker = arg;
@@ -255,6 +257,7 @@ static int32_t js_thread(void* arg) {
mjs_err_t err = mjs_exec_file(mjs, furi_string_get_cstr(worker->path), NULL); mjs_err_t err = mjs_exec_file(mjs, furi_string_get_cstr(worker->path), NULL);
#ifdef JS_DEBUG
if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug)) { if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug)) {
FuriString* dump_path = furi_string_alloc_set(worker->path); FuriString* dump_path = furi_string_alloc_set(worker->path);
furi_string_cat(dump_path, ".lst"); furi_string_cat(dump_path, ".lst");
@@ -273,6 +276,7 @@ static int32_t js_thread(void* arg) {
furi_string_free(dump_path); furi_string_free(dump_path);
} }
#endif
if(err != MJS_OK) { if(err != MJS_OK) {
FURI_LOG_E(TAG, "Exec error: %s", mjs_strerror(mjs, err)); FURI_LOG_E(TAG, "Exec error: %s", mjs_strerror(mjs, err));