X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=actions%2Fmeta.sh;h=10b188fef0bdab35f217fe5e299fd7a7f635429e;hb=9541d33307f68dbefb979e3a070a844f2be91d19;hp=605d8099d6c2b20720d4f31003984e070d5996dc;hpb=3a030bfc7933228ab4405dbb706bd63edbf7bc31;p=serve0 diff --git a/actions/meta.sh b/actions/meta.sh index 605d809..10b188f 100755 --- a/actions/meta.sh +++ b/actions/meta.sh @@ -4,7 +4,7 @@ info="$_GET[\"i\"]" order="$_GET[\"o\"]" search="$_GET[\"s\"]" filter="$_GET[\"f\"]" -page="$_GET[\"p\"]" +page="$_GET[\"pn\"]" file="${_DATA}/meta/$info.meta" cgi_post @@ -25,18 +25,19 @@ n=0; while [ -n "$_POST[\"tag$n\"]" ]; do n=$(($n + 1)) done -[ -z "$cancel" ] && if [ -n "$trash" ]; then +[ -z "$cancel" -a -n "$info" ] && if [ -n "$trash" ]; then rm "${_DATA}/thumbs/$info.jpg" 2>/dev/null mv "${_DATA}/videos/$info" "${_DATA}/meta/$info.meta" "${_DATA}/trash/" 2>/dev/null rm "${_DATA}/cache/$info.cache" 2>/dev/null rm ${_DATA}/cache/\?* 2>/dev/null else echo -e "$length\t$width\t$height\t$info" > "$file" - echo -e "${tagacc}${tags}" |tr '\n' '|' >> "$file" + echo -e "${tagacc}|${tags}" |tr '\n' '|' >> "$file" echo >>"$file" echo -e "${description}" >> "$file" rm "${_DATA}/cache/$info.cache" 2>/dev/null rm ${_DATA}/cache/\?* 2>/dev/null + rm ${_DATA}/cache/taglist 2>/dev/null fi -echo -n "Location: ?i=&p=${page}&s=${search}&f=${filter}&o=${order}#$info\n\n" +echo -n "Location: ?i=&pn=${page}&s=${search}&f=${filter}&o=${order}#$info\n\n"