mirrors/m3u8-rs
1
1
Fork 0
mirror of https://github.com/rutgersc/m3u8-rs.git synced 2025-03-29 08:35:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #37 from sdroege/is-master-playlist-early-return

Browse source 
Don't bother parsing as a playlist or detecting if it's a master/medi…
This commit is contained in:
rutgersc 2021-11-20 19:06:41 +01:00 committed by GitHub
commit 836ef1caaf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/parser.rs
View file

@ -42,6 +42,8 @@ use std::string;
/// } /// }
/// ``` /// ```
pub fn parse_playlist(input: &[u8]) -> IResult<&[u8], Playlist> { pub fn parse_playlist(input: &[u8]) -> IResult<&[u8], Playlist> {
m3u_tag(input)?;
match is_master_playlist(input) { match is_master_playlist(input) {
true => map(parse_master_playlist, Playlist::MasterPlaylist)(input), true => map(parse_master_playlist, Playlist::MasterPlaylist)(input),
false => map(parse_media_playlist, Playlist::MediaPlaylist)(input), false => map(parse_media_playlist, Playlist::MediaPlaylist)(input),
@ -135,6 +137,7 @@ pub fn is_master_playlist(input: &[u8]) -> bool {
/// - Some(true, tagstring): Line contains a master playlist tag /// - Some(true, tagstring): Line contains a master playlist tag
/// - Some(false, tagstring): Line contains a media playlist tag /// - Some(false, tagstring): Line contains a media playlist tag
fn contains_master_tag(input: &[u8]) -> Option<(bool, String)> { fn contains_master_tag(input: &[u8]) -> Option<(bool, String)> {
let (input, _) = m3u_tag(input).ok()?;
let mut is_master_opt = None; let mut is_master_opt = None;
let mut current_input: &[u8] = input; let mut current_input: &[u8] = input;