Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

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

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 0b3d5e40614040620f8d380df2809c57434d298a..d7117b6117a2c8407b8c551eedd77afcc06d59f4 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -8,14 +8,19 @@ use Encode;
 use IkiWiki 2.00;
 use URI;
 
 use IkiWiki 2.00;
 use URI;
 

+my %knownfeeds;
+my %page_numfeeds;
+my @inline;
+

 sub import { #{{{
        hook(type => "getopt", id => "inline", call => \&getopt);
        hook(type => "checkconfig", id => "inline", call => \&checkconfig);
 sub import { #{{{
        hook(type => "getopt", id => "inline", call => \&getopt);
        hook(type => "checkconfig", id => "inline", call => \&checkconfig);

-       hook(type => "sessioncgi", id => "skeleton", call => \&sessioncgi);
+       hook(type => "sessioncgi", id => "inline", call => \&sessioncgi);

        hook(type => "preprocess", id => "inline", 
                call => \&IkiWiki::preprocess_inline);
        hook(type => "pagetemplate", id => "inline",
                call => \&IkiWiki::pagetemplate_inline);
        hook(type => "preprocess", id => "inline", 
                call => \&IkiWiki::preprocess_inline);
        hook(type => "pagetemplate", id => "inline",
                call => \&IkiWiki::pagetemplate_inline);

+       hook(type => "format", id => "inline", call => \&format);

        # 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 to change to do pinging since it's called late.
        # This ensures each page only pings once and prevents slow
        # pings interrupting page builds.


@@ -31,6 +36,8 @@ sub getopt () { #{{{
        GetOptions(
                "rss!" => \$config{rss},
                "atom!" => \$config{atom},
        GetOptions(
                "rss!" => \$config{rss},
                "atom!" => \$config{atom},

+               "allowrss!" => \$config{allowrss},
+               "allowatom!" => \$config{allowatom},

        );
 }
 
        );
 }
 


@@ -46,6 +53,17 @@ sub checkconfig () { #{{{
        }
 } #}}}
 
        }
 } #}}}
 

+sub format (@) { #{{{
+        my %params=@_;
+
+       # Fill in the inline content generated earlier. This is actually an
+       # optimisation.
+       $params{content}=~s{<div class="inline" id="([^"]+)"></div>}{
+               delete @inline[$1,]
+       }eg;
+       return $params{content};
+} #}}}
+

 sub sessioncgi () { #{{{
        my $q=shift;
        my $session=shift;
 sub sessioncgi () { #{{{
        my $q=shift;
        my $session=shift;


@@ -88,19 +106,22 @@ sub preprocess_inline (@) { #{{{
        }
        my $raw=yesno($params{raw});
        my $archive=yesno($params{archive});
        }
        my $raw=yesno($params{raw});
        my $archive=yesno($params{archive});

-       my $rss=($config{rss} && exists $params{rss}) ? yesno($params{rss}) : $config{rss};
-       my $atom=($config{atom} && exists $params{atom}) ? yesno($params{atom}) : $config{atom};
+       my $rss=(($config{rss} || $config{allowrss}) && exists $params{rss}) ? yesno($params{rss}) : $config{rss};
+       my $atom=(($config{atom} || $config{allowatom}) && exists $params{atom}) ? yesno($params{atom}) : $config{atom};

        my $quick=exists $params{quick} ? yesno($params{quick}) : 0;
        my $feeds=exists $params{feeds} ? yesno($params{feeds}) : !$quick;
        my $quick=exists $params{quick} ? yesno($params{quick}) : 0;
        my $feeds=exists $params{feeds} ? yesno($params{feeds}) : !$quick;

-       $feeds=0 if $params{preview};

        my $feedonly=yesno($params{feedonly});
        if (! exists $params{show} && ! $archive) {
                $params{show}=10;
        }
        my $feedonly=yesno($params{feedonly});
        if (! exists $params{show} && ! $archive) {
                $params{show}=10;
        }

+       if (! exists $params{feedshow} && exists $params{show}) {
+               $params{feedshow}=$params{show};
+       }

        my $desc;
        if (exists $params{description}) {
                $desc = $params{description} 
        my $desc;
        if (exists $params{description}) {
                $desc = $params{description} 

-       } else {
+       }
+       else {

                $desc = $config{wikiname};
        }
        my $actions=yesno($params{actions});
                $desc = $config{wikiname};
        }
        my $actions=yesno($params{actions});


@@ -140,6 +161,17 @@ sub preprocess_inline (@) { #{{{
                @list=@list[$params{skip} .. scalar @list - 1];
        }
        
                @list=@list[$params{skip} .. scalar @list - 1];
        }
        

