pretty!

[ikiwiki.git] / ikiwiki

diff --git a/ikiwiki b/ikiwiki
index 9aaeed86ca64ae51ae535ab0928c563c3e28eaa1..72b1021eca97a323bc14724f98c29cab8d285b3e 100755 (executable)
--- a/ikiwiki
+++ b/ikiwiki
@@ -154,7 +154,7 @@ sub bestlink ($$) {
                }
        } while $cwd=~s!/?[^/]+$!!;
 
-       print STDERR "warning: page $page, broken link: $link\n";
+       #print STDERR "warning: page $page, broken link: $link\n";
        return "";
 }
 
@@ -172,6 +172,10 @@ sub htmllink ($$) {
 
        return $link if $page eq $bestlink;
        
+       # TODO BUG: %renderedfiles may not have it, if the linked to page
+       # was also added and isn't yet rendered! Note that this bug is
+       # masked by the bug mentioned below that makes all new files
+       # be rendered twice.
        if (! grep { $_ eq $bestlink } values %renderedfiles) {
                $bestlink=htmlpage($bestlink);
        }
@@ -214,13 +218,25 @@ sub linkbacks ($$) {
 
        my @links;
        foreach my $p (keys %links) {
-               if (grep { $_ eq $page } @{$links{$p}}) {
+               next if bestlink($page, $p) eq $page;
+               if (grep { length $_ && bestlink($p, $_) eq $page } @{$links{$p}}) {
                        my $href=File::Spec->abs2rel(htmlpage($p), dirname($page));
-                       push @links, "<a href=\"$href\">$p</a>";
+                       
+                       # Trim common dir prefixes from both pages.
+                       my $p_trimmed=$p;
+                       my $page_trimmed=$page;
+                       my $dir;
+                       1 while (($dir)=$page_trimmed=~m!^([^/]+/)!) &&
+                               defined $dir &&
+                               $p_trimmed=~s/^\Q$dir\E// &&
+                               $page_trimmed=~s/^\Q$dir\E//;
+                                      
+                       push @links, "<a href=\"$href\">$p_trimmed</a>";
                }
        }
 
-       $content.="<hr><p>Links: ".join(" ", sort @links)."</p>\n";
+       $content.="<hr><p>Links: ".join(" ", sort @links)."</p>\n" if @links;
+       return $content;
 }
 
 sub finalize ($$) {
@@ -288,8 +304,8 @@ sub loadindex () {
                my $page=pagename($file);
                $pagesources{$page}=$file;
                $oldpagemtime{$page}=$mtime;
-               $links{$page}=[@links];
                $oldlinks{$page}=[@links];
+               $links{$page}=[@links];
                $renderedfiles{$page}=$rendered;
        }
        close IN;
@@ -360,6 +376,7 @@ sub refresh () {
                        prune($destdir."/".$renderedfiles{$page});
                        delete $renderedfiles{$page};
                        $oldpagemtime{$page}=0;
+                       delete $pagesources{$page};
                }
        }
        
@@ -373,18 +390,15 @@ sub refresh () {
                        render($file);
                        $rendered{$file}=1;
                }
-               elsif ($rebuild) {
-                       debug("rebuilding unchanged file $file");
-                       render($file);
-                       $rendered{$file}=1;
-               }
        }
        
        # if any files were added or removed, check to see if each page
        # needs an update due to linking to them
+       # TODO: inefficient; pages may get rendered above and again here;
+       # problem is the bestlink may have changed and we won't know until
+       # now
        if (@add || @del) {
 FILE:          foreach my $file (@files) {
-                       next if $rendered{$file};
                        my $page=pagename($file);
                        foreach my $f (@add, @del) {
                                my $p=pagename($f);
@@ -392,6 +406,7 @@ FILE:               foreach my $file (@files) {
                                        if (bestlink($page, $link) eq $p) {
                                                debug("rendering $file, which links to $p");
                                                render($file);
+                                               $rendered{$file}=1;
                                                next FILE;
                                        }
                                }
@@ -403,23 +418,27 @@ FILE:             foreach my $file (@files) {
        # pages it links to
        # TODO: inefficient; pages may get rendered above and again here;
        # problem is the linkbacks could be wrong in the first pass render
-       # above.
+       # above
        if (%rendered) {
                my %linkchanged;
                foreach my $file (keys %rendered, @del) {
-                       my $pagename=pagename($file);
-                       if (exists $links{$pagename}) {
-                               foreach my $link (@{$links{$pagename}}) {
-                                       if (! exists $oldlinks{$pagename} ||
-                                           ! grep { $_ eq $link } @{$oldlinks{$pagename}}) {
+                       my $page=pagename($file);
+                       if (exists $links{$page}) {
+                               foreach my $link (@{$links{$page}}) {
+                                       $link=bestlink($page, $link);
+                                       if (length $link &&
+                                           ! exists $oldlinks{$page} ||
+                                           ! grep { $_ eq $link } @{$oldlinks{$page}}) {
                                                $linkchanged{$link}=1;
                                        }
                                }
                        }
-                       if (exists $oldlinks{$pagename}) {
-                               foreach my $link (@{$oldlinks{$pagename}}) {
-                                       if (! exists $links{$pagename} ||
-                                           ! grep { $_ eq $link } @{$links{$pagename}}) {
+                       if (exists $oldlinks{$page}) {
+                               foreach my $link (@{$oldlinks{$page}}) {
+                                       $link=bestlink($page, $link);
+                                       if (length $link &&
+                                           ! exists $links{$page} ||
+                                           ! grep { $_ eq $link } @{$links{$page}}) {
                                                $linkchanged{$link}=1;
                                        }
                                }
@@ -435,6 +454,6 @@ FILE:               foreach my $file (@files) {
        }
 }
 
-loadindex();
+loadindex() unless $rebuild;
 refresh();
 saveindex();