Changeset 2197 for lang/perl/WWW-NicoVideo

Timestamp:

12/01/07 03:02:29 (14 months ago)

Author:

yasu

Message:

lang/perl/WWW-NicoVideo?:

個別エントリから情報を取得するオプション (fetchEntry) を追加。(NicoVideo?.pm)
個別エントリから情報を取得するメソッド (fetch) を追加。(NicoVideo/Entry?.pm)
nicoURLでエントリのURLを取得できるように変更。(NicoVideo?/URL.pm)
とかちつくちて。

Location:

lang/perl/WWW-NicoVideo/trunk/lib/WWW

Files:

• NicoVideo.pm (modified) (3 diffs)
• NicoVideo/Entry.pm (modified) (2 diffs)
• NicoVideo/URL.pm (modified) (2 diffs)

lang/perl/WWW-NicoVideo/trunk/lib/WWW/NicoVideo.pm

@@ -17 +17 @@
 use WWW::NicoVideo::URL;
 
-__PACKAGE__->mk_accessors(qw[agent retry retryInterval mail passwd]);
+__PACKAGE__->mk_accessors(qw[agent retry retryInterval mail passwd fetchEntry]);
 
 our $VERSION = "0.04";
@@ -37 +37 @@
          retryInterval => $opts{retryInterval} || 30,
          mail => $opts{mail},
-         passwd => $opts{passwd}}, $pkg;
+         passwd => $opts{passwd},
+         fetchEntry => $opts{fetchEntry}}, $pkg;
 }
 
@@ -149 +150 @@
 
   my $scraper = scraper_entries();
-  my @res = (map { WWW::NicoVideo::Entry->new($_) }
-             @{$scraper->scrape($html)->{entries} || []});
+  my @res;
+  foreach my $e (@{$scraper->scrape($html)->{entries} || []}) {
+    my $ent = new WWW::NicoVideo::Entry($e);
+    $ent->fetch if($self->{fetchEntry});
+;
+    push @res, $ent;
+  }
+
   wantarray? @res: \@res;
 }

lang/perl/WWW-NicoVideo/trunk/lib/WWW/NicoVideo/Entry.pm

@@ -6 +6 @@
 use warnings;
 use base qw[Class::Accessor];
+use Carp;
+use WWW::NicoVideo;
+use WWW::NicoVideo::Scraper;
+use WWW::NicoVideo::URL;
 
 __PACKAGE__->mk_accessors(qw[id
                              comment
                              desc
+                             fullDesc
+                             postDateTime
+                             postDateTimeStr
+                             tags
                              imgHeight
                              imgUrl
@@ -21 +29 @@
                              title
                              url
+                             agent
+                             agentOpts
                             ]);
 
+sub fetch
+{
+  my $self = shift;
+  $self->{agent} ||= new LWP::UserAgent(agent => $WWW::NicoVideo::AGENT_NAME,
+                                        timeout => 30,
+                                        %{$self->{agentOpts}});
+  my $uri = nicoURL("entry", $self->{id});
+
+  my $scraper = scraper_entry;
+  $scraper->user_agent($self->{agent});
+
+  my $ent;
+  eval { $ent = $scraper->scrape($uri) } or do {
+     carp $@;
+     return;
+  };
+
+  @$self{keys %$ent} = values %$ent;
+}
+
 "Ritsuko";

lang/perl/WWW-NicoVideo/trunk/lib/WWW/NicoVideo/URL.pm

@@ -18 +18 @@
                  img => "http://res.nicovideo.jp/img/tpl/head/logo/rc.gif",
                  login => "https://secure.nicovideo.jp/secure/login?site=niconico",
-                 fmt => "http://www.nicovideo.jp/%s/%s");
+                 entry_fmt => "http://www.nicovideo.jp/watch/%s",
+                 entry_list_fmt => "http://www.nicovideo.jp/%s/%s");
 
 sub nicoURL
@@ -27 +28 @@
   $type = "top" if(!$type and !@keys);
 
-  if(defined $type and @keys) {
+  if(defined $type and $type =~ /^(?:tag|search)$/ and @keys) {
     my $keys = join " ", @keys;
     utf8::encode($keys) if(utf8::is_utf8($keys));
-    return new URI(sprintf($NICO_URL{fmt}, $type, uri_escape($keys)));
+    return new URI(sprintf($NICO_URL{entry_list_fmt},
+                           $type,
+                           uri_escape($keys)));
+  } elsif(defined $type and $type eq "entry" and @keys) {
+    my $id = $keys[0];
+    return new URI(sprintf($NICO_URL{entry_fmt},
+                           $id));
   } elsif(defined $type and defined $NICO_URL{$type}) {
     return new URI($NICO_URL{$type});