Merge branch 'master' into fancypodcast

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

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 7977bbcf567887e63a66f8487bf327cdf5419e0c..605f415994e73bee121faab9fb7e5e64f1a02182 100644 (file)
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -4,26 +4,27 @@ package IkiWiki::Plugin::tag;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 
 

-my %tags;
-
-sub import { #{{{
+sub import {
+       hook(type => "checkconfig", id => "tag", call => \&checkconfig);

        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 => "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 getopt () { #{{{
+       IkiWiki::loadplugin("transient");
+}
+
+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 getsetup () { #{{{
+sub getsetup () {

        return
                plugin => {
                        safe => 1,
        return
                plugin => {
                        safe => 1,


@@ -36,36 +37,104 @@ sub getsetup () { #{{{
                        safe => 1,
                        rebuild => 1,
                },
                        safe => 1,
                        rebuild => 1,
                },

-} #}}}
+               tag_autocreate => {
+                       type => "boolean",
+                       example => 1,
+                       description => "autocreate new tag pages?",
+                       safe => 1,
+                       rebuild => undef,
+               },
+               tag_autocreate_commit => {
+                       type => "boolean",
+                       example => 1,
+                       default => 1,
+                       description => "commit autocreated tag pages",
+                       safe => 1,
+                       rebuild => 0,
+               },
+}

 
 

-sub tagpage ($) { #{{{
+sub checkconfig () {
+       if (! defined $config{tag_autocreate_commit}) {
+               $config{tag_autocreate_commit} = 1;
+       }
+}
+
+sub taglink ($) {

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

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

            defined $config{tagbase}) {
                $tag="/".$config{tagbase}."/".$tag;
                $tag=~y#/#/#s; # squash dups
        }
 
        return $tag;
            defined $config{tagbase}) {
                $tag="/".$config{tagbase}."/".$tag;
                $tag=~y#/#/#s; # squash dups
        }
 
        return $tag;

-} #}}}
+}
+
+# Returns a tag name from a tag link
+sub tagname ($) {
+       my $tag=shift;
+       if (defined $config{tagbase}) {
+               $tag =~ s!^/\Q$config{tagbase}\E/!!;
+       } else {
+               $tag =~ s!^\.?/!!;
+       }
+       return pagetitle($tag, 1);
+}

 
 

-sub taglink ($$$;@) { #{{{
+sub htmllink_tag ($$$;@) {

        my $page=shift;
        my $destpage=shift;
        my $tag=shift;
        my %opts=@_;
 
        my $page=shift;
        my $destpage=shift;
        my $tag=shift;
        my %opts=@_;
 

-       my $link=tagpage($tag);
+       return htmllink($page, $destpage, taglink($tag), %opts);
+}

 
 

-       # Force tag creation links to create the tag under /tagbase,
-       # if there is a tagbase and this tag used it.
-       $link="/".$link if $tag ne $link;
+sub gentag ($) {
+       my $tag=shift;

 
 

-       return htmllink($page, $destpage, $link, %opts);
-} #}}}
+       if ($config{tag_autocreate} ||
+           ($config{tagbase} && ! defined $config{tag_autocreate})) {
+               my $tagpage=taglink($tag);
+               if ($tagpage=~/^\.\/(.*)/) {
+                       $tagpage=$1;
+               }
+               else {
+                       $tagpage=~s/^\///;
+               }
+               if (exists $IkiWiki::pagecase{lc $tagpage}) {
+                       $tagpage=$IkiWiki::pagecase{lc $tagpage}
+               }
+
+               my $tagfile = newpagefile($tagpage, $config{default_pageext});
+
+               add_autofile($tagfile, "tag", sub {
+                       my $message=sprintf(gettext("creating tag page %s"), $tagpage);
+                       debug($message);
+
+                       my $template=template("autotag.tmpl");
+                       $template->param(tagname => tagname($tag));
+                       $template->param(tag => $tag);
+
+                       my $dir = $config{srcdir};
+                       if (! $config{tag_autocreate_commit}) {
+                               $dir = $IkiWiki::Plugin::transient::transientdir;
+                       }
+
+                       writefile($tagfile, $dir, $template->output);
+                       if ($config{rcs} && $config{tag_autocreate_commit}) {
+                               IkiWiki::disable_commit_hook();
+                               IkiWiki::rcs_add($tagfile);
+                               IkiWiki::rcs_commit_staged(message => $message);
+                               IkiWiki::enable_commit_hook();
+                       }
+               });
+       }
+}

 
 

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

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


@@ -77,15 +146,17 @@ sub preprocess_tag (@) { #{{{
 
        foreach my $tag (keys %params) {
                $tag=linkpage($tag);
 
        foreach my $tag (keys %params) {
                $tag=linkpage($tag);

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

                # hidden WikiLink
                # hidden WikiLink

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

        }
                
        return "";
        }
                
        return "";

-} # }}}
+}

 
 

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

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


@@ -93,42 +164,55 @@ sub preprocess_taglink (@) { #{{{
        return join(" ", map {
                if (/(.*)\|(.*)/) {
                        my $tag=linkpage($2);
        return join(" ", map {
                if (/(.*)\|(.*)/) {
                        my $tag=linkpage($2);

-                       $tags{$params{page}}{$tag}=1;
-                       push @{$links{$params{page}}}, tagpage($tag);
-                       return taglink($params{page}, $params{destpage}, $tag,
+                       add_link($params{page}, taglink($tag), 'tag');
+                       gentag($tag);
+                       return htmllink_tag($params{page}, $params{destpage}, $tag,

                                linktext => pagetitle($1));
                }
                else {
                        my $tag=linkpage($_);
                                linktext => pagetitle($1));
                }
                else {
                        my $tag=linkpage($_);

-                       $tags{$params{page}}{$tag}=1;
-                       push @{$links{$params{page}}}, tagpage($tag);
-                       return taglink($params{page}, $params{destpage}, $tag);
+                       add_link($params{page}, taglink($tag), 'tag');
+                       gentag($tag);
+                       return htmllink_tag($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 $template=$params{template};
 
        my %params=@_;
        my $page=$params{page};
        my $destpage=$params{destpage};
        my $template=$params{template};
 

+       my $tags = $typedlinks{$page}{tag};
+

        $template->param(tags => [
                map { 
        $template->param(tags => [
                map { 

-                       link => taglink($page, $destpage, $_, rel => "tag")
-               }, sort keys %{$tags{$page}}
-       ]) if exists $tags{$page} && %{$tags{$page}} && $template->query(name => "tags");
+                       link => htmllink_tag($page, $destpage, $_,
+                                       rel => "tag", linktext => tagname($_))
+               }, sort keys %$tags
+       ]) if defined $tags && %$tags && $template->query(name => "tags");

 
        if ($template->query(name => "categories")) {
                # It's an rss/atom template. Add any categories.
 
        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}}]);
+               if (defined $tags && %$tags) {
+                       eval q{use HTML::Entities};
+                       $template->param(categories =>
+                               [map { category => HTML::Entities::encode_entities_numeric(tagname($_)) },
+                                       sort keys %$tags]);

                }
        }
                }
        }

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

 
 1
 
 1