mirrors/m3u8-rs
1
1
Fork 0
mirror of https://github.com/rutgersc/m3u8-rs.git synced 2024-06-02 13:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Map unknown strings to already existing Other variants of enums

Browse source 
Fixes https://github.com/rutgersc/m3u8-rs/issues/52
This commit is contained in:
Sebastian Dröge 2022-09-06 18:21:10 +03:00 committed by Sebastian Dröge
parent 31b31fd958
commit e41c47a8f8
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/playlist.rs
View file

@ -378,7 +378,7 @@ impl FromStr for HDCPLevel {
"TYPE-0" => Ok(HDCPLevel::Type0), "TYPE-0" => Ok(HDCPLevel::Type0),
"TYPE-1" => Ok(HDCPLevel::Type1), "TYPE-1" => Ok(HDCPLevel::Type1),
"NONE" => Ok(HDCPLevel::None), "NONE" => Ok(HDCPLevel::None),
_ => Err(format!("Unable to create HDCPLevel from {:?}", s)), _ => Ok(HDCPLevel::Other(String::from(s))),
} }
} }
} }
@ -412,11 +412,8 @@ impl TryFrom<QuotedOrUnquoted> for ClosedCaptionGroupId {
fn try_from(s: QuotedOrUnquoted) -> Result<ClosedCaptionGroupId, String> { fn try_from(s: QuotedOrUnquoted) -> Result<ClosedCaptionGroupId, String> {
match s { match s {
QuotedOrUnquoted::Unquoted(s) if s == "NONE" => Ok(ClosedCaptionGroupId::None), QuotedOrUnquoted::Unquoted(s) if s == "NONE" => Ok(ClosedCaptionGroupId::None),
QuotedOrUnquoted::Unquoted(s) => Ok(ClosedCaptionGroupId::Other(String::from(s))),
QuotedOrUnquoted::Quoted(s) => Ok(ClosedCaptionGroupId::GroupId(s)), QuotedOrUnquoted::Quoted(s) => Ok(ClosedCaptionGroupId::GroupId(s)),
_ => Err(format!(
"Unable to create ClosedCaptionGroupId from {:?}",
s
)),
} }
} }
} }
@ -556,10 +553,7 @@ impl FromStr for AlternativeMediaType {
"VIDEO" => Ok(AlternativeMediaType::Video), "VIDEO" => Ok(AlternativeMediaType::Video),
"SUBTITLES" => Ok(AlternativeMediaType::Subtitles), "SUBTITLES" => Ok(AlternativeMediaType::Subtitles),
"CLOSED-CAPTIONS" => Ok(AlternativeMediaType::ClosedCaptions), "CLOSED-CAPTIONS" => Ok(AlternativeMediaType::ClosedCaptions),
_ => Err(format!( _ => Ok(AlternativeMediaType::Other(String::from(s))),
"Unable to create AlternativeMediaType from {:?}",
s
)),
} }
} }
} }
@ -608,7 +602,7 @@ impl FromStr for InstreamId {
.map_err(|err| format!("Unable to create InstreamId from {:?}: {}", s, err))?; .map_err(|err| format!("Unable to create InstreamId from {:?}: {}", s, err))?;
Ok(InstreamId::Service(service)) Ok(InstreamId::Service(service))
} else { } else {
Err(format!("Unable to create InstreamId from {:?}", s)) Ok(InstreamId::Other(String::from(s)))
} }
} }
} }
@ -796,7 +790,7 @@ impl FromStr for MediaPlaylistType {
match s { match s {
"EVENT" => Ok(MediaPlaylistType::Event), "EVENT" => Ok(MediaPlaylistType::Event),
"VOD" => Ok(MediaPlaylistType::Vod), "VOD" => Ok(MediaPlaylistType::Vod),
_ => Err(format!("Unable to create MediaPlaylistType from {:?}", s)), _ => Ok(MediaPlaylistType::Other(String::from(s))),
} }
} }
} }
@ -920,7 +914,7 @@ impl FromStr for KeyMethod {
"NONE" => Ok(KeyMethod::None), "NONE" => Ok(KeyMethod::None),
"AES-128" => Ok(KeyMethod::AES128), "AES-128" => Ok(KeyMethod::AES128),
"SAMPLE-AES" => Ok(KeyMethod::SampleAES), "SAMPLE-AES" => Ok(KeyMethod::SampleAES),
_ => Err(format!("Unable to create KeyMethod from {:?}", s)), _ => Ok(KeyMethod::Other(String::from(s))),
} }
} }
} }