add news item for ikiwiki 2.52

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

diff --git a/IkiWiki.pm b/IkiWiki.pm
index bd804269dd16fee904743a59bd9ce33428479e4b..0b420e824975172b7a72ea6484f81c323cbde14e 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -7,6 +7,7 @@ use Encode;
 use HTML::Entities;
 use URI::Escape q{uri_escape_utf8};
 use POSIX;
 use HTML::Entities;
 use URI::Escape q{uri_escape_utf8};
 use POSIX;

+use Storable;

 use open qw{:utf8 :std};
 
 use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase
 use open qw{:utf8 :std};
 
 use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase


@@ -86,6 +87,8 @@ sub defaultconfig () { #{{{
        numbacklinks => 10,
        account_creation_password => "",
        prefix_directives => 0,
        numbacklinks => 10,
        account_creation_password => "",
        prefix_directives => 0,

+       hardlink => 0,
+       cgi_disable_uploads => 1,

 } #}}}
 
 sub checkconfig () { #{{{
 } #}}}
 
 sub checkconfig () { #{{{


@@ -101,6 +104,12 @@ sub checkconfig () { #{{{
                }
        }
 
                }
        }
 

+       if (ref $config{ENV} eq 'HASH') {
+               foreach my $val (keys %{$config{ENV}}) {
+                       $ENV{$val}=$config{ENV}{$val};
+               }
+       }
+

        if ($config{w3mmode}) {
                eval q{use Cwd q{abs_path}};
                error($@) if $@;
        if ($config{w3mmode}) {
                eval q{use Cwd q{abs_path}};
                error($@) if $@;


@@ -280,17 +289,22 @@ sub htmlpage ($) { #{{{
        return targetpage($page, $config{htmlext});
 } #}}}
 
        return targetpage($page, $config{htmlext});
 } #}}}
 

-sub srcfile ($) { #{{{
+sub srcfile_stat { #{{{

        my $file=shift;
        my $file=shift;

+       my $nothrow=shift;

 
 

-       return "$config{srcdir}/$file" if -e "$config{srcdir}/$file";
+       return "$config{srcdir}/$file", stat(_) if -e "$config{srcdir}/$file";

        foreach my $dir (@{$config{underlaydirs}}, $config{underlaydir}) {
        foreach my $dir (@{$config{underlaydirs}}, $config{underlaydir}) {

-               return "$dir/$file" if -e "$dir/$file";
+               return "$dir/$file", stat(_) if -e "$dir/$file";

        }
        }

-       error("internal error: $file cannot be found in $config{srcdir} or underlay");
+       error("internal error: $file cannot be found in $config{srcdir} or underlay") unless $nothrow;

        return;
 } #}}}
 
        return;
 } #}}}
 

+sub srcfile ($;$) { #{{{
+       return (srcfile_stat(@_))[0];
+} #}}}
+

 sub add_underlay ($) { #{{{
        my $dir=shift;
 
 sub add_underlay ($) { #{{{
        my $dir=shift;
 


@@ -322,12 +336,9 @@ sub readfile ($;$$) { #{{{
        return $ret;
 } #}}}
 
        return $ret;
 } #}}}
 

-sub writefile ($$$;$$) { #{{{
-       my $file=shift; # can include subdirs
-       my $destdir=shift; # directory to put file in
-       my $content=shift;
-       my $binary=shift;
-       my $writer=shift;
+sub prep_writefile ($$) {
+       my $file=shift;
+       my $destdir=shift;

        
        my $test=$file;
        while (length $test) {
        
        my $test=$file;
        while (length $test) {


@@ -336,12 +347,8 @@ sub writefile ($$$;$$) { #{{{
                }
                $test=dirname($test);
        }
                }
                $test=dirname($test);
        }

-       my $newfile="$destdir/$file.ikiwiki-new";
-       if (-l $newfile) {
-               error("cannot write to a symlink ($newfile)");
-       }

 
 

-       my $dir=dirname($newfile);
+       my $dir=dirname("$destdir/$file");

        if (! -d $dir) {
                my $d="";
                foreach my $s (split(m!/+!, $dir)) {
        if (! -d $dir) {
                my $d="";
                foreach my $s (split(m!/+!, $dir)) {


@@ -352,6 +359,23 @@ sub writefile ($$$;$$) { #{{{
                }
        }
 
                }
        }
 

+       return 1;
+}
+
+sub writefile ($$$;$$) { #{{{
+       my $file=shift; # can include subdirs
+       my $destdir=shift; # directory to put file in
+       my $content=shift;
+       my $binary=shift;
+       my $writer=shift;
+       
+       prep_writefile($file, $destdir);
+       
+       my $newfile="$destdir/$file.ikiwiki-new";
+       if (-l $newfile) {
+               error("cannot write to a symlink ($newfile)");
+       }
+       

        my $cleanup = sub { unlink($newfile) };
        open (my $out, '>', $newfile) || error("failed to write $newfile: $!", $cleanup);
        binmode($out) if ($binary);
        my $cleanup = sub { unlink($newfile) };
        open (my $out, '>', $newfile) || error("failed to write $newfile: $!", $cleanup);
        binmode($out) if ($binary);


@@ -524,7 +548,7 @@ sub urlto ($$) { #{{{
        my $from=shift;
 
        if (! length $to) {
        my $from=shift;
 
        if (! length $to) {

-               return beautify_url(baseurl($from));
+               return beautify_url(baseurl($from)."index.$config{htmlext}");

        }
 
        if (! $destsources{$to}) {
        }
 
        if (! $destsources{$to}) {


@@ -572,10 +596,10 @@ sub htmllink ($$$;@) { #{{{
                        return "<span class=\"createlink\"><a href=\"".
                                cgiurl(
                                        do => "create",
                        return "<span class=\"createlink\"><a href=\"".
                                cgiurl(
                                        do => "create",

-                                       page => pagetitle(lc($link), 1),
+                                       page => lc($link),

                                        from => $lpage
                                ).
                                        from => $lpage
                                ).

-                               "\">?</a>$linktext</span>"
+                               "\" rel=\"nofollow\">?</a>$linktext</span>"

                }
        }
        
                }
        }
        


@@ -609,14 +633,18 @@ sub userlink ($) { #{{{
                return "<a href=\"$user\">$oiduser</a>";
        }
        else {
                return "<a href=\"$user\">$oiduser</a>";
        }
        else {

+               eval q{use CGI 'escapeHTML'};
+               error($@) if $@;
+

                return htmllink("", "", escapeHTML(
                        length $config{userdir} ? $config{userdir}."/".$user : $user
                ), noimageinline => 1);
        }
 } #}}}
 
                return htmllink("", "", escapeHTML(
                        length $config{userdir} ? $config{userdir}."/".$user : $user
                ), noimageinline => 1);
        }
 } #}}}
 

-sub htmlize ($$$) { #{{{
+sub htmlize ($$$$) { #{{{

        my $page=shift;
        my $page=shift;

+       my $destpage=shift;

        my $type=shift;
        my $content=shift;
        
        my $type=shift;
        my $content=shift;
        


@@ -635,6 +663,7 @@ sub htmlize ($$$) { #{{{
        run_hooks(sanitize => sub {
                $content=shift->(
                        page => $page,
        run_hooks(sanitize => sub {
                $content=shift->(
                        page => $page,

+                       destpage => $destpage,

                        content => $content,
                );
        });
                        content => $content,
                );
        });


@@ -666,7 +695,7 @@ sub linkify ($$$) { #{{{
        return $content;
 } #}}}
 
        return $content;
 } #}}}
 

-my %preprocessing;
+our %preprocessing;

 our $preprocess_preview=0;
 sub preprocess ($$$;$$) { #{{{
        my $page=shift; # the page the data comes from
 our $preprocess_preview=0;
 sub preprocess ($$$;$$) { #{{{
        my $page=shift; # the page the data comes from


@@ -896,39 +925,49 @@ sub loadindex () { #{{{
        %oldrenderedfiles=%pagectime=();
        if (! $config{rebuild}) {
                %pagesources=%pagemtime=%oldlinks=%links=%depends=
        %oldrenderedfiles=%pagectime=();
        if (! $config{rebuild}) {
                %pagesources=%pagemtime=%oldlinks=%links=%depends=

-                       %destsources=%renderedfiles=%pagecase=%pagestate=();
-       }
-       open (my $in, "<", "$config{wikistatedir}/index") || return;
-       while (<$in>) {
-               $_=possibly_foolish_untaint($_);
-               chomp;
-               my %items;
-               $items{link}=[];
-               $items{dest}=[];
-               foreach my $i (split(/ /, $_)) {
-                       my ($item, $val)=split(/=/, $i, 2);
-                       push @{$items{$item}}, decode_entities($val);
+               %destsources=%renderedfiles=%pagecase=%pagestate=();
+       }
+       my $in;
+       if (! open ($in, "<", "$config{wikistatedir}/indexdb")) {
+               if (-e "$config{wikistatedir}/index") {
+                       system("ikiwiki-transition", "indexdb", $config{srcdir});
+                       open ($in, "<", "$config{wikistatedir}/indexdb") || return;

                }
                }

-
-               next unless exists $items{src}; # skip bad lines for now
-
-               my $page=pagename($items{src}[0]);
+               else {
+                       return;
+               }
+       }
+       my $ret=Storable::fd_retrieve($in);
+       if (! defined $ret) {
+               return 0;
+       }
+       my %index=%$ret;
+       foreach my $src (keys %index) {
+               my %d=%{$index{$src}};
+               my $page=pagename($src);
+               $pagectime{$page}=$d{ctime};

                if (! $config{rebuild}) {
                if (! $config{rebuild}) {

-                       $pagesources{$page}=$items{src}[0];
-                       $pagemtime{$page}=$items{mtime}[0];
-                       $oldlinks{$page}=[@{$items{link}}];
-                       $links{$page}=[@{$items{link}}];
-                       $depends{$page}=$items{depends}[0] if exists $items{depends};
-                       $destsources{$_}=$page foreach @{$items{dest}};
-                       $renderedfiles{$page}=[@{$items{dest}}];
-                       $pagecase{lc $page}=$page;
-                       foreach my $k (grep /_/, keys %items) {
-                               my ($id, $key)=split(/_/, $k, 2);
-                               $pagestate{$page}{decode_entities($id)}{decode_entities($key)}=$items{$k}[0];
+                       $pagesources{$page}=$src;
+                       $pagemtime{$page}=$d{mtime};
+                       $renderedfiles{$page}=$d{dest};
+                       if (exists $d{links} && ref $d{links}) {
+                               $links{$page}=$d{links};
+                               $oldlinks{$page}=[@{$d{links}}];
+                       }
+                       if (exists $d{depends}) {
+                               $depends{$page}=$d{depends};
+                       }
+                       if (exists $d{state}) {
+                               $pagestate{$page}=$d{state};

                        }
                }
                        }
                }

-               $oldrenderedfiles{$page}=[@{$items{dest}}];
-               $pagectime{$page}=$items{ctime}[0];
+               $oldrenderedfiles{$page}=[@{$d{dest}}];
+       }
+       foreach my $page (keys %pagesources) {
+               $pagecase{lc $page}=$page;
+       }
+       foreach my $page (keys %renderedfiles) {
+               $destsources{$_}=$page foreach @{$renderedfiles{$page}};

        }
        return close($in);
 } #}}}
        }
        return close($in);
 } #}}}


@@ -938,39 +977,45 @@ sub saveindex () { #{{{
 
        my %hookids;
        foreach my $type (keys %hooks) {
 
        my %hookids;
        foreach my $type (keys %hooks) {

-               $hookids{encode_entities($_)}=1 foreach keys %{$hooks{$type}};
+               $hookids{$_}=1 foreach keys %{$hooks{$type}};

        }
        }

-       my @hookids=sort keys %hookids;
+       my @hookids=keys %hookids;

 
        if (! -d $config{wikistatedir}) {
                mkdir($config{wikistatedir});
        }
 
        if (! -d $config{wikistatedir}) {
                mkdir($config{wikistatedir});
        }

-       my $newfile="$config{wikistatedir}/index.new";
+       my $newfile="$config{wikistatedir}/indexdb.new";

        my $cleanup = sub { unlink($newfile) };
        open (my $out, '>', $newfile) || error("cannot write to $newfile: $!", $cleanup);
        my $cleanup = sub { unlink($newfile) };
        open (my $out, '>', $newfile) || error("cannot write to $newfile: $!", $cleanup);

+       my %index;

        foreach my $page (keys %pagemtime) {
                next unless $pagemtime{$page};
        foreach my $page (keys %pagemtime) {
                next unless $pagemtime{$page};

-               my $line="mtime=$pagemtime{$page} ".
-                       "ctime=$pagectime{$page} ".
-                       "src=$pagesources{$page}";
-               $line.=" dest=$_" foreach @{$renderedfiles{$page}};
-               my %count;
-               $line.=" link=$_" foreach grep { ++$count{$_} == 1 } @{$links{$page}};
+               my $src=$pagesources{$page};
+
+               $index{$src}={
+                       ctime => $pagectime{$page},
+                       mtime => $pagemtime{$page},
+                       dest => $renderedfiles{$page},
+                       links => $links{$page},
+               };
+

                if (exists $depends{$page}) {
                if (exists $depends{$page}) {

-                       $line.=" depends=".encode_entities($depends{$page}, " \t\n");
+                       $index{$src}{depends} = $depends{$page};

                }
                }

+

                if (exists $pagestate{$page}) {
                        foreach my $id (@hookids) {
                                foreach my $key (keys %{$pagestate{$page}{$id}}) {
                if (exists $pagestate{$page}) {
                        foreach my $id (@hookids) {
                                foreach my $key (keys %{$pagestate{$page}{$id}}) {

-                                       $line.=' '.$id.'_'.encode_entities($key, " \t\n")."=".encode_entities($pagestate{$page}{$id}{$key}, " \t\n");
+                                       $index{$src}{state}{$id}{$key}=$pagestate{$page}{$id}{$key};

                                }
                        }
                }
                                }
                        }
                }

-               print $out $line."\n" || error("failed writing to $newfile: $!", $cleanup);

        }
        }

+       my $ret=Storable::nstore_fd(\%index, $out);
+       return if ! defined $ret || ! $ret;

        close $out || error("failed saving to $newfile: $!", $cleanup);
        close $out || error("failed saving to $newfile: $!", $cleanup);

-       rename($newfile, "$config{wikistatedir}/index") ||
-               error("failed renaming $newfile to $config{wikistatedir}/index", $cleanup);
+       rename($newfile, "$config{wikistatedir}/indexdb") ||
+               error("failed renaming $newfile to $config{wikistatedir}/indexdb", $cleanup);

        
        return 1;
 } #}}}
        
        return 1;
 } #}}}


@@ -1169,8 +1214,6 @@ sub pagespec_merge ($$) { #{{{
 } #}}}
 
 sub pagespec_translate ($) { #{{{
 } #}}}
 
 sub pagespec_translate ($) { #{{{

-       # This assumes that $page is in scope in the function
-       # that evalulates the translated pagespec code.

        my $spec=shift;
 
        # Support for old-style GlobLists.
        my $spec=shift;
 
        # Support for old-style GlobLists.


@@ -1207,18 +1250,23 @@ sub pagespec_translate ($) { #{{{
                }
                elsif ($word =~ /^(\w+)\((.*)\)$/) {
                        if (exists $IkiWiki::PageSpec::{"match_$1"}) {
                }
                elsif ($word =~ /^(\w+)\((.*)\)$/) {
                        if (exists $IkiWiki::PageSpec::{"match_$1"}) {

-                               $code.="IkiWiki::PageSpec::match_$1(\$page, ".safequote($2).", \@params)";
+                               $code.="IkiWiki::PageSpec::match_$1(\$page, ".safequote($2).", \@_)";

                        }
                        else {
                                $code.=' 0';
                        }
                }
                else {
                        }
                        else {
                                $code.=' 0';
                        }
                }
                else {

-                       $code.=" IkiWiki::PageSpec::match_glob(\$page, ".safequote($word).", \@params)";
+                       $code.=" IkiWiki::PageSpec::match_glob(\$page, ".safequote($word).", \@_)";

                }
        }
 
                }
        }
 

-       return $code;
+       if (! length $code) {
+               $code=0;
+       }
+
+       no warnings;
+       return eval 'sub { my $page=shift; '.$code.' }';

 } #}}}
 
 sub pagespec_match ($$;@) { #{{{
 } #}}}
 
 sub pagespec_match ($$;@) { #{{{


@@ -1231,21 +1279,24 @@ sub pagespec_match ($$;@) { #{{{
                unshift @params, 'location';
        }
 
                unshift @params, 'location';
        }
 

