Don't confuse old readers with Atom names in RSS.

[git.ikiwiki.info.git] / IkiWiki / Plugin / inline.pm

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index e5a5c112e33eef3b5bd5cd686c9313ce96083eec..e313eb7755313ea051b14f43310168fb5750dd0e 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -19,14 +19,14 @@ sub import {
        hook(type => "checkconfig", id => "inline", call => \&checkconfig);
        hook(type => "sessioncgi", id => "inline", call => \&sessioncgi);
        hook(type => "preprocess", id => "inline", 
        hook(type => "checkconfig", id => "inline", call => \&checkconfig);
        hook(type => "sessioncgi", id => "inline", call => \&sessioncgi);
        hook(type => "preprocess", id => "inline", 

-               call => \&IkiWiki::preprocess_inline);
+               call => \&IkiWiki::preprocess_inline, scan => 1);

        hook(type => "pagetemplate", id => "inline",
                call => \&IkiWiki::pagetemplate_inline);
        hook(type => "format", id => "inline", call => \&format, first => 1);
        # Hook to change to do pinging since it's called late.
        # This ensures each page only pings once and prevents slow
        # pings interrupting page builds.
        hook(type => "pagetemplate", id => "inline",
                call => \&IkiWiki::pagetemplate_inline);
        hook(type => "format", id => "inline", call => \&format, first => 1);
        # Hook to change to do pinging since it's called late.
        # This ensures each page only pings once and prevents slow
        # pings interrupting page builds.

-       hook(type => "change", id => "inline", call => \&IkiWiki::pingurl);
+       hook(type => "rendered", id => "inline", call => \&IkiWiki::pingurl);

 }
 
 sub getopt () {
 }
 
 sub getopt () {


@@ -155,6 +155,23 @@ sub preprocess_inline (@) {
        if (! exists $params{pages} && ! exists $params{pagenames}) {
                error gettext("missing pages parameter");
        }
        if (! exists $params{pages} && ! exists $params{pagenames}) {
                error gettext("missing pages parameter");
        }

+
+       if (! defined wantarray) {
+               # Running in scan mode: only do the essentials
+
+               if (yesno($params{trail}) && IkiWiki::Plugin::trail->can("preprocess_trailitems")) {
+                       # default to sorting age, the same as inline itself,
+                       # but let the params override that
+                       IkiWiki::Plugin::trail::preprocess_trailitems(sort => 'age', %params);
+               }
+
+               return;
+       }
+
+       if (yesno($params{trail}) && IkiWiki::Plugin::trail->can("preprocess_trailitems")) {
+               scalar IkiWiki::Plugin::trail::preprocess_trailitems(sort => 'age', %params);
+       }
+

        my $raw=yesno($params{raw});
        my $archive=yesno($params{archive});
        my $rss=(($config{rss} || $config{allowrss}) && exists $params{rss}) ? yesno($params{rss}) : $config{rss};
        my $raw=yesno($params{raw});
        my $archive=yesno($params{archive});
        my $rss=(($config{rss} || $config{allowrss}) && exists $params{rss}) ? yesno($params{rss}) : $config{rss};


@@ -194,8 +211,7 @@ sub preprocess_inline (@) {
                        }
                }
 
                        }
                }
 

-               @list = map { bestlink($params{page}, $_) }
-                       split ' ', $params{pagenames};
+               @list = split ' ', $params{pagenames};

 
                if (yesno($params{reverse})) {
                        @list=reverse(@list);
 
                if (yesno($params{reverse})) {
                        @list=reverse(@list);


@@ -204,6 +220,8 @@ sub preprocess_inline (@) {
                foreach my $p (@list) {
                        add_depends($params{page}, $p, deptype($quick ? "presence" : "content"));
                }
                foreach my $p (@list) {
                        add_depends($params{page}, $p, deptype($quick ? "presence" : "content"));
                }

+
+               @list = grep { exists $pagesources{$_} } @list;

        }
        else {
                my $num=0;
        }
        else {
                my $num=0;


@@ -294,11 +312,11 @@ sub preprocess_inline (@) {
        if ($feeds) {
                if ($rss) {
                        $rssurl=abs2rel($feedbase."rss".$feednum, dirname(htmlpage($params{destpage})));
        if ($feeds) {
                if ($rss) {
                        $rssurl=abs2rel($feedbase."rss".$feednum, dirname(htmlpage($params{destpage})));

-                       $rssdesc = "$desc (RSS)";
+                       $rssdesc = sprintf(gettext("%s (RSS feed)"), $desc);

                }
                if ($atom) {
                        $atomurl=abs2rel($feedbase."atom".$feednum, dirname(htmlpage($params{destpage})));
                }
                if ($atom) {
                        $atomurl=abs2rel($feedbase."atom".$feednum, dirname(htmlpage($params{destpage})));

-                       $atomdesc = "$desc (Atom)";
+                       $atomdesc = sprintf(gettext("%s (Atom feed)"), $desc);

                }
        }
 
                }
        }
 


@@ -329,6 +347,10 @@ sub preprocess_inline (@) {
                        $formtemplate->param(postformtext =>
                                gettext("Add a new post titled:"));
                }
                        $formtemplate->param(postformtext =>
                                gettext("Add a new post titled:"));
                }

+               if (exists $params{id}) {
+                       $formtemplate->param(postformid =>
+                               $params{id});
+               }

                $ret.=$formtemplate->output;
                
                # The post form includes the feed buttons, so
                $ret.=$formtemplate->output;
                
                # The post form includes the feed buttons, so


@@ -346,6 +368,9 @@ sub preprocess_inline (@) {
                        $linktemplate->param(atomurl => $atomurl);
                        $linktemplate->param(atomdesc => $atomdesc);
                }
                        $linktemplate->param(atomurl => $atomurl);
                        $linktemplate->param(atomdesc => $atomdesc);
                }

+               if (exists $params{id}) {
+                       $linktemplate->param(id => $params{id});
+               }

                $ret.=$linktemplate->output;
        }
        
                $ret.=$linktemplate->output;
        }
        


