mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Allow client to specify EXE file and args to set as default handler

Browse source 
* Optional path param to setAsDefaultProtocolClient
* Optional args param to setAsDefaultProtocolClient
This commit is contained in:
Samuel Attard 2016-08-16 15:35:20 +10:00
parent 420f756c47
commit e5daf63b0e
No known key found for this signature in database
GPG key ID: 273DC1869D8F13EF
4 changed files with 55 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

6
atom/browser/browser.h
View file

@ -76,13 +76,13 @@ class Browser : public WindowListObserver {
void SetAppUserModelID(const base::string16& name); void SetAppUserModelID(const base::string16& name);
// Remove the default protocol handler registry key // Remove the default protocol handler registry key
bool RemoveAsDefaultProtocolClient(const std::string& protocol); bool RemoveAsDefaultProtocolClient(const std::string& protocol, mate::Arguments* args);
// Set as default handler for a protocol. // Set as default handler for a protocol.
bool SetAsDefaultProtocolClient(const std::string& protocol); bool SetAsDefaultProtocolClient(const std::string& protocol, mate::Arguments* args);
// Query the current state of default handler for a protocol. // Query the current state of default handler for a protocol.
bool IsDefaultProtocolClient(const std::string& protocol); bool IsDefaultProtocolClient(const std::string& protocol, mate::Arguments* args);
// Set/Get the badge count. // Set/Get the badge count.
bool SetBadgeCount(int count); bool SetBadgeCount(int count);

6
atom/browser/browser_linux.cc
View file

@ -35,15 +35,15 @@ void Browser::ClearRecentDocuments() {
void Browser::SetAppUserModelID(const base::string16& name) { void Browser::SetAppUserModelID(const base::string16& name) {
} }
bool Browser::RemoveAsDefaultProtocolClient(const std::string& protocol) { bool Browser::RemoveAsDefaultProtocolClient(const std::string& protocol, mate::Arguments* args) {
return false; return false;
} }
bool Browser::SetAsDefaultProtocolClient(const std::string& protocol) { bool Browser::SetAsDefaultProtocolClient(const std::string& protocol, mate::Arguments* args) {
return false; return false;
} }
bool Browser::IsDefaultProtocolClient(const std::string& protocol) { bool Browser::IsDefaultProtocolClient(const std::string& protocol, mate::Arguments* args) {
return false; return false;
} }

6
atom/browser/browser_mac.mm
View file

@ -46,7 +46,7 @@ void Browser::ClearRecentDocuments() {
[[NSDocumentController sharedDocumentController] clearRecentDocuments:nil]; [[NSDocumentController sharedDocumentController] clearRecentDocuments:nil];
} }
bool Browser::RemoveAsDefaultProtocolClient(const std::string& protocol) { bool Browser::RemoveAsDefaultProtocolClient(const std::string& protocol, mate::Arguments* args) {
NSString* identifier = [base::mac::MainBundle() bundleIdentifier]; NSString* identifier = [base::mac::MainBundle() bundleIdentifier];
if (!identifier) if (!identifier)
return false; return false;
@ -74,7 +74,7 @@ bool Browser::RemoveAsDefaultProtocolClient(const std::string& protocol) {
return return_code == noErr; return return_code == noErr;
} }
bool Browser::SetAsDefaultProtocolClient(const std::string& protocol) { bool Browser::SetAsDefaultProtocolClient(const std::string& protocol, mate::Arguments* args) {
if (protocol.empty()) if (protocol.empty())
return false; return false;
@ -89,7 +89,7 @@ bool Browser::SetAsDefaultProtocolClient(const std::string& protocol) {
return return_code == noErr; return return_code == noErr;
} }
bool Browser::IsDefaultProtocolClient(const std::string& protocol) { bool Browser::IsDefaultProtocolClient(const std::string& protocol, mate::Arguments* args) {
if (protocol.empty()) if (protocol.empty())
return false; return false;

69
atom/browser/browser_win.cc
View file

@ -125,16 +125,47 @@ bool Browser::SetUserTasks(const std::vector<UserTask>& tasks) {
return SUCCEEDED(destinations->CommitList()); return SUCCEEDED(destinations->CommitList());
} }
bool Browser::RemoveAsDefaultProtocolClient(const std::string& protocol) { std::wstring protocolLaunchPath(std::string protocol, mate::Arguments* args) {
if (protocol.empty()) // Read in optional exe path arg
return false; std::wstring exePath;
std::string rawExePath;
base::FilePath path; base::FilePath path;
if (!PathService::Get(base::FILE_EXE, &path)) {
LOG(ERROR) << "Error getting app exe path"; if (!args->GetNext(&rawExePath)) {
return false; if (!PathService::Get(base::FILE_EXE, &path)) {
LOG(ERROR) << "Error getting app exe path";
return L"";
}
// Executable Path
exePath = path.value();
} else {
exePath.assign(rawExePath.begin(), rawExePath.end());
} }
// Read in optional args arg
std::vector<std::string> launchArgs;
args->GetNext(&launchArgs);
std::wstring exe = L"\"" + exePath + L"\" ";
// Parse launch args into a string of space spearated args
if (launchArgs.size() != 0) {
std::string launchArgString = "";
for (std::string launchArg : launchArgs) {
launchArgString = launchArgString + launchArg + " ";
}
std::wstring wLaunchArgString;
wLaunchArgString.assign(launchArgString.begin(), launchArgString.end());
exe = exe + L"\"" + wLaunchArgString + L"\"";
}
return exe + L"\"%1\"";
}
bool Browser::RemoveAsDefaultProtocolClient(const std::string& protocol, mate::Arguments* args) {
if (protocol.empty())
return false;
// Main Registry Key // Main Registry Key
HKEY root = HKEY_CURRENT_USER; HKEY root = HKEY_CURRENT_USER;
std::string keyPathStr = "Software\\Classes\\" + protocol; std::string keyPathStr = "Software\\Classes\\" + protocol;
@ -159,8 +190,9 @@ bool Browser::RemoveAsDefaultProtocolClient(const std::string& protocol) {
// Default value not set, we can confirm that it is not set // Default value not set, we can confirm that it is not set
return true; return true;
std::wstring exePath(path.value()); std::wstring exe = protocolLaunchPath(protocol, args);
std::wstring exe = L"\"" + exePath + L"\" \"%1\""; if (exe == L"")
return false;
if (keyVal == exe) { if (keyVal == exe) {
// Let's kill the key // Let's kill the key
if (FAILED(key.DeleteKey(L"shell"))) if (FAILED(key.DeleteKey(L"shell")))
@ -172,7 +204,7 @@ bool Browser::RemoveAsDefaultProtocolClient(const std::string& protocol) {
} }
} }
bool Browser::SetAsDefaultProtocolClient(const std::string& protocol) { bool Browser::SetAsDefaultProtocolClient(const std::string& protocol, mate::Arguments* args) {
// HKEY_CLASSES_ROOT // HKEY_CLASSES_ROOT
// $PROTOCOL // $PROTOCOL
// (Default) = "URL:$NAME" // (Default) = "URL:$NAME"
@ -190,9 +222,8 @@ bool Browser::SetAsDefaultProtocolClient(const std::string& protocol) {
if (protocol.empty()) if (protocol.empty())
return false; return false;
base::FilePath path; std::wstring exe = protocolLaunchPath(protocol, args);
if (!PathService::Get(base::FILE_EXE, &path)) { if (exe == L"") {
LOG(ERROR) << "Error getting app exe path";
return false; return false;
} }
@ -207,10 +238,6 @@ bool Browser::SetAsDefaultProtocolClient(const std::string& protocol) {
std::string cmdPathStr = keyPathStr + "\\shell\\open\\command"; std::string cmdPathStr = keyPathStr + "\\shell\\open\\command";
std::wstring cmdPath = std::wstring(cmdPathStr.begin(), cmdPathStr.end()); std::wstring cmdPath = std::wstring(cmdPathStr.begin(), cmdPathStr.end());
// Executable Path
std::wstring exePath(path.value());
std::wstring exe = L"\"" + exePath + L"\" \"%1\"";
// Write information to registry // Write information to registry
base::win::RegKey key(root, keyPath.c_str(), KEY_ALL_ACCESS); base::win::RegKey key(root, keyPath.c_str(), KEY_ALL_ACCESS);
if (FAILED(key.WriteValue(L"URL Protocol", L"")) || if (FAILED(key.WriteValue(L"URL Protocol", L"")) ||
@ -224,15 +251,13 @@ bool Browser::SetAsDefaultProtocolClient(const std::string& protocol) {
return true; return true;
} }
bool Browser::IsDefaultProtocolClient(const std::string& protocol) { bool Browser::IsDefaultProtocolClient(const std::string& protocol, mate::Arguments* args) {
if (protocol.empty()) if (protocol.empty())
return false; return false;
base::FilePath path; std::wstring exe = protocolLaunchPath(protocol, args);
if (!PathService::Get(base::FILE_EXE, &path)) { if (exe == L"")
LOG(ERROR) << "Error getting app exe path";
return false; return false;
}
// Main Registry Key // Main Registry Key
HKEY root = HKEY_CURRENT_USER; HKEY root = HKEY_CURRENT_USER;
@ -258,8 +283,6 @@ bool Browser::IsDefaultProtocolClient(const std::string& protocol) {
// Default value not set, we can confirm that it is not set // Default value not set, we can confirm that it is not set
return false; return false;
std::wstring exePath(path.value());
std::wstring exe = L"\"" + exePath + L"\" \"%1\"";
if (keyVal == exe) { if (keyVal == exe) {
// Default value is the same as current file path // Default value is the same as current file path
return true; return true;