Merge pull request #72 from Luro02/ci

Remove miri from ci

.github/workflows/rust.yml

@@ -1,36 +1,52 @@
-name: rust
-
-# Trigger the workflow on push or pull request
 on: [push, pull_request]
 
-jobs:
-    rustfmt:
-        name: rustfmt
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v2
-            - uses: actions-rs/toolchain@v1
-              with:
-                profile: minimal
-                toolchain: nightly
-                override: true
-                components: rustfmt
-            - uses: actions-rs/cargo@v1
-              with:
-                command: fmt
-                args: --all -- --check
+name: Continuous integration
 
-    clippy:
-        name: clippy
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v2
-            - uses: actions-rs/toolchain@v1
-              with:
-                profile: minimal
-                toolchain: nightly
-                override: true
-                components: clippy
-            - uses: actions-rs/cargo@v1
-              with:
-                command: clippy
+jobs:
+  check:
+    name: check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
+      - uses: Swatinem/rust-cache@v1
+      - uses: actions-rs/cargo@v1
+        with:
+          command: check
+
+  test:
+    name: test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
+      - uses: Swatinem/rust-cache@v1
+      - uses: actions-rs/cargo@v1
+        with:
+          command: test
+
+  fmt:
+    name: rustfmt
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          # rustfmt uses unstable features
+          toolchain: nightly
+          override: true
+      - run: rustup component add rustfmt
+      - uses: Swatinem/rust-cache@v1
+      - uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: --all -- --check

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "hls_m3u8"
-version = "0.4.0" # remember to update html_root_url
+version = "0.4.1" # remember to update html_root_url
 authors = ["Takeru Ohta <phjgt308@gmail.com>", "Luro02 <24826124+Luro02@users.noreply.github.com>"]
 description = "HLS m3u8 parser/generator"
 homepage = "https://github.com/sile/hls_m3u8"

src/attribute.rs

@@ -30,7 +30,8 @@ impl<'a> Iterator for AttributePairs<'a> {
             // NOTE: it is okay to add 1 to the index, because an `=` is exactly 1 byte.
             self.index = end + 1;
 
-            &self.string[start..end]
+            // NOTE: See https://github.com/sile/hls_m3u8/issues/64
+            self.string[start..end].trim()
         };
 
         let value = {
@@ -66,7 +67,8 @@ impl<'a> Iterator for AttributePairs<'a> {
             self.index += end;
             self.index -= start;
 
-            &self.string[start..end]
+            // NOTE: See https://github.com/sile/hls_m3u8/issues/64
+            self.string[start..end].trim()
         };
 
         Some((key, value))
@@ -190,7 +192,7 @@ mod test {
         assert_eq!((1, Some(1)), pairs.size_hint());
         assert_eq!(
             pairs.next(),
-            Some(("ध्वनि स्थिति और्४५० नीचे ", "देखने लाभो द्वारा करके(विशेष"))
+            Some(("ध्वनि स्थिति और्४५० नीचे", "देखने लाभो द्वारा करके(विशेष"))
         );
 
         assert_eq!((0, Some(0)), pairs.size_hint());

src/lib.rs

@@ -1,4 +1,4 @@
-#![doc(html_root_url = "https://docs.rs/hls_m3u8/0.4.0")]
+#![doc(html_root_url = "https://docs.rs/hls_m3u8/0.4.1")]
 #![forbid(unsafe_code)]
 #![warn(rust_2018_idioms)]
 #![warn(

src/master_playlist.rs

@@ -220,13 +220,9 @@ impl<'a> MasterPlaylist<'a> {
 
     /// Returns all streams, which have an audio group id.
     pub fn audio_streams(&self) -> impl Iterator<Item = &VariantStream<'a>> {
-        self.variant_streams.iter().filter(|stream| {
-            if let VariantStream::ExtXStreamInf { audio: Some(_), .. } = stream {
-                true
-            } else {
-                false
-            }
-        })
+        self.variant_streams
+            .iter()
+            .filter(|stream| matches!(stream, VariantStream::ExtXStreamInf { audio: Some(_), .. }))
     }
 
     /// Returns all streams, which have a video group id.
@@ -416,13 +412,11 @@ impl<'a> MasterPlaylistBuilder<'a> {
     }
 
     fn check_media_group<T: AsRef<str>>(&self, media_type: MediaType, group_id: T) -> bool {
-        if let Some(value) = &self.media {
+        self.media.as_ref().map_or(false, |value| {
             value.iter().any(|media| {
                 media.media_type == media_type && media.group_id().as_ref() == group_id.as_ref()
             })
-        } else {
-            false
-        }
+        })
     }
 }
 

src/media_playlist.rs

@@ -315,12 +315,11 @@ impl<'a> MediaPlaylistBuilder<'a> {
                     method, iv, format, ..
                 })) = key
                 {
-                    if *method == EncryptionMethod::Aes128 && *iv == InitializationVector::Missing {
-                        if format.is_none() {
-                            *iv = InitializationVector::Number(segment.number as u128);
-                        } else if let Some(KeyFormat::Identity) = format {
-                            *iv = InitializationVector::Number(segment.number as u128);
-                        }
+                    if *method == EncryptionMethod::Aes128
+                        && *iv == InitializationVector::Missing
+                        && (format.is_none() || &mut Some(KeyFormat::Identity) == format)
+                    {
+                        *iv = InitializationVector::Number(segment.number as u128);
                     }
                 }
             }
