Skip to content

Commit 0f70bd8

Browse files
committed
fix download failure with --versions=default
Regression introduced in v3.32 Closes #446
1 parent 390bc09 commit 0f70bd8

File tree

1 file changed

+4
-12
lines changed

1 file changed

+4
-12
lines changed

get_iplayer

+4-12
Original file line numberDiff line numberDiff line change
@@ -5031,6 +5031,7 @@ sub get_verpids_json {
50315031
my ( $prog, $ua ) = @_;
50325032
my $pid = $prog->{pid};
50335033
my $url = "https://www.bbc.co.uk/programmes/$pid/playlist.json";
5034+
my $version_map = { "default" => "", "audiodescribed" => "ad", "signed" => "sign", "combined" => "" };
50345035
main::logger "INFO: iPlayer metadata URL (JSON) = $url\n" if $opt->{verbose};
50355036
my $json = main::request_url_retry( $ua, $url, 3, undef, undef, undef, undef, 1 );
50365037
if ( $json ) {
@@ -5071,7 +5072,6 @@ sub get_verpids_json {
50715072
main::logger "WARNING: Could not download version PID metadata from $url\n";
50725073
}
50735074
$prog->{versions} = join ',', keys %{ $prog->{verpids} };
5074-
my $version_map = { "default" => "", "audiodescribed" => "ad", "signed" => "sign", "combined" => "" };
50755075
my $version_list = $opt->{versionlist} || $prog->{versions};
50765076
for ( split /,/, $version_list ) {
50775077
if ( $prog->{verpids}->{$_} ) {
@@ -5087,11 +5087,7 @@ sub get_verpids_json {
50875087
}
50885088
}
50895089
}
5090-
my $found;
5091-
for ( keys %{ $prog->{verpids} } ) {
5092-
$found = 1 if $version_list =~ /$_/ && $prog->{verpids}->{$_};
5093-
last if $found;
5094-
}
5090+
my $found = keys %{ $prog->{verpids} } > 0;
50955091
return 1 if ! $found;
50965092
return 0;
50975093
}
@@ -5119,7 +5115,6 @@ sub get_verpids_html_radio {
51195115
sub get_verpids_html {
51205116
my ( $prog, $ua ) = @_;
51215117
my $pid = $prog->{pid};
5122-
my $version_list = $opt->{versionlist} || 'default';
51235118
my $version_map = { "default" => "", "audiodescribed" => "ad", "signed" => "sign", "combined" => "" };
51245119
for my $version ( "default", "audiodescribed", "signed", "combined" ) {
51255120
next if $prog->{verpids}->{$version};
@@ -5189,6 +5184,7 @@ sub get_verpids_html {
51895184
$prog->{durations}->{$version} = $1 if $config =~ /"duration":(\d+)/;
51905185
}
51915186
$prog->{versions} = join ',', keys %{ $prog->{verpids} };
5187+
my $version_list = $opt->{versionlist} || $prog->{versions};
51925188
for ( split /,/, $version_list ) {
51935189
if ( $prog->{verpids}->{$_} ) {
51945190
my $episode_url;
@@ -5203,11 +5199,7 @@ sub get_verpids_html {
52035199
}
52045200
}
52055201
}
5206-
my $found;
5207-
for ( keys %{ $prog->{verpids} } ) {
5208-
$found = 1 if $version_list =~ /$_/ && $prog->{verpids}->{$_};
5209-
last if $found;
5210-
}
5202+
my $found = keys %{ $prog->{verpids} } > 0;
52115203
return 1 if ! $found;
52125204
return 0;
52135205
}

0 commit comments

Comments
 (0)