aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--components/net/Cargo.toml4
-rw-r--r--components/net/filemanager_thread.rs50
-rw-r--r--components/net_traits/filemanager_thread.rs2
-rw-r--r--components/script/Cargo.toml3
-rw-r--r--components/script/dom/htmlinputelement.rs25
-rw-r--r--components/script/lib.rs1
-rw-r--r--components/servo/Cargo.lock17
-rw-r--r--ports/cef/Cargo.lock17
-rw-r--r--tests/unit/net/filemanager_thread.rs4
9 files changed, 78 insertions, 45 deletions
diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml
index 013df85f3db..8eba3907a05 100644
--- a/components/net/Cargo.toml
+++ b/components/net/Cargo.toml
@@ -22,8 +22,8 @@ ipc-channel = {git = "https://github.com/servo/ipc-channel"}
lazy_static = "0.2"
log = "0.3.5"
matches = "0.1"
-mime = "0.2.0"
-mime_guess = "1.6.0"
+mime = "0.2.1"
+mime_guess = "1.8.0"
msg = {path = "../msg"}
net_traits = {path = "../net_traits"}
openssl = "0.7.6"
diff --git a/components/net/filemanager_thread.rs b/components/net/filemanager_thread.rs
index 6164867c794..9c1cb851dc4 100644
--- a/components/net/filemanager_thread.rs
+++ b/components/net/filemanager_thread.rs
@@ -25,37 +25,51 @@ pub trait FileManagerThreadFactory<UI: 'static + UIProvider> {
}
pub trait UIProvider where Self: Sync {
- fn open_file_dialog(&self, path: &str,
- filter: Option<(&[&str], &str)>) -> Option<String>;
+ fn open_file_dialog(&self, path: &str, patterns: Vec<FilterPattern>) -> Option<String>;
- fn open_file_dialog_multi(&self, path: &str,
- filter: Option<(&[&str], &str)>) -> Option<Vec<String>>;
+ fn open_file_dialog_multi(&self, path: &str, patterns: Vec<FilterPattern>) -> Option<Vec<String>>;
}
pub struct TFDProvider;
impl UIProvider for TFDProvider {
#[cfg(any(target_os = "macos", target_os = "linux"))]
- fn open_file_dialog(&self, path: &str,
- filter: Option<(&[&str], &str)>) -> Option<String> {
- tinyfiledialogs::open_file_dialog("Pick a file", path, filter)
+ fn open_file_dialog(&self, path: &str, patterns: Vec<FilterPattern>) -> Option<String> {
+ let mut filter = vec![];
+ for p in patterns {
+ let s = "*.".to_string() + &p.0;
+ filter.push(s)
+ }
+
+ let filter_ref = &(filter.iter().map(|s| s.as_str()).collect::<Vec<&str>>()[..]);
+
+ let filter_opt = if filter.len() > 0 { Some((filter_ref, "")) } else { None };
+
+ tinyfiledialogs::open_file_dialog("Pick a file", path, filter_opt)
}
#[cfg(any(target_os = "macos", target_os = "linux"))]
- fn open_file_dialog_multi(&self, path: &str,
- filter: Option<(&[&str], &str)>) -> Option<Vec<String>> {
- tinyfiledialogs::open_file_dialog_multi("Pick files", path, filter)
+ fn open_file_dialog_multi(&self, path: &str, patterns: Vec<FilterPattern>) -> Option<Vec<String>> {
+ let mut filter = vec![];
+ for p in patterns {
+ let s = "*.".to_string() + &p.0;
+ filter.push(s)
+ }
+
+ let filter_ref = &(filter.iter().map(|s| s.as_str()).collect::<Vec<&str>>()[..]);
+
+ let filter_opt = if filter.len() > 0 { Some((filter_ref, "")) } else { None };
+
+ tinyfiledialogs::open_file_dialog_multi("Pick files", path, filter_opt)
}
#[cfg(not(any(target_os = "macos", target_os = "linux")))]
- fn open_file_dialog(&self, _path: &str,
- _filter: Option<(&[&str], &str)>) -> Option<String> {
+ fn open_file_dialog(&self, path: &str, patterns: Vec<FilterPattern>) -> Option<String> {
None
}
#[cfg(not(any(target_os = "macos", target_os = "linux")))]
- fn open_file_dialog_multi(&self, _path: &str,
- _filter: Option<(&[&str], &str)>) -> Option<Vec<String>> {
+ fn open_file_dialog_multi(&self, path: &str, patterns: Vec<FilterPattern>) -> Option<Vec<String>> {
None
}
}
@@ -116,9 +130,9 @@ impl<UI: 'static + UIProvider> FileManager<UI> {
}
}
- fn select_file(&mut self, _filter: Vec<FilterPattern>,
+ fn select_file(&mut self, patterns: Vec<FilterPattern>,
sender: IpcSender<FileManagerResult<SelectedFile>>) {
- match self.ui.open_file_dialog("", None) {
+ match self.ui.open_file_dialog("", patterns) {
Some(s) => {
let selected_path = Path::new(&s);
@@ -134,9 +148,9 @@ impl<UI: 'static + UIProvider> FileManager<UI> {
}
}
- fn select_files(&mut self, _filter: Vec<FilterPattern>,
+ fn select_files(&mut self, patterns: Vec<FilterPattern>,
sender: IpcSender<FileManagerResult<Vec<SelectedFile>>>) {
- match self.ui.open_file_dialog_multi("", None) {
+ match self.ui.open_file_dialog_multi("", patterns) {
Some(v) => {
let mut selected_paths = vec![];
diff --git a/components/net_traits/filemanager_thread.rs b/components/net_traits/filemanager_thread.rs
index e4d0cb591f2..1650853bf15 100644
--- a/components/net_traits/filemanager_thread.rs
+++ b/components/net_traits/filemanager_thread.rs
@@ -19,6 +19,8 @@ pub struct SelectedFile {
pub type_string: String,
}
+/// Filter for file selection
+/// the content is expected to be extension (e.g, "doc", without the prefixing ".")
#[derive(Clone, Debug, Deserialize, Serialize)]
pub struct FilterPattern(pub String);
diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
index 911f1b9cc67..a9daf1a2adf 100644
--- a/components/script/Cargo.toml
+++ b/components/script/Cargo.toml
@@ -37,7 +37,8 @@ ipc-channel = {git = "https://github.com/servo/ipc-channel"}
js = {git = "https://github.com/servo/rust-mozjs"}
libc = "0.2"
log = "0.3.5"
-mime = "0.2.0"
+mime = "0.2.1"
+mime_guess = "1.8.0"
msg = {path = "../msg"}
net_traits = {path = "../net_traits"}
num-traits = "0.1.32"
diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/htmlinputelement.rs
index 561ccc647f2..71edf5c7abb 100644
--- a/components/script/dom/htmlinputelement.rs
+++ b/components/script/dom/htmlinputelement.rs
@@ -32,6 +32,7 @@ use dom::nodelist::NodeList;
use dom::validation::Validatable;
use dom::virtualmethods::VirtualMethods;
use ipc_channel::ipc::{self, IpcSender};
+use mime_guess;
use net_traits::IpcSend;
use net_traits::filemanager_thread::{FileManagerThreadMsg, FilterPattern};
use script_traits::ScriptMsg as ConstellationMsg;
@@ -44,6 +45,7 @@ use style::element_state::*;
use textinput::KeyReaction::{DispatchInput, Nothing, RedrawSelection, TriggerDefaultAction};
use textinput::Lines::Single;
use textinput::{TextInput, SelectionDirection};
+use util::str::split_commas;
const DEFAULT_SUBMIT_VALUE: &'static str = "Submit";
const DEFAULT_RESET_VALUE: &'static str = "Reset";
@@ -1140,7 +1142,7 @@ impl Activatable for HTMLInputElement {
let mut files: Vec<Root<File>> = vec![];
let mut error = None;
- let filter = filter_from_accept(self.Accept());
+ let filter = filter_from_accept(&self.Accept());
if self.Multiple() {
let (chan, recv) = ipc::channel().expect("Error initializing channel");
@@ -1231,9 +1233,20 @@ impl Activatable for HTMLInputElement {
}
}
-fn filter_from_accept(_s: DOMString) -> Vec<FilterPattern> {
- /// TODO: it means not pattern restriction now
- /// Blocked by https://github.com/cybergeek94/mime_guess/issues/19
- vec![]
-}
+// https://html.spec.whatwg.org/multipage/#attr-input-accept
+fn filter_from_accept(s: &DOMString) -> Vec<FilterPattern> {
+ let mut filter = vec![];
+ for p in split_commas(s) {
+ if let Some('.') = p.chars().nth(0) {
+ filter.push(FilterPattern(p[1..].to_string()));
+ } else {
+ if let Some(exts) = mime_guess::get_mime_extensions_str(p) {
+ for ext in exts {
+ filter.push(FilterPattern(ext.to_string()));
+ }
+ }
+ }
+ }
+ filter
+}
diff --git a/components/script/lib.rs b/components/script/lib.rs
index 307376854ca..208e48811f6 100644
--- a/components/script/lib.rs
+++ b/components/script/lib.rs
@@ -55,6 +55,7 @@ extern crate libc;
extern crate log;
#[macro_use]
extern crate mime;
+extern crate mime_guess;
extern crate msg;
extern crate net_traits;
extern crate num_traits;
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index caba1fc1beb..3139d73870e 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -770,7 +770,7 @@ dependencies = [
"lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
"net_traits 0.0.1",
"plugins 0.0.1",
@@ -981,7 +981,7 @@ dependencies = [
"httparse 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"num_cpus 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
"openssl 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)",
"openssl-verify 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1303,7 +1303,7 @@ dependencies = [
[[package]]
name = "mime"
-version = "0.2.0"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1312,10 +1312,10 @@ dependencies = [
[[package]]
name = "mime_guess"
-version = "1.6.1"
+version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"phf 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)",
"phf_codegen 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)",
"unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1377,8 +1377,8 @@ dependencies = [
"lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
"matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime_guess 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime_guess 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
"net_traits 0.0.1",
"openssl 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1891,7 +1891,8 @@ dependencies = [
"js 0.1.3 (git+https://github.com/servo/rust-mozjs)",
"libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime_guess 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
"net_traits 0.0.1",
"num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index 69af9dcbedf..b92f6724a90 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -692,7 +692,7 @@ dependencies = [
"lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
"net_traits 0.0.1",
"plugins 0.0.1",
@@ -894,7 +894,7 @@ dependencies = [
"httparse 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"num_cpus 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
"openssl 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)",
"openssl-verify 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1209,7 +1209,7 @@ dependencies = [
[[package]]
name = "mime"
-version = "0.2.0"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1218,10 +1218,10 @@ dependencies = [
[[package]]
name = "mime_guess"
-version = "1.6.1"
+version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"phf 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)",
"phf_codegen 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)",
"unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1283,8 +1283,8 @@ dependencies = [
"lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
"matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime_guess 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime_guess 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
"net_traits 0.0.1",
"openssl 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1749,7 +1749,8 @@ dependencies = [
"js 0.1.3 (git+https://github.com/servo/rust-mozjs)",
"libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime_guess 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
"net_traits 0.0.1",
"num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/tests/unit/net/filemanager_thread.rs b/tests/unit/net/filemanager_thread.rs
index 43cda6b8244..d5a2a1530b1 100644
--- a/tests/unit/net/filemanager_thread.rs
+++ b/tests/unit/net/filemanager_thread.rs
@@ -14,11 +14,11 @@ const TEST_PROVIDER: &'static TestProvider = &TestProvider;
struct TestProvider;
impl UIProvider for TestProvider {
- fn open_file_dialog(&self, _: &str, _: Option<(&[&str], &str)>) -> Option<String> {
+ fn open_file_dialog(&self, _path: &str, _patterns: Vec<FilterPattern>) -> Option<String> {
Some("test.txt".to_string())
}
- fn open_file_dialog_multi(&self, _: &str, _: Option<(&[&str], &str)>) -> Option<Vec<String>> {
+ fn open_file_dialog_multi(&self, _path: &str, _patterns: Vec<FilterPattern>) -> Option<Vec<String>> {
Some(vec!["test.txt".to_string()])
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-04 04:50:12 +0000