Changeset 63 for FlickrPublicPhotos/trunk/FlickrPublicPhotos.pl

Timestamp:

05/06/05 16:35:38 (4 years ago)

Author:

ogawa

Message:

Code cleanup

Files:

• FlickrPublicPhotos/trunk/FlickrPublicPhotos.pl (modified) (5 diffs)

FlickrPublicPhotos/trunk/FlickrPublicPhotos.pl

@@ -1 +1 @@
 # A plugin for adding "FlickrPublicPhotos" container and related tags
 #
-# Release 0.10 (Mar 5, 2005)
+# Release 0.11 (Mar 6, 2005)
 #
 # This software is provided as-is. You may use it for commercial or 
@@ -16 +16 @@
     $plugin = new MT::Plugin();
     $plugin->name("FlickrPublicPhotos Plugin");
-    $plugin->description("Add FlickrPublicPhotos container and related tags. Version 0.10");
+    $plugin->description("Add FlickrPublicPhotos container and related tags. Version 0.11");
     $plugin->doc_link("http://as-is.net/hacks/2005/05/flickrpublicphotos_plugin.html");
     MT->add_plugin($plugin);
@@ -59 +59 @@
 
 sub photo_title {
-    $_[0]->stash('flickr_public_photo')->{title};
+    $_[0]->stash('flickr_public_photo')->title;
 }
 
 sub photo_url {
-    my $photo = $_[0]->stash('flickr_public_photo');
-    my $url = 'http://www.flickr.com/photos/' . $photo->{nsid} . '/' . $photo->{id} . '/';
+    $_[0]->stash('flickr_public_photo')->url;
+}
+
+sub photo_img_url {
+    $_[0]->stash('flickr_public_photo')->img_url($_[1]->{size} || 't');
+}
+
+package MT::Plugin::FlickrPublicPhotos::Photo;
+
+sub new {
+    my ($class, $params) = @_;
+    $params ||= {};
+    bless $params, $class;
+}
+
+sub title {
+    my $this = shift;
+    $this->{title} || '';
+}
+
+sub url {
+    my $this = shift;
+    my $url = 'http://www.flickr.com/photos/' . $this->{nsid} . '/' . $this->{id} . '/';
     $url;
 }
 
-sub photo_img_url {
-    my ($ctx, $args) = @_;
-    my $photo = $ctx->stash('flickr_public_photo');
-    my $size = $args->{size} || 't';
-    my $url = 'http://photos' . $photo->{server} . '.flickr.com/' . $photo->{id} . '_' . $photo->{secret} . '_' . $size . '.jpg';
+sub img_url {
+    my $this = shift;
+    my ($size) = @_;
+    $size ||= 't';
+    my $url = 'http://photos' . $this->{server} . '.flickr.com/' . $this->{id} . '_' . $this->{secret} . '_' . $size . '.jpg';
     $url;
-}
-
-package MT::Plugin::FlickrPublicPhotos::Photo;
-use constant DEFAULT => {
-    id => undef,
-    nsid => undef,
-    secret => undef,
-    server => undef,
-    title => undef
-};
-
-sub new {
-    my $class = shift;
-    my %params = @_;
-    my $self = {};
-    bless $self => $class;
 }
 
@@ -98 +103 @@
 
 sub new {
-    my $class = shift;
-    bless $class->SUPER::new({ key => API_KEY }) => $class;
+    my ($class, $params) = @_;
+    my $key = $params->{key} || API_KEY;
+    bless $class->SUPER::new({ key => $key }), $class;
 }
 
 sub resolve_nsid {
-    my $class = shift;
+    my $this = shift;
     my ($uname) = @_;
     return $uname if $uname =~ /^\d+\@N00$/;
-    my $rsp = $class->execute_method('flickr.people.findByUsername', 
-                                     { username => $uname });
+
+    my $rsp = ($uname =~ /^[^@]+@[^.]+\..+/) ?
+        $this->execute_method('flickr.people.findByEmail',
+                              { find_email => $uname }) :
+        $this->execute_method('flickr.people.findByUsername',
+                              { username => $uname });
     die "Flickr request failed: " . $rsp->{error_message} . "\n"
         unless $rsp->{success} == 1;
@@ -117 +127 @@
 
 sub photos {
-    my $class = shift;
+    my $this = shift;
     my ($uname) = @_;
     my @photos = ();
-    my $nsid = $class->resolve_nsid($uname);
-    my $rsp = $class->execute_method('flickr.people.getPublicPhotos',
-                                     { user_id => $nsid });
+    my $nsid = $this->resolve_nsid($uname);
+    my $rsp = $this->execute_method('flickr.people.getPublicPhotos',
+                                    { user_id => $nsid });
     die "Flickr request failed: " . $rsp->{error_message} . "\n"
         unless $rsp->{success} == 1;