@@ -5031,6 +5031,7 @@ sub get_verpids_json {
5031
5031
my ( $prog , $ua ) = @_ ;
5032
5032
my $pid = $prog -> {pid };
5033
5033
my $url = " https://www.bbc.co.uk/programmes/$pid /playlist.json" ;
5034
+ my $version_map = { " default" => " " , " audiodescribed" => " ad" , " signed" => " sign" , " combined" => " " };
5034
5035
main::logger " INFO: iPlayer metadata URL (JSON) = $url \n " if $opt -> {verbose };
5035
5036
my $json = main::request_url_retry( $ua , $url , 3, undef , undef , undef , undef , 1 );
5036
5037
if ( $json ) {
@@ -5071,7 +5072,6 @@ sub get_verpids_json {
5071
5072
main::logger " WARNING: Could not download version PID metadata from $url \n " ;
5072
5073
}
5073
5074
$prog -> {versions } = join ' ,' , keys %{ $prog -> {verpids } };
5074
- my $version_map = { " default" => " " , " audiodescribed" => " ad" , " signed" => " sign" , " combined" => " " };
5075
5075
my $version_list = $opt -> {versionlist } || $prog -> {versions };
5076
5076
for ( split /,/, $version_list ) {
5077
5077
if ( $prog -> {verpids }-> {$_ } ) {
@@ -5087,11 +5087,7 @@ sub get_verpids_json {
5087
5087
}
5088
5088
}
5089
5089
}
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;
5095
5091
return 1 if ! $found ;
5096
5092
return 0;
5097
5093
}
@@ -5119,7 +5115,6 @@ sub get_verpids_html_radio {
5119
5115
sub get_verpids_html {
5120
5116
my ( $prog , $ua ) = @_ ;
5121
5117
my $pid = $prog -> {pid };
5122
- my $version_list = $opt -> {versionlist } || ' default' ;
5123
5118
my $version_map = { " default" => " " , " audiodescribed" => " ad" , " signed" => " sign" , " combined" => " " };
5124
5119
for my $version ( " default" , " audiodescribed" , " signed" , " combined" ) {
5125
5120
next if $prog -> {verpids }-> {$version };
@@ -5189,6 +5184,7 @@ sub get_verpids_html {
5189
5184
$prog -> {durations }-> {$version } = $1 if $config =~ / "duration":(\d +)/ ;
5190
5185
}
5191
5186
$prog -> {versions } = join ' ,' , keys %{ $prog -> {verpids } };
5187
+ my $version_list = $opt -> {versionlist } || $prog -> {versions };
5192
5188
for ( split /,/, $version_list ) {
5193
5189
if ( $prog -> {verpids }-> {$_ } ) {
5194
5190
my $episode_url ;
@@ -5203,11 +5199,7 @@ sub get_verpids_html {
5203
5199
}
5204
5200
}
5205
5201
}
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;
5211
5203
return 1 if ! $found ;
5212
5204
return 0;
5213
5205
}
0 commit comments