Mirrors/dioxus
2
0
Fork 0
mirror of https://github.com/DioxusLabs/dioxus synced 2025-02-17 06:08:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

log errors instead of panicing on io errors

Browse source
This commit is contained in:
Evan Almloff 2023-02-22 09:09:00 -06:00
parent 09703ef858
commit bfbda510fe
3 changed files with 251 additions and 329 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

531
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

22
Cargo.toml
View file

@ -76,23 +76,15 @@ ctrlc = "3.2.3"
# dioxus-rsx = "0.0.1"
gitignore = "1.0.7"
dioxus-rsx = { path = "../../dioxus/packages/rsx" }
dioxus-html = { path = "../../dioxus/packages/html", features = [
dioxus-rsx = { git = "https://github.com/DioxusLabs/dioxus" }
dioxus-html = { git = "https://github.com/DioxusLabs/dioxus", features = [
"hot-reload-context",
] }
dioxus-core = { path = "../../dioxus/packages/core", features = ["serialize"] }
dioxus-autofmt = { path = "../../dioxus/packages/autofmt" }
rsx-rosetta = { path = "../../dioxus/packages/rsx-rosetta" }
# dioxus-rsx = { git = "https://github.com/DioxusLabs/dioxus" }
# dioxus-html = { git = "https://github.com/DioxusLabs/dioxus", features = [
# "hot-reload-context",
# ] }
# dioxus-core = { git = "https://github.com/DioxusLabs/dioxus", features = [
# "serialize",
# ] }
# dioxus-autofmt = { git = "https://github.com/dioxuslabs/dioxus" }
# rsx-rosetta = { git = "https://github.com/dioxuslabs/dioxus" }
dioxus-core = { git = "https://github.com/DioxusLabs/dioxus", features = [
"serialize",
] }
dioxus-autofmt = { git = "https://github.com/dioxuslabs/dioxus" }
rsx-rosetta = { git = "https://github.com/dioxuslabs/dioxus" }
[[bin]]
path = "src/main.rs"

27
src/server/mod.rs
View file

@ -136,9 +136,11 @@ pub async fn startup_hot_reload(ip: String, port: u16, config: CrateConfig) -> R
let dist_path = config.out_dir.clone();
let (reload_tx, _) = broadcast::channel(100);
let file_map = Arc::new(Mutex::new(FileMap::<HtmlCtx>::new(
config.crate_dir.clone(),
)));
let FileMapBuildResult { map, errors } = FileMap::<HtmlCtx>::create(config.crate_dir.clone())?;
for err in errors {
log::error!("{}", err);
}
let file_map = Arc::new(Mutex::new(map));
let build_manager = Arc::new(BuildManager {
config: config.clone(),
reload_tx: reload_tx.clone(),
@ -185,10 +187,10 @@ pub async fn startup_hot_reload(ip: String, port: u16, config: CrateConfig) -> R
let mut map = file_map.lock().unwrap();
match map.update_rsx(&path, &crate_dir) {
UpdateResult::UpdatedRsx(msgs) => {
Ok(UpdateResult::UpdatedRsx(msgs)) => {
messages.extend(msgs);
}
UpdateResult::NeedsRebuild => {
Ok(UpdateResult::NeedsRebuild) => {
match build_manager.rebuild() {
Ok(res) => {
print_console_info(
@ -208,6 +210,9 @@ pub async fn startup_hot_reload(ip: String, port: u16, config: CrateConfig) -> R
}
return;
}
Err(err) => {
log::error!("{}", err);
}
}
}
for msg in messages {
@ -222,12 +227,12 @@ pub async fn startup_hot_reload(ip: String, port: u16, config: CrateConfig) -> R
.unwrap();
for sub_path in allow_watch_path {
watcher
.watch(
&config.crate_dir.join(sub_path),
notify::RecursiveMode::Recursive,
)
.unwrap();
if let Err(err) = watcher.watch(
&config.crate_dir.join(&sub_path),
notify::RecursiveMode::Recursive,
) {
log::error!("error watching {sub_path:?}: \n{}", err);
}
}
// start serve dev-server at 0.0.0.0:8080