Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes related to File API #10873

Merged
merged 1 commit into from May 2, 2016
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Fixes related to file input and File API

  • Loading branch information
izgzhen committed May 2, 2016
commit e0f3cdafe121055c2494197e2724ddd90a6e9479
@@ -66,6 +66,10 @@ impl DataSlice {
&self.bytes[self.bytes_start..self.bytes_end]
}

pub fn get_all_bytes(&self) -> Arc<Vec<u8>> {
self.bytes.clone()
}

pub fn size(&self) -> u64 {
(self.bytes_end as u64) - (self.bytes_start as u64)
}
@@ -18,14 +18,15 @@ pub struct File {
}

impl File {
fn new_inherited(_file_bits: &Blob, name: DOMString) -> File {
fn new_inherited(file_bits: &Blob, name: DOMString) -> File {
// TODO: FilePropertyBag
let mut bytes = Vec::new();
bytes.extend_from_slice(file_bits.get_data().get_all_bytes().as_slice());

File {
//TODO: get type from the underlying filesystem instead of "".to_string()
blob: Blob::new_inherited(Arc::new(Vec::new()), None, None, ""),
blob: Blob::new_inherited(Arc::new(bytes), None, None, ""),
name: name,
}
// XXXManishearth Once Blob is able to store data
// the relevant subfields of file_bits should be copied over
}

pub fn new(global: GlobalRef, file_bits: &Blob, name: DOMString) -> Root<File> {
@@ -40,7 +40,11 @@ impl FileListMethods for FileList {

// https://w3c.github.io/FileAPI/#dfn-item
fn Item(&self, index: u32) -> Option<Root<File>> {
Some(Root::from_ref(&*(self.list[index as usize])))
if (index as usize) < self.list.len() {
Some(Root::from_ref(&*(self.list[index as usize])))
} else {
None
}
}

// check-tidy: no specs after this line
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.