- Support for passing search query via command line when starting gtk-youtube-viewer (closes #204)

- `Video details` and `video comments` windows now load much faster. (by using Glib::Idle to delay the loading of content)
- Playlist search: the number of items in each playlist is now retrieved with a single GET request.

Author: trizen

bin/gtk-youtube-viewer

@@ -1564,7 +1564,14 @@ sub show_comments_window {
     $feeds_window->show;
     $feeds_statusbar->pop(0);
 
-    display_comments($yv_obj->comments_from_video_id($videoID));
+    Glib::Idle->add(
+        sub {
+            display_comments($yv_obj->comments_from_video_id($videoID));
+            return 0;
+        },
+        [],
+        Glib::G_PRIORITY_DEFAULT_IDLE
+                   );
 
     return 1;
 }
@@ -2254,34 +2261,45 @@ sub get_next_page_spaces {
 
 sub get_code {
     my ($code, $iter) = get_selected_entry_code();
+
     $code // return;
 
-    my $type = $liststore->get($iter, 7);
+    Glib::Idle->add(
+        sub {
+            my ($code, $iter) = @{$_[0]};
 
-    $type eq 'playlist' ? list_playlist($code)
-      : ($type eq 'channel' || $type eq 'subscription') ? uploads('channel', $code)
-      : $type eq 'next_page' && $code ne '' ? do {
+            my $type = $liststore->get($iter, 7);
 
-        my $next_page_token = $liststore->get($iter, 5);
-        my $results         = $yv_obj->next_page($code, $next_page_token);
+            $type eq 'playlist' ? list_playlist($code)
+              : ($type eq 'channel' || $type eq 'subscription') ? uploads('channel', $code)
+              : $type eq 'next_page' && $code ne '' ? do {
 
-        if ($yv_utils->has_entries($results)) {
-            $liststore->set($iter, 0, get_next_page_spaces() . '<big><b>' . ('=' x 20) . '</b></big>');
-            $liststore->set($iter, 3, q{});
-        }
-        else {
-            $liststore->remove($iter);
-            die "This is the last page!\n";
-        }
+                my $next_page_token = $liststore->get($iter, 5);
+                my $results         = $yv_obj->next_page($code, $next_page_token);
 
-        display_results($results);
-      }
-      : $type eq 'video' ? (
-                            $CONFIG{audio_only}
-                            ? execute_cli_youtube_viewer("--id=$code")
-                            : play_video($yv_obj->parse_json_string($liststore->get($iter, 8)))
-                           )
-      : return;
+                if ($yv_utils->has_entries($results)) {
+                    $liststore->set($iter, 0, get_next_page_spaces() . '<big><b>' . ('=' x 20) . '</b></big>');
+                    $liststore->set($iter, 3, q{});
+                }
+                else {
+                    $liststore->remove($iter);
+                    die "This is the last page!\n";
+                }
+
+                display_results($results);
+              }
+              : $type eq 'video' ? (
+                                    $CONFIG{audio_only}
+                                    ? execute_cli_youtube_viewer("--id=$code")
+                                    : play_video($yv_obj->parse_json_string($liststore->get($iter, 8)))
+                                   )
+              : ();
+
+            return 0;
+        },
+        [$code, $iter],
+        Glib::G_PRIORITY_DEFAULT_IDLE
+                   );
 }
 
 sub make_row_description {
@@ -2372,33 +2390,57 @@ sub display_results {
     hide_feeds_window();
 
     if (not $from_history) {
-        my @video_ids;
 
-        my $position = 0;
-        my $video_details;
-        my %video_position;
+        my @video_ids;
+        my @playlist_ids;
 
         foreach my $i (0 .. $#{$items}) {
             my $item = $items->[$i];
-            if ($yv_utils->is_video($item)) {
-                $video_position{$i} = $position++;
+
+            if ($yv_utils->is_playlist($item)) {
+                push @playlist_ids, $yv_utils->get_playlist_id($item);
+            }
+            elsif ($yv_utils->is_video($item)) {
                 push @video_ids, $yv_utils->get_video_id($item);
             }
         }
 
+        my %id_lookup;
+
         if (@video_ids) {
             my $content_details = $yv_obj->video_details(join(',', @video_ids), VIDEO_PART);
-            $video_details = $content_details->{results}{items};
+            my $video_details   = $content_details->{results}{items};
+
+            foreach my $i (0 .. $#video_ids) {
+                $id_lookup{$video_ids[$i]} = $video_details->[$i];
+            }
+        }
 
-            $info->{__pos__}     = \%video_position;
-            $info->{__details__} = $video_details;
+        if (@playlist_ids) {
+            my $content_details  = $yv_obj->playlist_from_id(join(',', @playlist_ids), 'contentDetails');
+            my $playlist_details = $content_details->{results}{items};
+
+            foreach my $i (0 .. $#playlist_ids) {
+                $id_lookup{$playlist_ids[$i]} = $playlist_details->[$i];
+            }
         }
+
+        $info->{__extra_info__} = \%id_lookup;
     }
 
     foreach my $i (0 .. $#{$items}) {
         my $item = $items->[$i];
 
         if ($yv_utils->is_playlist($item)) {
+
+            # Filter out deleted playlists
+            my $playlist_id = $yv_utils->get_playlist_id($item) || next;
+
+            if (exists($info->{__extra_info__}{$playlist_id})) {
+                @{$item}{qw(contentDetails)} =
+                  @{$info->{__extra_info__}{$playlist_id}}{qw(contentDetails)};
+            }
+
             add_playlist_entry($item);
         }
         elsif ($yv_utils->is_channel($item)) {
@@ -2409,13 +2451,13 @@ sub display_results {
         }
         elsif ($yv_utils->is_video($item) or $item->{__is_video__}) {
 
-            exists($info->{__pos__}{$i}) || next;
-
-            @{$item}{qw(id contentDetails statistics snippet)} =
-              @{$info->{__details__}[$info->{__pos__}{$i}]}{qw(id contentDetails statistics snippet)};
-
             # Filter out private or deleted videos
-            $yv_utils->get_video_id($item) || next;
+            my $video_id = $yv_utils->get_video_id($item) || next;
+
+            if (exists($info->{__extra_info__}{$video_id})) {
+                @{$item}{qw(id contentDetails statistics snippet)} =
+                  @{$info->{__extra_info__}{$video_id}}{qw(id contentDetails statistics snippet)};
+            }
 
             # Mark as video
             $item->{__is_video__} = 1;
@@ -2437,6 +2479,26 @@ sub set_entry_tooltip {
     $liststore->set($iter, 9, "<b>" . encode_entities($title) . "</b>" . "\n\n" . encode_entities($description));
 }
 
+sub set_thumbnail {
+    my ($entry, $liststore, $iter) = @_;
+
+    $liststore->set_value($iter, 1, $default_thumb);
+
+    Glib::Idle->add(
+        sub {
+            my ($entry, $liststore, $iter) = @{$_[0]};
+
+            my $thumb_url = $yv_utils->get_thumbnail_url($entry, $CONFIG{thumbnail_type});
+            my $pixbuf    = get_pixbuf_thumbnail($thumb_url);
+            $liststore->set_value($iter, 1, $pixbuf);
+
+            return 0;
+        },
+        [$entry, $liststore, $iter],
+        Glib::G_PRIORITY_DEFAULT_IDLE
+                   );
+}
+
 sub add_subscription_entry {
     my ($subscription) = @_;
 
@@ -2470,8 +2532,7 @@ sub add_subscription_entry {
     $liststore->set($iter, 2, "<b>$symbols{diamond}</b>  " . 'Subscription' . "\n");
 
     if ($CONFIG{show_thumbs}) {
-        my $pixbuf = get_pixbuf_thumbnail($yv_utils->get_thumbnail_url($subscription, $CONFIG{thumbnail_type}));
-        $liststore->set_value($iter, 1, $pixbuf);
+        set_thumbnail($subscription, $liststore, $iter);
     }
 }
 
@@ -2531,9 +2592,7 @@ sub add_video_entry {
     );
 
     if ($CONFIG{show_thumbs}) {
-        my $thumb_url = $yv_utils->get_thumbnail_url($video, $CONFIG{thumbnail_type});
-        my $pixbuf    = get_pixbuf_thumbnail($thumb_url);
-        $liststore->set_value($iter, 1, $pixbuf);
+        set_thumbnail($video, $liststore, $iter);
     }
 }
 
@@ -2573,8 +2632,7 @@ sub add_channel_entry {
     $liststore->set($iter, 2, reflow_text("<b>$symbols{diamond}</b>  " . 'Channel' . "\n"));
 
     if ($CONFIG{show_thumbs}) {
-        my $pixbuf = get_pixbuf_thumbnail($yv_utils->get_thumbnail_url($channel, $CONFIG{thumbnail_type}));
-        $liststore->set_value($iter, 1, $pixbuf);
+        set_thumbnail($channel, $liststore, $iter);
     }
 }
 
@@ -2611,39 +2669,15 @@ sub add_playlist_entry {
 
     my $num_items_template = "<b>$symbols{numero}</b>  %d items\n";
     my $num_items_text     = "";
+
     if (defined($playlist->{contentDetails}{itemCount})) {
         $num_items_text = sprintf $num_items_template, $playlist->{contentDetails}->{itemCount};
     }
-    else {
-        # append number of items delayed
-        Glib::Idle->add(
-            sub {
-                my ($liststore, $iter, $text_column, $playlist_id, $playlist_id_column, $num_items_template) = @{$_[0]};
-
-                # fetch contentDetails of playlist
-                my $results = $yv_obj->playlist_from_id($playlist_id);
-                my $info    = $results->{results};
-                my $items   = $info->{items};
-                my $item    = $items->[0];
-
-                # ensure the given iter still represents the given playlist
-                if ($liststore->get($iter, $playlist_id_column) eq $playlist_id) {
-                    my $text = $liststore->get($iter, $text_column);
-                    $text .= sprintf $num_items_template, $item->{contentDetails}->{itemCount};
-                    $liststore->set($iter, $text_column, $text);
-                }
-                return 0;
-            },
-            [$liststore, $iter, 2, $playlist_id, 3, $num_items_template],
-            Glib::G_PRIORITY_DEFAULT_IDLE
-                       );
-    }
 
     $liststore->set($iter, 2, reflow_text("<b>$symbols{diamond}</b>  " . 'Playlist' . "\n" . $num_items_text));
 
     if ($CONFIG{show_thumbs}) {
-        my $pixbuf = get_pixbuf_thumbnail($yv_utils->get_thumbnail_url($playlist, $CONFIG{thumbnail_type}));
-        $liststore->set_value($iter, 1, $pixbuf);
+        set_thumbnail($playlist, $liststore, $iter);
     }
 }
 
@@ -3280,18 +3314,32 @@ sub set_entry_details {
     # Setting the link button
     my $url        = make_youtube_url($type, $code);
     my $linkbutton = $gui->get_object('linkbutton1');
+
     $linkbutton->set_label($url);
     $linkbutton->set_uri($url);
 
     # Getting thumbs
     foreach my $nr (qw(1 2 3)) {
-        if ($code =~ /$valid_video_id_re/) {
-            my $pixbuf = get_pixbuf_thumbnail(sprintf($CONFIG{youtube_thumb_url}, $code, $nr), 120, 90);
-            $gui->get_object("image$nr")->set_from_pixbuf($pixbuf);
-        }
-        else {
-            $gui->get_object("image$nr")->set_from_pixbuf($default_thumb);
-        }
+
+        $gui->get_object("image$nr")->set_from_pixbuf($default_thumb);
+
+        Glib::Idle->add(
+            sub {
+                my ($nr) = @{$_[0]};
+
+                if ($code =~ /$valid_video_id_re/) {
+                    my $pixbuf = get_pixbuf_thumbnail(sprintf($CONFIG{youtube_thumb_url}, $code, $nr), 120, 90);
+                    $gui->get_object("image$nr")->set_from_pixbuf($pixbuf);
+                }
+                else {
+                    $gui->get_object("image$nr")->set_from_pixbuf($default_thumb);
+                }
+
+                return 0;
+            },
+            [$nr],
+            Glib::G_PRIORITY_DEFAULT_IDLE
+                       );
     }
 
     # Setting textview description
@@ -3313,4 +3361,19 @@ sub on_mainw_destroy {
 
 $notebook->set_current_page($CONFIG{default_notebook_page});
 
+if (@ARGV) {
+    my $text = join(' ', @ARGV);
+    $search_entry->set_text($text);
+    $search_entry->set_position(length($text));
+
+    Glib::Idle->add(
+        sub {
+            search();
+            return 0;
+        },
+        [],
+        Glib::G_PRIORITY_DEFAULT_IDLE
+                   );
+}
+
 'Gtk2'->main;

lib/WWW/YoutubeViewer/Playlists.pm

@@ -52,8 +52,8 @@ PlaylistIDs can be separated by commas.
 =cut
 
 sub playlist_from_id {
-    my ($self, $id) = @_;
-    $self->_get_results($self->_make_playlists_url(id => $id));
+    my ($self, $id, $part) = @_;
+    $self->_get_results($self->_make_playlists_url(id => $id, part => ($part // 'snippet')));
 }
 
 =head2 playlists($channel_id)

share/gtk-youtube-viewer.glade

@@ -2232,6 +2232,8 @@ See <https://dev.perl.org/licenses/> for more information.
     <property name="title" translatable="yes">Video details</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
+    <property name="default_width">300</property>
+    <property name="default_height">400</property>
     <property name="transient_for">__MAIN__</property>
     <signal name="destroy" handler="hide_details_window" swapped="no"/>
     <signal name="delete-event" handler="hide_details_window" swapped="no"/>