mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8658 from natinusala/master

Browse Source 
task_database: use regular progress report
This commit is contained in:
Twinaphex 2019-04-30 09:42:42 +02:00 committed by GitHub
commit 90ea42c2d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 58 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libretro-common/include/queues/task_queue.h
View File

@ -114,10 +114,15 @@ struct retro_task
/* task identifier */ /* task identifier */
uint32_t ident; uint32_t ident;
/* frontend userdata /* frontend userdata
* (e.g. associate a sticky notification to a task) */ * (e.g. associate a sticky notification to a task) */
void *frontend_userdata; void *frontend_userdata;
/* if set to true, frontend will
use an alternative look for the
task progress display */
bool alternative_look;
/* don't touch this. */ /* don't touch this. */
retro_task_t *next; retro_task_t *next;
}; };

53
menu/widgets/menu_widgets.c
View File

@ -158,6 +158,7 @@ typedef struct menu_widget_msg
uint8_t task_count; /* how many tasks have used this notification? */ uint8_t task_count; /* how many tasks have used this notification? */
int8_t task_progress; int8_t task_progress;
bool task_alternative_look;
bool task_finished; bool task_finished;
bool task_error; bool task_error;
bool task_cancelled; bool task_cancelled;
@ -380,24 +381,25 @@ static bool menu_widgets_msg_queue_push_internal(retro_task_t *task, const char
if (task) if (task)
{ {
msg_widget->msg = strdup(title); msg_widget->msg = strdup(title);
msg_widget->msg_len = strlen(title); msg_widget->msg_len = strlen(title);
msg_widget->task_error = task->error; msg_widget->task_error = task->error;
msg_widget->task_cancelled = task->cancelled; msg_widget->task_cancelled = task->cancelled;
msg_widget->task_finished = task->finished; msg_widget->task_finished = task->finished;
msg_widget->task_progress = task->progress; msg_widget->task_alternative_look = task->alternative_look;
msg_widget->task_ident = task->ident; msg_widget->task_progress = task->progress;
msg_widget->task_title_ptr = task->title; msg_widget->task_ident = task->ident;
msg_widget->task_count = 1; msg_widget->task_title_ptr = task->title;
msg_widget->task_count = 1;
msg_widget->unfolded = true; msg_widget->unfolded = true;
msg_widget->width = font_driver_get_message_width(font_regular, title, msg_widget->msg_len, msg_queue_text_scale_factor) + simple_widget_padding/2; msg_widget->width = font_driver_get_message_width(font_regular, title, msg_widget->msg_len, msg_queue_text_scale_factor) + simple_widget_padding/2;
task->frontend_userdata = msg_widget; task->frontend_userdata = msg_widget;
msg_widget->hourglass_rotation = 0; msg_widget->hourglass_rotation = 0;
} }
else else
{ {
@ -448,7 +450,6 @@ static bool menu_widgets_msg_queue_push_internal(retro_task_t *task, const char
if (task->title != msg_widget->task_title_ptr) if (task->title != msg_widget->task_title_ptr)
{ {
menu_animation_ctx_entry_t entry;
unsigned len = strlen(task->title); unsigned len = strlen(task->title);
unsigned new_width = font_driver_get_message_width(font_regular, task->title, len, msg_queue_text_scale_factor); unsigned new_width = font_driver_get_message_width(font_regular, task->title, len, msg_queue_text_scale_factor);
@ -460,15 +461,23 @@ static bool menu_widgets_msg_queue_push_internal(retro_task_t *task, const char
msg_widget->task_title_ptr = task->title; msg_widget->task_title_ptr = task->title;
msg_widget->msg_transition_animation = 0; msg_widget->msg_transition_animation = 0;
entry.easing_enum = EASING_OUT_QUAD; if (!task->alternative_look)
entry.tag = (uintptr_t) NULL; {
entry.duration = MSG_QUEUE_ANIMATION_DURATION*2; menu_animation_ctx_entry_t entry;
entry.target_value = msg_queue_height/2.0f; entry.easing_enum = EASING_OUT_QUAD;
entry.subject = &msg_widget->msg_transition_animation; entry.tag = (uintptr_t) NULL;
entry.cb = msg_widget_msg_transition_animation_done; entry.duration = MSG_QUEUE_ANIMATION_DURATION*2;
entry.userdata = msg_widget; entry.target_value = msg_queue_height/2.0f;
entry.subject = &msg_widget->msg_transition_animation;
entry.cb = msg_widget_msg_transition_animation_done;
entry.userdata = msg_widget;
menu_animation_push(&entry); menu_animation_push(&entry);
}
else
{
msg_widget_msg_transition_animation_done(msg_widget);
}
msg_widget->task_count++; msg_widget->task_count++;

34
tasks/task_database.c
View File

@ -15,6 +15,7 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <math.h>
#include <compat/strcasestr.h> #include <compat/strcasestr.h>
#include <compat/strl.h> #include <compat/strl.h>
#include <retro_miscellaneous.h> #include <retro_miscellaneous.h>
@ -131,13 +132,23 @@ static const char *database_info_get_current_element_name(
return handle->list->elems[handle->list_ptr].data; return handle->list->elems[handle->list_ptr].data;
} }
static int task_database_iterate_start(database_info_handle_t *db, static int task_database_iterate_start(retro_task_t *task,
database_info_handle_t *db,
const char *name) const char *name)
{ {
char msg[511]; char msg[511];
msg[0] = msg[510] = '\0'; msg[0] = msg[510] = '\0';
#ifdef RARCH_INTERNAL
snprintf(msg, sizeof(msg),
"%s %s\n",
msg_hash_to_str(MSG_SCANNING),
path_basename(name));
task_free_title(task);
task_set_title(task, strdup(msg));
if (db->list->size != 0)
task_set_progress(task, roundf((float)db->list_ptr / (float)db->list->size * 100.0f));
#else
snprintf(msg, sizeof(msg), snprintf(msg, sizeof(msg),
STRING_REP_USIZE "/" STRING_REP_USIZE ": %s %s...\n", STRING_REP_USIZE "/" STRING_REP_USIZE ": %s %s...\n",
(size_t)db->list_ptr, (size_t)db->list_ptr,
@ -146,13 +157,8 @@ static int task_database_iterate_start(database_info_handle_t *db,
name); name);
if (!string_is_empty(msg)) if (!string_is_empty(msg))
{
#ifdef RARCH_INTERNAL
runloop_msg_queue_push(msg, 1, 180, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
#else
fprintf(stderr, "msg: %s\n", msg); fprintf(stderr, "msg: %s\n", msg);
#endif #endif
}
db->status = DATABASE_STATUS_ITERATE; db->status = DATABASE_STATUS_ITERATE;
@ -1204,8 +1210,6 @@ static void task_database_handler(retro_task_t *task)
db->handle = database_info_file_init(db->fullpath, DATABASE_TYPE_ITERATE, task); db->handle = database_info_file_init(db->fullpath, DATABASE_TYPE_ITERATE, task);
} }
task_free_title(task);
if (db->handle) if (db->handle)
db->handle->status = DATABASE_STATUS_ITERATE_BEGIN; db->handle->status = DATABASE_STATUS_ITERATE_BEGIN;
} }
@ -1275,7 +1279,7 @@ static void task_database_handler(retro_task_t *task)
task_database_cleanup_state(dbstate); task_database_cleanup_state(dbstate);
dbstate->list_index = 0; dbstate->list_index = 0;
dbstate->entry_index = 0; dbstate->entry_index = 0;
task_database_iterate_start(dbinfo, name); task_database_iterate_start(task, dbinfo, name);
break; break;
case DATABASE_STATUS_ITERATE: case DATABASE_STATUS_ITERATE:
if (task_database_iterate(db, dbstate, dbinfo) == 0) if (task_database_iterate(db, dbstate, dbinfo) == 0)
@ -1292,14 +1296,14 @@ static void task_database_handler(retro_task_t *task)
} }
else else
{ {
#ifdef RARCH_INTERNAL
task_set_progress(task, 100);
#else
const char *msg = NULL; const char *msg = NULL;
if (db->is_directory) if (db->is_directory)
msg = msg_hash_to_str(MSG_SCANNING_OF_DIRECTORY_FINISHED); msg = msg_hash_to_str(MSG_SCANNING_OF_DIRECTORY_FINISHED);
else else
msg = msg_hash_to_str(MSG_SCANNING_OF_FILE_FINISHED); msg = msg_hash_to_str(MSG_SCANNING_OF_FILE_FINISHED);
#ifdef RARCH_INTERNAL
runloop_msg_queue_push(msg, 0, 180, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
#else
fprintf(stderr, "msg: %s\n", msg); fprintf(stderr, "msg: %s\n", msg);
#endif #endif
ui_companion_driver_notify_refresh(); ui_companion_driver_notify_refresh();
@ -1351,7 +1355,7 @@ bool task_push_dbscan(
bool db_dir_show_hidden_files, bool db_dir_show_hidden_files,
retro_task_callback_t cb) retro_task_callback_t cb)
{ {
retro_task_t *t = (retro_task_t*)calloc(1, sizeof(*t)); retro_task_t *t = task_init();
db_handle_t *db = (db_handle_t*)calloc(1, sizeof(db_handle_t)); db_handle_t *db = (db_handle_t*)calloc(1, sizeof(db_handle_t));
if (!t || !db) if (!t || !db)
@ -1362,6 +1366,8 @@ bool task_push_dbscan(
t->callback = cb; t->callback = cb;
t->title = strdup(msg_hash_to_str(MSG_PREPARING_FOR_CONTENT_SCAN)); t->title = strdup(msg_hash_to_str(MSG_PREPARING_FOR_CONTENT_SCAN));
t->alternative_look = true;
db->show_hidden_files = db_dir_show_hidden_files; db->show_hidden_files = db_dir_show_hidden_files;
db->is_directory = directory; db->is_directory = directory;
db->playlist_directory = NULL; db->playlist_directory = NULL;

2
tasks/task_decompress.c
View File

@ -332,7 +332,7 @@ bool task_push_decompress(
s->archive.type = ARCHIVE_TRANSFER_INIT; s->archive.type = ARCHIVE_TRANSFER_INIT;
s->userdata = (struct archive_extract_userdata*)calloc(1, sizeof(*s->userdata)); s->userdata = (struct archive_extract_userdata*)calloc(1, sizeof(*s->userdata));
t = (retro_task_t*)calloc(1, sizeof(*t)); t = task_init();
if (!t) if (!t)
goto error; goto error;