Tim-Paik
/
neutauri
mirror of https://github.com/Tim-Paik/neutauri.git
1
0
Fork 0
Code Issues Releases Activity

fixed windows error

This commit is contained in:
Tim-Paik 2022-02-01 19:48:42 +08:00
parent 4df957fdf3
commit cab70b156b
Signed by: Tim-Paik
GPG Key ID: DC36A050DB42566D
2 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
neutauri_bundler/src/main.rs
View File

@ -2,8 +2,35 @@ use std::{fs, io::Write};
mod data;
#[cfg(windows)]
const RUNTIME_DATA: &[u8] = include_bytes!("../../target/release/neutauri_runtime.exe");
#[cfg(not(windows))]
const RUNTIME_DATA: &[u8] = include_bytes!("../../target/release/neutauri_runtime");
#[cfg(not(windows))]
fn options() -> fs::OpenOptions {
use std::os::unix::prelude::OpenOptionsExt;
let mut options = fs::OpenOptions::new();
options.write(true);
options.create(true);
options.truncate(true);
options.mode(0o755);
options
}
#[cfg(windows)]
fn options() -> fs::OpenOptions {
let mut options = fs::OpenOptions::new();
options.write(true);
options.create(true);
options.truncate(true);
options
}
fn main() -> wry::Result<()> {
let arg = std::env::args().nth(1).unwrap_or_else(|| "neutauri.toml".to_string());
let arg = std::env::args()
.nth(1)
.unwrap_or_else(|| "neutauri.toml".to_string());
if arg == "--help" || arg == "-h" {
println!("Usage: neutauri_bundler [neutauri.toml]");
return Ok(());
@ -24,16 +51,8 @@ fn main() -> wry::Result<()> {
return Ok(());
}
let data = data::Data::build_from_dir(source, config.window_attr()?, config.webview_attr()?)?;
let mut option = fs::OpenOptions::new();
let option = option.write(true).create(true).truncate(true);
let option = if cfg!(unix) {
std::os::unix::prelude::OpenOptionsExt::mode(option, 0o755)
} else {
option
};
let mut f = option.open(&target)?;
let runtime_data = include_bytes!("../../target/release/neutauri_runtime");
f.write_all(runtime_data)?;
let mut f = options().open(&target)?;
f.write_all(RUNTIME_DATA)?;
f.write_all(&data)?;
f.sync_all()?;
f.flush()?;

6
neutauri_runtime/src/main.rs
View File

@ -1,3 +1,5 @@
#![windows_subsystem = "windows"]
use wry::{
application::{
dpi::{PhysicalSize, Size},
@ -9,11 +11,7 @@ use wry::{
};
mod data;
#[cfg(windows)]
const PROTOCOL_PREFIX: &str = "https://{PROTOCOL}.";
#[cfg(not(windows))]
const PROTOCOL_PREFIX: &str = "{PROTOCOL}://";
const PROTOCOL: &str = "neu";
fn custom_protocol_uri<T: Into<String>>(protocol: T, path: T) -> String {