diff options
Diffstat (limited to 'lib/WWW')
| -rw-r--r-- | lib/WWW/FairViewer.pm | 42 | ||||
| -rw-r--r-- | lib/WWW/FairViewer/Search.pm | 10 |
2 files changed, 14 insertions, 38 deletions
diff --git a/lib/WWW/FairViewer.pm b/lib/WWW/FairViewer.pm index 8d8abff..d11286d 100644 --- a/lib/WWW/FairViewer.pm +++ b/lib/WWW/FairViewer.pm @@ -54,25 +54,15 @@ my %valid_options = ( order => {valid => [qw(relevance rating upload_date view_count)], default => undef}, date => {valid => [qw(hour today week month year)], default => undef}, - channelId => {valid => qr/^[-\w]{2,}\z/, default => undef}, - channelType => {valid => [qw(any show)], default => undef}, + channelId => {valid => qr/^[-\w]{2,}\z/, default => undef}, # Video only options - videoCaption => {valid => [qw(1 true)], default => undef}, - videoDefinition => {valid => [qw(high standard)], default => undef}, - videoCategoryId => {valid => qr/^\d+\z/, default => undef}, - videoDimension => {valid => [qw(2d 3d)], default => undef}, - videoDuration => {valid => [qw(short long)], default => undef}, - videoEmbeddable => {valid => [qw(true)], default => undef}, - videoLicense => {valid => [qw(creative_commons)], default => undef}, - videoSyndicated => {valid => [qw(true)], default => undef}, - eventType => {valid => [qw(completed live upcoming)], default => undef}, - chart => {valid => [qw(mostPopular)], default => 'mostPopular'}, - - region => {valid => qr/^[A-Z]{2}\z/i, default => undef}, - relevanceLanguage => {valid => qr/^[a-z]+(?:\-\w+)?\z/i, default => undef}, - safeSearch => {valid => [qw(none moderate strict)], default => undef}, - videoType => {valid => [qw(episode movie)], default => undef}, + videoCaption => {valid => [qw(1 true)], default => undef}, + videoDefinition => {valid => [qw(high standard)], default => undef}, + videoDimension => {valid => [qw(2d 3d)], default => undef}, + videoDuration => {valid => [qw(short long)], default => undef}, + videoLicense => {valid => [qw(creative_commons)], default => undef}, + region => {valid => qr/^[A-Z]{2}\z/i, default => undef}, comments_order => {valid => [qw(top new)], default => 'top'}, subscriptions_order => {valid => [qw(alphabetical relevance unread)], default => undef}, @@ -233,23 +223,9 @@ sub new { sub page_token { my ($self) = @_; - my $page = $self->get_page; - - # Don't generate the token for the first page - return undef if $page == 1; - - my $index = $page * $self->get_maxResults() - $self->get_maxResults(); - my $k = int($index / 128) - 1; - $index -= 128 * $k; - - my @f = (8, $index); - if ($k > 0 or $index > 127) { - push @f, $k + 1; - } - - require MIME::Base64; - MIME::Base64::encode_base64(pack('C*', @f, 16, 0)) =~ tr/=\n//dr; + return undef if ($page == 1); + return $page; } =head2 escape_string($string) diff --git a/lib/WWW/FairViewer/Search.pm b/lib/WWW/FairViewer/Search.pm index 69ae560..7242637 100644 --- a/lib/WWW/FairViewer/Search.pm +++ b/lib/WWW/FairViewer/Search.pm @@ -50,11 +50,11 @@ sub _make_search_url { return $self->_make_feed_url( 'search', - region => $self->get_region, - sort_by => $self->get_order, - date => $self->get_date, - pageToken => $self->page_token, - duration => $self->get_videoDuration, + region => $self->get_region, + sort_by => $self->get_order, + date => $self->get_date, + page => $self->page_token, + duration => $self->get_videoDuration, (@features ? (features => join(',', @features)) : ()), |