diff --git a/bin/straw-viewer b/bin/straw-viewer index 52cc849..c03b2c8 100755 --- a/bin/straw-viewer +++ b/bin/straw-viewer @@ -2092,7 +2092,7 @@ sub rate_videos { } sub get_and_play_video_ids { - (my @ids = grep { get_valid_video_id($_) } @_) || return; + (my @ids = grep { defined($_) } map { get_valid_video_id($_) } @_) || return; foreach my $id (@ids) { my $info = $yv_obj->video_details($id); diff --git a/lib/WWW/StrawViewer/RegularExpressions.pm b/lib/WWW/StrawViewer/RegularExpressions.pm index 2bc6a67..7d35854 100644 --- a/lib/WWW/StrawViewer/RegularExpressions.pm +++ b/lib/WWW/StrawViewer/RegularExpressions.pm @@ -38,7 +38,7 @@ our $get_username_playlists_re = qr{$get_username_videos_re/playlists}; # Video ID my $video_id_re = qr/[0-9A-Za-z_\-]{11}/; our $valid_video_id_re = qr{^$video_id_re\z}; -our $get_video_id_re = qr{(?:%3F|\b)(?>v|embed|youtu[.]be)(?>[=/]|%3D)(?$video_id_re)}; +our $get_video_id_re = qr{(?:%3F|\b)(?>v|embed|youtu(?:\\)?[.]be)(?>(?:\\)?[=/]|%3D)(?$video_id_re)}; # Playlist ID our $valid_playlist_id_re = qr{^$generic_name_re\z};