Skip to content

Commit

Permalink
master_playlist: a cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
2bc4 committed Oct 11, 2024
1 parent 41183a0 commit 7dda8c8
Showing 1 changed file with 24 additions and 25 deletions.
49 changes: 24 additions & 25 deletions src/hls/master_playlist.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,31 +29,29 @@ pub fn fetch_playlist(mut args: Args, agent: &Agent) -> Result<Option<Connection
}

info!("Fetching playlist for channel {}", &args.channel);
let playlist = {
if let Some(servers) = &args.servers {
fetch_proxy_playlist(
!args.no_low_latency,
servers,
&args.codecs,
&args.channel,
agent,
)?
} else {
let response = fetch_twitch_gql(
args.client_id.take(),
args.auth_token.take(),
&args.channel,
agent,
)?;

fetch_twitch_playlist(
&response,
!args.no_low_latency,
&args.codecs,
&args.channel,
agent,
)?
}
let playlist = if let Some(servers) = &args.servers {
fetch_proxy_playlist(
!args.no_low_latency,
servers,
&args.codecs,
&args.channel,
agent,
)?
} else {
let response = fetch_twitch_gql(
args.client_id.take(),
args.auth_token.take(),
&args.channel,
agent,
)?;

fetch_twitch_playlist(
&response,
!args.no_low_latency,
&args.codecs,
&args.channel,
agent,
)?
};

let Some(url) = choose_stream(&playlist, &args.quality, args.print_streams) else {
Expand Down Expand Up @@ -229,6 +227,7 @@ fn fetch_proxy_playlist(

Ok(playlist)
}

fn choose_stream(playlist: &str, quality: &Option<String>, should_print: bool) -> Option<Url> {
debug!("Master playlist:\n{playlist}");
let (Some(quality), false) = (quality, should_print) else {
Expand Down

0 comments on commit 7dda8c8

Please sign in to comment.