mirrors/hls_m3u8
1
0
Fork 0
mirror of https://github.com/sile/hls_m3u8.git synced 2024-11-26 00:51:00 +00:00
Code Issues Projects Releases Wiki Activity

improve ExtXProgramDateTime

Browse source
This commit is contained in:
Luro02 2020-03-25 11:56:43 +01:00
parent fc1136265c
commit ca3ba476c3
No known key found for this signature in database
GPG key ID: B66FD4F74501A9CF
1 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/tags/media_segment/program_date_time.rs
View file

@ -10,16 +10,23 @@ use crate::types::ProtocolVersion;
use crate::utils::tag; use crate::utils::tag;
use crate::{Error, RequiredVersion}; use crate::{Error, RequiredVersion};
/// # [4.3.2.6. EXT-X-PROGRAM-DATE-TIME] /// Associates the first sample of a [`MediaSegment`] with an absolute date
/// and/or time.
/// ///
/// The [`ExtXProgramDateTime`] tag associates the first sample of a /// ## Features
/// [`MediaSegment`] with an absolute date and/or time. ///
/// By enabling the `chrono` feature the `date_time`-field will change from
/// `String` to `DateTime<FixedOffset>` and the traits
/// - `Deref<Target=DateTime<FixedOffset>>`,
/// - `DerefMut<Target=DateTime<FixedOffset>>`
/// - and `Copy`
///
/// will be derived.
/// ///
/// [`MediaSegment`]: crate::MediaSegment /// [`MediaSegment`]: crate::MediaSegment
/// [4.3.2.6. EXT-X-PROGRAM-DATE-TIME]:
/// https://tools.ietf.org/html/rfc8216#section-4.3.2.6
#[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)] #[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]
#[cfg_attr(feature = "chrono", derive(Deref, DerefMut, Copy))] #[cfg_attr(feature = "chrono", derive(Deref, DerefMut, Copy))]
#[non_exhaustive]
pub struct ExtXProgramDateTime { pub struct ExtXProgramDateTime {
/// The date-time of the first sample of the associated media segment. /// The date-time of the first sample of the associated media segment.
#[cfg(feature = "chrono")] #[cfg(feature = "chrono")]
@ -28,7 +35,6 @@ pub struct ExtXProgramDateTime {
/// The date-time of the first sample of the associated media segment. /// The date-time of the first sample of the associated media segment.
#[cfg(not(feature = "chrono"))] #[cfg(not(feature = "chrono"))]
pub date_time: String, pub date_time: String,
__non_exhaustive: (),
} }
impl ExtXProgramDateTime { impl ExtXProgramDateTime {
@ -52,12 +58,7 @@ impl ExtXProgramDateTime {
/// ``` /// ```
#[must_use] #[must_use]
#[cfg(feature = "chrono")] #[cfg(feature = "chrono")]
pub const fn new(date_time: DateTime<FixedOffset>) -> Self { pub const fn new(date_time: DateTime<FixedOffset>) -> Self { Self { date_time } }
Self {
date_time,
__non_exhaustive: (),
}
}
/// Makes a new [`ExtXProgramDateTime`] tag. /// Makes a new [`ExtXProgramDateTime`] tag.
/// ///
@ -71,7 +72,6 @@ impl ExtXProgramDateTime {
pub fn new<T: Into<String>>(date_time: T) -> Self { pub fn new<T: Into<String>>(date_time: T) -> Self {
Self { Self {
date_time: date_time.into(), date_time: date_time.into(),
__non_exhaustive: (),
} }
} }
} }
@ -103,7 +103,7 @@ impl FromStr for ExtXProgramDateTime {
fn from_str(input: &str) -> Result<Self, Self::Err> { fn from_str(input: &str) -> Result<Self, Self::Err> {
let input = tag(input, Self::PREFIX)?; let input = tag(input, Self::PREFIX)?;
let date_time = { Ok(Self::new({
#[cfg(feature = "chrono")] #[cfg(feature = "chrono")]
{ {
DateTime::parse_from_rfc3339(input).map_err(Error::chrono)? DateTime::parse_from_rfc3339(input).map_err(Error::chrono)?
@ -112,9 +112,7 @@ impl FromStr for ExtXProgramDateTime {
{ {
input input
} }
}; }))
Ok(Self::new(date_time))
} }
} }