mapfile instead of cat-like call is faster

[zk.zsh.git] / zk.zsh

diff --git a/zk.zsh b/zk.zsh
index 38455b6f0b185a1cb47c334f8ab973ae66269a9b..fe3f62e9018e63d2b855a22c314592990418a4f6 100755 (executable)
--- a/zk.zsh
+++ b/zk.zsh
@@ -19,7 +19,6 @@ EOF
 
 [[ $# -eq 2 ]] || usage
 
-# Collect all pages
 setopt GLOB_STAR_SHORT
 zmodload -F zsh/stat b:zstat
 typeset -A pages
@@ -30,13 +29,13 @@ for p (**(.)) {
 typeset -a cats
 for p (**(/)) cats=($p $cats)
 
-# Determine the links between them
+zmodload zsh/mapfile
 typeset -A links
 typeset -A backs
 typeset -aU words
 for p (${(k)pages}) {
     words=()
-    for w (`< $p`) {
+    for w (${=mapfile[$p]}) {
         [[ $w =~ "\[(.*)\]" ]] || continue
         w=${match[1]}
         [[ ${pages[$w]} ]] || {
@@ -74,7 +73,7 @@ getrel() {
 genHTML() {
     local page=$1
     local data p
-    [[ $# -eq 1 ]] && data=`< $page` || data=$2
+    [[ $# -eq 1 ]] && data=${mapfile[$page]} || data=$2
     data=${data//&/&amp;}
     data=${data//</&lt;}
     data=${data//>/&gt;}
@@ -99,7 +98,7 @@ $data
 }
 
 zmodload -F zsh/datetime b:strftime
-now=$(strftime "%F %T")
+strftime -s now "%F %T"
 
 genIndex() {
     local p
@@ -118,7 +117,7 @@ genIndex() {
     }
     for p (${(oi)_links}) entries=($entries "[$p] (${pages[$p]})")
     if [[ $cats ]]; then
-        entries=($entries "\nBacklinks:\n")
+        entries=($entries "\nSubdirectories:\n")
         for p (${(oi)cats}) {
             entries=($entries "[$p/Index]")
             _links=($p/Index $_links)