X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=view.sh;h=094337ea15d99ea3c1cff1a86b34fd0f24658a94;hb=dde89971f018789ec41464c30373aa04c6a1f157;hp=4ee5fb590ec6d731a3f256b03064f4dc77bd9a59;hpb=7db7dc21eaa620d93ab65b41ae5aa336cb501db5;p=serve0

diff --git a/view.sh b/view.sh
old mode 100644
new mode 100755
index 4ee5fb5..094337e
--- a/view.sh
+++ b/view.sh
@@ -1,45 +1,41 @@
 #!/bin/sh
 
-. "$_EXEC/indexmeta.sh"
+. "$_EXEC/db_meta.sh"
 . "$_EXEC/widgets.sh"
 
-read length width height tags comment short <<-EOF
-	$(meta_info "$_DATA/$ITEM")
-	EOF
+read_meta "${ITEM%.*}"
 
 printf 'Content-Type: text/html;charset=utf-8\r\n\r\n'
 
-{ printf '
-[!DOCTYPE HTML]
-[html [head [title \n'
-  HTML "${ITEM##*/}"
-  printf ']
-  [meta name="viewport" content="width=device-width"]
-  [link rel=stylesheet href="/style.css" ]
-] [body #view
-  [script type="text/javascript" src="/stereoview.js"\n]
-  [div #navigation
-    [a #t_bookmarks href="#bookmarks" &#x2605;]'
-    w_search
-    printf '
-    [a #t_avsearch href="#advsearch" Advanced]
-    [a #t_prefs href="#prefs" &#x2699;]
-  ]'
+{ cat <<-EOF
+	[!DOCTYPE HTML]
+	[html [head
+	  [title . $(HTML "${ITEM##*/}")]
+	  [meta name="viewport" content="width=device-width"]
+	  [link rel=stylesheet href="/cgilite/common.css" ]
+	  [link rel=stylesheet href="/style.css" ]
+	] [body #view
+	  [script type="text/javascript" src="/stereoview.js"\n]
+	  [div #navigation
+	    [a #t_bookmarks href="#bookmarks" &#x2605;]
+	    $(w_search)
+	    [a #t_prefs href="#prefs" &#x2699;]
+	  ]
+	EOF
   w_bookmarks
   w_advsearch
   w_prefs
-  printf '
-  [video #mainvideo controls="controls" [source src="?a=download" type="video/mp4"]]
-  [a "?a=download" Download]
-  [a "javascript:stereoview(180, document.getElementById(&#34;mainvideo&#34;));" View 180° Stereoscopic]
-  [a "javascript:stereoview(360, document.getElementById(&#34;mainvideo&#34;));" View 360° Stereoscopic]
-  [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;'
-    )"
+  cat <<-EOF
+	  [video #mainvideo controls="controls" preload="auto" [source src="?a=download" type="video/mp4"]]
+	  [a "?a=download" Download]
+	  [a "javascript:stereoview(180, document.getElementById(&#34;mainvideo&#34;));" View 180° Stereoscopic]
+	  [a "javascript:stereoview(360, document.getElementById(&#34;mainvideo&#34;));" View 360° Stereoscopic]
+	  [h1 . $(HTML "${ITEM##*/}" |sed -E 's;[^0-9a-zA-Z&#];&[wbr];g')]
+	  [span .time $((META_LENGTH / 60)):$(printf %02i $((META_LENGTH % 60)))min] [span .dim ${META_WIDTH}x${META_HEIGHT}]
+	EOF
+  printf %s\\n "$META_TAGS" |tr , \\n |while read tag; do
+    [ "$tag" ] && printf '  [span .tag . %s]\n' "$(HTML "${tag#-}")"
+  done
   printf '
   [div #editing
     [form method=POST action="/?a=multitag"