Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove GCI Folder Path from the Wrote to OSD Message #11697

Merged
merged 1 commit into from Mar 26, 2023

Conversation

MayImilae
Copy link
Contributor

@MayImilae MayImilae commented Mar 26, 2023

This is a follow up to #11470. In that one I only did Memory Cards, and forgot to do the GCI Folder as well. Whoops.

This removes the GCI Folder path from the wrote to OSD message, to make it less likely that streamers will get dox'd from Dolphin. That is all.

Before:
gcifolder-before

After:
gcifolder-after

@delroth
Copy link
Member

delroth commented Mar 26, 2023

"GCI Folder" seems very technical for something that we put in user-facing OSDs. Why not always say "memory card A/B" regardless of the backend storage implementation?

@delroth
Copy link
Member

delroth commented Mar 26, 2023

Also note that this will still leak full path when the write fails.

@MayImilae
Copy link
Contributor Author

MayImilae commented Mar 26, 2023

"GCI Folder" seems very technical for something that we put in user-facing OSDs.

I went with that because that is the name for it in Dolphin's settings. If we're going to change what GCI Folder is called, we should probably do it everywhere all at once.

We've talked about it once before and everyone involved in the conversation was pretty happy with changing GCI Folder to "Memory Card Folder" and Memory Card to "Memory Card File". That's for another day though.

Also note that this will still leak full path when the write fails.

Yea I know. This is just covering the primary case. For the write failures, something more nuanced will be required, such as shortening the string ala what I did in #11485. Unlike with the wrote messages, the errors actually have a reason to have the file path along with the file name - to help the user go to the file in question and diagnose the problem. So to best take care of that issue, ideally we'd have a shortened path starting with the user folder that would then go to the file name, for example: [user folder]/GC/USA/Card A/01-GZLE-gczelda.gci. However, there are a lot of errors in savestates and memory cards and GCI files and everything else, so I'd really like for Fileutils to have shortened path and only actual file name options and just use those, rather than repeating the same std::filesystem shenanigans over and over again. That's a whole thing and I'm not sure when I'll get around to that.

Follow up to PR11470. Forgot to do GCI as well. Oops.
@delroth delroth merged commit 0de2890 into dolphin-emu:master Mar 26, 2023
4 of 14 checks passed
@MayImilae MayImilae deleted the oops-gci-osd branch March 26, 2023 13:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
3 participants