+       my @feedlist;
+       if ($feeds) {
+               if (exists $params{feedshow} &&
+                   $params{feedshow} && @list > $params{feedshow}) {
+                       @feedlist=@list[0..$params{feedshow} - 1];
+               }
+               else {
+                       @feedlist=@list;
+               }
+       }
+       

        if ($params{show} && @list > $params{show}) {
                @list=@list[0..$params{show} - 1];
        }
        if ($params{show} && @list > $params{show}) {
                @list=@list[0..$params{show} - 1];
        }


@@ -148,13 +180,33 @@ sub preprocess_inline (@) { #{{{
        # Explicitly add all currently displayed pages as dependencies, so
        # that if they are removed or otherwise changed, the inline will be
        # sure to be updated.
        # Explicitly add all currently displayed pages as dependencies, so
        # that if they are removed or otherwise changed, the inline will be
        # sure to be updated.

-       add_depends($params{page}, join(" or ", @list));
+       add_depends($params{page}, join(" or ", $#list >= $#feedlist ? @list : @feedlist));
+
+       my $feednum="";
+
+       my $feedid=join("\0", map { $_."\0".$params{$_} } sort keys %params);
+       if (exists $knownfeeds{$feedid}) {
+               $feednum=$knownfeeds{$feedid};
+       }
+       else {
+               if (exists $page_numfeeds{$params{destpage}}) {
+                       if ($feeds) {
+                               $feednum=$knownfeeds{$feedid}=++$page_numfeeds{$params{destpage}};
+                       }
+               }
+               else {
+                       $feednum=$knownfeeds{$feedid}="";
+                       if ($feeds) {
+                               $page_numfeeds{$params{destpage}}=1;
+                       }
+               }
+       }

 
 

-       my $rssurl=basename(rsspage($params{page}));
-       my $atomurl=basename(atompage($params{page}));
+       my $rssurl=basename(rsspage($params{destpage}).$feednum) if $feeds && $rss;
+       my $atomurl=basename(atompage($params{destpage}).$feednum) if $feeds && $atom;

        my $ret="";
 
        my $ret="";
 

-       if ($config{cgiurl} && (exists $params{rootpage} ||
+       if ($config{cgiurl} && ! $params{preview} && (exists $params{rootpage} ||

                        (exists $params{postform} && yesno($params{postform})))) {
                # Add a blog post form, with feed buttons.
                my $formtemplate=template("blogpost.tmpl", blind_cache => 1);
                        (exists $params{postform} && yesno($params{postform})))) {
                # Add a blog post form, with feed buttons.
                my $formtemplate=template("blogpost.tmpl", blind_cache => 1);


@@ -173,7 +225,7 @@ sub preprocess_inline (@) { #{{{
                }
                $ret.=$formtemplate->output;
        }
                }
                $ret.=$formtemplate->output;
        }

-       elsif ($feeds) {
+       elsif ($feeds && !$params{preview}) {

                # Add feed buttons.
                my $linktemplate=template("feedlink.tmpl", blind_cache => 1);
                $linktemplate->param(rssurl => $rssurl) if $rss;
                # Add feed buttons.
                my $linktemplate=template("feedlink.tmpl", blind_cache => 1);
                $linktemplate->param(rssurl => $rssurl) if $rss;


@@ -202,7 +254,9 @@ sub preprocess_inline (@) { #{{{
                                }
                                $template->param(pageurl => urlto(bestlink($params{page}, $page), $params{destpage}));
                                $template->param(title => pagetitle(basename($page)));
                                }
                                $template->param(pageurl => urlto(bestlink($params{page}, $page), $params{destpage}));
                                $template->param(title => pagetitle(basename($page)));

-                               $template->param(ctime => displaytime($pagectime{$page}));
+                               $template->param(ctime => displaytime($pagectime{$page}, $params{timeformat}));
+                               $template->param(first => 1) if $page eq $list[0];
+                               $template->param(last => 1) if $page eq $list[$#list];

        
                                if ($actions) {
                                        my $file = $pagesources{$page};
        
                                if ($actions) {
                                        my $file = $pagesources{$page};


@@ -215,7 +269,7 @@ sub preprocess_inline (@) { #{{{
                                                        $template->param(have_actions => 1);
                                                        $template->param(discussionlink =>
                                                                htmllink($page,
                                                        $template->param(have_actions => 1);
                                                        $template->param(discussionlink =>
                                                                htmllink($page,

-                                                                       $params{page},
+                                                                       $params{destpage},

                                                                        gettext("Discussion"),
                                                                        noimageinline => 1,
                                                                        forcesubpage => 1));
                                                                        gettext("Discussion"),
                                                                        noimageinline => 1,
                                                                        forcesubpage => 1));


@@ -228,7 +282,7 @@ sub preprocess_inline (@) { #{{{
                                }
        
                                run_hooks(pagetemplate => sub {
                                }
        
                                run_hooks(pagetemplate => sub {

-                                       shift->(page => $page, destpage => $params{page},
+                                       shift->(page => $page, destpage => $params{destpage},

                                                template => $template,);
                                });
        
                                                template => $template,);
                                });
        


@@ -238,9 +292,9 @@ sub preprocess_inline (@) { #{{{
                        else {
                                if (defined $type) {
                                        $ret.="\n".
                        else {
                                if (defined $type) {
                                        $ret.="\n".

-                                             linkify($page, $params{page},
-                                             preprocess($page, $params{page},
-                                             filter($page, $params{page},
+                                             linkify($page, $params{destpage},
+                                             preprocess($page, $params{destpage},
+                                             filter($page, $params{destpage},

                                              readfile(srcfile($file)))));
                                }
                        }
                                              readfile(srcfile($file)))));
                                }
                        }


@@ -248,32 +302,36 @@ sub preprocess_inline (@) { #{{{
        }
        
        if ($feeds) {
        }
        
        if ($feeds) {

-               if (exists $params{feedshow} && @list > $params{feedshow}) {
-                       @list=@list[0..$params{feedshow} - 1];
-               }

                if (exists $params{feedpages}) {
                if (exists $params{feedpages}) {

-                       @list=grep { pagespec_match($_, $params{feedpages}, location => $params{page}) } @list;
+                       @feedlist=grep { pagespec_match($_, $params{feedpages}, location => $params{page}) } @feedlist;

                }
        
                if ($rss) {
                }
        
                if ($rss) {

-                       my $rssp=rsspage($params{page});
-                       will_render($params{page}, $rssp);
-                       writefile($rssp, $config{destdir},
-                               genfeed("rss", $rssurl, $desc, $params{page}, @list));
-                       $toping{$params{page}}=1 unless $config{rebuild};
-                       $feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/rss+xml" title="RSS" href="$rssurl" />};
+                       my $rssp=rsspage($params{destpage}).$feednum;
+                       will_render($params{destpage}, $rssp);
+                       if (! $params{preview}) {
+                               writefile($rssp, $config{destdir},
+                                       genfeed("rss",
+                                               $config{url}."/".rsspage($params{destpage}).$feednum, $desc, $params{destpage}, @feedlist));
+                               $toping{$params{destpage}}=1 unless $config{rebuild};
+                               $feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/rss+xml" title="RSS" href="$rssurl" />};
+                       }

                }
                if ($atom) {
                }
                if ($atom) {

-                       my $atomp=atompage($params{page});
-                       will_render($params{page}, $atomp);
-                       writefile($atomp, $config{destdir},
-                               genfeed("atom", $atomurl, $desc, $params{page}, @list));
-                       $toping{$params{page}}=1 unless $config{rebuild};
-                       $feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/atom+xml" title="Atom" href="$atomurl" />};
+                       my $atomp=atompage($params{destpage}).$feednum;
+                       will_render($params{destpage}, $atomp);
+                       if (! $params{preview}) {
+                               writefile($atomp, $config{destdir},
+                                       genfeed("atom", $config{url}."/".atompage($params{destpage}).$feednum, $desc, $params{destpage}, @feedlist));
+                               $toping{$params{destpage}}=1 unless $config{rebuild};
+                               $feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/atom+xml" title="Atom" href="$atomurl" />};
+                       }

                }
        }
        
                }
        }
        

-       return $ret;
+       return $ret if $raw;
+       push @inline, $ret;
+       return "<div class=\"inline\" id=\"$#inline\"></div>\n\n";

 } #}}}
 
 sub pagetemplate_inline (@) { #{{{
 } #}}}
 
 sub pagetemplate_inline (@) { #{{{


@@ -330,10 +388,19 @@ sub absolute_urls ($$) { #{{{
 
        my $url=$baseurl;
        $url=~s/[^\/]+$//;
 
        my $url=$baseurl;
        $url=~s/[^\/]+$//;

-       
+
+        # what is the non path part of the url?
+        my $top_uri = URI->new($url);
+        $top_uri->path_query(""); # reset the path
+        my $urltop = $top_uri->as_string;
+

        $content=~s/(<a(?:\s+(?:class|id)\s*="?\w+"?)?)\s+href=\s*"(#[^"]+)"/$1 href="$baseurl$2"/mig;
        $content=~s/(<a(?:\s+(?:class|id)\s*="?\w+"?)?)\s+href=\s*"(#[^"]+)"/$1 href="$baseurl$2"/mig;

-       $content=~s/(<a(?:\s+(?:class|id)\s*="?\w+"?)?)\s+href=\s*"(?!\w+:\/\/)([^"]+)"/$1 href="$url$2"/mig;
-       $content=~s/(<img(?:\s+(?:class|id|width|height)\s*="?\w+"?)*)\s+src=\s*"(?!\w+:\/\/)([^"]+)"/$1 src="$url$2"/mig;
+        # relative to another wiki page
+       $content=~s/(<a(?:\s+(?:class|id)\s*="?\w+"?)?)\s+href=\s*"(?!\w+:)([^\/][^"]*)"/$1 href="$url$2"/mig;
+       $content=~s/(<img(?:\s+(?:class|id|width|height)\s*="?\w+"?)*)\s+src=\s*"(?!\w+:)([^\/][^"]*)"/$1 src="$url$2"/mig;
+        # relative to the top of the site
+       $content=~s/(<a(?:\s+(?:class|id)\s*="?\w+"?)?)\s+href=\s*"(?!\w+:)(\/[^"]*)"/$1 href="$urltop$2"/mig;
+       $content=~s/(<img(?:\s+(?:class|id|width|height)\s*="?\w+"?)*)\s+src=\s*"(?!\w+:)(\/[^"]*)"/$1 src="$urltop$2"/mig;

        return $content;
 } #}}}
 
        return $content;
 } #}}}
 


