Merge branch 'cgilite' of git.plutz.net:serve0 into cgilite

diff --git a/cgilite b/cgilite
index a301c53cc6f28dde4fa2f80d5785f7988542e327..d214859aadb31a565718da69754ad2573fa3f917 160000 (submodule)
--- a/cgilite
+++ b/cgilite
@@ -1 +1 @@
-Subproject commit a301c53cc6f28dde4fa2f80d5785f7988542e327
+Subproject commit d214859aadb31a565718da69754ad2573fa3f917

diff --git a/indexmeta.sh b/indexmeta.sh
index 2e4e74f16494305ce92f77578208447096e1b192..4545df93118bff9869839b0d9dbebcee3011c19e 100644 (file)
--- a/indexmeta.sh
+++ b/indexmeta.sh
@@ -40,7 +40,7 @@ meta_file(){
   name="$(meta_name "$file")"
 
   if [ -d "${meta%/meta}" ] && LOCK "$meta"; then
-    grep -vF " ${name}" "$meta" >"$meta.tmp"
+    grep -avF "        ${name}" "$meta" >"$meta.tmp"
     meta_line "$file" \
     | tee -a "$meta.tmp"
     mv "$meta.tmp" "$meta"
@@ -48,14 +48,28 @@ meta_file(){
   fi
 }
 
+meta_purge(){
+  local file meta name
+  file="$1"
+  meta="${file%/*}/.index/meta"
+  name="$(meta_name "$file")"
+
+  if [ -d "${meta%/meta}" ] && LOCK "$meta"; then
+    grep -avF "        ${name}" "$meta" >"$meta.tmp"
+    grep -aF " ${name}" "$meta" >>"$meta.trash"
+    mv "$meta.tmp" "$meta"
+    RELEASE "$meta"
+  fi
+}
+
 meta_info(){
   local file meta
   file="$1"
   meta="${file%/*}/.index/meta"
 
   if [ -d "${meta%/meta}" ]; then
-    grep -m1 -F "      $(meta_name "$file")" "$meta" \
-    | grep -xE '[0-9]+ [0-9]+  [0-9]+  tags=[^ ]*      comment=[^      ]*      .+' \
+    grep -aF " $(meta_name "$file")" "$meta" \
+    | grep -m1 -xE '[0-9]+     [0-9]+  [0-9]+  tags=[^ ]*      comment=[^      ]*      .+' \
     || meta_file "$file"
   else
     printf '0\t0\t0\ttags=\tcomment=\t\r'

diff --git a/list.sh b/list.sh
index d6228347bec5006fea4cad050b6c868abb0da8d0..d729c6c34a8c35c11a590752bc35378c62b3b8ba 100644 (file)
--- a/list.sh
+++ b/list.sh
@@ -6,12 +6,12 @@
 list_item() {
   local name path length width height tags comment n
   name="$(HTML "$1")"
-  path="$(URL "${ITEM}/${1}")"
+  path="$(URL "$ITEM/$1")"
+  qry=$(HTML "$QUERY_STRING")
 
   if [ -d "$_DATA/$ITEM/$1" ]; then
-    printf '[a .list .dir href="%s?%s" %s]' \
-      "$path" "$(HTML "$QUERY_STRING")" "$name"
-  else
+    printf '[a .list .dir href="%s" %s]' "${path}?${qry}" "$name"
+  elif [ -f "$_DATA/$ITEM/$1" ]; then
     read -r length width height tags comment n <<-EOF
        $(meta_info "$_DATA/$ITEM/$1")
        EOF
@@ -25,6 +25,9 @@ list_item() {
       "$width" "$height" \
       "$(UNSTRING "${tags#tags=}" |tr , '\0' |xargs -r0 printf ' [span .tag %s]')" \
       "$path" "$path" "$path"
+  else
+    printf 'Canning record for nonexist file: %s\n' "$1" >&2
+    meta_purge "$_DATA/$ITEM/$1"
   fi
 }
 
@@ -48,25 +51,37 @@ list_directories(){
   | tail -n1
 )"
 
+list_fullname(){
+  sn="$1"
+  [ ! "${sn%%*/*}" ] && base="${sn%/*}" || base=.
+  file="$(printf '%s' "$_DATA/$ITEM/$sn".*)"
+  file="${file##*/}"
+  [ -e "$_DATA/$ITEM/$base/${file}" ] \
+  && printf '%s\n' "${base}/${file}"
+}
+
 list_filemeta(){
   local meta base f fn file
   base="$1"
-  meta="$1/.index/meta"
+  meta="$_DATA/$ITEM/$base/.index/meta"
   meta_dir "$_DATA/$ITEM/$base"
 
-  if [ "$FILTER" ]; then
-    sed -nr "$list_fex" "$_DATA/$ITEM/$meta"
+  if [ $ORDER = Name ]; then
+    sort -k6 "$meta"
+  elif [ $ORDER = Length ]; then
+    sort -n "$meta"
+  else
+    cat "$meta"
+  fi \
+  | if [ "$FILTER" ]; then
+    sed -nr "$list_fex"
   elif [ "${SEARCH#!}" != "${SEARCH}" ]; then
-    grep -viE "$(STRING "${SEARCH#!}")" "$_DATA/$ITEM/$meta"
+    grep -viE "$(STRING "${SEARCH#!}")"
   else
-    grep -iE "$(STRING "${SEARCH}")" "$_DATA/$ITEM/$meta"
-  fi |cut -f1,6- \
-  | while f="$(line)"; do
-    fn="$(UNSTRING "${f#*      }")"; fn="${fn%${CR}}";
-    file="$(printf '%s\n' "$_DATA/$ITEM/$base/${fn}".*)"
-    file="${file##*/}"
-    [ -e "$_DATA/$ITEM/$base/${file}" ] \
-    && printf '%s      %s\n' "${f%%    *}" "${base}/${file}"
+    grep -iE "$(STRING "${SEARCH}")"
+  fi |cut -f6 | UNSTRING \
+  | while read -r fn; do
+    printf '%s\n' "${base}/${fn%${CR}}"
   done
 }
 
@@ -79,6 +94,15 @@ list_index(){
   done
 }
 
+list_dateorder(){
+  while read -r sn; do 
+    list_fullname "$sn"
+  done \
+  | xargs -rd'\n' stat -c '%Y  %n' \
+  | sort -rn |cut -d/ -f2- \
+  | sed -r 's;\.[^\.]*$;;;'
+}
+
 list_items() {
   local mode
   mode="$(COOKIE mode |grep -m1 -xE 'index|browse' || printf browse )"
@@ -87,78 +111,66 @@ list_items() {
 
   if   [ "$mode" = browse -a "$ORDER" = Date ]; then
     list_directories
-    list_filemeta . |cut -f2- \
-    | xargs -rd'\n' stat -c '%Y        %n' \
-    | sort -rn |cut -d/ -f2-
-  elif [ "$mode" = browse -a "$ORDER" = Name ]; then
-    list_directories
-    list_filemeta . \
-    | sort -k 2 |cut -d/ -f2-
+    list_filemeta . |list_dateorder
   elif [ "$mode" = index  -a "$ORDER" = Date ]; then
-    list_index |cut -f2- \
-    | xargs -rd'\n' stat -c '%Y        %n' \
-    | sort -rn | cut -d/ -f2-
-  elif [ "$mode" = index  -a "$ORDER" = Name ]; then
-    list_index | sort -k 2 | cut -d/ -f2-
-  elif [ "$mode" = browse -a "$ORDER" = Length ]; then
+    list_index |list_dateorder
+  elif [ "$mode" = browse ]; then
     list_directories
-    list_filemeta . \
-    | sort -n |cut -d/ -f2-
-  elif [ "$mode" = index  -a "$ORDER" = Length ]; then
-    list_index \
-    | sort -n |cut -d/ -f2-
+    list_filemeta .
+  elif [ "$mode" = index ]; then
+    list_index
   fi
 }
 
 list_paginate() {
-  local page i c n
-  page="$(GET p |grep -xE '[0-9]+' || printf 1)"
+  local page i c n end
+  page="$(GET p |grep -xE '[0-9]+' || printf 1)"; c=1
+  end=$((page + LISTSIZE))
 
   printf '[div .itemlist '
-  while i="$(line)"; do
-    c=$((${c-0} + 1))
-    if [ $c -lt $page ]; then
-      true
-    elif [ $c -lt $((LISTSIZE + page)) ]; then
-      list_item "$i"
-    fi
+  while read -r i; do
+    [ $c -ge $page -a $c -lt $end  ] \
+    && list_item "$(list_fullname "$i")"
+    c=$((c + 1))
   done
   printf ']'
 
   printf '[div .pagination'
-  for n in $(seq 1 $((c / LISTSIZE + 1)) ); do
+  for n in $( seq 1 $((c / LISTSIZE + 1)) ); do
     printf '[a .page href="%s" %s]' \
-      "?p=$(( (n - 1) * LISTSIZE + 1))" "$n"
+      "?p=$(( (n - 1) * LISTSIZE + 1))&$qry" "$n"
   done
   printf ']'
 }
 
 printf 'Content-Type: text/html;charset=utf-8\r\n\r\n'
 
-"$_EXEC/cgilite/html-sh.sed" <<-EOF
+{ printf '
 [!DOCTYPE HTML]
 [html [head [title Listing]
   [meta name="viewport" content="width=device-width"]
   [link rel=stylesheet href="/style.css" ]
 ] [body
   [div #navigation
-    [a #t_bookmarks href="#bookmarks" &#x2605;]
-    $(w_search)
+    [a #t_bookmarks href="#bookmarks" &#x2605;]'
+    w_search
+    printf '
     [a #t_avsearch href="#advsearch" Advanced]
     [a #t_prefs href="#prefs" &#x2699;]
-  ]
-  $(w_prefs)
-  $(w_advsearch)
-
-  [form method=POST action="?a=multitag"
-    $(list_items \
-      | list_paginate
-    )
+  ]'
+  w_prefs
+  w_advsearch
+  printf '
+  [form method=POST action="?a=multitag"'
+    list_items \
+    | list_paginate
+    printf '
     [div #editing
-      [a href="#multitag" Add Tags] $(w_tagging)
-      $(w_index)
+      [a href="#multitag" Add Tags]'
+      w_tagging
+      w_index
+      printf '
     ]
   ]
 ] ]
-EOF
-
+'; } | "$_EXEC/cgilite/html-sh.sed"

diff --git a/widgets.sh b/widgets.sh
index 658d2bb2291d87bdf979f6912a6f5ecd62e3139c..ba47062a9f775b9020b1cacebdd8a412edf1e0a8 100644 (file)
--- a/widgets.sh
+++ b/widgets.sh
@@ -8,12 +8,15 @@ include_widgets="$0"
 w_refuri="$(HTML "$REQUEST_URI")"
 
 w_tags="$(find "$_DATA/" -path '*/.index/meta' -print0 \
-        | xargs -r0 cut -f4 \
-        | cut -d= -f2- |tr , '\n' | sort -u)"
-w_tags="$(UNSTRING "$w_tags")"
-w_tagcategories="$(printf %s "$w_tags" |cut -sd: -f1 |sort -u)"
+        | xargs -r0 sed -r '
+          s;^.*\t.*\t.*\ttags=(.*)\tcomment=.*\t.*\r$;\1;;
+          s;,;\n;g;'"$UNSTRING" \
+        | sort -u |HTML |sed 's;&#58\;;:;g; s;&#10\;;\n;g;')"
+w_tagcategories="$(printf %s "$w_tags" | cut -sd: -f1 | uniq)"
 
-CHECK(){ [ "$1" = "$2" ] && printf checked; }
+[ "$ORDER" = Name   ] && w_coname=checked
+[ "$ORDER" = Date   ] && w_codate=checked
+[ "$ORDER" = Length ] && w_colength=checked
 
 w_bookmarks(){
   local name link bm
@@ -50,16 +53,16 @@ w_search(){
     [input name=s placeholder=Search value="%s"]
   ]
   ' \
-  "$(CHECK "$ORDER" Name)" \
-  "$(CHECK "$ORDER" Date)" \
-  "$(CHECK "$ORDER" Length)" \
+  "$w_coname" "$w_codate" "$w_colength" \
   "$(HTML "$SEARCH")"
 }
 
 w_prefs(){
-  local fakemp4 mode
-  fakemp4="$(COOKIE fakemp4)"
-  mode="$(COOKIE mode)"
+  local tm tf
+
+  tm=''; [ "$(COOKIE mode)" = index ] && tm=' '
+  tf=''; [ "$(COOKIE fakemp4)" = yes ] && tf=checked
+
   printf '
   [form #prefs method="POST" action="?a=setprefs"
     [a href="#" x]
@@ -73,9 +76,7 @@ w_prefs(){
   ]
   ' \
   "$w_refuri" "$LISTSIZE" \
-  "$([ "$mode" = index  ] || CHECK)" \
-  "$(CHECK "$mode" index)" \
-  "$(CHECK "$fakemp4" yes)"
+  "${tm:-checked}" "${tm:+checked}" "$tf"
 }
 
 w_index(){
@@ -90,47 +91,47 @@ w_index(){
 }
 
 w_advsearch(){
-  local n lbid tag category tn filter f
-  filter="${FILTER}^"
+  local n lbid tag category filter f t
+  filter="$(HTML "${FILTER}^" |sed 's;&#126\;;~;g; s;&#94\;;^;g; s;&#124\;;|;g; s;&#58\;;:;g;')"
 
   printf '[form #advsearch action=?a=advsearch method=POST
             [a href="#" Hide]
             [p .help Select multiple tags from each category by holding down the [strong Ctrl] key on your keyboard.[br]
-            Refine the search further by setting additional search tags using the [strong "+and"] button.]
-         '
+            Refine the search further by setting additional search tags using the [strong "+and"] button.]'
 
   for n in 1 2 3 4 5 6 7 8 9 10; do
     f="${filter%%^*}"; filter="${filter#*^}"
 
-    lbid="$(HTML "cat_${n}_(none)")"
+    t=''; [ "$f" -a ! "${f%%~*}" ] && t=" "
+
+    lbid="cat_${n}_(none)"
     printf '[input .and type=checkbox name=and id="and_%i" %s][label for="and_%i" +and
             ][fieldset .select
             [radio "pol_%i" "pos" .pol %s #pol_pos_%i"][label for=pol_pos_%i Any]
             [radio "pol_%i" "neg" .pol %s #pol_neg_%i"][label for=pol_neg_%i None]
             [label .head Category:]' \
-            $n "$([ "$f" ] && printf checked)" $n \
-            $n "$([ "$f" -a ! "${f%%~*}" ] || printf checked)" $n $n \
-            $n "$([ "$f" -a ! "${f%%~*}" ] && printf checked)" $n $n
-    f="|${f#~}|"
+            $n "${f:+checked}" $n \
+            $n "${t:-checked}" $n $n \
+            $n "${t:+checked}" $n $n
 
+    f="|${f#~}|"
     printf '*\n%s\n' "$w_tagcategories" \
     | while read -r category; do
-      catn="$(HTML "$category")"
-      lbid="cat_${n}_${catn}"
-      printf '[radio "cat_%i" "%s" .cat id="%s" %s][label for="%s" %s]
+      lbid="cat_${n}_${category}"
+
+      t=''
+      [ "$category"  = '*' -a   "${f%%|${category}:*}" ] && t=checked
+      [ "$category" != '*' -a ! "${f%%|${category}:*}" ] && t=checked
+
+      printf '[radio "cat_%i" "%s" .cat %s id="%s"][label for="%s" %s]
               [select name=tag_%s size=10 multiple' \
-              $n "$catn" "$lbid" \
-              "$([ ! "${f%%*|${category}:*}" -o ! "${category%\*}" ] && printf checked)" \
-              "$lbid" "$catn" $n
+              $n "$category" "$t" "$lbid" "$lbid" "$category" $n
 
-      printf %s "$w_tags" \
-      | { [ "$category" = '*' ] && grep -vF ':' || grep -wF "${category}"; } \
+      printf '%s\n' "$w_tags" \
+      | { [ "$category" = '*' ] && grep -vF ':' |grep -vxF '' || grep -wF "${category}"; } \
       | while read -r tag; do
-        [ ! "$tag" ] && continue
-        tg="$(HTML "$tag")"; tn="${tg#*:}"
-        printf '[option %s value="%s"\n%s]' \
-          "$([ ! "${f%%*|${tag}|*}" ] && printf selected)" \
-          "$tg" "$tn"
+        t=''; [ ! "${f%%*|${tag}|*}" ] && t=checked
+        printf '[option %s value="%s"\n%s]' "$t" "$tag" "${tag#*:}"
       done
       printf '\n]'
     done
@@ -144,9 +145,9 @@ w_advsearch(){
             [option value=Length %s Length]
           ][button type=submit Apply Filter]]
           ]' \
-          "$(CHECK "$ORDER" Name)" \
-          "$(CHECK "$ORDER" Date)" \
-          "$(CHECK "$ORDER" Length)"
+          "$w_coname" \
+          "$w_codate" \
+          "$w_colength"
 }
 
 w_tagging(){
@@ -156,13 +157,11 @@ w_tagging(){
 
   printf 'Tags\n%s\n' "$w_tagcategories" \
   | while read -r category; do
-    printf '[fieldset [legend %s:][select name=tag size=4 multiple' "$(HTML "$category")"
+    printf '[fieldset [legend %s:][select name=tag size=4 multiple' "$category"
     printf %s "$w_tags" \
-    | { [ "$category" = 'Tags' ] && grep -vF ':' || grep -wF "${category}"; } \
+    | { [ "$category" = 'Tags' ] && grep -vF ':' | grep -vxF '' || grep -wF "${category}"; } \
     | while read -r tag; do
-      [ ! "$tag" ] && continue
-      tag="$(HTML "$tag")"; tn="${tag#*:}"
-      printf '[option value="%s"\n%s]' "$tag" "$tn"
+      printf '[option value="%s"\n%s]' "$tag" "${tag#*:}"
     done
     printf ']]'
   done