Changeset 840

Timestamp:

05/29/06 18:57:17

Author:

miyagawa

Message:

• $ua->mirror($req, $file) now doesn't initialize $req so that you can modify headers. Fixes #229
  
• Added fake_referer: config to FetchEnclosures? so that it adds Referer: when downloading enclosures
  
• Publish::Gmail attaches inline encllosures (e.g. <img>s) as inline, rewriting src to cid:
  

Files:

• trunk/plagger/lib/Plagger/Plugin/Filter/FetchEnclosure.pm (modified) (1 diff)
• trunk/plagger/lib/Plagger/Plugin/Publish/Gmail.pm (modified) (4 diffs)
• trunk/plagger/lib/Plagger/UserAgent.pm (modified) (1 diff)
• trunk/plagger/t/plugins/Filter-FetchEnclosure (added)
• trunk/plagger/t/plugins/Filter-FetchEnclosure/fetch.t (added)

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

@@ -38 +38 @@
-        my $path = File::Spec->catfile($feed_dir, $enclosure->filename);
-        $context->log(info => "fetch " . $enclosure->url . " to " . $path);
-
+
+
+
+
+
+
+
+
-        $enclosure->local_path($path); # set to be used in later plugins
-

trunk/plagger/lib/Plagger/Plugin/Publish/Gmail.pm

@@ -9 +9 @@
-use Encode;
-use Encode::MIME::Header;
+use HTML::Entities;
+use HTML::Parser;
-use MIME::Lite;
-
@@ -53 +55 @@
-    my $feed = $args->{feed};
-    my $subject = $feed->title || '(no-title)';
+
+    my $enclosure_cb;
+    for my $entry ($args->{feed}->entries) {
+        $enclosure_cb = $self->prepare_enclosures($entry);
+    }
+
-    my $body = $self->templatize($context, $feed);
-
@@ -78 +86 @@
-    );
-
-
-
-
-
-
-
-
-
-
+
+
-    }
-
@@ -110 +111 @@
-}
-
+sub prepare_enclosures {
+    my($self, $entry) = @_;
+
+    if (grep $_->is_inline, $entry->enclosures) {
+        # replace inline enclosures to cid: entities
+        my %url2enclosure = map { $_->url => $_ } $entry->enclosures;
+
+        my $output;
+        my $p = HTML::Parser->new(api_version => 3);
+        $p->handler( default => sub { $output .= $_[0] }, "text" );
+        $p->handler( start => sub {
+                         my($tag, $attr, $attrseq, $text) = @_;
+                         # TODO: use HTML::Tagset?
+                         if (my $url = $attr->{src}) {
+                             if (my $enclosure = $url2enclosure{$url}) {
+                                 $attr->{src} = "cid:" . $self->enclosure_id($enclosure);
+                             }
+                             $output .= $self->generate_tag($tag, $attr, $attrseq);
+                         } else {
+                             $output .= $text;
+                         }
+                     }, "tag, attr, attrseq, text");
+        $p->parse($entry->body);
+        $p->eof;
+
+        $entry->body($output);
+    }
+
+    return sub {
+        my $msg = shift;
+
+        for my $enclosure (grep $_->local_path, $entry->enclosures) {
+            my %param = (
+                Type => $enclosure->type,
+                Path => $enclosure->local_path,
+                Filename => $enclosure->filename,
+            );
+
+            if ($enclosure->is_inline) {
+                $param{Id} = '<' . $self->enclosure_id($enclosure) . '>';
+                $param{Disposition} = 'inline';
+            } else {
+                $param{Disposition} = 'attachment';
+            }
+
+            $msg->attach(%param);
+        }
+    }
+}
+
+sub generate_tag {
+    my($self, $tag, $attr, $attrseq) = @_;
+
+    return "<$tag " .
+        join(' ', map { $_ eq '/' ? '/' : sprintf qq(%s="%s"), $_, encode_entities($attr->{$_}, q(<>"')) } @$attrseq) .
+        '>';
+}
+
+sub enclosure_id {
+    my($self, $enclosure) = @_;
+    return Digest::MD5::md5_hex($enclosure->url->as_string) . '@Plagger';
+}
+
-sub templatize {
-    my($self, $context, $feed) = @_;

trunk/plagger/lib/Plagger/UserAgent.pm

@@ -32 +32 @@
-}
-
+sub mirror {
+    my($self, $request, $file) = @_;
+
+    unless (ref($request)) {
+        return $self->SUPER::mirror($request, $file);
+    }
+
+    # below is copied from LWP::UserAgent
+    if (-e $file) {
+        my($mtime) = (stat($file))[9];
+        if($mtime) {
+            $request->header('If-Modified-Since' =>
+                             HTTP::Date::time2str($mtime));
+        }
+    }
+    my $tmpfile = "$file-$$";
+
+    my $response = $self->request($request, $tmpfile);
+    if ($response->is_success) {
+
+        my $file_length = (stat($tmpfile))[7];
+        my($content_length) = $response->header('Content-length');
+
+        if (defined $content_length and $file_length < $content_length) {
+            unlink($tmpfile);
+            die "Transfer truncated: " .
+                "only $file_length out of $content_length bytes received\n";
+        }
+        elsif (defined $content_length and $file_length > $content_length) {
+            unlink($tmpfile);
+            die "Content-length mismatch: " .
+                "expected $content_length bytes, got $file_length\n";
+        }
+        else {
+            # OK
+            if (-e $file) {
+                # Some dosish systems fail to rename if the target exists
+                chmod 0777, $file;
+                unlink $file;
+            }
+            rename($tmpfile, $file) or
+                die "Cannot rename '$tmpfile' to '$file': $!\n";
+
+            if (my $lm = $response->last_modified) {
+                # make sure the file has the same last modification time
+                utime $lm, $lm, $file;
+            }
+        }
+    }
+    else {
+        unlink($tmpfile);
+    }
+    return $response;
+}
+
-1;
-