Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Flatten implementation of net::file_loader::factory.

Browse source
This commit is contained in:
Corey Farwell 2016-04-15 09:11:43 -04:00
parent 6c5cfb738a
commit 50c6d937a5
1 changed files with 45 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

40
components/net/file_loader.rs
View file

@ -72,11 +72,26 @@ pub fn factory(load_data: LoadData,
cancel_listener: CancellationListener) { cancel_listener: CancellationListener) {
assert!(&*load_data.url.scheme == "file"); assert!(&*load_data.url.scheme == "file");
spawn_named("file_loader".to_owned(), move || { spawn_named("file_loader".to_owned(), move || {
let file_path: Result<PathBuf, ()> = load_data.url.to_file_path(); let file_path = match load_data.url.to_file_path() {
match file_path { Ok(file_path) => file_path,
Ok(file_path) => { Err(_) => {
match File::open(&file_path) { send_error(load_data.url, "Could not parse path".to_owned(), senders);
Ok(ref mut reader) => { return;
},
};
let mut file = File::open(&file_path);
let reader = match file {
Ok(ref mut reader) => reader,
Err(_) => {
// this should be one of the three errors listed in
// http://doc.rust-lang.org/std/fs/struct.OpenOptions.html#method.open
// but, we'll go for a "file not found!"
let url = Url::parse("about:not-found").unwrap();
let load_data_404 = LoadData::new(load_data.context, url, None);
about_loader::factory(load_data_404, senders, classifier, cancel_listener);
return;
}
};
if cancel_listener.is_cancelled() { if cancel_listener.is_cancelled() {
if let Ok(progress_chan) = get_progress_chan(load_data, file_path, if let Ok(progress_chan) = get_progress_chan(load_data, file_path,
senders, classifier, &[]) { senders, classifier, &[]) {
@ -106,21 +121,6 @@ pub fn factory(load_data: LoadData,
Err(e) => { Err(e) => {
send_error(load_data.url, e, senders); send_error(load_data.url, e, senders);
} }
};
}
Err(_) => {
// this should be one of the three errors listed in
// http://doc.rust-lang.org/std/fs/struct.OpenOptions.html#method.open
// but, we'll go for a "file not found!"
let url = Url::parse("about:not-found").unwrap();
let load_data_404 = LoadData::new(load_data.context, url, None);
about_loader::factory(load_data_404, senders, classifier, cancel_listener)
}
}
}
Err(_) => {
send_error(load_data.url, "Could not parse path".to_owned(), senders);
}
} }
}); });
} }