- Added the "--srt-languages=s" command-line option.

It takes a list of comma-separated preferred language codes. It's particularily useful in combination with "--auto-captions" option to load auto-translated subtitles in a specific language, without editing the configuration file. Example: # Romanian auto-translated subtitles youtube-viewer --srt-languages=ro --auto-captions https://www.youtube.com/watch?v=iZnLZFRylbs
trizen · Mar 2, 2021 · 2116147 · 2116147
1 parent e92b0f2
commit 2116147
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/bin/youtube-viewer b/bin/youtube-viewer
@@ -875,6 +875,7 @@ usage: $execname [options] ([url] | [keywords])
  * Closed-captions
    --get-captions!      : download closed-captions for videos
    --auto-captions!     : include or exclude auto-generated captions
+   --srt-languages=s    : comma separated list of preferred languages
 
  * Config
    --config=s           : configuration file
@@ -1782,6 +1783,7 @@ sub parse_arguments {
         'thousand-separator=s'           => \$opt{thousand_separator},
         'get-captions|get_captions!'     => \$opt{get_captions},
         'auto-captions|auto_captions!'   => \$opt{auto_captions},
+        'srt-languages=s'                => \$opt{srt_languages},
         'copy-caption|copy_caption!'     => \$opt{copy_caption},
         'skip-if-exists|skip_if_exists!' => \$opt{skip_if_exists},
         'downloads-dir|download-dir=s'   => \$opt{downloads_dir},
@@ -3676,11 +3678,18 @@ sub get_streaming_url {
     my $srt_file;
     if (ref($captions) eq 'ARRAY' and @$captions and $opt{get_captions} and not $opt{novideo}) {
         require WWW::YoutubeViewer::GetCaption;
+
+        my $languages = $opt{srt_languages};
+
+        if (ref($languages) ne 'ARRAY') {
+            $languages = [grep { /[a-z]/i } split(/\s*,\s*/, $languages)];
+        }
+
         my $yv_cap = WWW::YoutubeViewer::GetCaption->new(
                                                          auto_captions => $opt{auto_captions},
                                                          captions_dir  => $opt{cache_dir},
                                                          captions      => $captions,
-                                                         languages     => $CONFIG{srt_languages},
+                                                         languages     => $languages,
                                                          yv_obj        => $yv_obj,
                                                         );
         $srt_file = $yv_cap->save_caption($video_id);

diff --git a/lib/WWW/YoutubeViewer.pm b/lib/WWW/YoutubeViewer.pm
@@ -998,7 +998,6 @@ sub get_streaming_urls {
             push @caption_urls, @{$caption_data->{captions}{playerCaptionsTracklistRenderer}{captionTracks}};
 
             my $translationLanguages = $caption_data->{captions}{playerCaptionsTracklistRenderer}{translationLanguages};
-
             if (ref($translationLanguages) eq 'ARRAY') {
                 foreach my $caption (@caption_urls) {
                     $caption->{translationLanguages} = $translationLanguages;

diff --git a/lib/WWW/YoutubeViewer/GetCaption.pm b/lib/WWW/YoutubeViewer/GetCaption.pm
@@ -132,6 +132,9 @@ sub find_caption_data {
 
             foreach my $lang (@{$self->{languages}}) {
                 foreach my $trans_lang (@{$caption->{translationLanguages}}) {
+
+                    ref($trans_lang) eq 'HASH' or next;
+
                     if ($trans_lang->{languageCode} =~ /^\Q$lang\E(?:\z|[_-])/i) {
                         my %caption_copy = %{$caption};
                         $caption_copy{languageCode} = $trans_lang->{languageCode};
@@ -215,17 +218,6 @@ sub xml2srt {
     return join("\n\n", @text);
 }
 
-=head2 get_xml_data($caption_data)
-
-Get the XML content for a given caption data.
-
-=cut
-
-sub get_xml_data {
-    my ($self, $url) = @_;
-    $self->{yv_obj}->lwp_get($url, simple => 1);
-}
-
 =head2 save_caption($video_ID)
 
 Save the caption in a .srt file and return its file path.
@@ -246,8 +238,9 @@ sub save_caption {
     return $srt_file if (-e $srt_file);
 
     # Get XML data, then transform it to SubRip data
-    my $xml = $self->get_xml_data($info->{baseUrl} // return) // return;
-    my $srt = $self->xml2srt($xml)                            // return;
+    my $url = $info->{baseUrl}                            // return;
+    my $xml = $self->{yv_obj}->lwp_get($url, simple => 1) // return;
+    my $srt = $self->xml2srt($xml)                        // return;
 
     # Write the SubRib data to the $srt_file
     open(my $fh, '>:utf8', $srt_file) or return;