diff options
| author | trizen <trizen@protonmail.com> | 2020-07-15 15:38:44 +0300 |
|---|---|---|
| committer | Jesús <heckyel@hyperbola.info> | 2020-07-27 21:23:12 -0500 |
| commit | b429f8af7436ea35177a96dc2b80e59774f0fbe4 (patch) | |
| tree | bab3d2562746ec1d984055a37a9aaae97131e00c | |
| parent | ddc0b8872b38b739f2dd0b55bf280ca182df03c5 (diff) | |
| download | fair-viewer-b429f8af7436ea35177a96dc2b80e59774f0fbe4.tar.lz fair-viewer-b429f8af7436ea35177a96dc2b80e59774f0fbe4.tar.xz fair-viewer-b429f8af7436ea35177a96dc2b80e59774f0fbe4.zip | |
- Allow YouTube URLs to be passed to `--id`.
Signed-off-by: Jesús <heckyel@hyperbola.info>
| -rwxr-xr-x | bin/fair-viewer | 2 | ||||
| -rw-r--r-- | 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>$video_id_re)}; +our $get_video_id_re = qr{(?:%3F|\b)(?>v|embed|youtu(?:\\)?[.]be)(?>(?:\\)?[=/]|%3D)(?<video_id>$video_id_re)}; # Playlist ID our $valid_playlist_id_re = qr{^$generic_name_re\z}; |