diff options
| -rwxr-xr-x | bin/fair-viewer | 4 | ||||
| -rwxr-xr-x | bin/gtk-fair-viewer | 6 | ||||
| -rw-r--r-- | lib/WWW/FairViewer.pm | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/bin/fair-viewer b/bin/fair-viewer index 525d2bb..db79106 100755 --- a/bin/fair-viewer +++ b/bin/fair-viewer @@ -207,7 +207,7 @@ my %CONFIG = ( regionCode => undef, # URI options - youtube_video_url => 'https://www.youtube.com/watch?v=%s', + youtube_video_url => 'https://invidio.us/watch?v=%s', # Subtitle options srt_languages => ['en', 'es'], @@ -446,7 +446,7 @@ sub load_config { $cache_dir = catdir(curdir(), '.cache'); } - $CONFIG{cache_dir} = catdir($cache_dir, 'youtube-viewer'); + $CONFIG{cache_dir} = catdir($cache_dir, 'fair-viewer'); $update_config = 1; } diff --git a/bin/gtk-fair-viewer b/bin/gtk-fair-viewer index 6b6b424..2053051 100755 --- a/bin/gtk-fair-viewer +++ b/bin/gtk-fair-viewer @@ -214,9 +214,9 @@ my %CONFIG = ( # URI options thumbnail_type => 'medium', - youtube_video_url => 'https://www.youtube.com/watch?v=%s', - youtube_playlist_url => 'https://www.youtube.com/playlist?list=%s', - youtube_channel_url => 'https://www.youtube.com/channel/%s', + youtube_video_url => 'https://invidio.us/watch?v=%s', + youtube_playlist_url => 'https://invidio.us/playlist?list=%s', + youtube_channel_url => 'https://invidio.us/channel/%s', # Subtitle options srt_languages => ['en', 'es'], diff --git a/lib/WWW/FairViewer.pm b/lib/WWW/FairViewer.pm index 2749215..e9e968f 100644 --- a/lib/WWW/FairViewer.pm +++ b/lib/WWW/FairViewer.pm @@ -567,7 +567,7 @@ sub _extract_from_invidious { } sub _ytdl_is_available { - (state $x = system('youtube-dl', '--version')) == 0; + (state $x = system('hypervideo', '--version')) == 0; } sub _extract_from_ytdl { @@ -575,7 +575,7 @@ sub _extract_from_ytdl { $self->_ytdl_is_available() || return; - my $json = $self->proxy_stdout('youtube-dl', '--all-formats', '--dump-single-json', + my $json = $self->proxy_stdout('hypervideo', '--all-formats', '--dump-single-json', quotemeta("https://www.youtube.com/watch?v=" . $videoID)); my $ref = $self->parse_json_string($json); @@ -606,7 +606,7 @@ sub _fallback_extract_urls { if ($self->_ytdl_is_available) { if ($self->get_debug) { - say STDERR ":: Using youtube-dl to extract the streaming URLs..."; + say STDERR ":: Using hypervideo to extract the streaming URLs..."; } push @formats, $self->_extract_from_ytdl($videoID); @@ -888,7 +888,7 @@ sub get_streaming_urls { } } - # Try again with youtube-dl + # Try again with hypervideo if (!@streaming_urls or $info{status} =~ /fail|error/i) { @streaming_urls = $self->_fallback_extract_urls($videoID); } |