fix bug in exclusive tag support

[serve0] / view.sh

diff --git a/view.sh b/view.sh
index baaad115a27ae8c0dba0ccbf4e74eee5d326cc18..887876d9beefe810f0213645b01b2502c3a5fa0a 100644 (file)
--- a/view.sh
+++ b/view.sh
@@ -11,7 +11,7 @@ printf 'Content-Type: text/html;charset=utf-8\r\n\r\n'
 
 { printf '
 [!DOCTYPE HTML]
-[html [head [title Listing]
+[html [head [title View]
   [meta name="viewport" content="width=device-width"]
   [link rel=stylesheet href="/style.css" ]
 ] [body #view
@@ -27,20 +27,21 @@ printf 'Content-Type: text/html;charset=utf-8\r\n\r\n'
   w_advsearch
   w_prefs
   printf '
-  [h1\n %s]
+  [video #mainvideo controls="controls" [source src="?a=download" type="video/mp4"]]
   [a "?a=download" Download]
   [a "javascript:stereoview(180, document.getElementById("mainvideo"));" View 180° Stereoscopic]
   [a "javascript:stereoview(360, document.getElementById("mainvideo"));" View 360° Stereoscopic]
-  [video #mainvideo controls="controls" [source src="?a=download" type="video/mp4"]]
-  [span .time %i:%imin] [span .dim %ix%i] %s
-  ' "$(HTML "${ITEM##*/}")" \
+  [h1\n %s]
+  [span .time %i:%02imin] [span .dim %ix%i] %s
+  ' "$(HTML "${ITEM##*/}" |sed -r "$w_ascii"' s;[^0-9a-zA-Z&#];&[wbr];g')" \
     "$((length / 60))" "$((length % 60))" "$width" "$height" \
     "$(printf '%s\n' "${tags#tags=}" |sed -r "$UNSTRING"'
-       s;^;,;; s;,+;,;g; s;,$;;; :X s;,([^,]+)(,|$); [span .tag\n \1]\2;; tX;'
+       s;^;,;; s;,+;,;g; s;,$;;; :X s;,-?([^,]+)(,|$); [span .tag\n \1]\2;; tX;'
     )"
   printf '
   [div #editing
-    [form method=POST action="?a=multitag"'
+    [form method=POST action="/?a=multitag"
+    [hidden "select" "%s"]' "$(HTML "${ITEM}")"
       [ -d "$_DATA/${ITEM%/*}/.index/" ] && w_tagging
     printf '
     ]