Changeset 494

Timestamp:

04/02/06 12:54:53

Author:

miyagawa

Message:

• EntryFullText? now can handle CustomFeed?
  
• entry fulltext handlers can be written in YAML
  

Files:

• trunk/plagger/assets/plugins/filter-entryfulltext/sportsnavi.pl (deleted)
• trunk/plagger/assets/plugins/filter-entryfulltext/sportsnavi.yaml (added)
• trunk/plagger/lib/Plagger/Plugin/CustomFeed/Simple.pm (modified) (2 diffs)
• trunk/plagger/lib/Plagger/Plugin/Filter/EntryFullText.pm (modified) (6 diffs)

trunk/plagger/lib/Plagger/Plugin/CustomFeed/Simple.pm

@@ -19 +19 @@
-    my($self, $context, $args) = @_;
-
-
+
+
-        return $self->aggregate($context, $args);
-    }
@@ -47 +48 @@
-    $feed->link($url);
-
-feed}->meta->{follow_link
+match
-
-    my $parser = HTML::TokeParser->new(\$content);

trunk/plagger/lib/Plagger/Plugin/Filter/EntryFullText.pm

@@ -10 +10 @@
-use Plagger::Date; # for metadata in plugins
-use Plagger::Util qw( decode_content );
-
+
-use Plagger::UserAgent;
-
@@ -17 +17 @@
-    $context->register_hook(
-        $self,
+        'customfeed.handle'  => \&handle,
-        'update.entry.fixup' => \&filter,
-    );
@@ -35 +36 @@
-    my $dir = $self->assets_dir;
-    my $dh = DirHandle->new($dir) or $context->error("$dir: $!");
-pl
+(?:yaml)
-                  map [ File::Spec->catfile($dir, $_), $_ ], $dh->read) {
-        $self->load_plugin(@$file);
@@ -45 +46 @@
-
-    Plagger->context->log(debug => "loading $file");
+
+    my $load_method = $file =~ /\.pl$/ ? 'load_plugin_perl' : 'load_plugin_yaml';
+    push @{ $self->{plugins} }, $self->$load_method($file, $base);
+}
+
+sub load_plugin_perl {
+    my($self, $file, $base) = @_;
-
-    open my $fh, $file or Plagger->context->error("$file: $!");
@@ -66 +74 @@
-    my $plugin = $plugin_class->new;
-    push @{ $self->{plugins} }, $plugin;
+}
+
+sub load_plugin_yaml {
+    my($self, $file, $base) = @_;
+    my $data = YAML::LoadFile($file);
+
+    return Plagger::Plugin::Filter::EntryFullText::YAML->new($data, $base);
+}
+
+sub handle {
+    my($self, $context, $args) = @_;
+
+    my $handler = first { $_->custom_feed_handle($args) } @{ $self->{plugins} };
+    if ($handler) {
+        $args->{match} = $handler->custom_feed_follow_link;
+        return $self->Plagger::Plugin::CustomFeed::Simple::aggregate($context, $args);
+    }
-}
-
@@ -113 +138 @@
-package Plagger::Plugin::Filter::EntryFullText::Site;
-sub new { bless {}, shift }
+sub custom_feed_handle { 0 }
+sub custom_feed_follow_link { }
-sub handle_force { 0 }
-sub handle { 0 }
+
+package Plagger::Plugin::Filter::EntryFullText::YAML;
+sub new {
+    my($class, $data, $base) = @_;
+    bless {%$data, base => $base }, $class;
+}
+
+sub site_name {
+    my $self = shift;
+    $self->{base};
+}
+
+sub custom_feed_handle {
+    my($self, $args) = @_;
+    $args->{feed}->url =~ /$self->{custom_feed_handle}/;
+}
+
+sub custom_feed_follow_link {
+    $_[0]->{custom_feed_follow_link};
+}
+
+sub handle_force {
+    my($self, $args) = @_;
+    $self->{handle_force}
+        ? $args->{entry}->link =~ /$self->{handle_force}/ : 0;
+}
+
+sub handle {
+    my($self, $args) = @_;
+    $args->{entry}->link =~ /$self->{handle}/;
+}
+
+sub extract {
+    my($self, $args) = @_;
+
+    if (my @match = $args->{content} =~ /$self->{extract}/s) {
+        my @capture = split /\s+/, $self->{extract_capture};
+        my %data; @data{@capture} = @match;
+        if ($data{date} && $self->{extract_date_format}) {
+            @data{date} = Plagger::Date->strptime($self->{extract_date_format}, $data{date});
+        }
+        return \%data;
+    }
+}
-
-1;