(no commit message)

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

diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index f7ab291c7b1222b374c37b9629ff5229e2b81735..4a9bf58dbc1a446ae72f37f13089af05fdc7b221 100644 (file)
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -9,45 +9,59 @@ package IkiWiki::Plugin::map;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 
 

-sub import { #{{{
+sub import {
+       hook(type => "getsetup", id => "map", call => \&getsetup);

        hook(type => "preprocess", id => "map", call => \&preprocess);
        hook(type => "preprocess", id => "map", call => \&preprocess);

-} # }}}
+}

 
 

-sub preprocess (@) { #{{{
+sub getsetup () {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+                       section => "widget",
+               },
+}
+
+sub preprocess (@) {

        my %params=@_;
        $params{pages}="*" unless defined $params{pages};
        
        my %params=@_;
        $params{pages}="*" unless defined $params{pages};
        

+       # Needs to update whenever a page is added or removed (or in some
+       # cases, when its content changes, if show= is specified).
+       my $deptype=deptype(exists $params{show} ? "content" : "presence");
+       

        my $common_prefix;
 
        # Get all the items to map.
        my %mapitems;
        my $common_prefix;
 
        # Get all the items to map.
        my %mapitems;

-       foreach my $page (keys %pagesources) {
-               if (pagespec_match($page, $params{pages}, location => $params{page})) {
-                       if (exists $params{show} && 
-                           exists $pagestate{$page}{meta}{$params{show}}) {
-                               $mapitems{$page}=$pagestate{$page}{meta}{$params{show}};
-                       }
-                       else {
-                               $mapitems{$page}=$page;
-                       }
-                       # Check for a common prefix.
-                       if (! defined $common_prefix) {
-                               $common_prefix=$page;
-                       }
-                       elsif (length $common_prefix &&
-                              $page !~ /^\Q$common_prefix\E(\/|$)/) {
-                               my @a=split(/\//, $page);
-                               my @b=split(/\//, $common_prefix);
-                               $common_prefix="";
-                               while (@a && @b && $a[0] eq $b[0]) {
-                                       if (length $common_prefix) {
-                                               $common_prefix.="/";
-                                       }
-                                       $common_prefix.=shift(@a);
-                                       shift @b;
+       foreach my $page (pagespec_match_list($params{page}, $params{pages},
+                                       deptype => $deptype)) {
+               if (exists $params{show} && 
+                   exists $pagestate{$page} &&
+                   exists $pagestate{$page}{meta}{$params{show}}) {
+                       $mapitems{$page}=$pagestate{$page}{meta}{$params{show}};
+               }
+               else {
+                       $mapitems{$page}='';
+               }
+               # Check for a common prefix.
+               if (! defined $common_prefix) {
+                       $common_prefix=$page;
+               }
+               elsif (length $common_prefix &&
+                      $page !~ /^\Q$common_prefix\E(\/|$)/) {
+                       my @a=split(/\//, $page);
+                       my @b=split(/\//, $common_prefix);
+                       $common_prefix="";
+                       while (@a && @b && $a[0] eq $b[0]) {
+                               if (length $common_prefix) {
+                                       $common_prefix.="/";

                                }
                                }

+                               $common_prefix.=shift(@a);
+                               shift @b;

                        }
                }
        }
                        }
                }
        }


@@ -58,41 +72,47 @@ sub preprocess (@) { #{{{
                $common_prefix=IkiWiki::dirname($common_prefix);
        }
 
                $common_prefix=IkiWiki::dirname($common_prefix);
        }
 

-       # Needs to update whenever a page is added or removed (or in some
-       # cases, when its content changes, if show=title), so register a
-       # dependency.
-       add_depends($params{page}, $params{pages});
-       # Explicitly add all currently shown pages, to detect when pages
-       # are removed.
-       add_depends($params{page}, join(" or ", keys %mapitems));
+       # Set this to 1 or more spaces to pretty-print maps for debugging
+       my $spaces = "";

 
        # Create the map.
        my $parent="";
        my $indent=0;
        my $openli=0;
 
        # Create the map.
        my $parent="";
        my $indent=0;
        my $openli=0;

-       my $dummy=0;
-       my $map = "<div class='map'>\n<ul>\n";
-       foreach my $item (sort { $mapitems{$a} cmp $mapitems{$b} } keys %mapitems) {
+       my $addparent="";
+       my $map = "<div class='map'>\n";
+
+       if (! keys %mapitems) {
+               # return empty div for empty map
+               $map .= "</div>\n";
+               return $map; 
+       } 
+       else {
+               $map .= "<ul>\n";
+       }
+
+       foreach my $item (sort keys %mapitems) {
+               my @linktext = (length $mapitems{$item} ? (linktext => $mapitems{$item}) : ());

                $item=~s/^\Q$common_prefix\E\///
                        if defined $common_prefix && length $common_prefix;
                my $depth = ($item =~ tr/\//\//) + 1;
                my $baseitem=IkiWiki::dirname($item);
                while (length $parent && length $baseitem && $baseitem !~ /^\Q$parent\E(\/|$)/) {
                        $parent=IkiWiki::dirname($parent);
                $item=~s/^\Q$common_prefix\E\///
                        if defined $common_prefix && length $common_prefix;
                my $depth = ($item =~ tr/\//\//) + 1;
                my $baseitem=IkiWiki::dirname($item);
                while (length $parent && length $baseitem && $baseitem !~ /^\Q$parent\E(\/|$)/) {
                        $parent=IkiWiki::dirname($parent);

-                       last if !$dummy && length $parent && $baseitem =~ /^\Q$parent\E(\/|$)/;
-                       $indent--;
-                       $map .= "</li>\n";
-                       if ($indent > 0) {
-                               $map .= "</ul>\n";
+                       last if length $addparent && $baseitem =~ /^\Q$addparent\E(\/|$)/;
+                       $addparent="";
+                       $map .= ($spaces x $indent) . "</li>\n";
+                       if ($indent > 1) {
+                               $map .= ($spaces x $indent) . "</ul><map:collapse>\n";

                        }
                        }

+                       $indent--;

                }
                }

-               $dummy=0;

                while ($depth < $indent) {
                while ($depth < $indent) {

-                       $indent--;
-                       $map .= "</li>\n";
-                       if ($indent > 0) {
-                               $map .= "</ul>\n";
+                       $map .= ($spaces x $indent) . "</li>\n";
+                       if ($indent > 1) {
+                               $map .= ($spaces x $indent) . "</ul>\n";

                        }
                        }

+                       $indent--;

                }
                my @bits=split("/", $item);
                my $p="";
                }
                my @bits=split("/", $item);
                my $p="";


@@ -100,14 +120,16 @@ sub preprocess (@) { #{{{
                while ($depth > $indent) {
                        $indent++;
                        if ($indent > 1) {
                while ($depth > $indent) {
                        $indent++;
                        if ($indent > 1) {

-                               $map .= "<ul>\n";
+                               $map .= ($spaces x $indent) . "<ul><map:collapse>\n";

                        }
                        if ($depth > $indent) {
                        }
                        if ($depth > $indent) {

-                               $dummy=1;

                                $p.="/".shift(@bits);
                                $p.="/".shift(@bits);

-                               $map .= "<li>"
+                               $addparent=$p;
+                               $addparent=~s/^\///;
+                               $map .= ($spaces x $indent) . "<li>\n";
+                               $map .= ($spaces x $indent)

                                        .htmllink($params{page}, $params{destpage},
                                        .htmllink($params{page}, $params{destpage},

-                                                $p, class => "mapparent",
+                                                "/".$common_prefix.$p, class => "mapparent",

                                                 noimageinline => 1)
                                        ."\n";
                                $openli=1;
                                                 noimageinline => 1)
                                        ."\n";
                                $openli=1;


@@ -116,22 +138,26 @@ sub preprocess (@) { #{{{
                                $openli=0;
                        }
                }
                                $openli=0;
                        }
                }

-               $map .= "</li>\n" if $openli;
-               $map .= "<li>"
+               $map .= ($spaces x $indent) . "</li>\n" if $openli;
+               $map .= ($spaces x $indent) . "<li>\n";
+               $map .= ($spaces x $indent)

                        .htmllink($params{page}, $params{destpage}, 
                                "/".$common_prefix."/".$item,
                        .htmllink($params{page}, $params{destpage}, 
                                "/".$common_prefix."/".$item,

-                               linktext => $mapitems{$item},
+                               @linktext,

                                class => "mapitem", noimageinline => 1)
                        ."\n";
                $openli=1;
                $parent=$item;
        }
        while ($indent > 0) {
                                class => "mapitem", noimageinline => 1)
                        ."\n";
                $openli=1;
                $parent=$item;
        }
        while ($indent > 0) {

+               $map .= ($spaces x $indent) . "</li>\n";

                $indent--;
                $indent--;

-               $map .= "</li>\n</ul>\n";
+               $map .= ($spaces x $indent) . "</ul>\n";

        }
        }

+       $map =~ s{\n *</ul><map:collapse>\n *<ul><map:collapse>\n}{\n}gs;
+       $map =~ s{<map:collapse>}{}g;

        $map .= "</div>\n";
        return $map;
        $map .= "</div>\n";
        return $map;

-} # }}}
+}

 
 1
 
 1