@@ -727,7 +726,7 @@ impl FromStr for MediaPlaylist<'static> {
     type Err = Error;
 
     fn from_str(input: &str) -> Result<Self, Self::Err> {
-        Ok(parse_media_playlist(input, &mut Self::builder())?.into_owned())
+        Ok(parse_media_playlist(input, &mut MediaPlaylist::builder())?.into_owned())
     }
 }
 

src/tags/master_playlist/session_data.rs

@@ -223,9 +223,9 @@ impl<'a> TryFrom<&'a str> for ExtXSessionData<'a> {
             if let Some(value) = session_value {
                 if uri.is_some() {
                     return Err(Error::custom("unexpected URI"));
-                } else {
-                    SessionData::Value(value)
                 }
+
+                SessionData::Value(value)
             } else if let Some(uri) = uri {
                 SessionData::Uri(uri)
             } else {

src/tags/master_playlist/variant_stream.rs

@@ -348,13 +348,7 @@ impl<'a> TryFrom<&'a str> for VariantStream<'a> {
     fn try_from(input: &'a str) -> Result<Self, Self::Error> {
         if let Ok(input) = tag(input, Self::PREFIX_EXTXIFRAME) {
             let uri = AttributePairs::new(input)
-                .find_map(|(key, value)| {
-                    if key == "URI" {
-                        Some(unquote(value))
-                    } else {
-                        None
-                    }
-                })
+                .find_map(|(key, value)| (key == "URI").then(|| unquote(value)))
                 .ok_or_else(|| Error::missing_value("URI"))?;
 
             Ok(Self::ExtXIFrame {
@@ -379,7 +373,7 @@ impl<'a> TryFrom<&'a str> for VariantStream<'a> {
                     "AUDIO" => audio = Some(unquote(value)),
                     "SUBTITLES" => subtitles = Some(unquote(value)),
                     "CLOSED-CAPTIONS" => {
-                        closed_captions = Some(ClosedCaptions::try_from(value).unwrap())
+                        closed_captions = Some(ClosedCaptions::try_from(value).unwrap());
                     }
                     _ => {}
                 }

src/tags/media_segment/date_range.rs

@@ -380,21 +380,21 @@ impl<'a> TryFrom<&'a str> for ExtXDateRange<'a> {
                 "START-DATE" => {
                     #[cfg(feature = "chrono")]
                     {
-                        start_date = Some(unquote(value).parse().map_err(Error::chrono)?)
+                        start_date = Some(unquote(value).parse().map_err(Error::chrono)?);
                     }
                     #[cfg(not(feature = "chrono"))]
                     {
-                        start_date = Some(unquote(value))
+                        start_date = Some(unquote(value));
                     }
                 }
                 "END-DATE" => {
                     #[cfg(feature = "chrono")]
                     {
-                        end_date = Some(unquote(value).parse().map_err(Error::chrono)?)
+                        end_date = Some(unquote(value).parse().map_err(Error::chrono)?);
                     }
                     #[cfg(not(feature = "chrono"))]
                     {
-                        end_date = Some(unquote(value))
+                        end_date = Some(unquote(value));
                     }
                 }
                 "DURATION" => {

src/types/byte_range.rs

@@ -354,11 +354,9 @@ impl_from_ranges![u64, u32, u16, u8, usize, i32];
 #[must_use]
 impl RangeBounds<usize> for ByteRange {
     fn start_bound(&self) -> Bound<&usize> {
-        if let Some(start) = &self.start {
-            Bound::Included(start)
-        } else {
-            Bound::Unbounded
-        }
+        self.start
+            .as_ref()
+            .map_or(Bound::Unbounded, Bound::Included)
     }
 
     #[inline]

src/types/float.rs

@@ -12,7 +12,7 @@ use crate::Error;
 /// [`NaN`]: core::f32::NAN
 /// [`INFINITY`]: core::f32::INFINITY
 /// [`NEG_INFINITY`]: core::f32::NEG_INFINITY
-#[derive(AsRef, Deref, Default, Debug, Copy, Clone, Display, PartialOrd)]
+#[derive(AsRef, Deref, Default, Debug, Copy, Clone, Display)]
 pub struct Float(f32);
 
 impl Float {
@@ -129,6 +129,11 @@ impl PartialEq<f32> for Float {
 // be soundly implemented.
 impl Eq for Float {}
 
+impl PartialOrd for Float {
+    #[inline]
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> { Some(self.cmp(other)) }
+}
+
 impl Ord for Float {
     #[inline]
     fn cmp(&self, other: &Self) -> Ordering {
@@ -177,7 +182,7 @@ impl ::core::hash::Hash for Float {
         } else {
             // I do not think it matters to differentiate between architectures, that use
             // big endian by default and those, that use little endian.
-            state.write(&self.to_be_bytes())
+            state.write(&self.to_be_bytes());
         }
     }
 }

src/types/in_stream_id.rs

@@ -19,8 +19,8 @@ use crate::types::ProtocolVersion;
 /// [`MediaPlaylist`]: crate::MediaPlaylist
 #[non_exhaustive]
 #[allow(missing_docs)]
-#[strum(serialize_all = "UPPERCASE")]
 #[derive(Ord, PartialOrd, Debug, Clone, Copy, PartialEq, Eq, Hash, Display, EnumString)]
+#[strum(serialize_all = "UPPERCASE")]
 pub enum InStreamId {
     Cc1,
     Cc2,

src/types/key_format_versions.rs

@@ -36,7 +36,7 @@ use crate::RequiredVersion;
 /// ```
 ///
 /// [`KeyFormat`]: crate::types::KeyFormat
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, Default)]
 pub struct KeyFormatVersions {
     // NOTE(Luro02): if the current array is not big enough one can easily increase
     //               the number of elements or change the type to something bigger,
@@ -295,7 +295,7 @@ impl Extend<u8> for KeyFormatVersions {
 
 impl<'a> Extend<&'a u8> for KeyFormatVersions {
     fn extend<I: IntoIterator<Item = &'a u8>>(&mut self, iter: I) {
-        <Self as Extend<u8>>::extend(self, iter.into_iter().copied())
+        <Self as Extend<u8>>::extend(self, iter.into_iter().copied());
     }
 }
 
@@ -346,17 +346,7 @@ impl FromIterator<u8> for KeyFormatVersions {
 
 impl<'a> FromIterator<&'a u8> for KeyFormatVersions {
     fn from_iter<I: IntoIterator<Item = &'a u8>>(iter: I) -> Self {
-        <Self as FromIterator<u8>>::from_iter(iter.into_iter().copied())
-    }
-}
-
-impl Default for KeyFormatVersions {
-    #[inline]
-    fn default() -> Self {
-        Self {
-            buffer: [0; 9],
-            len: 0,
-        }
+        iter.into_iter().copied().collect()
     }
 }
 
@@ -413,7 +403,7 @@ impl fmt::Display for KeyFormatVersions {
 }
 
 impl<T: AsRef<[usize]>> From<T> for KeyFormatVersions {
-    fn from(value: T) -> Self { Self::from_iter(value.as_ref().iter().map(|i| *i as u8)) }
+    fn from(value: T) -> Self { value.as_ref().iter().map(|i| *i as u8).collect() }
 }
 
 /// `Iterator` for [`KeyFormatVersions`].

src/types/stream_data.rs

@@ -323,12 +323,12 @@ impl<'a> TryFrom<&'a str> for StreamData<'a> {
                         value
                             .parse::<u64>()
                             .map_err(|e| Error::parse_int(value, e))?,
-                    )
+                    );
                 }
                 "CODECS" => codecs = Some(TryFrom::try_from(unquote(value))?),
                 "RESOLUTION" => resolution = Some(value.parse()?),
                 "HDCP-LEVEL" => {
-                    hdcp_level = Some(value.parse::<HdcpLevel>().map_err(Error::strum)?)
+                    hdcp_level = Some(value.parse::<HdcpLevel>().map_err(Error::strum)?);
                 }
                 "VIDEO" => video = Some(unquote(value)),
                 _ => {

src/types/ufloat.rs

@@ -13,7 +13,7 @@ use crate::Error;
 /// [`NaN`]: core::f32::NAN
 /// [`INFINITY`]: core::f32::INFINITY
 /// [`NEG_INFINITY`]: core::f32::NEG_INFINITY
-#[derive(AsRef, Deref, Default, Debug, Copy, Clone, PartialOrd, Display)]
+#[derive(AsRef, Deref, Default, Debug, Copy, Clone, Display)]
 pub struct UFloat(f32);
 
 impl UFloat {
@@ -141,6 +141,11 @@ impl PartialEq<f32> for UFloat {
 // be soundly implemented.
 impl Eq for UFloat {}
 
+impl PartialOrd for UFloat {
+    #[inline]
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> { Some(self.cmp(other)) }
+}
+
 impl Ord for UFloat {
     #[inline]
     fn cmp(&self, other: &Self) -> Ordering {
@@ -188,7 +193,7 @@ impl ::core::hash::Hash for UFloat {
 
         // I do not think it matters to differentiate between architectures, that use
         // big endian by default and those, that use little endian.
-        state.write(&self.to_be_bytes())
+        state.write(&self.to_be_bytes());
     }
 }
 
@@ -266,7 +271,7 @@ mod tests {
     fn test_new_negative() { let _ = UFloat::new(-1.1); }
 
     #[test]
-    #[should_panic = "float must be positive: `0`"]
+    #[should_panic = "float must be positive: `-0`"]
     fn test_new_negative_zero() { let _ = UFloat::new(-0.0); }
 
     #[test]

src/utils.rs

@@ -73,11 +73,7 @@ pub(crate) fn unquote(value: &str) -> Cow<'_, str> {
     if value.starts_with('"') && value.ends_with('"') {
         let result = Cow::Borrowed(&value[1..value.len() - 1]);
 
-        if result
-            .chars()
-            .find(|c| *c == '"' || *c == '\n' || *c == '\r')
-            .is_none()
-        {
+        if !result.chars().any(|c| c == '"' || c == '\n' || c == '\r') {
             return result;
         }
     }

tests/issues/assets/issue_00064.m3u8

@@ -0,0 +1,3 @@
+#EXTM3U
+#EXT-X-STREAM-INF:PROGRAM-ID=1, BANDWIDTH=10000000
+https://995107575.cloudvdn.com/a.m3u8?cdn=cn-gotcha03&domain=d1--cn-gotcha103.bilivideo.com&expires=1614619920&len=0&oi=1891753406&order=1&player=70YAALwcl0b9RGgW&pt=h5&ptype=0&qn=10000&secondToken=secondToken%3ACZ4ggpPHomuwcnT8XWDjJUp9eh8&sign=325afc8bc3b01ccbadeac084004ece64&sigparams=cdn%2Cexpires%2Clen%2Coi%2Cpt%2Cqn%2Ctrid&sl=1&src=4&streamid=live-qn%3Alive-qn%2Flive_402401719_42665292&trid=20d9f245179b4ef3a7e3635afaaa87ea&v3=1

tests/issues/issue_00064.rs

@@ -0,0 +1,34 @@
+// The relevant issue:
+// https://github.com/sile/hls_m3u8/issues/55
+use std::convert::TryFrom;
+
+use hls_m3u8::tags::VariantStream;
+use hls_m3u8::types::StreamData;
+use hls_m3u8::MasterPlaylist;
+
+use pretty_assertions::assert_eq;
+
+#[test]
+fn parse() {
+    let file = include_str!("assets/issue_00064.m3u8");
+
+    assert_eq!(
+        MasterPlaylist::try_from(file).unwrap(),
+        MasterPlaylist::builder()
+            .variant_streams(vec![
+                VariantStream::ExtXStreamInf {
+                    uri: "https://995107575.cloudvdn.com/a.m3u8?cdn=cn-gotcha03&domain=d1--cn-gotcha103.bilivideo.com&expires=1614619920&len=0&oi=1891753406&order=1&player=70YAALwcl0b9RGgW&pt=h5&ptype=0&qn=10000&secondToken=secondToken%3ACZ4ggpPHomuwcnT8XWDjJUp9eh8&sign=325afc8bc3b01ccbadeac084004ece64&sigparams=cdn%2Cexpires%2Clen%2Coi%2Cpt%2Cqn%2Ctrid&sl=1&src=4&streamid=live-qn%3Alive-qn%2Flive_402401719_42665292&trid=20d9f245179b4ef3a7e3635afaaa87ea&v3=1".into(),
+                    frame_rate: None,
+                    audio: None,
+                    subtitles: None,
+                    closed_captions: None,
+                    stream_data: StreamData::builder()
+                        .bandwidth(10000000)
+                        .build()
+                        .unwrap()
+                }
+            ])
+            .build()
+            .unwrap()
+    );
+}