-       my $ret=eval pagespec_translate($spec);
-       return IkiWiki::FailReason->new('syntax error') if $@;
-       return $ret;
+       my $sub=pagespec_translate($spec);
+       return IkiWiki::FailReason->new("syntax error in pagespec \"$spec\"") if $@;
+       return $sub->($page, @params);

 } #}}}
 
 sub pagespec_valid ($) { #{{{
        my $spec=shift;
 
 } #}}}
 
 sub pagespec_valid ($) { #{{{
        my $spec=shift;
 

-       # used by generated code
-       my $page="";
-       my @params;
-
-       eval pagespec_translate($spec);
+       my $sub=pagespec_translate($spec);

        return ! $@;
 } #}}}
        return ! $@;
 } #}}}

+       
+sub glob2re ($) { #{{{
+       my $re=quotemeta(shift);
+       $re=~s/\\\*/.*/g;
+       $re=~s/\\\?/./g;
+       return $re;
+} #}}}

 
 package IkiWiki::FailReason;
 
 
 package IkiWiki::FailReason;
 


@@ -1257,7 +1308,9 @@ use overload ( #{{{
 ); #}}}
 
 sub new { #{{{
 ); #}}}
 
 sub new { #{{{

-       return bless \$_[1], $_[0];
+       my $class = shift;
+       my $value = shift;
+       return bless \$value, $class;

 } #}}}
 
 package IkiWiki::SuccessReason;
 } #}}}
 
 package IkiWiki::SuccessReason;


@@ -1270,7 +1323,9 @@ use overload ( #{{{
 ); #}}}
 
 sub new { #{{{
 ); #}}}
 
 sub new { #{{{

-       return bless \$_[1], $_[0];
+       my $class = shift;
+       my $value = shift;
+       return bless \$value, $class;

 }; #}}}
 
 package IkiWiki::PageSpec;
 }; #}}}
 
 package IkiWiki::PageSpec;


@@ -1289,12 +1344,8 @@ sub match_glob ($$;@) { #{{{
                $glob="$from/$glob" if length $from;
        }
 
                $glob="$from/$glob" if length $from;
        }
 

-       # turn glob into safe regexp
-       $glob=quotemeta($glob);
-       $glob=~s/\\\*/.*/g;
-       $glob=~s/\\\?/./g;
-
-       if ($page=~/^$glob$/i) {
+       my $regexp=IkiWiki::glob2re($glob);
+       if ($page=~/^$regexp$/i) {

                if (! IkiWiki::isinternal($page) || $params{internal}) {
                        return IkiWiki::SuccessReason->new("$glob matches $page");
                }
                if (! IkiWiki::isinternal($page) || $params{internal}) {
                        return IkiWiki::SuccessReason->new("$glob matches $page");
                }