@@ -378,7 +445,7 @@ sub genfeed ($$$$@) { #{{{
                                $itemtemplate->param(content => $pcontent);
                        }
                        else {
                                $itemtemplate->param(content => $pcontent);
                        }
                        else {

-                               my ($a, $b, $c, $d, $e, $f, $g, $size) = stat(srcfile($file));
+                               my $size=(srcfile_stat($file))[8];

                                my $mime="unknown";
                                eval q{use File::MimeInfo};
                                if (! $@) {
                                my $mime="unknown";
                                eval q{use File::MimeInfo};
                                if (! $@) {


@@ -438,7 +505,7 @@ sub pingurl (@) { #{{{
        defined(my $pid = fork) or error("Can't fork: $!");
        return if $pid;
        chdir '/';
        defined(my $pid = fork) or error("Can't fork: $!");
        return if $pid;
        chdir '/';

-       setsid() or error("Can't start a new session: $!");
+       POSIX::setsid() or error("Can't start a new session: $!");

        open STDIN, '/dev/null';
        open STDOUT, '>/dev/null';
        open STDERR, '>&STDOUT' or error("Can't dup stdout: $!");
        open STDIN, '/dev/null';
        open STDOUT, '>/dev/null';
        open STDERR, '>&STDOUT' or error("Can't dup stdout: $!");