@@ -440,7 +465,7 @@ sub preprocess_inline (@) {
                        if (! $params{preview}) {
                                writefile($rssp, $config{destdir},
                                        genfeed("rss",
                        if (! $params{preview}) {
                                writefile($rssp, $config{destdir},
                                        genfeed("rss",

-                                               $config{url}."/".$rssp, $desc, $params{guid}, $params{destpage}, @feedlist));
+                                               $config{url}."/".$rssp, $desc, $params{guid}, $params{page}, @feedlist));

                                $toping{$params{destpage}}=1 unless $config{rebuild};
                                $feedlinks{$params{destpage}}.=qq{<link rel="alternate" type="application/rss+xml" title="$rssdesc" href="$rssurl" />};
                        }
                                $toping{$params{destpage}}=1 unless $config{rebuild};
                                $feedlinks{$params{destpage}}.=qq{<link rel="alternate" type="application/rss+xml" title="$rssdesc" href="$rssurl" />};
                        }


@@ -450,7 +475,7 @@ sub preprocess_inline (@) {
                        will_render($params{destpage}, $atomp);
                        if (! $params{preview}) {
                                writefile($atomp, $config{destdir},
                        will_render($params{destpage}, $atomp);
                        if (! $params{preview}) {
                                writefile($atomp, $config{destdir},

-                                       genfeed("atom", $config{url}."/".$atomp, $desc, $params{guid}, $params{destpage}, @feedlist));
+                                       genfeed("atom", $config{url}."/".$atomp, $desc, $params{guid}, $params{page}, @feedlist));

                                $toping{$params{destpage}}=1 unless $config{rebuild};
                                $feedlinks{$params{destpage}}.=qq{<link rel="alternate" type="application/atom+xml" title="$atomdesc" href="$atomurl" />};
                        }
                                $toping{$params{destpage}}=1 unless $config{rebuild};
                                $feedlinks{$params{destpage}}.=qq{<link rel="alternate" type="application/atom+xml" title="$atomdesc" href="$atomurl" />};
                        }


@@ -499,7 +524,7 @@ sub get_inline_content ($$) {
                if (isinternal($page)) {
                        # make inlined text of internal pages searchable
                        run_hooks(indexhtml => sub {
                if (isinternal($page)) {
                        # make inlined text of internal pages searchable
                        run_hooks(indexhtml => sub {

-                               shift->(page => $page, destpage => $page,
+                               shift->(page => $page, destpage => $destpage,

                                        content => $ret);
                        });
                }
                                        content => $ret);
                        });
                }


@@ -557,13 +582,15 @@ sub absolute_urls ($$) {
                                next unless $v_offset; # 0 v_offset means no value
                                my $v = substr($text, $v_offset, $v_len);
                                $v =~ s/^([\'\"])(.*)\1$/$2/;
                                next unless $v_offset; # 0 v_offset means no value
                                my $v = substr($text, $v_offset, $v_len);
                                $v =~ s/^([\'\"])(.*)\1$/$2/;

-                               if ($v=~/^#/) {
+                               eval q{use HTML::Entities};
+                               my $dv = decode_entities($v);
+                               if ($dv=~/^#/) {

                                        $v=$baseurl.$v; # anchor
                                }
                                        $v=$baseurl.$v; # anchor
                                }

-                               elsif ($v=~/^(?!\w+:)[^\/]/) {
+                               elsif ($dv=~/^(?!\w+:)[^\/]/) {

                                        $v=$url.$v; # relative url
                                }
                                        $v=$url.$v; # relative url
                                }

-                               elsif ($v=~/^\//) {
+                               elsif ($dv=~/^\//) {

                                        if (! defined $urltop) {
                                                # what is the non path part of the url?
                                                my $top_uri = URI->new($url);
                                        if (! defined $urltop) {
                                                # what is the non path part of the url?
                                                my $top_uri = URI->new($url);


@@ -584,6 +611,26 @@ sub absolute_urls ($$) {
        return $ret;
 }
 
        return $ret;
 }
 

+sub genenclosure {
+       my $itemtemplate=shift;
+       my $url=shift;
+       my $file=shift;
+
+       return unless $itemtemplate->query(name => "enclosure");
+
+       my $size=(srcfile_stat($file))[8];
+       my $mime="unknown";
+       eval q{use File::MimeInfo};
+       if (! $@) {
+               $mime = mimetype($file);
+       }
+       $itemtemplate->param(
+               enclosure => $url,
+               type => $mime,
+               length => $size,
+       );
+}
+

 sub genfeed ($$$$$@) {
        my $feedtype=shift;
        my $feedurl=shift;
 sub genfeed ($$$$$@) {
        my $feedtype=shift;
        my $feedurl=shift;


@@ -600,6 +647,7 @@ sub genfeed ($$$$$@) {
        foreach my $p (@pages) {
                my $u=URI->new(encode_utf8(urlto($p, "", 1)));
                my $pcontent = absolute_urls(get_inline_content($p, $page), $url);
        foreach my $p (@pages) {
                my $u=URI->new(encode_utf8(urlto($p, "", 1)));
                my $pcontent = absolute_urls(get_inline_content($p, $page), $url);

+               my $fancy_enclosure_seen = 0;

 
                $itemtemplate->param(
                        title => pagetitle(basename($p)),
 
                $itemtemplate->param(
                        title => pagetitle(basename($p)),


@@ -621,32 +669,27 @@ sub genfeed ($$$$$@) {
                                $itemtemplate->param(mdate_822 => date_822($pagestate{$p}{meta}{updated}));
                                $itemtemplate->param(mdate_3339 => date_3339($pagestate{$p}{meta}{updated}));
                        }
                                $itemtemplate->param(mdate_822 => date_822($pagestate{$p}{meta}{updated}));
                                $itemtemplate->param(mdate_3339 => date_3339($pagestate{$p}{meta}{updated}));
                        }

-               }

 
 

-               if ($itemtemplate->query(name => "enclosure")) {
-                       my $file=$pagesources{$p};
-                       my $type=pagetype($file);
-                       if (defined $type) {
-                               $itemtemplate->param(content => $pcontent);
-                       }
-                       else {
-                               my $size=(srcfile_stat($file))[8];
-                               my $mime="unknown";
-                               eval q{use File::MimeInfo};
-                               if (! $@) {
-                                       $mime = mimetype($file);
-                               }
-                               $itemtemplate->param(
-                                       enclosure => $u,
-                                       type => $mime,
-                                       length => $size,
-                               );
+                       if (exists $pagestate{$p}{meta}{enclosure}) {
+                               my $absurl = $pagestate{$p}{meta}{enclosure};
+
+                               # XXX better way to compute relative to srcdir?
+                               my $file = $absurl;
+                               $file =~ s|^$config{url}/||;
+
+                               genenclosure($itemtemplate, $absurl, $file);
+                               $fancy_enclosure_seen = 1;

                        }
                }
                        }
                }

-               else {
-                       $itemtemplate->param(content => $pcontent);
+
+               my $file=$pagesources{$p};
+               unless ($fancy_enclosure_seen || defined(pagetype($file))) {
+                       genenclosure($itemtemplate, $u, $file);
+                       $itemtemplate->param(simplepodcast => 1);

                }
 
                }
 

+               $itemtemplate->param(content => $pcontent);
+

                run_hooks(pagetemplate => sub {
                        shift->(page => $p, destpage => $page,
                                template => $itemtemplate);
                run_hooks(pagetemplate => sub {
                        shift->(page => $p, destpage => $page,
                                template => $itemtemplate);


@@ -667,8 +710,8 @@ sub genfeed ($$$$$@) {
                feeddesc => $feeddesc,
                guid => $guid,
                feeddate => date_3339($lasttime),
                feeddesc => $feeddesc,
                guid => $guid,
                feeddate => date_3339($lasttime),

+               feeddate_822 => date_822($lasttime),

                feedurl => $feedurl,
                feedurl => $feedurl,

-               version => $IkiWiki::version,

        );
        run_hooks(pagetemplate => sub {
                shift->(page => $page, destpage => $page,
        );
        run_hooks(pagetemplate => sub {
                shift->(page => $page, destpage => $page,