From b429f8af7436ea35177a96dc2b80e59774f0fbe4 Mon Sep 17 00:00:00 2001 From: trizen Date: Wed, 15 Jul 2020 15:38:44 +0300 Subject: - Allow YouTube URLs to be passed to `--id`. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jesús --- bin/fair-viewer | 2 +- lib/WWW/FairViewer/RegularExpressions.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/fair-viewer b/bin/fair-viewer index 0124453..3ee9f24 100755 --- a/bin/fair-viewer +++ b/bin/fair-viewer @@ -2095,7 +2095,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/FairViewer/RegularExpressions.pm b/lib/WWW/FairViewer/RegularExpressions.pm index 6b8ed5f..51e85cd 100644 --- a/lib/WWW/FairViewer/RegularExpressions.pm +++ b/lib/WWW/FairViewer/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}; -- cgit v1.2.3