libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-25 12:20:48 +00:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

Improve CLI scan console output

Browse Source
This commit is contained in:
sonninnos 2023-05-03 21:15:42 +03:00 committed by LibretroAdmin
parent f5f1d35370
commit 8f5442da5b
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
retroarch.c
View File

@ -4306,6 +4306,9 @@ void retroarch_override_setting_set(
case RARCH_OVERRIDE_SETTING_LOG_TO_FILE:
p_rarch->flags |= RARCH_FLAGS_HAS_SET_LOG_TO_FILE;
break;
case RARCH_OVERRIDE_SETTING_DATABASE_SCAN:
p_rarch->flags |= RARCH_FLAGS_CLI_DATABASE_SCAN;
break;
case RARCH_OVERRIDE_SETTING_NONE:
default:
break;
@ -4380,6 +4383,9 @@ void retroarch_override_setting_unset(
case RARCH_OVERRIDE_SETTING_LOG_TO_FILE:
p_rarch->flags &= ~RARCH_FLAGS_HAS_SET_LOG_TO_FILE;
break;
case RARCH_OVERRIDE_SETTING_DATABASE_SCAN:
p_rarch->flags &= ~RARCH_FLAGS_CLI_DATABASE_SCAN;
break;
case RARCH_OVERRIDE_SETTING_NONE:
default:
break;
@ -5564,6 +5570,7 @@ static bool retroarch_parse_input_and_config(
case RA_OPT_DATABASE_SCAN:
#ifdef HAVE_LIBRETRODB
verbosity_enable();
retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_DATABASE_SCAN, NULL);
#endif
break;
@ -6754,6 +6761,8 @@ bool retroarch_override_setting_is_set(
#endif
case RARCH_OVERRIDE_SETTING_LOG_TO_FILE:
return ((p_rarch->flags & RARCH_FLAGS_HAS_SET_LOG_TO_FILE) > 0);
case RARCH_OVERRIDE_SETTING_DATABASE_SCAN:
return ((p_rarch->flags & RARCH_FLAGS_CLI_DATABASE_SCAN) > 0);
case RARCH_OVERRIDE_SETTING_NONE:
default:
break;

3
retroarch.h
View File

@ -178,7 +178,8 @@ enum rarch_state_flags
RARCH_FLAGS_UPS_PREF = (1 << 10),
RARCH_FLAGS_BPS_PREF = (1 << 11),
RARCH_FLAGS_IPS_PREF = (1 << 12),
RARCH_FLAGS_BLOCK_CONFIG_READ = (1 << 13)
RARCH_FLAGS_BLOCK_CONFIG_READ = (1 << 13),
RARCH_FLAGS_CLI_DATABASE_SCAN = (1 << 14)
};
/**

1
retroarch_types.h
View File

@ -126,6 +126,7 @@ enum rarch_override_setting
RARCH_OVERRIDE_SETTING_IPS_PREF,
RARCH_OVERRIDE_SETTING_LIBRETRO_DEVICE,
RARCH_OVERRIDE_SETTING_LOG_TO_FILE,
RARCH_OVERRIDE_SETTING_DATABASE_SCAN,
RARCH_OVERRIDE_SETTING_LAST
};

9
tasks/task_database.c
View File

@ -40,6 +40,7 @@
#include "../ui/ui_companion_driver.h"
#include "../gfx/video_display_server.h"
#endif
#include "../retroarch.h"
#include "../verbosity.h"
#include "task_database_cue.h"
@ -132,7 +133,7 @@ static int task_database_iterate_start(retro_task_t *task,
roundf((float)db->list_ptr /
((float)db->list->size / 100.0f)));
RARCH_LOG("[Scanner]: %s", msg);
if (verbosity_is_enabled())
if (retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_DATABASE_SCAN, NULL))
printf("%s", msg);
#else
fprintf(stderr, "msg: %s\n", msg);
@ -804,7 +805,7 @@ static int database_info_list_iterate_found_match(
playlist_push(playlist, &entry);
RARCH_LOG("[Scanner]: Add \"%s\"\n", entry_label);
if (verbosity_is_enabled())
if (retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_DATABASE_SCAN, NULL))
printf("Add \"%s\"\n", entry.label);
}
@ -1170,7 +1171,7 @@ static void task_database_handler(retro_task_t *task)
false, false);
RARCH_LOG("[Scanner]: %s\"%s\"..\n", msg_hash_to_str(MSG_MANUAL_CONTENT_SCAN_START), db->fullpath);
if (verbosity_is_enabled())
if (retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_DATABASE_SCAN, NULL))
printf("%s\"%s\"..\n", msg_hash_to_str(MSG_MANUAL_CONTENT_SCAN_START), db->fullpath);
/* If the scan path matches a database path exactly then
@ -1264,7 +1265,7 @@ static void task_database_handler(retro_task_t *task)
task_set_progress(task, 100);
ui_companion_driver_notify_refresh();
RARCH_LOG("[Scanner]: %s\n", msg);
if (verbosity_is_enabled())
if (retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_DATABASE_SCAN, NULL))
printf("%s\n", msg);
#else
fprintf(stderr, "msg: %s\n", msg);