1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
|
The [[plugins/map]] plugin has inconsistent behaviour. In particular, I have in my wiki some directory structures holding files without wikitext pointers (I point directly to the files from elsewhere). For example, imagine the following file structure in the source dir:
; ls -R dirA dirB
dirA:
subA subB
dirA/subA:
filea.mdwn fileb.mdwn
dirA/subB:
filec.mdwn filed.mdwn
dirB:
subA subC
dirB/subA:
filea.mdwn
dirB/subC:
fileb.mdwn filec.mdwn
When I use map to make a map of this, the result looks more like this:
<ul>
<li><span class="createlink">? dirA</span>
<ul>
<li><span class="createlink">? subA</span>
<ul>
<li>filea
</li>
</ul>
<ul>
<li>fileb
</li>
</ul>
<ul>
<li>filec
</li>
<li>filed
</li>
</ul>
</li>
</ul>
</li>
<li><span class="createlink">? dirB</span>
<ul>
<li><span class="createlink">? subA</span>
<ul>
<li>filea
</li>
</ul>
</li>
</ul>
<ul>
<li><span class="createlink">? subC</span>
<ul>
<li>fileb
</li>
</ul>
<ul>
<li>filec
</li>
</ul>
</li>
</ul>
</li>
</ul>
Note that while the dirA/subA directory exists with a create link, the dirA/subB directory is missing from the map. Interestingly, dirB/subC is shown in the map. If you add a second file to dirB/subA then dirB/subC disappears as well.
I could imagine including all 'bare' directories in the map, and I could imagine including no 'bare' directories in the map. Just including the first bare directory seems a strange intermediate point.
Attached is a [[patch]] that fixes the issue. The current map code makes one pass over the sorted list of pages. This adds an initial pass that goes through and makes sure that all parent directories are included. With this initial pass added, the following pass could probably be simplified.
One solution could also use the [[plugins/autoindex]] plugin to make sure that parent pages actually exist. This is really only a stop-gap solution until the patch is applied - map still needs to be made bug-free.
Note: This patch adds items to a map while it is in a foreach loop over a sorted list of keys from that same map. Changing a map while iterating through it is normally problematic. I'm assuming the sort insulates the code from this - I do not need to iterate over any of the newly added elements.
diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 5b6a843..16de45e 100644
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -67,6 +67,39 @@ sub preprocess (@) { #{{{
# are removed.
add_depends($params{page}, join(" or ", keys %mapitems));
+ # Include all the parent directories in the map
+ my $lastbase="";
+ my $commonbase = "";
+ $commonbase = $common_prefix if defined $common_prefix && length $common_prefix;
+ foreach my $item (sort keys %mapitems) {
+ $item=~s/^\Q$common_prefix\E\///
+ if defined $common_prefix && length $common_prefix;
+ my $itembase=IkiWiki::dirname($item);
+ if ($itembase ne $lastbase) {
+ # find the common dir
+ my @a=split(/\//, $itembase);
+ my @b=split(/\//, $lastbase);
+ my $common_dir=$commonbase;
+ while (@a && @b && $a[0] eq $b[0]) {
+ if (length $common_dir) {
+ $common_dir.="/";
+ }
+ $common_dir.=shift(@a);
+ shift @b;
+ }
+ # add all the dirs down to the current base
+ while (@a) {
+ if (length $common_dir) {
+ $common_dir.="/";
+ }
+ $common_dir.=shift(@a);
+ $mapitems{$common_dir}=''
+ unless defined $mapitems{$common_dir};
+ }
+ $lastbase = $itembase;
+ }
+ }
+
# Create the map.
my $parent="";
my $indent=0;
|