Draft: Fix #746 (CLI) Auto-detect Core when -L isn't present #15458

zig-for · 2023-07-05T07:36:18Z

Guidelines

Rebase before opening a pull request
If you are sending several unrelated fixes or features, use a branch and a separate pull request for each
If possible try squashing everything in a single commit. This is particularly beneficial in the case of feature merges since it allows easy bisecting when a problem arises

Description

This allows Retroarch to attempt to pick the proper core when loading. Windows already does this on drag and drop.

The PR as is doesn't handle missing cores, nor does it delegate to the frontend if there's multiple possible cores. Happy to put work towards that if there's a desire for this to go in. The main desire is to try to push for a "good" solution even if no perfect solution exists (I'd rather a happy path of being able to easily set file extensions associated with RA to do the right thing, then give up on every case just because some cases are hard to handle).

To repeat - as is, the PR is not ready, just looking for direction on both implementation and probability of acceptance later

EDIT: Additional changes:

Always allows downloading cores when suggesting cores
Fixes bug that caused cancelling "Core Downloader" to pop the entire menu stack if run from anywhere but "Online Updater"
The core download menu is now filtered when appropriate

Current bugs:

When backing out from the content suggester, the main menu on the left isn't scrolled properly
Suggested cores don't show licenses (is this desired? I kind of like the slim, clean look)

Related Issues

#746
#9275
https://forums.libretro.com/t/autodetect-core-when-opening-a-rom-file/1863
#1704
#8557

Reviewers

[If possible @mention all the people that should review your pull request]

hizzlekizzle · 2023-07-05T14:03:06Z

I think this is welcome functionality and indeed picking some core behind the scenes is better than failing with no core at all. For multiple cores, I think the ideal behavior would be to launch into the menu at the point of the core picker dialog, just as you would if you just 'load content'.

runloop.c

zig-for · 2023-07-06T00:04:16Z

I attempted to get @hizzlekizzle 's idea working, but can't figure out how to control the menu programatically. I tried something along the lines of menu_displaylist_ctl(DISPLAYLIST_CORES, &info, settings); and deferred_push_core_list(&info); (with empty lists for now), but neither control the menu. I'm not sure if:

Calling these with empty lists just doesn't work
I'm calling the wrong function
The menu system isn't in a proper state to accept control at this point in execution

Could I get a hint for what to do?

zig-for · 2023-07-06T03:09:49Z

