ParityShell::open Return result (#8377)

* start

* add error handling for winapi

* fix typo

* fix warnings and windows errors

* formatting

* Address review comments
This commit is contained in:
Niklas Adolfsson 2018-04-21 12:54:48 +02:00 committed by Afri Schoedon
parent c983efe895
commit b0cc44aabb
3 changed files with 46 additions and 13 deletions

View File

@ -231,7 +231,7 @@ fn take_spec_name_override() -> Option<String> {
#[cfg(windows)] #[cfg(windows)]
fn global_cleanup() { fn global_cleanup() {
// We need to cleanup all sockets before spawning another Parity process. This makes shure everything is cleaned up. // We need to cleanup all sockets before spawning another Parity process. This makes shure everything is cleaned up.
// The loop is required because of internal refernce counter for winsock dll. We don't know how many crates we use do // The loop is required because of internal reference counter for winsock dll. We don't know how many crates we use do
// initialize it. There's at least 2 now. // initialize it. There's at least 2 now.
for _ in 0.. 10 { for _ in 0.. 10 {
unsafe { ::winapi::um::winsock2::WSACleanup(); } unsafe { ::winapi::um::winsock2::WSACleanup(); }

View File

@ -145,7 +145,7 @@ pub fn open_ui(ws_conf: &rpc::WsConfiguration, ui_conf: &rpc::UiConfiguration, l
let token = signer::generate_token_and_url(ws_conf, ui_conf, logger_config)?; let token = signer::generate_token_and_url(ws_conf, ui_conf, logger_config)?;
// Open a browser // Open a browser
url::open(&token.url); url::open(&token.url).map_err(|e| format!("{}", e))?;
// Print a message // Print a message
println!("{}", token.message); println!("{}", token.message);
Ok(()) Ok(())
@ -157,10 +157,9 @@ pub fn open_dapp(dapps_conf: &dapps::Configuration, rpc_conf: &rpc::HttpConfigur
} }
let url = format!("http://{}:{}/{}/", rpc_conf.interface, rpc_conf.port, dapp); let url = format!("http://{}:{}/{}/", rpc_conf.interface, rpc_conf.port, dapp);
url::open(&url); url::open(&url).map_err(|e| format!("{}", e))?;
Ok(()) Ok(())
} }
// node info fetcher for the local store. // node info fetcher for the local store.
struct FullNodeInfo { struct FullNodeInfo {
miner: Option<Arc<Miner>>, // TODO: only TXQ needed, just use that after decoupling. miner: Option<Arc<Miner>>, // TODO: only TXQ needed, just use that after decoupling.

View File

@ -16,33 +16,67 @@
//! Cross-platform open url in default browser //! Cross-platform open url in default browser
use std;
use std::os::raw::c_int;
#[allow(unused)]
pub enum Error {
ProcessError(std::io::Error),
WindowsShellExecute(c_int),
}
impl From<std::io::Error> for Error {
fn from(err: std::io::Error) -> Self {
Error::ProcessError(err)
}
}
impl std::fmt::Display for Error {
fn fmt(&self, f: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> {
match *self {
Error::ProcessError(ref e) => write!(f, "{}", e),
Error::WindowsShellExecute(e) => write!(f, "WindowsShellExecute error: {}", e),
}
}
}
#[cfg(windows)] #[cfg(windows)]
pub fn open(url: &str) { pub fn open(url: &str) -> Result<(), Error> {
use std::ffi::CString; use std::ffi::CString;
use std::ptr; use std::ptr;
use winapi::um::shellapi::ShellExecuteA; use winapi::um::shellapi::ShellExecuteA;
use winapi::um::winuser::SW_SHOWNORMAL as Normal; use winapi::um::winuser::SW_SHOWNORMAL as Normal;
unsafe { const WINDOWS_SHELL_EXECUTE_SUCCESS: c_int = 32;
let h_instance = unsafe {
ShellExecuteA(ptr::null_mut(), ShellExecuteA(ptr::null_mut(),
CString::new("open").unwrap().as_ptr(), CString::new("open").unwrap().as_ptr(),
CString::new(url.to_owned().replace("\n", "%0A")).unwrap().as_ptr(), CString::new(url.to_owned().replace("\n", "%0A")).unwrap().as_ptr(),
ptr::null(), ptr::null(),
ptr::null(), ptr::null(),
Normal); Normal) as c_int
};
// https://msdn.microsoft.com/en-us/library/windows/desktop/bb762153(v=vs.85).aspx
// `ShellExecute` returns a value greater than 32 on success
if h_instance > WINDOWS_SHELL_EXECUTE_SUCCESS {
Ok(())
} else {
Err(Error::WindowsShellExecute(h_instance))
} }
} }
#[cfg(any(target_os="macos", target_os="freebsd"))] #[cfg(any(target_os="macos", target_os="freebsd"))]
pub fn open(url: &str) { pub fn open(url: &str) -> Result<(), Error> {
use std; let _ = std::process::Command::new("open").arg(url).spawn()?;
let _ = std::process::Command::new("open").arg(url).spawn(); Ok(())
} }
#[cfg(target_os="linux")] #[cfg(target_os="linux")]
pub fn open(url: &str) { pub fn open(url: &str) -> Result<(), Error> {
use std; let _ = std::process::Command::new("xdg-open").arg(url).spawn()?;
let _ = std::process::Command::new("xdg-open").arg(url).spawn(); Ok(())
} }
#[cfg(target_os="android")] #[cfg(target_os="android")]