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 957fd986d69a83496eddced3be5e495f85760477..c6c99ae45cd008469b9918af315c2a2b4ffda132 100644 (file)
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -4,18 +4,85 @@ package IkiWiki::Plugin::tag;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 3.00;

 
 my %tags;
 
 
 my %tags;
 

-sub import { #{{{
-       IkiWiki::hook(type => "preprocess", id => "tag",
-               call => \&preprocess);
-       IkiWiki::hook(type => "pagetemplate", id => "tag",
-               call => \&pagetemplate);
-} # }}}
+sub import {
+       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);
+}

 
 

-sub preprocess (@) { #{{{
+sub getopt () {
+       eval q{use Getopt::Long};
+       error($@) if $@;
+       Getopt::Long::Configure('pass_through');
+       GetOptions("tagbase=s" => \$config{tagbase});
+}
+
+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;
+                       
+       if ($tag !~ m{^\.?/} &&
+           defined $config{tagbase}) {
+               $tag="/".$config{tagbase}."/".$tag;
+               $tag=~y#/#/#s; # squash dups
+       }
+
+       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));
+
+               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 "";
        }


@@ -23,27 +90,74 @@ sub preprocess (@) { #{{{
        my $page = $params{page};
        delete $params{page};
        delete $params{destpage};
        my $page = $params{page};
        delete $params{page};
        delete $params{destpage};

+       delete $params{preview};

 
 

-       $tags{$page} = [];

        foreach my $tag (keys %params) {
        foreach my $tag (keys %params) {

-               push @{$tags{$page}}, $tag;
+               $tag=linkpage($tag);
+               $tags{$page}{$tag}=1;
+
+               # add tagpage if necessary
+               gentag($tag);
+

                # hidden WikiLink
                # hidden WikiLink

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

        }
                
        return "";
        }
                
        return "";

-} # }}}
+}
+
+sub preprocess_taglink (@) {
+       if (! @_) {
+               return "";
+       }
+       my %params=@_;
+       return join(" ", map {
+               if (/(.*)\|(.*)/) {
+                       my $tag=linkpage($2);
+                       $tags{$params{page}}{$tag}=1;
+                       add_link($params{page}, tagpage($tag));
+                       return taglink($params{page}, $params{destpage}, $tag,
+                               linktext => pagetitle($1));
+               }
+               else {
+                       my $tag=linkpage($_);
+                       $tags{$params{page}}{$tag}=1;
+                       add_link($params{page}, tagpage($tag));
+                       return taglink($params{page}, $params{destpage}, $tag);
+               }
+       }
+       grep {
+               $_ ne 'page' && $_ ne 'destpage' && $_ ne 'preview'
+       } keys %params);
+}

 
 

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

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

-       $template->param(tags => join(', ', 
-                       map { IkiWiki::htmllink($page, $destpage, $_) } 
-                               @{$tags{$page}}))
-               if exists $tags{$page} && $template->query(name => "tags");
-} # }}}
+       $template->param(tags => [
+               map { 
+                       link => taglink($page, $destpage, $_, rel => "tag")
+               }, sort keys %{$tags{$page}}
+       ]) if exists $tags{$page} && %{$tags{$page}} && $template->query(name => "tags");
+
+       if ($template->query(name => "categories")) {
+               # It's an rss/atom template. Add any categories.
+               if (exists $tags{$page} && %{$tags{$page}}) {
+                       $template->param(categories => [map { category => $_ },
+                               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