diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/reqwest/src/reqwesthttpsrc/imp.rs | 29 | ||||
| -rw-r--r-- | net/reqwest/tests/reqwesthttpsrc.rs | 9 | ||||
| -rw-r--r-- | net/rusoto/src/aws_transcriber/imp.rs | 6 | ||||
| -rw-r--r-- | net/rusoto/src/s3sink/imp.rs | 20 |
4 files changed, 30 insertions, 34 deletions
diff --git a/net/reqwest/src/reqwesthttpsrc/imp.rs b/net/reqwest/src/reqwesthttpsrc/imp.rs index 6565ea74b..699efa404 100644 --- a/net/reqwest/src/reqwesthttpsrc/imp.rs +++ b/net/reqwest/src/reqwesthttpsrc/imp.rs @@ -304,8 +304,8 @@ impl ReqwestHttpSrc { let mut append_header = |field: &HeaderName, value: &glib::Value| { let value = match value.transform::<String>() { - Some(value) => value, - None => { + Ok(value) => value, + Err(_) => { gst_warning!( CAT, obj: src, @@ -316,7 +316,7 @@ impl ReqwestHttpSrc { } }; - let value = value.get::<&str>().unwrap().unwrap_or(""); + let value = value.get::<Option<&str>>().unwrap().unwrap_or(""); let value = match HeaderValue::from_str(value) { Ok(value) => value, @@ -334,11 +334,11 @@ impl ReqwestHttpSrc { headers.append(field.clone(), value); }; - if let Ok(Some(values)) = value.get::<gst::Array>() { + if let Ok(values) = value.get::<gst::Array>() { for value in values.as_slice() { append_header(&field, value); } - } else if let Ok(Some(values)) = value.get::<gst::List>() { + } else if let Ok(values) = value.get::<gst::List>() { for value in values.as_slice() { append_header(&field, value); } @@ -673,7 +673,7 @@ impl ObjectImpl for ReqwestHttpSrc { ) { match pspec.name() { "location" => { - let location = value.get::<&str>().expect("type checked upstream"); + let location = value.get::<Option<&str>>().expect("type checked upstream"); if let Err(err) = self.set_location(obj, location) { gst_error!( CAT, @@ -686,13 +686,13 @@ impl ObjectImpl for ReqwestHttpSrc { "user-agent" => { let mut settings = self.settings.lock().unwrap(); let user_agent = value - .get() + .get::<Option<String>>() .expect("type checked upstream") .unwrap_or_else(|| DEFAULT_USER_AGENT.into()); settings.user_agent = user_agent; } "is-live" => { - let is_live = value.get_some().expect("type checked upstream"); + let is_live = value.get().expect("type checked upstream"); obj.set_live(is_live); } "user-id" => { @@ -707,12 +707,12 @@ impl ObjectImpl for ReqwestHttpSrc { } "timeout" => { let mut settings = self.settings.lock().unwrap(); - let timeout = value.get_some().expect("type checked upstream"); + let timeout = value.get().expect("type checked upstream"); settings.timeout = timeout; } "compress" => { let mut settings = self.settings.lock().unwrap(); - let compress = value.get_some().expect("type checked upstream"); + let compress = value.get().expect("type checked upstream"); settings.compress = compress; } "extra-headers" => { @@ -722,17 +722,16 @@ impl ObjectImpl for ReqwestHttpSrc { } "cookies" => { let mut settings = self.settings.lock().unwrap(); - let cookies = value.get().expect("type checked upstream"); - settings.cookies = cookies.unwrap_or_else(Vec::new); + settings.cookies = value.get::<Vec<String>>().expect("type checked upstream"); } "iradio-mode" => { let mut settings = self.settings.lock().unwrap(); - let iradio_mode = value.get_some().expect("type checked upstream"); + let iradio_mode = value.get().expect("type checked upstream"); settings.iradio_mode = iradio_mode; } "keep-alive" => { let mut settings = self.settings.lock().unwrap(); - let keep_alive = value.get_some().expect("type checked upstream"); + let keep_alive = value.get().expect("type checked upstream"); settings.keep_alive = keep_alive; } _ => unimplemented!(), @@ -831,7 +830,7 @@ impl ElementImpl for ReqwestHttpSrc { let mut external_client = self.external_client.lock().unwrap(); let s = context.structure(); *external_client = s - .get_some::<&ClientContext>("client") + .get::<&ClientContext>("client") .map(|c| Some(c.clone())) .unwrap_or(None); } diff --git a/net/reqwest/tests/reqwesthttpsrc.rs b/net/reqwest/tests/reqwesthttpsrc.rs index 2705f7d7d..a107ff5f4 100644 --- a/net/reqwest/tests/reqwesthttpsrc.rs +++ b/net/reqwest/tests/reqwesthttpsrc.rs @@ -655,14 +655,11 @@ fn test_iradio_mode() { let tag_event = srcpad.sticky_event(gst::EventType::Tag, 0).unwrap(); if let EventView::Tag(tags) = tag_event.view() { let tags = tags.tag(); - assert_eq!( - tags.get::<gst::tags::Organization>().unwrap().get(), - Some("Name") - ); - assert_eq!(tags.get::<gst::tags::Genre>().unwrap().get(), Some("Genre")); + assert_eq!(tags.get::<gst::tags::Organization>().unwrap().get(), "Name"); + assert_eq!(tags.get::<gst::tags::Genre>().unwrap().get(), "Genre"); assert_eq!( tags.get::<gst::tags::Location>().unwrap().get(), - Some("http://www.example.com"), + "http://www.example.com", ); } else { unreachable!(); diff --git a/net/rusoto/src/aws_transcriber/imp.rs b/net/rusoto/src/aws_transcriber/imp.rs index 2dc77897d..5ef5c8569 100644 --- a/net/rusoto/src/aws_transcriber/imp.rs +++ b/net/rusoto/src/aws_transcriber/imp.rs @@ -822,7 +822,7 @@ impl Transcriber { let in_caps = self.sinkpad.current_caps().unwrap(); let s = in_caps.structure(0).unwrap(); - let sample_rate: i32 = s.get("rate").unwrap().unwrap(); + let sample_rate = s.get::<i32>("rate").unwrap(); let settings = self.settings.lock().unwrap(); @@ -1075,11 +1075,11 @@ impl ObjectImpl for Transcriber { } "latency" => { let mut settings = self.settings.lock().unwrap(); - settings.latency_ms = value.get_some().expect("type checked upstream"); + settings.latency_ms = value.get().expect("type checked upstream"); } "use-partial-results" => { let mut settings = self.settings.lock().unwrap(); - settings.use_partial_results = value.get_some().expect("type checked upstream"); + settings.use_partial_results = value.get().expect("type checked upstream"); } "vocabulary-name" => { let mut settings = self.settings.lock().unwrap(); diff --git a/net/rusoto/src/s3sink/imp.rs b/net/rusoto/src/s3sink/imp.rs index 42b6f952d..55de4cef2 100644 --- a/net/rusoto/src/s3sink/imp.rs +++ b/net/rusoto/src/s3sink/imp.rs @@ -399,22 +399,22 @@ impl ObjectImpl for S3Sink { match pspec.name() { "bucket" => { - settings.bucket = value.get::<String>().expect("type checked upstream"); + settings.bucket = value + .get::<Option<String>>() + .expect("type checked upstream"); } "key" => { - settings.key = value.get::<String>().expect("type checked upstream"); + settings.key = value + .get::<Option<String>>() + .expect("type checked upstream"); } "region" => { - settings.region = Region::from_str( - &value - .get::<String>() - .expect("type checked upstream") - .expect("set_property(\"region\"): no value provided"), - ) - .unwrap(); + settings.region = + Region::from_str(&value.get::<String>().expect("type checked upstream")) + .unwrap(); } "part-size" => { - settings.buffer_size = value.get_some::<u64>().expect("type checked upstream"); + settings.buffer_size = value.get::<u64>().expect("type checked upstream"); } _ => unimplemented!(), } |