map: don't create useless </ul><ul> sequences

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

diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index af14ef5dee9cd6b33e127794c9bf7be7ee80bd91..38f090ff782f8799edbe074b9778477809f9d045 100644 (file)
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -9,7 +9,7 @@ package IkiWiki::Plugin::map;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
        hook(type => "getsetup", id => "map", call => \&getsetup);
@@ -21,6 +21,7 @@ sub getsetup () {
                plugin => {
                        safe => 1,
                        rebuild => undef,
+                       section => "widget",
                },
 }
 
@@ -28,36 +29,39 @@ sub preprocess (@) {
        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;
-       foreach my $page (keys %pagesources) {
-               if (pagespec_match($page, $params{pages}, location => $params{page})) {
-                       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;
+       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;
                        }
                }
        }
@@ -68,28 +72,31 @@ sub preprocess (@) {
                $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));
-
        # Create the map.
        my $parent="";
        my $indent=0;
        my $openli=0;
        my $addparent="";
-       my $map = "<div class='map'>\n<ul>\n";
+       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);
+               my $parentbase=IkiWiki::dirname($parent);
+               while (length $parentbase && length $baseitem && $baseitem !~ /^\Q$parentbase\E(\/|$)/) {
+                       $parentbase=IkiWiki::dirname($parentbase);
                        last if length $addparent && $baseitem =~ /^\Q$addparent\E(\/|$)/;
                        $addparent="";
                        $indent--;
@@ -107,14 +114,10 @@ sub preprocess (@) {
                }
                my @bits=split("/", $item);
                my $p="";
+               $indent++  unless length $parent;
                $p.="/".shift(@bits) for 1..$indent;
                while ($depth > $indent) {
-                       $indent++;
-                       if ($indent > 1) {
-                               $map .= "<ul>\n";
-                       }
-                       if ($depth > $indent) {
-                               $p.="/".shift(@bits);
+                       if (@bits && !(length $parent && "/$parent" eq $p)) {
                                $addparent=$p;
                                $addparent=~s/^\///;
                                $map .= "<li>"
@@ -127,6 +130,11 @@ sub preprocess (@) {
                        else {
                                $openli=0;
                        }
+                       $indent++;
+                       $p.="/".shift(@bits) if @bits;
+                       if ($indent > 1) {
+                               $map .= "<ul>\n";
+                       }
                }
                $map .= "</li>\n" if $openli;
                $map .= "<li>"