1
0
mirror of https://github.com/Tim-Paik/neutauri.git synced 2024-10-12 23:29:41 +00:00
This commit is contained in:
2023-03-24 21:40:29 +08:00
parent 1bebb857ee
commit 167bee14e7
10 changed files with 483 additions and 469 deletions

View File

@ -6,12 +6,12 @@ version = "0.1.0"
[dependencies]
anyhow = "1.0"
gumdrop = "0.8"
inquire = "0.5"
inquire = "0.6"
neutauri_data = {path = "../neutauri_data", features = ["bundler"]}
new_mime_guess = "4.0"
serde = {version = "1.0", features = ["derive"]}
toml = "0.5"
wry = {version = "0.23", default-features = false, features = ["protocol", "tray", "transparent", "fullscreen", "devtools"]}
toml = "0.7"
wry = {version = "0.27", default-features = false, features = ["protocol", "tray", "transparent", "fullscreen", "devtools"]}
[target.'cfg(windows)'.dependencies]
rcedit = {git = "https://github.com/Tim-Paik/rcedit-rs.git", rev = "2805fca"}

View File

@ -83,8 +83,7 @@ pub(crate) fn bundle(config_path: String) -> anyhow::Result<()> {
target
};
if target.extension() == Some(std::ffi::OsStr::new("neu")) {
data::pack(config_path)?;
return Ok(());
return data::pack(config_path);
}
let data = data::Data::build_from_dir(source, config.window_attr()?, config.webview_attr()?)?;
let mut f = options().open(&target)?;

View File

@ -1,6 +1,6 @@
use anyhow::{Context, Result};
use neutauri_data as data;
use std::{fs, io::Read, path::PathBuf};
use std::{fs, io::Read, path::PathBuf, borrow::Cow};
use wry::{
application::{
dpi::{PhysicalSize, Size},
@ -168,7 +168,7 @@ pub(crate) fn dev(config_path: String) -> Result<()> {
wry::http::Response::builder()
.header("Content-Type", mime)
.header("Access-Control-Allow-Origin", "*")
.body(data)
.body(Cow::Owned(data))
.map_err(|e| e.into())
})
.with_ipc_handler(|window: &Window, req: String| {

View File

@ -54,7 +54,6 @@ fn print_help_and_exit(args: Args) {
eprintln!(
"Usage: {:?} [SUBCOMMAND] [OPTIONS]",
std::env::args()
.into_iter()
.next()
.unwrap_or_else(|| "neutauri_bundler".to_string())
);