platform: fix build on Linux and update web-view

This commit is contained in:
liushuyu 2019-03-28 11:08:13 -06:00
parent f2af419b95
commit d236eeec0c
No known key found for this signature in database
GPG key ID: 23D1CE4534419437
9 changed files with 853 additions and 576 deletions

1311
Cargo.lock generated

File diff suppressed because it is too large Load diff

View file

@ -8,7 +8,7 @@ description = "An adaptable installer for your application."
build = "build.rs"
[dependencies]
web-view = {git = "https://github.com/Boscop/web-view.git", rev = "555f422d09cbb94e82a728d47e9e07ca91963f6e"}
web-view = "0.4.0"
hyper = "0.11.27"
futures = "*"

View file

@ -328,7 +328,8 @@ impl InstallerFramework {
x.to_str()
.log_expect("Unable to convert argument to String")
.to_string()
}).collect();
})
.collect();
{
let new_app_file = match File::create(&args_file) {

View file

@ -17,7 +17,8 @@ pub fn setup_logger(file_name: String) -> Result<(), fern::InitError> {
record.level(),
message
))
}).level(log::LevelFilter::Info)
})
.level(log::LevelFilter::Info)
.chain(io::stdout())
.chain(fern::log_file(file_name)?)
.apply()?;

View file

@ -40,7 +40,7 @@ extern crate log;
extern crate chrono;
extern crate clap;
#[cfg(windows)]
extern crate winapi;
mod archives;
@ -112,7 +112,8 @@ fn main() {
.value_name("TARGET")
.help("Launches the specified executable after checking for updates")
.takes_value(true),
).arg(
)
.arg(
Arg::with_name("swap")
.long("swap")
.value_name("TARGET")
@ -280,14 +281,15 @@ fn main() {
let resizable = false;
let debug = true;
run(
&format!("{} Installer", app_name),
Content::Url(http_address),
Some(size),
resizable,
debug,
|_| {},
|wv, msg, _| {
web_view::builder()
.title(&format!("{} Installer", app_name))
.content(Content::Url(http_address))
.size(size.0, size.1)
.resizable(resizable)
.debug(debug)
.user_data(())
.invoke_handler(|wv, msg| {
let mut cb_result = Ok(());
let command: CallbackType =
serde_json::from_str(msg).log_expect(&format!("Unable to parse string: {:?}", msg));
@ -304,15 +306,16 @@ fn main() {
};
#[cfg(not(windows))]
let result =
wv.dialog(Dialog::ChooseDirectory, "Select a install directory...", "");
let result = wv
.dialog()
.choose_directory("Select a install directory...", "");
if !result.is_empty() {
let result = serde_json::to_string(&result)
if result.is_ok() {
let result = serde_json::to_string(&result.ok())
.log_expect("Unable to serialize response");
let command = format!("{}({});", callback_name, result);
debug!("Injecting response: {}", command);
wv.eval(&command);
cb_result = wv.eval(&command);
}
}
CallbackType::Log { msg, kind } => {
@ -326,7 +329,8 @@ fn main() {
log!(target: "liftinstall::frontend-js", kind, "{}", msg);
}
}
},
(),
);
cb_result
})
.run()
.expect("Unable to launch Web UI!");
}

View file

@ -3,8 +3,8 @@
/// Basic definition of some running process.
#[derive(Debug)]
pub struct Process {
pub pid : usize,
pub name : String
pub pid: usize,
pub name: String,
}
#[cfg(windows)]
@ -23,14 +23,13 @@ mod natives {
use std::process::Command;
use winapi::shared::minwindef::{DWORD, FALSE, MAX_PATH};
use winapi::um::processthreadsapi::OpenProcess;
use winapi::um::psapi::{
EnumProcessModulesEx, GetModuleFileNameExW, K32EnumProcesses, LIST_MODULES_ALL,
};
use winapi::um::winnt::{
HANDLE, PROCESS_QUERY_INFORMATION, PROCESS_TERMINATE, PROCESS_VM_READ,
};
use winapi::um::processthreadsapi::{OpenProcess};
use winapi::um::psapi::{
K32EnumProcesses,
EnumProcessModulesEx, GetModuleFileNameExW, LIST_MODULES_ALL,
};
extern "C" {
pub fn saveShortcut(
@ -149,9 +148,7 @@ mod natives {
let size = ::std::mem::size_of::<DWORD>() * process_ids.len();
unsafe {
if K32EnumProcesses(process_ids.as_mut_ptr(),
size as DWORD,
&mut cb_needed) == 0 {
if K32EnumProcesses(process_ids.as_mut_ptr(), size as DWORD, &mut cb_needed) == 0 {
return vec![];
}
}
@ -160,7 +157,7 @@ mod natives {
let mut processes = Vec::new();
for i in 0 .. nb_processes {
for i in 0..nb_processes {
let pid = process_ids[i as usize];
unsafe {
@ -169,20 +166,25 @@ mod natives {
let mut process_name = [0u16; MAX_PATH + 1];
let mut cb_needed = 0;
if EnumProcessModulesEx(process_handler,
if EnumProcessModulesEx(
process_handler,
&mut h_mod,
::std::mem::size_of::<DWORD>() as DWORD,
&mut cb_needed,
LIST_MODULES_ALL) != 0 {
GetModuleFileNameExW(process_handler,
LIST_MODULES_ALL,
) != 0
{
GetModuleFileNameExW(
process_handler,
h_mod,
process_name.as_mut_ptr(),
MAX_PATH as DWORD + 1);
MAX_PATH as DWORD + 1,
);
let mut pos = 0;
for x in process_name.iter() {
if *x == 0 {
break
break;
}
pos += 1;
}
@ -210,11 +212,11 @@ mod natives {
use logging::LoggingErrors;
pub fn create_shortcut(
name: &str,
description: &str,
target: &str,
args: &str,
working_dir: &str,
_name: &str,
_description: &str,
_target: &str,
_args: &str,
_working_dir: &str,
) -> Result<String, String> {
// TODO: no-op
warn!("create_shortcut is stubbed!");

View file

@ -62,7 +62,8 @@ impl WebServer {
Ok(WebService {
framework: framework.clone(),
})
}).log_expect("Failed to bind to port");
})
.log_expect("Failed to bind to port");
server.run().log_expect("Failed to run HTTP server");
});

View file

@ -41,7 +41,8 @@ impl ReleaseSource for GithubReleases {
.get(&format!(
"https://api.github.com/repos/{}/releases",
config.repo
)).header(USER_AGENT, "liftinstall (j-selby)")
))
.header(USER_AGENT, "liftinstall (j-selby)")
.send()
.map_err(|x| format!("Error while sending HTTP request: {:?}", x))?;
@ -87,14 +88,16 @@ impl ReleaseSource for GithubReleases {
let string = match asset["name"].as_str() {
Some(v) => v,
None => {
return Err("JSON payload missing information about release name".to_string())
return Err(
"JSON payload missing information about release name".to_string()
);
}
};
let url = match asset["browser_download_url"].as_str() {
Some(v) => v,
None => {
return Err("JSON payload missing information about release URL".to_string())
return Err("JSON payload missing information about release URL".to_string());
}
};

View file

@ -7,8 +7,8 @@ use tasks::TaskDependency;
use tasks::TaskMessage;
use tasks::TaskParamType;
use native::Process;
use native::get_process_names;
use native::Process;
use std::process;