Changeset 433 for HatenaBookmarker

Timestamp:

09/20/07 12:28:35 (14 months ago)

Author:

ogawa

Message:

renaming several methods for clarifying their purpose.
aggregating multiple background jobs to a single job when bookmarking
multiple entries.

Files:

• HatenaBookmarker/trunk/HatenaBookmarker/HatenaBookmarker.pl (modified) (10 diffs)

HatenaBookmarker/trunk/HatenaBookmarker/HatenaBookmarker.pl

@@ -14 +14 @@
 use MT;
 
-our $VERSION = '0.01';
+our $VERSION = '0.10';
 
 my $plugin = __PACKAGE__->new({
@@ -33 +33 @@
 });
 MT->add_plugin($plugin);
+
+sub instance { $plugin }
 
 sub init_registry {
@@ -73 +75 @@
 }
 
+##
+## handlers
+##
 sub post_save_entry {
     my $class = shift;
@@ -102 +107 @@
     my @entry_ids = $app->param('id')
         or return $app->error($plugin->translate('No [_1] was selected to bookmark.', $type));
-    for my $entry_id (@entry_ids) {
-        my $entry = $class->load($entry_id)
-            or return $app->error($plugin->translate('Invalid entry_id'));
-        if ($entry->status == MT::Entry::RELEASE()) {
-            MT::Util::start_background_task(
-                sub { bookmark_entry($app, $entry) }
-            );
-        }
-    }
+    MT::Util::start_background_task(
+        sub {
+            for my $entry_id (@entry_ids) {
+                my $entry = $class->load($entry_id)
+                    or return $app->error($plugin->translate('Invalid entry_id'));
+                if ($entry->status == MT::Entry::RELEASE()) {
+                    bookmark_entry($app, $entry);
+                }
+            }
+        }
+    );
     $app->call_return;
 }
 
+##
+## main
+##
 use MT::Log;
 use MT::I18N;
@@ -156 +166 @@
 
     my $saved_title   = $bookmark->title;
-    my $saved_summary = extract_summary($bookmark);
+    my $saved_summary = get_bookmark_summary($bookmark);
     my $title         = format_bm_title($config->{hatena_bm_title}, $entry);
-    my $summary       = tags2summary($entry) || keywords2summary($entry->keywords) || '';
+    my $summary       = get_entry_summary($entry);
 
     my $enc = $app->config->PublishCharset || 'utf-8';
@@ -193 +203 @@
     }
 }
+
+##
+## utilities
+##
 
 # format bookmark title
@@ -212 +226 @@
 
 # extract summary text from a hatena entry
-sub extract_summary {
+sub get_bookmark_summary {
     my $entry = shift;
     my $summary = '';
@@ -222 +236 @@
 }
 
-# convert MT keywords to summary text
-sub keywords2summary {
-    my $str = shift;
-    return '' unless $str;
+# extract summary text from an MT entry
+sub get_entry_summary {
+    my $entry = shift;
+    tags_to_text($entry) || keywords_to_text($entry) || '';
+}
+
+# convert entry tags to a flattened text
+sub tags_to_text {
+    my $entry = shift;
+    return '' unless $entry->can('tags');
+
+    my $text = '';
+    for my $tag ($entry->tags) {
+        $text .= '[' . $tag . ']';
+    }
+    $text;
+}
+
+# convert entry keywords to a flattened text
+sub keywords_to_text {
+    my $entry = shift;
+    my $str = $entry->keywords or return '';
     $str =~ s/\#.*$//g;
     $str =~ s/(^\s+|\s+$)//g;
     return '' unless $str;
 
-    my $summary = '';
+    my $text = '';
     if ($str =~ m/[;,|]/) {
         # separated by non-whitespaces
@@ -236 +268 @@
             my $tag = $1;
             $tag =~ s/(^[\["'\s;,|]+|[\]"'\s;,|]+$)//g;
-            $summary .= '[' . $tag . ']' if $tag;
+            $text .= '[' . $tag . ']' if $tag;
         }
     } else {
@@ -243 +275 @@
             my $tag = $1;
             $tag =~ s/(^[\["'\s]+|[\]"'\s]+$)//g;
-            $summary .= '[' . $tag . ']' if $tag;
-        }
-    }
-    $summary;
-}
-
-# convert MT tags to summary text
-sub tags2summary {
-    my $entry = shift;
-    return '' unless $entry->can('tags');
-
-    my $summary = '';
-    for my $tag ($entry->tags) {
-        $summary .= '[' . $tag . ']';
-    }
-    $summary;
+            $text .= '[' . $tag . ']' if $tag;
+        }
+    }
+    $text;
 }