Some improvements (suggestions)
This commit is contained in:
parent
74961d4dfb
commit
26417da5d3
@ -254,11 +254,8 @@ fs::path GetExeDirectory() {
|
|||||||
WCHAR exe_path[MAX_PATH];
|
WCHAR exe_path[MAX_PATH];
|
||||||
|
|
||||||
if (SUCCEEDED(GetModuleFileNameW(nullptr, exe_path, MAX_PATH))) {
|
if (SUCCEEDED(GetModuleFileNameW(nullptr, exe_path, MAX_PATH))) {
|
||||||
std::wstring wideExePath(exe_path);
|
std::wstring wide_exe_path(exe_path);
|
||||||
|
return fs::path{Common::UTF16ToUTF8(wide_exe_path)}.parent_path();
|
||||||
// UTF-16 filesystem lib to UTF-8 is broken, so we need to convert to UTF-8 with the with
|
|
||||||
// the Windows library (Filesystem converts the strings literally).
|
|
||||||
return fs::path{Common::UTF16ToUTF8(wideExePath)}.parent_path();
|
|
||||||
} else {
|
} else {
|
||||||
LOG_ERROR(Common_Filesystem, "Failed to get the path to the executable of the current "
|
LOG_ERROR(Common_Filesystem, "Failed to get the path to the executable of the current "
|
||||||
"process");
|
"process");
|
||||||
@ -273,9 +270,6 @@ fs::path GetAppDataRoamingDirectory() {
|
|||||||
if (SUCCEEDED(SHGetKnownFolderPath(FOLDERID_RoamingAppData, 0, NULL, &appdata_roaming_path))) {
|
if (SUCCEEDED(SHGetKnownFolderPath(FOLDERID_RoamingAppData, 0, NULL, &appdata_roaming_path))) {
|
||||||
std::wstring wideAppdataRoamingPath(appdata_roaming_path);
|
std::wstring wideAppdataRoamingPath(appdata_roaming_path);
|
||||||
CoTaskMemFree(appdata_roaming_path);
|
CoTaskMemFree(appdata_roaming_path);
|
||||||
|
|
||||||
// UTF-16 filesystem lib to UTF-8 is broken, so we need to convert to UTF-8 with the with
|
|
||||||
// the Windows library (Filesystem converts the strings literally).
|
|
||||||
return fs::path{Common::UTF16ToUTF8(wideAppdataRoamingPath)};
|
return fs::path{Common::UTF16ToUTF8(wideAppdataRoamingPath)};
|
||||||
} else {
|
} else {
|
||||||
LOG_ERROR(Common_Filesystem, "Failed to get the path to the %APPDATA% directory");
|
LOG_ERROR(Common_Filesystem, "Failed to get the path to the %APPDATA% directory");
|
||||||
|
@ -2847,8 +2847,6 @@ bool GMainWindow::CreateShortcutLink(const std::filesystem::path& shortcut_path,
|
|||||||
const std::string& arguments, const std::string& categories,
|
const std::string& arguments, const std::string& categories,
|
||||||
const std::string& keywords, const std::string& name) {
|
const std::string& keywords, const std::string& name) {
|
||||||
|
|
||||||
bool shortcut_succeeded = false;
|
|
||||||
|
|
||||||
// Copy characters if they are not illegal in Windows filenames
|
// Copy characters if they are not illegal in Windows filenames
|
||||||
std::string filename = "";
|
std::string filename = "";
|
||||||
const std::string illegal_chars = "<>:\"/\\|?*";
|
const std::string illegal_chars = "<>:\"/\\|?*";
|
||||||
@ -2858,22 +2856,13 @@ bool GMainWindow::CreateShortcutLink(const std::filesystem::path& shortcut_path,
|
|||||||
|
|
||||||
if (filename.empty()) {
|
if (filename.empty()) {
|
||||||
LOG_ERROR(Frontend, "Filename is empty");
|
LOG_ERROR(Frontend, "Filename is empty");
|
||||||
shortcut_succeeded = false;
|
return false;
|
||||||
return shortcut_succeeded;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Replace characters that are illegal in Windows filenames
|
// Append .desktop or .lnk extension
|
||||||
std::filesystem::path shortcut_path_full = shortcut_path / filename;
|
std::filesystem::path shortcut_path_full = shortcut_path / filename;
|
||||||
|
|
||||||
#if defined(__linux__) || defined(__FreeBSD__)
|
#if defined(__linux__) || defined(__FreeBSD__) // Linux and FreeBSD
|
||||||
shortcut_path_full += ".desktop";
|
|
||||||
#elif defined(_WIN32)
|
|
||||||
shortcut_path_full += ".lnk";
|
|
||||||
#endif
|
|
||||||
|
|
||||||
LOG_ERROR(Frontend, "Create shortcut path: {}", shortcut_path_full.string());
|
|
||||||
|
|
||||||
#if defined(__linux__) || defined(__FreeBSD__)
|
|
||||||
// This desktop file template was writing referencing
|
// This desktop file template was writing referencing
|
||||||
// https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-1.0.html
|
// https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-1.0.html
|
||||||
try {
|
try {
|
||||||
@ -2881,9 +2870,13 @@ bool GMainWindow::CreateShortcutLink(const std::filesystem::path& shortcut_path,
|
|||||||
// Plus 'Type' is required
|
// Plus 'Type' is required
|
||||||
if (name.empty()) {
|
if (name.empty()) {
|
||||||
LOG_ERROR(Frontend, "Name is empty");
|
LOG_ERROR(Frontend, "Name is empty");
|
||||||
shortcut_succeeded = false;
|
return false;
|
||||||
return shortcut_succeeded;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Append .desktop extension
|
||||||
|
shortcut_path_full += ".desktop";
|
||||||
|
|
||||||
|
// Create shortcut file
|
||||||
std::ofstream shortcut_stream(shortcut_path_full, std::ios::binary | std::ios::trunc);
|
std::ofstream shortcut_stream(shortcut_path_full, std::ios::binary | std::ios::trunc);
|
||||||
|
|
||||||
if (shortcut_stream.is_open()) {
|
if (shortcut_stream.is_open()) {
|
||||||
@ -2923,78 +2916,82 @@ bool GMainWindow::CreateShortcutLink(const std::filesystem::path& shortcut_path,
|
|||||||
|
|
||||||
} else {
|
} else {
|
||||||
LOG_ERROR(Frontend, "Failed to create shortcut");
|
LOG_ERROR(Frontend, "Failed to create shortcut");
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
shortcut_stream.close();
|
shortcut_stream.close();
|
||||||
} catch (const std::exception& e) {
|
} catch (const std::exception& e) {
|
||||||
LOG_ERROR(Frontend, "Failed to create shortcut: {}", e.what());
|
LOG_ERROR(Frontend, "Failed to create shortcut: {}", e.what());
|
||||||
}
|
}
|
||||||
#elif defined(_WIN32)
|
return false;
|
||||||
// Initialize COM
|
#elif defined(_WIN32) // Windows
|
||||||
auto hr = CoInitialize(NULL);
|
HRESULT hr = CoInitialize(NULL);
|
||||||
if (FAILED(hr)) {
|
if (SUCCEEDED(hr)) {
|
||||||
return shortcut_succeeded;
|
|
||||||
}
|
|
||||||
|
|
||||||
IShellLinkW* ps1;
|
IShellLinkW* ps1 = nullptr;
|
||||||
|
IPersistFile* persist_file = nullptr;
|
||||||
|
|
||||||
auto hres = CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, IID_IShellLinkW,
|
SCOPE_EXIT({
|
||||||
(void**)&ps1);
|
if (persist_file != nullptr) {
|
||||||
|
persist_file->Release();
|
||||||
|
}
|
||||||
|
if (ps1 != nullptr) {
|
||||||
|
ps1->Release();
|
||||||
|
}
|
||||||
|
|
||||||
// The UTF-16 / UTF-8 conversion is broken in C++, it is necessary to perform these steps and
|
CoUninitialize();
|
||||||
// resort to the native Windows function.
|
});
|
||||||
std::wstring wshortcut_path_full = Common::UTF8ToUTF16W(shortcut_path_full.string());
|
|
||||||
std::wstring wicon_path = Common::UTF8ToUTF16W(icon_path.string());
|
|
||||||
std::wstring wcommand = Common::UTF8ToUTF16W(command.string());
|
|
||||||
std::wstring warguments = Common::UTF8ToUTF16W(arguments);
|
|
||||||
std::wstring wcomment = Common::UTF8ToUTF16W(comment);
|
|
||||||
|
|
||||||
if (SUCCEEDED(hres)) {
|
HRESULT hres = CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER,
|
||||||
if (std::filesystem::is_regular_file(command))
|
IID_IShellLinkW, (void**)&ps1);
|
||||||
hres = ps1->SetPath(wcommand.data());
|
|
||||||
|
|
||||||
if (SUCCEEDED(hres) && !arguments.empty())
|
std::wstring wshortcut_path_full = Common::UTF8ToUTF16W(shortcut_path_full.string());
|
||||||
hres = ps1->SetArguments(warguments.data());
|
std::wstring wicon_path = Common::UTF8ToUTF16W(icon_path.string());
|
||||||
|
std::wstring wcommand = Common::UTF8ToUTF16W(command.string());
|
||||||
if (SUCCEEDED(hres) && !comment.empty())
|
std::wstring warguments = Common::UTF8ToUTF16W(arguments);
|
||||||
hres = ps1->SetDescription(wcomment.data());
|
std::wstring wcomment = Common::UTF8ToUTF16W(comment);
|
||||||
|
|
||||||
if (SUCCEEDED(hres) && std::filesystem::is_regular_file(icon_path))
|
|
||||||
hres = ps1->SetIconLocation(wicon_path.data(), 0);
|
|
||||||
|
|
||||||
IPersistFile* pPersistFile = nullptr;
|
|
||||||
|
|
||||||
if (SUCCEEDED(hres)) {
|
if (SUCCEEDED(hres)) {
|
||||||
hres = ps1->QueryInterface(IID_IPersistFile, (void**)&pPersistFile);
|
if (std::filesystem::is_regular_file(command)) {
|
||||||
|
hres = ps1->SetPath(wcommand.data());
|
||||||
|
} else {
|
||||||
|
LOG_ERROR(Frontend, "Command is not a regular file");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
if (SUCCEEDED(hres) && pPersistFile != nullptr) {
|
if (SUCCEEDED(hres) && !arguments.empty()) {
|
||||||
hres = pPersistFile->Save(wshortcut_path_full.data(), TRUE);
|
hres = ps1->SetArguments(warguments.data());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (SUCCEEDED(hres) && !comment.empty()) {
|
||||||
|
hres = ps1->SetDescription(wcomment.data());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (SUCCEEDED(hres) && std::filesystem::is_regular_file(icon_path)) {
|
||||||
|
hres = ps1->SetIconLocation(wicon_path.data(), 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (SUCCEEDED(hres)) {
|
||||||
|
hres = ps1->QueryInterface(IID_IPersistFile, (void**)&persist_file);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (SUCCEEDED(hres) && persist_file != nullptr) {
|
||||||
|
// Append .lnk extension and save shortcut
|
||||||
|
shortcut_path_full += ".lnk";
|
||||||
|
hres = persist_file->Save(wshortcut_path_full.data(), TRUE);
|
||||||
if (SUCCEEDED(hres)) {
|
if (SUCCEEDED(hres)) {
|
||||||
shortcut_succeeded = true;
|
return true;
|
||||||
|
} else {
|
||||||
|
LOG_ERROR(Frontend, "Failed to create shortcut");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
LOG_ERROR(Frontend, "Failed to create CoCreateInstance");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pPersistFile != nullptr) {
|
|
||||||
pPersistFile->Release();
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
LOG_ERROR(Frontend, "Failed to create IShellLinkWinstance");
|
|
||||||
}
|
}
|
||||||
|
return false;
|
||||||
ps1->Release();
|
#else // Unsupported platform
|
||||||
CoUninitialize();
|
return false;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (shortcut_succeeded && std::filesystem::is_regular_file(shortcut_path_full)) {
|
|
||||||
LOG_ERROR(Frontend, "Shortcut created");
|
|
||||||
} else {
|
|
||||||
LOG_ERROR(Frontend, "Shortcut error, failed to create it");
|
|
||||||
shortcut_succeeded = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return shortcut_succeeded;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Messages in pre-defined message boxes for less code spaghetti
|
// Messages in pre-defined message boxes for less code spaghetti
|
||||||
@ -3049,31 +3046,31 @@ bool GMainWindow::CreateShortcutMessagesGUI(QWidget* parent, const int& imsg,
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool GMainWindow::MakeShortcutIcoPath(const u64 program_id, const std::string_view game_file_name,
|
bool GMainWindow::MakeShortcutIcoPath(const u64 program_id, const std::string_view game_file_name,
|
||||||
std::filesystem::path& icons_path) {
|
std::filesystem::path& out_icon_path) {
|
||||||
|
|
||||||
// Get path to Yuzu icons directory & icon extension
|
// Get path to Yuzu icons directory & icon extension
|
||||||
std::string ico_extension = "png";
|
std::string ico_extension = "png";
|
||||||
#if defined(_WIN32)
|
#if defined(_WIN32)
|
||||||
icons_path = Common::FS::GetYuzuPath(Common::FS::YuzuPath::ConfigDir) / "icons";
|
out_icon_path = Common::FS::GetYuzuPath(Common::FS::YuzuPath::ConfigDir) / "icons";
|
||||||
ico_extension = "ico";
|
ico_extension = "ico";
|
||||||
#elif defined(__linux__) || defined(__FreeBSD__)
|
#elif defined(__linux__) || defined(__FreeBSD__)
|
||||||
icons_path = Common::FS::GetDataDirectory("XDG_DATA_HOME") / "icons/hicolor/256x256";
|
out_icon_path = Common::FS::GetDataDirectory("XDG_DATA_HOME") / "icons/hicolor/256x256";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Create icons directory if it doesn't exist
|
// Create icons directory if it doesn't exist
|
||||||
if (!Common::FS::CreateDirs(icons_path)) {
|
if (!Common::FS::CreateDirs(out_icon_path)) {
|
||||||
QMessageBox::critical(
|
QMessageBox::critical(
|
||||||
this, tr("Create Icon"),
|
this, tr("Create Icon"),
|
||||||
tr("Cannot create icon file. Path \"%1\" does not exist and cannot be created.")
|
tr("Cannot create icon file. Path \"%1\" does not exist and cannot be created.")
|
||||||
.arg(QString::fromStdString(icons_path.string())),
|
.arg(QString::fromStdString(out_icon_path.string())),
|
||||||
QMessageBox::StandardButton::Ok);
|
QMessageBox::StandardButton::Ok);
|
||||||
icons_path = ""; // Reset path
|
out_icon_path = ""; // Reset path
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create icon file path
|
// Create icon file path
|
||||||
icons_path /= (program_id == 0 ? fmt::format("yuzu-{}.{}", game_file_name, ico_extension)
|
out_icon_path /= (program_id == 0 ? fmt::format("yuzu-{}.{}", game_file_name, ico_extension)
|
||||||
: fmt::format("yuzu-{:016X}.{}", program_id, ico_extension));
|
: fmt::format("yuzu-{:016X}.{}", program_id, ico_extension));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -3096,13 +3093,11 @@ void GMainWindow::OnGameListCreateShortcut(u64 program_id, const std::string& ga
|
|||||||
QStandardPaths::writableLocation(QStandardPaths::DesktopLocation).toStdString();
|
QStandardPaths::writableLocation(QStandardPaths::DesktopLocation).toStdString();
|
||||||
} else if (target == GameListShortcutTarget::Applications) {
|
} else if (target == GameListShortcutTarget::Applications) {
|
||||||
#if defined(_WIN32)
|
#if defined(_WIN32)
|
||||||
HANDLE hProcess = GetCurrentProcess();
|
|
||||||
if (!IsUserAnAdmin()) {
|
if (!IsUserAnAdmin()) {
|
||||||
GMainWindow::CreateShortcutMessagesGUI(this, GMainWindow::CREATE_SHORTCUT_MSGBOX_ADMIN,
|
GMainWindow::CreateShortcutMessagesGUI(this, GMainWindow::CREATE_SHORTCUT_MSGBOX_ADMIN,
|
||||||
"");
|
"");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
CloseHandle(hProcess);
|
|
||||||
#endif // _WIN32
|
#endif // _WIN32
|
||||||
shortcut_path =
|
shortcut_path =
|
||||||
QStandardPaths::writableLocation(QStandardPaths::ApplicationsLocation).toStdString();
|
QStandardPaths::writableLocation(QStandardPaths::ApplicationsLocation).toStdString();
|
||||||
@ -3110,9 +3105,8 @@ void GMainWindow::OnGameListCreateShortcut(u64 program_id, const std::string& ga
|
|||||||
|
|
||||||
// Icon path and title
|
// Icon path and title
|
||||||
std::string title;
|
std::string title;
|
||||||
std::filesystem::path icons_path;
|
std::filesystem::path out_icon_path;
|
||||||
if (std::filesystem::exists(shortcut_path)) {
|
if (std::filesystem::exists(shortcut_path)) {
|
||||||
|
|
||||||
// Get title from game file
|
// Get title from game file
|
||||||
const FileSys::PatchManager pm{program_id, system->GetFileSystemController(),
|
const FileSys::PatchManager pm{program_id, system->GetFileSystemController(),
|
||||||
system->GetContentProvider()};
|
system->GetContentProvider()};
|
||||||
@ -3139,8 +3133,8 @@ void GMainWindow::OnGameListCreateShortcut(u64 program_id, const std::string& ga
|
|||||||
QImage icon_data =
|
QImage icon_data =
|
||||||
QImage::fromData(icon_image_file.data(), static_cast<int>(icon_image_file.size()));
|
QImage::fromData(icon_image_file.data(), static_cast<int>(icon_image_file.size()));
|
||||||
|
|
||||||
if (GMainWindow::MakeShortcutIcoPath(program_id, title, icons_path)) {
|
if (GMainWindow::MakeShortcutIcoPath(program_id, title, out_icon_path)) {
|
||||||
if (!SaveIconToFile(icons_path, icon_data)) {
|
if (!SaveIconToFile(out_icon_path, icon_data)) {
|
||||||
LOG_ERROR(Frontend, "Could not write icon to file");
|
LOG_ERROR(Frontend, "Could not write icon to file");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -3178,8 +3172,8 @@ void GMainWindow::OnGameListCreateShortcut(u64 program_id, const std::string& ga
|
|||||||
const std::string categories = "Game;Emulator;Qt;";
|
const std::string categories = "Game;Emulator;Qt;";
|
||||||
const std::string keywords = "Switch;Nintendo;";
|
const std::string keywords = "Switch;Nintendo;";
|
||||||
|
|
||||||
if (GMainWindow::CreateShortcutLink(shortcut_path, comment, icons_path, yuzu_command, arguments,
|
if (GMainWindow::CreateShortcutLink(shortcut_path, comment, out_icon_path, yuzu_command,
|
||||||
categories, keywords, title)) {
|
arguments, categories, keywords, title)) {
|
||||||
GMainWindow::CreateShortcutMessagesGUI(this, GMainWindow::CREATE_SHORTCUT_MSGBOX_SUCCESS,
|
GMainWindow::CreateShortcutMessagesGUI(this, GMainWindow::CREATE_SHORTCUT_MSGBOX_SUCCESS,
|
||||||
title);
|
title);
|
||||||
return;
|
return;
|
||||||
|
@ -444,7 +444,7 @@ private:
|
|||||||
QString GetTasStateDescription() const;
|
QString GetTasStateDescription() const;
|
||||||
bool CreateShortcutMessagesGUI(QWidget* parent, const int& imsg, const std::string title);
|
bool CreateShortcutMessagesGUI(QWidget* parent, const int& imsg, const std::string title);
|
||||||
bool MakeShortcutIcoPath(const u64 program_id, const std::string_view game_file_name,
|
bool MakeShortcutIcoPath(const u64 program_id, const std::string_view game_file_name,
|
||||||
std::filesystem::path& icons_path);
|
std::filesystem::path& out_icon_path);
|
||||||
bool CreateShortcutLink(const std::filesystem::path& shortcut_path, const std::string& comment,
|
bool CreateShortcutLink(const std::filesystem::path& shortcut_path, const std::string& comment,
|
||||||
const std::filesystem::path& icon_path,
|
const std::filesystem::path& icon_path,
|
||||||
const std::filesystem::path& command, const std::string& arguments,
|
const std::filesystem::path& command, const std::string& arguments,
|
||||||
|
Loading…
Reference in New Issue
Block a user