From dff0a7c52a73a3989b788b5328a782e995f07c8c Mon Sep 17 00:00:00 2001 From: Andrew Pilley Date: Wed, 17 Jan 2024 09:06:45 -0800 Subject: Allow -u to accept a username string in addition to index, and suppress the User selector even if settings requires it to be shown for one instance only. --- src/core/hle/service/acc/profile_manager.cpp | 17 +++++++++++++++++ src/core/hle/service/acc/profile_manager.h | 1 + src/yuzu/main.cpp | 24 ++++++++++++++++++++---- src/yuzu/main.h | 2 ++ 4 files changed, 40 insertions(+), 4 deletions(-) diff --git a/src/core/hle/service/acc/profile_manager.cpp b/src/core/hle/service/acc/profile_manager.cpp index 683f44e27..aff97b999 100644 --- a/src/core/hle/service/acc/profile_manager.cpp +++ b/src/core/hle/service/acc/profile_manager.cpp @@ -11,6 +11,7 @@ #include "common/fs/path_util.h" #include "common/polyfill_ranges.h" #include "common/settings.h" +#include "common/string_util.h" #include "core/hle/service/acc/profile_manager.h" namespace Service::Account { @@ -164,6 +165,22 @@ std::optional ProfileManager::GetUserIndex(const ProfileInfo& user) return GetUserIndex(user.user_uuid); } +/// Returns the first user profile seen based on username (which does not enforce uniqueness) +std::optional ProfileManager::GetUserIndex(const std::string& username) const { + const auto iter = + std::find_if(profiles.begin(), profiles.end(), [&username](const ProfileInfo& p) { + const std::string pusername = Common::StringFromFixedZeroTerminatedBuffer( + reinterpret_cast(p.username.data()), p.username.size()); + + return username.compare(pusername) == 0; + }); + if (iter == profiles.end()) { + return std::nullopt; + } + + return static_cast(std::distance(profiles.begin(), iter)); +} + /// Returns the data structure used by the switch when GetProfileBase is called on acc:* bool ProfileManager::GetProfileBase(std::optional index, ProfileBase& profile) const { if (!index || index >= MAX_USERS) { diff --git a/src/core/hle/service/acc/profile_manager.h b/src/core/hle/service/acc/profile_manager.h index e21863e64..f94157300 100644 --- a/src/core/hle/service/acc/profile_manager.h +++ b/src/core/hle/service/acc/profile_manager.h @@ -70,6 +70,7 @@ public: std::optional GetUser(std::size_t index) const; std::optional GetUserIndex(const Common::UUID& uuid) const; std::optional GetUserIndex(const ProfileInfo& user) const; + std::optional GetUserIndex(const std::string& username) const; bool GetProfileBase(std::optional index, ProfileBase& profile) const; bool GetProfileBase(Common::UUID uuid, ProfileBase& profile) const; bool GetProfileBase(const ProfileInfo& user, ProfileBase& profile) const; diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 33756febf..3c562e3b2 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -518,12 +518,21 @@ GMainWindow::GMainWindow(std::unique_ptr config_, bool has_broken_vulk continue; } + int user_arg_idx = ++i; bool argument_ok; - const std::size_t selected_user = args[++i].toUInt(&argument_ok); + std::size_t selected_user = args[user_arg_idx].toUInt(&argument_ok); if (!argument_ok) { - LOG_ERROR(Frontend, "Invalid user argument"); - continue; + // try to look it up by username, only finds the first username that matches. + const std::string user_arg_str = args[user_arg_idx].toStdString(); + const auto user_idx = system->GetProfileManager().GetUserIndex(user_arg_str); + + if (user_idx == std::nullopt) { + LOG_ERROR(Frontend, "Invalid user argument"); + continue; + } + + selected_user = user_idx.value(); } if (!system->GetProfileManager().UserExistsIndex(selected_user)) { @@ -532,6 +541,8 @@ GMainWindow::GMainWindow(std::unique_ptr config_, bool has_broken_vulk } Settings::values.current_user = static_cast(selected_user); + + user_flag_cmd_line = true; continue; } @@ -1942,7 +1953,7 @@ void GMainWindow::BootGame(const QString& filename, u64 program_id, std::size_t Settings::LogSettings(); - if (UISettings::values.select_user_on_boot) { + if (UISettings::values.select_user_on_boot && !user_flag_cmd_line) { const Core::Frontend::ProfileSelectParameters parameters{ .mode = Service::AM::Applets::UiMode::UserSelector, .invalid_uid_list = {}, @@ -1954,6 +1965,11 @@ void GMainWindow::BootGame(const QString& filename, u64 program_id, std::size_t } } + // If the user specifies -u (successfully) on the cmd line, don't prompt for a user on first + // game startup only. If the user stops emulation and starts a new one, go back to the expected + // behavior of asking. + user_flag_cmd_line = false; + if (!LoadROM(filename, program_id, program_index, launch_type)) { return; } diff --git a/src/yuzu/main.h b/src/yuzu/main.h index 366e806d5..f3276da64 100644 --- a/src/yuzu/main.h +++ b/src/yuzu/main.h @@ -523,6 +523,8 @@ private: std::unique_ptr emu_thread; // The path to the game currently running QString current_game_path; + // Whether a user was set on the command line (skips UserSelector if it's forced to show up) + bool user_flag_cmd_line = false; bool auto_paused = false; bool auto_muted = false; -- cgit v1.2.3 From 6536d29c61d08c1225d8c229632fd6c5ccb07933 Mon Sep 17 00:00:00 2001 From: Andrew Pilley Date: Wed, 17 Jan 2024 18:14:05 -0800 Subject: Update based on feedback --- src/core/hle/service/acc/profile_manager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/hle/service/acc/profile_manager.cpp b/src/core/hle/service/acc/profile_manager.cpp index aff97b999..29a10ad13 100644 --- a/src/core/hle/service/acc/profile_manager.cpp +++ b/src/core/hle/service/acc/profile_manager.cpp @@ -169,10 +169,10 @@ std::optional ProfileManager::GetUserIndex(const ProfileInfo& user) std::optional ProfileManager::GetUserIndex(const std::string& username) const { const auto iter = std::find_if(profiles.begin(), profiles.end(), [&username](const ProfileInfo& p) { - const std::string pusername = Common::StringFromFixedZeroTerminatedBuffer( + const std::string profile_username = Common::StringFromFixedZeroTerminatedBuffer( reinterpret_cast(p.username.data()), p.username.size()); - return username.compare(pusername) == 0; + return username.compare(profile_username) == 0; }); if (iter == profiles.end()) { return std::nullopt; -- cgit v1.2.3