use ffprobe for reading video meta data, dropping dependency on mplayer

[serve0] / index.cgi

diff --git a/index.cgi b/index.cgi
index 000fabbf1e96fa89f886f59cc61e302ac4c7d327..f625199d035a76049e316a7ca03912b0138712eb 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -1,29 +1,20 @@
 #!/bin/sh
 
 exec 2>/dev/null
-for n in "$@"; do case ${n%%=*} in
-  data) _DATA="${n#data=}";;
-  exec) _exec="${n#exec=}";;
-  noerr) exec 2>&-;;
-esac; done
-
-[ -z "${_EXEC%/}" ] && _EXEC="$(realpath "${0%/*}")" || _EXEC="${_EXEC%/}"
-[ -z "${_DATA%/}" ] && _DATA=. || _DATA="${_DATA%/}"
-
 file_pattern='^.*\.(mov|ts|mpg|mpeg|mp4|m4v|avi|mkv|flv|sfv|wmv|ogm|ogv|webm|iso|rmvb)$'
 
-. "$_EXEC/cgilite/cgilite.sh"
+. "${_EXEC:-${0%/*}}/cgilite/cgilite.sh"
 
 FILTER="$(GET f)"
 SEARCH="$(GET s)"
 ORDER="$(GET o |grep -m1 -axE 'Date|Name|Length|Group' || printf Name)"
-LISTSIZE="$(COOKIE pagesize |grep -m1 -axE '[1-9][0-9]*' || printf 50)"
+LISTSIZE="$(COOKIE pagesize |grep -m1 -axE '[1-9][0-9]*' || printf 60)"
 ITEM="${PATH_INFO%/}"
 ACTION="$(GET a)"
 
 case $ACTION in
   setprefs)
-    SET_COOKIE +$((86400 * 90))  pagesize="$(POST pagesize |grep -m1 -axE '[1-9][0-9]*' || printf 50)"
+    SET_COOKIE +$((86400 * 90))  pagesize="$(POST pagesize |grep -m1 -axE '[1-9][0-9]*' || printf 60)"
     SET_COOKIE +$((86400 * 90))      mode="$(POST     mode |grep -m1 -axE 'browse|index' || printf browse)"
     SET_COOKIE +$((86400 * 90))   fakemp4="$(POST  fakemp4 |grep -m1 -axE 'yes' || printf no)"
     SET_COOKIE +$((86400 * 90)) downscale="$(POST  downscale |grep -m1 -axE 'yes' || printf no)"
@@ -90,22 +81,26 @@ case $ACTION in
   fi;;
 esac
 
-case $PATH_INFO in
-  /style.css)
-    . "$_EXEC/cgilite/file.sh"
-    [ -r "$_DATA/$PATH_INFO" ] \
-    && FILE "$_DATA/$PATH_INFO" \
-    || FILE "$_EXEC/style.css"
-    return 0
-  ;;
-  /stereoview.js)
-    . "$_EXEC/cgilite/file.sh"
-    FILE "$_EXEC/stereoview.js"
-    return 0
-  ;;
-esac
+# case $PATH_INFO in
+#   /style.css)
+#     . "$_EXEC/cgilite/file.sh"
+#     [ -r "$_DATA/$PATH_INFO" ] \
+#     && FILE "$_DATA/$PATH_INFO" \
+#     || FILE "$_EXEC/style.css"
+#     return 0
+#   ;;
+#   /stereoview.js)
+#     . "$_EXEC/cgilite/file.sh"
+#     FILE "$_EXEC/stereoview.js"
+#     return 0
+#   ;;
+# esac
 
-if [ -f "$_DATA/$PATH_INFO" ]; then
+if [ -f "$_EXEC/$PATH_INFO" ]; then
+  . "$_EXEC/cgilite/file.sh"
+  FILE "$_EXEC/$PATH_INFO"
+  return 0
+elif [ -f "$_DATA/$PATH_INFO" ]; then
   . "$_EXEC/view.sh"
   return 0
 elif [ -d "$_DATA/$PATH_INFO" ]; then