Made some progress, with the caveat that it involves moving menu initialization earlier. :(

…e no menu

zig-for · 2023-07-06T04:10:39Z

Looking at the menu code, it's ok to initialize the menu multiple times, even early. @LibretroAdmin could you comment on direction here? The other option is figuring out some deferral method that waits until after the menu is actually initialized (some sort of hook in the main menu?).

There's a case that doesn't work as well as I'd like - downloading:

Cores aren't filtered by the current content type (I think this is fixable, I can potentially read detect_content_path, please comment if this is desired)
if you download a core it doesn't launch the core (this doesn't really look fixable - core downloads are very asynchronous - unless I disallow swapping away from the core download screen or put up some sort of modal menu I don't see options, also open to direction)
EDIT: 3. It would be neat if "suggested cores" also included a download button - and then also would be neat if downloading added to the stack rather than replacing.

I need to do another pass at C89 compat, but will do so after I know I'm not barking up the wrong tree.

…list

zig-for · 2023-07-06T07:04:42Z

Fixed (2) and (3) - there was a bug in how the stack was popped - now downloading a core, waiting, and backing out does the right thing (it would be extra neat if the list refreshed itself, but I'm not super worried about it)

…ntent

zig-for · 2023-07-06T08:49:15Z

....ok, now when you go to download the core, you're only presented with cores associated with the content. The way I implemented the clear on cancel seems wrong, please lemme know if there's a nicer way. What I really want to do is associate a cancel option with the window, not every item on the window, even though I get why the extra flexibility would be nice. Please lemme know the "proper" way of doing this, I feel like I took a sledgehammer to the menu system.

hizzlekizzle · 2023-07-06T13:35:59Z

being able to download a core from there is a great idea, and having it only show eligible cores is even better. :)

good stuff!

keithbowes · 2023-07-06T20:19:35Z

I had been thinking about trying my hand at this, but I hadn't started yet. I have written a shell script that looks at .info files for file extensions and then prompts you to enter a number which core you want if more than one core supports a file extension, and was thinking about doing the same in RetroArch when it is built with --disable-menu.

LibretroAdmin · 2023-07-07T03:54:37Z

Hi, quite a few CI tasks are failing. Can you check it out and fix it?

zig-for · 2023-07-07T07:54:25Z

Yes, of course. I'm out of town for four days, but I will circle back to this next week.

LibretroAdmin · 2023-07-14T16:11:41Z

Let us know when you're ready to look into the matter.

RobLoach · 2023-07-15T20:29:51Z

Just sharing that this has been on my wishlist FOREVER. Thanks a lot for picking it up.

I tried building locally, and got the following...

runloop.c:(.text+0x3652): undefined reference to `file_load_with_detect_core_wrapper'

As a side-note to #15458 (comment) , make sure to Update Assets.

zig-for · 2023-07-16T02:43:38Z

I am going to try to work on this tomorrow. Got back from vacation, got slammed with work, and now MAGWEST is upon me. :)

zig-for · 2023-07-17T05:20:43Z

@LibretroAdmin fixed the build errors

RobLoach

Worked for me! When loading from a .zip file, it resolves correctly too. When no cores are suggested, it says "No Cores Available". Nice work, so happy to see this get pushed forwards.

Curious about cleaning up the approach a bit, but this is incredible. Thanks so much!

RobLoach · 2023-07-17T05:55:55Z

runloop.c

+{
+   core_info_list_t* core_info_list = NULL;
+
+   /* TODO: error printing */


Error printing?

runloop.c

RobLoach · 2023-07-17T06:06:41Z

runloop.c

+                        runloop_set_current_core_type(CORE_TYPE_DUMMY, false);
+#ifdef HAVE_MENU
+                        /* this is a hack, we should be deferring the core list until after we have loaded menu */
+                        /* TODO: ask how to unhackify it */


Hmmm, good point. I haven't tested this without the menu being available yet. Do you have any ideas on how we could "do it right"?

I would think automatically picking the first in the list would be pretty much the only way to go.

In other projects with similar issues I've printed out a list of options and asked the user to enter a number.

Unfortunately, it seems we have to first fix an RA compilation issue when using ./configure --disable-menu

Compilation log

CC tasks/task_manual_content_scan.c tasks/task_manual_content_scan.c: In function 'task_manual_content_scan_handler': tasks/task_manual_content_scan.c:215:16: warning: implicit declaration of function 'runloop_msg_queue_push' [-Wimplicit-function-declaration] 215 | runloop_msg_queue_push( | ^~~~~~~~~~~~~~~~~~~~~~ CC tasks/task_core_backup.c CC libretro-common/encodings/encoding_utf.c tasks/task_manual_content_scan.c:218:28: error: 'MESSAGE_QUEUE_ICON_DEFAULT' undeclared (first use in this function) 218 | NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO); | ^~~~~~~~~~~~~~~~~~~~~~~~~~ tasks/task_manual_content_scan.c:218:28: note: each undeclared identifier is reported only once for each function it appears in tasks/task_manual_content_scan.c:218:56: error: 'MESSAGE_QUEUE_CATEGORY_INFO' undeclared (first use in this function) 218 | NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ tasks/task_manual_content_scan.c: In function 'task_push_manual_content_scan': tasks/task_manual_content_scan.c:576:19: error: 'MESSAGE_QUEUE_ICON_DEFAULT' undeclared (first use in this function) 576 | NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO); | ^~~~~~~~~~~~~~~~~~~~~~~~~~ CC libretro-common/encodings/encoding_crc32.c tasks/task_manual_content_scan.c:576:47: error: 'MESSAGE_QUEUE_CATEGORY_INFO' undeclared (first use in this function) 576 | NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ make: *** [Makefile:209: obj-unix/release/tasks/task_manual_content_scan.o] Error 1 make: *** Waiting for unfinished jobs....

`

Edit
Compilation issue is fixed with this PR, last error is linking issue.

Linking issue log

`

/usr/bin/ld: obj-unix/release/retroarch.o: in function `retroarch_main_init': retroarch.c:(.text+0x8b2d): undefined reference to `handle_dbscan_finished' collect2: error: ld returned 1 exit status make: *** [Makefile:204: retroarch] Error 1

`

Edit 2

Linking issue is fixed with f34481c

Hi @zig-for will it be possible to rebase so that you can get the two fixes for the option --disable-menu ?

Thank you.

runloop.c

RobLoach · 2023-07-17T06:09:52Z

runloop.c

+   /*This isn't needed, is it?*/
+   /*command_event(CMD_EVENT_LOAD_CORE_PERSIST, NULL);*/
+   core_info_get_list(&core_info_list);


Co-authored-by: Rob Loach <robloach@gmail.com>

zig-for · 2023-09-13T15:28:12Z

Not for a few weeks. Slammed with work.Sent from my iPhoneOn Sep 13, 2023, at 5:19 AM, gouchi ***@***.***> wrote: @gouchi commented on this pull request. In runloop.c:

@@ -3615,9 +3680,51 @@ bool runloop_init_libretro_symbols(

if (string_is_empty(path)) { - RARCH_ERR("[Core]: Frontend is built for dynamic libretro cores, but " + const char* content_path = path_get(RARCH_PATH_CONTENT); + if (!string_is_empty(content_path)) + { + bool core_loaded = auto_load_core(content_path); + if (!core_loaded) { + struct menu_state* menu_state = menu_state_get_ptr(); + + CORE_SYMBOLS(SYMBOL_DUMMY); + runloop_set_current_core_type(CORE_TYPE_DUMMY, false); +#ifdef HAVE_MENU + /* this is a hack, we should be deferring the core list until after we have loaded menu */ + /* TODO: ask how to unhackify it */ Hi @zig-for will it be possible to rebase so that you can get the two fixes for the option --disable-menu ? Thank you. —Reply to this email directly, view it on GitHub, or unsubscribe.You are receiving this because you were mentioned.Message ID: ***@***.***>

…load_cores

RobLoach · 2023-09-13T20:21:58Z

Thanks, brought in the latest from master.

zig-for added 3 commits July 5, 2023 00:27

auto load core when possible

1e150d5

fixes

c4558f4

c89

f693734

LibretroAdmin requested changes Jul 5, 2023

View reviewed changes

runloop.c Outdated Show resolved Hide resolved

runloop.c Show resolved Hide resolved

fixes

abd54e2

zig-for added 3 commits July 5, 2023 20:36

Adds ability to start content from menu in a hacky way

6eef89d

fix comments; always set video_threaded to false; ifdef out if we hav…

3c41ed5

…e no menu

remove extra var

4c13423

zig-for added 2 commits July 5, 2023 23:03

Forward declare, at least

9660b6a

always allow downloading cores; fix bug with bad stack flush on core …

75bc0a0

…list

Filter core list by extension when we are searching for a core for co…

f3dd9e8

…ntent

Don't forget the no content string...

4c4a880

zig-for added 5 commits July 16, 2023 21:36

fix c89

6702535

menu

88927dc

try fixing this way

df8f38a

fix bad compile time thing

e08ae32

more c89

12f27e4

RobLoach requested changes Jul 17, 2023

View reviewed changes

zig-for and others added 6 commits July 28, 2023 19:39

Update runloop.c

94106eb

Co-authored-by: Rob Loach <robloach@gmail.com>

Update runloop.c

35ae3a9

Co-authored-by: Rob Loach <robloach@gmail.com>

Update runloop.c

f8e6a7c

Co-authored-by: Rob Loach <robloach@gmail.com>

Update runloop.c

4de215c

Co-authored-by: Rob Loach <robloach@gmail.com>

Update runloop.c

096cbfa

Co-authored-by: Rob Loach <robloach@gmail.com>

Update runloop.c

bad69c5

Co-authored-by: Rob Loach <robloach@gmail.com>

RobLoach mentioned this pull request Aug 13, 2023

Windows Explorer File Association #9718

Open

Merge branch 'master' of github.com:libretro/RetroArch into zig/auto_…

d37465b

…load_cores

gouchi mentioned this pull request Aug 15, 2024

Allow building RetroArch with menu disabled #16881

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Draft: Fix #746 (CLI) Auto-detect Core when -L isn't present #15458

Draft: Fix #746 (CLI) Auto-detect Core when -L isn't present #15458

zig-for commented Jul 5, 2023 •

edited

Loading

hizzlekizzle commented Jul 5, 2023

zig-for commented Jul 6, 2023

zig-for commented Jul 6, 2023

zig-for commented Jul 6, 2023 •

edited

Loading

zig-for commented Jul 6, 2023

zig-for commented Jul 6, 2023 •

edited

Loading

hizzlekizzle commented Jul 6, 2023

keithbowes commented Jul 6, 2023

LibretroAdmin commented Jul 7, 2023

zig-for commented Jul 7, 2023

LibretroAdmin commented Jul 14, 2023

RobLoach commented Jul 15, 2023 •

edited

Loading

zig-for commented Jul 16, 2023

zig-for commented Jul 17, 2023

RobLoach left a comment

RobLoach Jul 17, 2023

RobLoach Jul 17, 2023

hizzlekizzle Jul 17, 2023

zig-for Jul 29, 2023

gouchi Aug 14, 2023 •

edited

Loading

gouchi Sep 13, 2023

RobLoach Jul 17, 2023

zig-for commented Sep 13, 2023 via email

RobLoach commented Sep 13, 2023

Draft: Fix #746 (CLI) Auto-detect Core when -L isn't present #15458

Are you sure you want to change the base?

Draft: Fix #746 (CLI) Auto-detect Core when -L isn't present #15458

Conversation

zig-for commented Jul 5, 2023 • edited Loading

Guidelines

Description

Related Issues

Reviewers

hizzlekizzle commented Jul 5, 2023

zig-for commented Jul 6, 2023

zig-for commented Jul 6, 2023

zig-for commented Jul 6, 2023 • edited Loading

zig-for commented Jul 6, 2023

zig-for commented Jul 6, 2023 • edited Loading

hizzlekizzle commented Jul 6, 2023

keithbowes commented Jul 6, 2023

LibretroAdmin commented Jul 7, 2023

zig-for commented Jul 7, 2023

LibretroAdmin commented Jul 14, 2023

RobLoach commented Jul 15, 2023 • edited Loading

zig-for commented Jul 16, 2023

zig-for commented Jul 17, 2023

RobLoach left a comment

Choose a reason for hiding this comment

RobLoach Jul 17, 2023

Choose a reason for hiding this comment

RobLoach Jul 17, 2023

Choose a reason for hiding this comment

hizzlekizzle Jul 17, 2023

Choose a reason for hiding this comment

zig-for Jul 29, 2023

Choose a reason for hiding this comment

gouchi Aug 14, 2023 • edited Loading

Choose a reason for hiding this comment

gouchi Sep 13, 2023

Choose a reason for hiding this comment

RobLoach Jul 17, 2023

Choose a reason for hiding this comment

zig-for commented Sep 13, 2023 via email

RobLoach commented Sep 13, 2023

zig-for commented Jul 5, 2023 •

edited

Loading

zig-for commented Jul 6, 2023 •

edited

Loading

zig-for commented Jul 6, 2023 •

edited

Loading

RobLoach commented Jul 15, 2023 •

edited

Loading

gouchi Aug 14, 2023 •

edited

Loading