Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 07:13:52 +01:00
Code Issues Projects Releases Packages Wiki Activity

Inform about unminify errors and store unmodified version if js-beautify fails

Browse source
This commit is contained in:
Fernando Jiménez Moreno 2017-04-12 11:43:07 +02:00
parent 3ad473755c
commit 11f227b4ff
1 changed files with 25 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

33
components/script/dom/htmlscriptelement.rs
View file

@ -461,38 +461,41 @@ impl HTMLScriptElement {
return; return;
} }
let process = Command::new("js-beautify") match Command::new("js-beautify")
.stdin(Stdio::piped()) .stdin(Stdio::piped())
.stdout(Stdio::piped()) .stdout(Stdio::piped())
.spawn() .spawn() {
.expect("Failed to execute js-beautify"); Err(_) => {
warn!("Failed to execute js-beautify. Will store unmodified script");
},
Ok(process) => {
let mut script_content = String::from(script.text.clone()); let mut script_content = String::from(script.text.clone());
let _ = process.stdin.unwrap().write_all(script_content.as_bytes()); let _ = process.stdin.unwrap().write_all(script_content.as_bytes());
script_content.clear(); script_content.clear();
let _ = process.stdout.unwrap().read_to_string(&mut script_content); let _ = process.stdout.unwrap().read_to_string(&mut script_content);
script.text = DOMString::from(script_content); script.text = DOMString::from(script_content);
},
}
let unminified_js_dir = PathBuf::from(window_from_node(self).unminified_js_dir().unwrap()); let path = PathBuf::from(window_from_node(self).unminified_js_dir().unwrap());
let path = if script.external { let path = if script.external {
// External script. // External script.
debug!("unminifying script {:?}", script.url); let path_parts = script.url.path_segments().unwrap();
let url = script.url.clone().into_string();
let path_parts = url.split("/").collect::<Vec<&str>>();
match path_parts.last() { match path_parts.last() {
Some(script_name) => unminified_js_dir.join(script_name), Some(script_name) => path.join(script_name),
None => unminified_js_dir.join(Uuid::new_v4().to_string()), None => path.join(Uuid::new_v4().to_string()),
} }
} else { } else {
// Inline script. // Inline script.
debug!("unminifying inline script for {:?}", script.url); path.join(Uuid::new_v4().to_string())
unminified_js_dir.join(Uuid::new_v4().to_string())
}; };
debug!("unminified script will be stored in {:?}", path); debug!("script will be stored in {:?}", path);
if let Ok(mut file) = File::create(&path) {
file.write_all(script.text.as_bytes()).unwrap(); match File::create(&path) {
Ok(mut file) => file.write_all(script.text.as_bytes()).unwrap(),
Err(why) => warn!("Could not store script {:?}", why),
} }
} }