mirror of
https://github.com/servo/servo.git
synced 2025-08-06 14:10:11 +01:00
Start switching net/ to use abstractions over channels to allow introducing non-channel communication in the future.
This commit is contained in:
parent
7fddf4aa13
commit
1644436557
13 changed files with 108 additions and 79 deletions
|
@ -2,7 +2,7 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use net_traits::{LoadData, Metadata, ProgressMsg};
|
||||
use net_traits::{LoadData, Metadata, ProgressMsg, ResponseSenders};
|
||||
use net_traits::ProgressMsg::{Payload, Done};
|
||||
use mime_classifier::MIMEClassifier;
|
||||
use resource_task::{start_sending, start_sending_sniffed};
|
||||
|
@ -44,9 +44,8 @@ fn read_all(reader: &mut File, progress_chan: &Sender<ProgressMsg>)
|
|||
}
|
||||
}
|
||||
|
||||
pub fn factory(load_data: LoadData, classifier: Arc<MIMEClassifier>) {
|
||||
pub fn factory(load_data: LoadData, senders: ResponseSenders, classifier: Arc<MIMEClassifier>) {
|
||||
let url = load_data.url;
|
||||
let start_chan = load_data.consumer;
|
||||
assert!(&*url.scheme == "file");
|
||||
spawn_named("file_loader".to_owned(), move || {
|
||||
let metadata = Metadata::default(url.clone());
|
||||
|
@ -58,24 +57,24 @@ pub fn factory(load_data: LoadData, classifier: Arc<MIMEClassifier>) {
|
|||
let res = read_block(reader);
|
||||
let (res, progress_chan) = match res {
|
||||
Ok(ReadStatus::Partial(buf)) => {
|
||||
let progress_chan = start_sending_sniffed(start_chan, metadata,
|
||||
let progress_chan = start_sending_sniffed(senders, metadata,
|
||||
classifier, &buf);
|
||||
progress_chan.send(Payload(buf)).unwrap();
|
||||
(read_all(reader, &progress_chan), progress_chan)
|
||||
}
|
||||
Ok(ReadStatus::EOF) | Err(_) =>
|
||||
(res.map(|_| ()), start_sending(start_chan, metadata)),
|
||||
(res.map(|_| ()), start_sending(senders, metadata)),
|
||||
};
|
||||
progress_chan.send(Done(res)).unwrap();
|
||||
}
|
||||
Err(e) => {
|
||||
let progress_chan = start_sending(start_chan, metadata);
|
||||
let progress_chan = start_sending(senders, metadata);
|
||||
progress_chan.send(Done(Err(e.description().to_string()))).unwrap();
|
||||
}
|
||||
}
|
||||
}
|
||||
Err(_) => {
|
||||
let progress_chan = start_sending(start_chan, metadata);
|
||||
let progress_chan = start_sending(senders, metadata);
|
||||
progress_chan.send(Done(Err(url.to_string()))).unwrap();
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue