Fix excess dummy link appearance

[zk.zsh.git] / zk.zsh

diff --git a/zk.zsh b/zk.zsh
index a4984cc0fa3731550e40388b537bc812fb762dc4..d583ae3d5d3dc5a990578bad5599916e9605a347 100755 (executable)
--- a/zk.zsh
+++ b/zk.zsh
@@ -6,7 +6,7 @@ set -e
 ZK_VERSION=ZKZSH1
 
 usage() {
-    cat >&2 <<EOF
+    >&2 <<EOF
 Usage:
   \$ $0:t links PAGE
     Print PAGE's links
@@ -20,11 +20,16 @@ EOF
 
 [[ $# -eq 2 ]] || usage
 
+separator="------------------------ >8 ------------------------"
 setopt GLOB_STAR_SHORT
 zmodload -F zsh/stat b:zstat
 typeset -A pages
 typeset -A sizes
 for p (**(.)) {
+    [[ $p:t == "index" ]] && {
+        echo unacceptable filename: $p >&2
+        exit 1
+    }
     zstat -A mtime -F "%F %T" +mtime $p
     zstat -A size +size $p
     pages[$p]=${mtime[1]}
@@ -67,7 +72,7 @@ for p (${(k)pages}) {
         zf_mkdir -p $ZK_CACHE/$p:h
         ws=($ZK_VERSION ${inode[1]} ${ctime[1]} $ws)
         print -l $ws > $ZK_CACHE/$p
-        ws=(${ws[3,-1]})
+        ws=(${ws[4,-1]})
     }
     [[ $ws ]] && links[$p]=${(j: :)ws}
 }
@@ -102,7 +107,7 @@ genHTML() {
     [[ $# -eq 1 ]] && data=${mapfile[$page]} || data=$2
     local _links=(${(oi)=links[$page]})
     if [[ ( ${cached[$page]} ) && ( -s $ZK_CACHE/${page}.html ) ]]; then
-        cat $ZK_CACHE/${page}.html
+        < $ZK_CACHE/${page}.html
     else
         data=${data//&/&amp;}
         data=${data//</&lt;}
@@ -116,7 +121,7 @@ genHTML() {
 $data</pre>"
         if [[ $ZK_CACHE ]]; then
             print -r "$data" > $ZK_CACHE/${page}.html
-            cat $ZK_CACHE/${page}.html
+            < $ZK_CACHE/${page}.html
         else
             print -r "$data"
         fi
@@ -152,7 +157,7 @@ genIndex() {
     local curdepth=${#${(s:/:)1}}
     (( curdepth = curdepth + 1 ))
     for p (${(oi)${(k)pages[(I)$1*]}}) {
-        [[ $p =~ "/Index$" ]] && continue
+        [[ ( $p =~ "/index$" ) || ( $p = "index" ) ]] && continue
         case ${#${(As:/:)p}} in
         ($curdepth) _links=($p $_links) ;;
         ( $(( $curdepth + 1 )) ) cats=(${1}${${p#$1}%%/*} $cats) ;;
@@ -162,14 +167,14 @@ genIndex() {
     for p (${(oi)_links}) \
         entries=($entries "[$p] (${pages[$p]}) (${sizes[$p]} bytes)")
     if [[ $cats ]]; then
-        entries=($entries " " "Subdirectories:" " ")
+        entries=($entries $separator "Subdirectories:" $separator)
         for p (${(oi)cats}) {
-            entries=($entries "[$p/Index]")
-            _links=($p/Index $_links)
+            entries=($entries "[$p/index]")
+            _links=($p/index $_links)
         }
     fi
-    links[${1}Index]=${(j: :)_links}
-    genHTML ${1}Index ${(F)entries}
+    links[${1}index]=${(j: :)_links}
+    genHTML ${1}index ${(F)entries}
 }
 
 case $1 in
@@ -183,11 +188,11 @@ case $1 in
         genHTML $p > $2/$p.html
         touch -r $p $2/$p.html
     }
-    for p ($cats) pages[${p}/Index]=$now
-    pages[Index]=$now
-    for p ($cats) genIndex $p/ > $2/$p/Index.html
-    genIndex "" > $2/Index.html
-    for p ("" $cats) touch -d ${now/ /T} $2/$p/Index.html
+    for p ($cats) pages[${p}/index]=$now
+    pages[index]=$now
+    for p ($cats) genIndex $p/ > $2/$p/index.html
+    genIndex "" > $2/index.html
+    for p ("" $cats) touch -d ${now/ /T} $2/$p/index.html
     ;;
 (*) usage ;;
 esac