9cede0e3bd
- [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy --faster` does not report any errors - [x] These changes fix #10851, related to #11131 - [x] These changes do not require tests because the implementation is partial and can't work alone 1. Add new backend to `Blob` and a `BlobImpl` struct to abstract multiple backends 2. Rewrite most interfaces of `Blob` to accommodate the change 3. Change the `read` behaviour of `FileReader`, considering the case when blob is file-backed and not cached The design is still immature, welcome comments! - [x] I used `DOMRefCell` to cache the bytes in `BlobImpl`, is it sound? - [x] The interfaces (like `BlobImpl::get_bytes`) handle requests in a default-to-empty way when the inner `DataSlice` is not cached. It might be possible to handle this condition better. Source-Repo: https://github.com/servo/servo Source-Revision: 3d7b17681dc9c20358fda9efc72575feb968cc81
93 lines
3.2 KiB
Rust
93 lines
3.2 KiB
Rust
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* 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 dom::bindings::codegen::Bindings::FileBinding;
|
|
use dom::bindings::codegen::Bindings::FileBinding::FileMethods;
|
|
use dom::bindings::codegen::UnionTypes::BlobOrString;
|
|
use dom::bindings::error::{Error, Fallible};
|
|
use dom::bindings::global::GlobalRef;
|
|
use dom::bindings::js::Root;
|
|
use dom::bindings::reflector::reflect_dom_object;
|
|
use dom::bindings::str::DOMString;
|
|
use dom::blob::{Blob, BlobImpl, DataSlice, blob_parts_to_bytes};
|
|
use dom::window::Window;
|
|
use net_traits::filemanager_thread::SelectedFile;
|
|
use time;
|
|
|
|
#[dom_struct]
|
|
pub struct File {
|
|
blob: Blob,
|
|
name: DOMString,
|
|
modified: i64,
|
|
}
|
|
|
|
impl File {
|
|
fn new_inherited(blob_impl: BlobImpl, name: DOMString,
|
|
modified: Option<i64>, typeString: &str) -> File {
|
|
File {
|
|
blob: Blob::new_inherited(blob_impl, typeString),
|
|
name: name,
|
|
// https://w3c.github.io/FileAPI/#dfn-lastModified
|
|
modified: match modified {
|
|
Some(m) => m,
|
|
None => {
|
|
let time = time::get_time();
|
|
time.sec * 1000 + (time.nsec / 1000000) as i64
|
|
}
|
|
},
|
|
}
|
|
}
|
|
|
|
pub fn new(global: GlobalRef, blob_impl: BlobImpl,
|
|
name: DOMString, modified: Option<i64>, typeString: &str) -> Root<File> {
|
|
reflect_dom_object(box File::new_inherited(blob_impl, name, modified, typeString),
|
|
global,
|
|
FileBinding::Wrap)
|
|
}
|
|
|
|
// Construct from selected file message from file manager thread
|
|
pub fn new_from_selected(window: &Window, selected: SelectedFile) -> Root<File> {
|
|
let name = DOMString::from(selected.filename.to_str().expect("File name encoding error"));
|
|
|
|
let global = GlobalRef::Window(window);
|
|
|
|
File::new(global, BlobImpl::new_from_file(selected.id), name, Some(selected.modified as i64), "")
|
|
}
|
|
|
|
// https://w3c.github.io/FileAPI/#file-constructor
|
|
pub fn Constructor(global: GlobalRef,
|
|
fileBits: Vec<BlobOrString>,
|
|
filename: DOMString,
|
|
filePropertyBag: &FileBinding::FilePropertyBag)
|
|
-> Fallible<Root<File>> {
|
|
let bytes: Vec<u8> = match blob_parts_to_bytes(fileBits) {
|
|
Ok(bytes) => bytes,
|
|
Err(_) => return Err(Error::InvalidCharacter),
|
|
};
|
|
|
|
let ref blobPropertyBag = filePropertyBag.parent;
|
|
let typeString = blobPropertyBag.get_typestring();
|
|
|
|
let slice = DataSlice::from_bytes(bytes);
|
|
let modified = filePropertyBag.lastModified;
|
|
Ok(File::new(global, BlobImpl::new_from_slice(slice), filename, modified, &typeString))
|
|
}
|
|
|
|
pub fn name(&self) -> &DOMString {
|
|
&self.name
|
|
}
|
|
}
|
|
|
|
impl FileMethods for File {
|
|
// https://w3c.github.io/FileAPI/#dfn-name
|
|
fn Name(&self) -> DOMString {
|
|
self.name.clone()
|
|
}
|
|
|
|
// https://w3c.github.io/FileAPI/#dfn-lastModified
|
|
fn LastModified(&self) -> i64 {
|
|
self.modified
|
|
}
|
|
}
|