Revert "Revert the effects of find_del_files() for (re)autoadded files."

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

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 276d67e03d4983c32242c6ee682637e0b5897b27..c6c99ae45cd008469b9918af315c2a2b4ffda132 100644 (file)
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -4,36 +4,85 @@ package IkiWiki::Plugin::tag;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 
 my %tags;
 
 
 my %tags;
 

-sub import { #{{{
+sub import {

        hook(type => "getopt", id => "tag", call => \&getopt);
        hook(type => "getopt", id => "tag", call => \&getopt);

+       hook(type => "getsetup", id => "tag", call => \&getsetup);

        hook(type => "preprocess", id => "tag", call => \&preprocess_tag, scan => 1);
        hook(type => "preprocess", id => "taglink", call => \&preprocess_taglink, scan => 1);
        hook(type => "pagetemplate", id => "tag", call => \&pagetemplate);
        hook(type => "preprocess", id => "tag", call => \&preprocess_tag, scan => 1);
        hook(type => "preprocess", id => "taglink", call => \&preprocess_taglink, scan => 1);
        hook(type => "pagetemplate", id => "tag", call => \&pagetemplate);

-} # }}}
+}

 
 

-sub getopt () { #{{{
+sub getopt () {

        eval q{use Getopt::Long};
        error($@) if $@;
        Getopt::Long::Configure('pass_through');
        GetOptions("tagbase=s" => \$config{tagbase});
        eval q{use Getopt::Long};
        error($@) if $@;
        Getopt::Long::Configure('pass_through');
        GetOptions("tagbase=s" => \$config{tagbase});

-} #}}}
+}

 
 

-sub tagpage ($) { #{{{
+sub getsetup () {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+               tagbase => {
+                       type => "string",
+                       example => "tag",
+                       description => "parent page tags are located under",
+                       safe => 1,
+                       rebuild => 1,
+               },
+               tag_autocreate => {
+                       type => "boolean",
+                       example => 0,
+                       description => "Autocreate new tag pages",
+                       safe => 1,
+                       rebuild => 1,
+               },
+}
+
+sub tagpage ($) {

        my $tag=shift;
                        
        my $tag=shift;
                        

-       if (exists $config{tagbase} &&
+       if ($tag !~ m{^\.?/} &&

            defined $config{tagbase}) {
            defined $config{tagbase}) {

-               $tag=$config{tagbase}."/".$tag;
+               $tag="/".$config{tagbase}."/".$tag;
+               $tag=~y#/#/#s; # squash dups

        }
 
        return $tag;
        }
 
        return $tag;

-} #}}}
+}
+
+sub taglink ($$$;@) {
+       my $page=shift;
+       my $destpage=shift;
+       my $tag=shift;
+       my %opts=@_;
+
+       return htmllink($page, $destpage, tagpage($tag), %opts);
+}
+
+sub gentag ($) {
+       my $tag=shift;
+       if (defined $config{tag_autocreate} && $config{tag_autocreate}) {
+               my $tagfile = newpagefile(tagpage($tag), $config{default_pageext});
+               $tagfile=~s/^\///;
+
+               return if (! add_autofile($tagfile));

 
 

-sub preprocess_tag (@) { #{{{
+               debug(sprintf(gettext("creating tag page %s"), $tag));
+
+               my $template=template("autotag.tmpl");
+               $template->param(tag => $tag);
+               writefile($tagfile, $config{srcdir}, $template->output);
+       }
+}
+
+sub preprocess_tag (@) {

        if (! @_) {
                return "";
        }
        if (! @_) {
                return "";
        }


@@ -44,41 +93,45 @@ sub preprocess_tag (@) { #{{{
        delete $params{preview};
 
        foreach my $tag (keys %params) {
        delete $params{preview};
 
        foreach my $tag (keys %params) {

-               $tag=IkiWiki::linkpage($tag);
+               $tag=linkpage($tag);

                $tags{$page}{$tag}=1;
                $tags{$page}{$tag}=1;

+
+               # add tagpage if necessary
+               gentag($tag);
+

                # hidden WikiLink
                # hidden WikiLink

-               push @{$links{$page}}, tagpage($tag);
+               add_link($page, tagpage($tag));

        }
                
        return "";
        }
                
        return "";

-} # }}}
+}

 
 

-sub preprocess_taglink (@) { #{{{
+sub preprocess_taglink (@) {

        if (! @_) {
                return "";
        }
        my %params=@_;
        return join(" ", map {
                if (/(.*)\|(.*)/) {
        if (! @_) {
                return "";
        }
        my %params=@_;
        return join(" ", map {
                if (/(.*)\|(.*)/) {

-                       my $tag=IkiWiki::linkpage($2);
+                       my $tag=linkpage($2);

                        $tags{$params{page}}{$tag}=1;
                        $tags{$params{page}}{$tag}=1;

-                       return htmllink($params{page}, $params{destpage},
-                               tagpage($tag),
-                               linktext => IkiWiki::pagetitle($1));
+                       add_link($params{page}, tagpage($tag));
+                       return taglink($params{page}, $params{destpage}, $tag,
+                               linktext => pagetitle($1));

                }
                else {
                }
                else {

-                       my $tag=IkiWiki::linkpage($_);
+                       my $tag=linkpage($_);

                        $tags{$params{page}}{$tag}=1;
                        $tags{$params{page}}{$tag}=1;

-                       return htmllink($params{page}, $params{destpage},
-                               tagpage($tag));
+                       add_link($params{page}, tagpage($tag));
+                       return taglink($params{page}, $params{destpage}, $tag);

                }
        }
        grep {
                $_ ne 'page' && $_ ne 'destpage' && $_ ne 'preview'
        } keys %params);
                }
        }
        grep {
                $_ ne 'page' && $_ ne 'destpage' && $_ ne 'preview'
        } keys %params);

-} # }}}
+}

 
 

-sub pagetemplate (@) { #{{{
+sub pagetemplate (@) {

        my %params=@_;
        my $page=$params{page};
        my $destpage=$params{destpage};
        my %params=@_;
        my $page=$params{page};
        my $destpage=$params{destpage};


@@ -86,8 +139,7 @@ sub pagetemplate (@) { #{{{
 
        $template->param(tags => [
                map { 
 
        $template->param(tags => [
                map { 

-                       link => htmllink($page, $destpage, tagpage($_),
-                                       rel => "tag")
+                       link => taglink($page, $destpage, $_, rel => "tag")

                }, sort keys %{$tags{$page}}
        ]) if exists $tags{$page} && %{$tags{$page}} && $template->query(name => "tags");
 
                }, sort keys %{$tags{$page}}
        ]) if exists $tags{$page} && %{$tags{$page}} && $template->query(name => "tags");
 


@@ -98,6 +150,14 @@ sub pagetemplate (@) { #{{{
                                sort keys %{$tags{$page}}]);
                }
        }
                                sort keys %{$tags{$page}}]);
                }
        }

-} # }}}
+}
+
+package IkiWiki::PageSpec;
+
+sub match_tagged ($$;@) {
+       my $page = shift;
+       my $glob = shift;
+       return match_link($page, IkiWiki::Plugin::tag::tagpage($glob));
+}

 
 1
 
 1