izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tray-icon: execute as user (#1046)

Browse Source
This commit is contained in:
ReenigneArcher
2023-03-17 08:59:13 -04:00
committed by GitHub
parent 7e9b18458d
commit e20ca7a8f0
1 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/system_tray.cpp
View File

@@ -6,7 +6,6 @@
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
#define TRAY_ICON WEB_DIR "images/favicon.ico" #define TRAY_ICON WEB_DIR "images/favicon.ico"
#include <windows.h>
#elif defined(__linux__) || defined(linux) || defined(__linux) #elif defined(__linux__) || defined(linux) || defined(__linux)
#define TRAY_ICON "sunshine" #define TRAY_ICON "sunshine"
#elif defined(__APPLE__) || defined(__MACH__) #elif defined(__APPLE__) || defined(__MACH__)
@@ -20,14 +19,14 @@
// lib includes // lib includes
#include "tray/tray.h" #include "tray/tray.h"
#include <boost/filesystem.hpp>
#include <boost/process/environment.hpp>
// local includes // local includes
#include "confighttp.h" #include "confighttp.h"
#include "main.h" #include "main.h"
#include "platform/common.h"
// local includes #include "process.h"
//#include "platform/common.h"
//#include "process.h"
using namespace std::literals; using namespace std::literals;
@@ -39,12 +38,32 @@ namespace system_tray {
* @param url The url to open. * @param url The url to open.
*/ */
void open_url(const std::string &url) { void open_url(const std::string &url) {
boost::filesystem::path working_dir;
// if windows // if windows
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
ShellExecuteA(nullptr, "open", url.c_str(), nullptr, nullptr, SW_SHOWNORMAL); // set working dir to Windows system directory
working_dir = boost::filesystem::path(std::getenv("SystemRoot"));
// this isn't ideal as it briefly shows a command window
// but start a command built into cmd, not an executable
std::string cmd = R"(cmd /C "start )" + url + R"(")";
#else // if unix #else // if unix
system(("open "s + url).c_str()); // set working dir to user home directory
working_dir = boost::filesystem::path(std::getenv("HOME"));
std::string cmd = R"(open ")" + url + R"(")";
#endif #endif
boost::process::environment _env = boost::this_process::environment();
std::error_code ec;
auto child = platf::run_unprivileged(cmd, working_dir, _env, nullptr, ec, nullptr);
if(ec) {
BOOST_LOG(warning) << "Couldn't open url ["sv << url << "]: System: "sv << ec.message();
}
else {
BOOST_LOG(info) << "Opened url ["sv << url << "]"sv;
child.detach();
}
} }
/** /**