X-Git-Url: http://git.plutz.net/?p=bookman;a=blobdiff_plain;f=index.cgi;h=911e5eed684715e6e67cf5413617b33752f831d9;hp=0c563eae531e062cb42b899b95bb61caf83c7d7a;hb=28ce309347435c1dd23beab8104d36cbe640d2dd;hpb=3ecee15fc19ec1a2d4b44d965e63412860ea01b6 diff --git a/index.cgi b/index.cgi index 0c563ea..911e5ee 100755 --- a/index.cgi +++ b/index.cgi @@ -4,9 +4,8 @@ exec 2>>error.log . shcgi/cgilite.sh mkdir -p users -#env >>debug -printf 'POST: %s\n' "$cgilite_post" >>debug -printf 'action: %s\n' "$(GET action)" >>debug +# printf 'POST: %s\n' "$cgilite_post" >>debug +# printf 'action: %s\n' "$(GET action)" >>debug wget="$(which wget)" wget(){ "$wget" -T 5 -t 1 -q -U '' $@; } @@ -58,7 +57,7 @@ getFavicon(){ ' )" - printf 'Shortcut icon for %s is %s\n' "$url" "$favinfo" >>debug + # printf 'Shortcut icon for %s is %s\n' "$url" "$favinfo" >>debug [ -z "$favinfo" ] && favinfo="${ubase}/favicon.ico" case "$favinfo" in http://*|https://*|//*) wget -O "$file" "$favinfo" @@ -94,7 +93,7 @@ BDB="users/${COKID}" if [ -n "$QRYID" ]; then printf '%s 303 See Other\r\n' "$SERVER_PROTOCOL" - printf 'Location: %s\r\n' "${SCRIPT_NAME}" + printf 'Location: %s\r\n' "${SCRIPT_NAME}?${QUERY_STRING#id=*&}" SET_COOKIE +8640000 "id=${QRYID}" printf '\r\n' exit 0 @@ -152,6 +151,8 @@ case "$(GET action)" in order="$(((order + 1000) / 1000 * 1000))" if [ -n "$name" -a -d "${BDB}" ]; then printf '%s\t%s\t%s\n' "$fid" "$(HTML "$name")" "$order" >"${BDB}/${fid}.bm" + git -C "${BDB}" add "${fid}.bm" >&- + git -C "${BDB}" commit -m "New bookmark folder: ${name} (${fid})" -- "${fid}.bm" >&- fi REDIRECT "${SCRIPT_NAME}#${fid}" ;; @@ -160,10 +161,9 @@ case "$(GET action)" in fid="$(POST fid | checkid)" file="${BDB}/${fid}.bm" if [ "$(POST control)" = confirm -a -n "$name" -a -f "$file" ]; then - order="$(head -n1 "$file" |cut -f3 || printf 1000)" - printf '%s\t%s\t%s\n' "$fid" "$(HTML "$name")" "$order" >"${file%.bm}.tmp" - tail -n+2 "$file" >>"${file%.bm}.tmp" - mv "${file%.bm}.tmp" "$file" + sed -ri "1s'^(${fid}\t)[^\t]+(\t.+)$'\1${name}\2';" "$file" + git -C "${BDB}" add "${fid}.bm" >&- + git -C "${BDB}" commit -m "Renamed folder ${fid} to '${name}'" -- "${fid}.bm" >&- fi REDIRECT "${SCRIPT_NAME}#${fid}" ;; @@ -173,8 +173,12 @@ case "$(GET action)" in file="${BDB}/${fid}.bm" tfile="${BDB}/${target}.bm" if [ "$(POST control)" = confirm -a -f "$file" ]; then - if [ "$target" = "____________" ] || tail -n+2 "$file" >>"$tfile"; then - rm -f "$file" + if [ "$target" = "____________" ]; then + rm -f "$file" >&- + git -C "${BDB}" commit -m "Deleted folder ${fid}" -- "${fid}.bm" >&- + elif tail -n+2 "$file" >>"$tfile"; then + rm -f "$file" >&- + git -C "${BDB}" commit -m "Deleted folder ${fid}" -- "${fid}.bm" "${target}.bm" >&- fi fi REDIRECT "${SCRIPT_NAME}#${target}" @@ -192,6 +196,7 @@ case "$(GET action)" in sed -ri "1s;^(([^\t]+\t){2})[^\t]+(.*)$;\1$((${tid:-1} -1))\2;;" "$file" order_files fi + git -C "${BDB}" commit -a -m "Modified folder order (moved ${fid})" >&- REDIRECT "${SCRIPT_NAME}#${fid}" ;; newbookmark) @@ -200,47 +205,194 @@ case "$(GET action)" in url="$(POST url |head -n1)" file="${BDB}/${fid}.bm" bid="$(timeid)" - if [ -n "$name" -a -f "${file}" ]; then - printf '%s\t%s\t%s\n' "$bid" "$(HTML "$name")" "$(HTML "$url")" >>"${file}" + ctl="$(POST control)" + [ "$url" = "${url#*://}" ] && url="http://$url" + + if [ -n "$name" -a -n "$url" -a -f "${file}" -a "$ctl" = "confirm" ]; then + printf '%s\t%s\t%s\n' "$bid" "$(HTML "$name")" "$url" >>"${file}" + git -C "${BDB}" commit -m "New Bookmark: ${name} in ${fid}" -- "${fid}.bm" >&- + getFavicon "$url" "$bid" + REDIRECT "${SCRIPT_NAME}#${fid}" + elif [ "$ctl" = "confirm" ]; then + REDIRECT "${SCRIPT_NAME}?newbm=${fid}&nbmurl=${url}&nbmname=${name}" + else + REDIRECT "${SCRIPT_NAME}#${fid}" fi - getFavicon "$url" "$bid" - REDIRECT "${SCRIPT_NAME}#${fid}" ;; modbookmark) bid="$(POST bid | checkid)" name="$(POST name |head -n1)" url="$(POST url |head -n1)" - file="$(grep -lE "^${bid}" "${BDB}"/????????????.bm)" - if [ -w "$file" -a -n "$name" -a -n "$url" ]; then - bm="$(printf '%s\t%s\t%s' "$bid" "$(HTML "$name")" "$(HTML "$url")" |sed -r 's;[\&\;];\\&;g;')" - sed -ri "s;^${bid}\t.*$;${bm};" "$file" + file="$(grep -lm1 "^${bid}" "${BDB}"/????????????.bm |head -n1)" + if [ -n "$name" -a -n "$url" -a "$(POST control)" = confirm -a -w "$file" ]; then + sed -rni "/^${bid}\t/!p; /^${bid}\t/i${bid}\t$(HTML "$name")\t${url}" "$file" + git -C "${BDB}" commit -m "Modified Bookmark: ${name} (${bid}) in ${file##*/}" -- "${file##*/}" >&- fi getFavicon "$url" "$bid" REDIRECT "${SCRIPT_NAME}#${fid}" ;; + movebookmark) + bid="$(POST bid | checkid)" + fid="$(POST target | checkid)" + sfile="$(grep -lm1 "^${bid}" "${BDB}"/????????????.bm |head -n1)" + tfile="${BDB}/${fid}.bm" + + if [ "$(POST control)" = confirm -a -n "$bid" -a -w "$sfile" -a -w "$tfile" ]; then + grep -m1 "^${bid}" "$sfile" >>"$tfile" \ + && sed -ri "0,/^${bid}/{/^${bid}/d;}" "$sfile" + git -C "${BDB}" commit -m "Moved Bookmark ${bid} from ${sfile##*/} to ${tfile##*/}" \ + -- "${sfile##*/}" "${tfile##*/}" >&- + fi + REDIRECT "${SCRIPT_NAME}#${fid}" + ;; + bmup) + fid="$(GET fid |checkid)" + bid="$(GET bid |checkid)" + file="${BDB}/${fid}.bm" + + if [ -n "$bid" -a -n "$fid" ] && grep -q "^${bid}" "$file"; then + sed -ri ":X;\$bY;N;bX;:Y; s;(\n[^\n]+)(\n${bid}\t[^\n]+);\2\1;;" "$file" + git -C "${BDB}" commit -m "Modified bookmark order in ${fid} (raised ${bid})" -- "${fid}.bm" >&- + fi + REDIRECT "${SCRIPT_NAME}#${fid}" + ;; + bmdn) + fid="$(GET fid |checkid)" + bid="$(GET bid |checkid)" + file="${BDB}/${fid}.bm" + + if [ -n "$bid" -a -n "$fid" ] && grep -q "^${bid}" "$file"; then + sed -ri ":X;\$bY;N;bX;:Y; s;(\n${bid}\t[^\n]+)(\n[^\n]+);\2\1;;" "$file" + git -C "${BDB}" commit -m "Modified bookmark order in ${fid} (lowered ${bid})" -- "${fid}.bm" >&- + fi + REDIRECT "${SCRIPT_NAME}#${fid}" + ;; + query) + fid="$(POST fid |checkid)" + bid="$(POST bid |checkid)" + file="${BDB}/${fid}.bm" + query="$(URL "$(POST query)")" + + + url="$(grep -m1 "^${bid}" "$file" |cut -f3-)" + urlpfx="${url%\{@\}*}" + urlsfx="${url#*\{@\}}" + + REDIRECT "${urlpfx}${query}${urlsfx}" + ;; esac -list_bookmarks(){ +bookmarkgen(){ + fid="$(GET newbm |checkid)" + name="$(GET nbmname)" + url="$(GET nbmurl)" + file="${BDB}/${fid}.bm" + + [ "$url" = "${url#*://}" ] && url="http://$url" + if [ -z "$name" -a -n "$url" ]; then + name="$(wget -O- "$url" \ + | head -c4096 \ + | sed -rn ':X;$bY;N;bX;:Y; s;^.*]*>([^<]+)<.*$;\1;p;' + )" + fi + + if [ -n "$fid" -o -n "$name" -o -n "$url" ]; then + cat <<-EOF +
+

New Bookmark

+ + + + + + + + +
+ EOF + fi +} + +bookmarkmod(){ + bmod="$(GET bmodify |checkid)" + bmove="$(GET bmove |checkid)" + + if [ -n "$bmod" ]; then + file="$(grep -lm1 "^${bmod}" "${BDB}/"????????????.bm |head -n1)" + read bid name url <<-EOF + $(grep -m1 "^${bmod}" "$file") + EOF + cat <<-EOF +
+ +

Modify: ${name}

+ + Move + + + + + + +
+ EOF + elif [ -n "$bmove" ]; then + file="$(grep -lm1 "^${bmove}" "${BDB}/"????????????.bm |head -n1)" + read bid name url <<-EOF + $(grep -m1 "^${bmove}" "$file") + EOF + cat <<-EOF +
+ +

Move: ${name}

+ Modify + + + + + +
+ EOF + fi +} + +show_bookmarks(){ fid="$1" bmodify="$(GET bmodify |checkid)" tail -n+2 "${BDB}/${fid}.bm" \ | while read bid name url; do - if [ "${bid}" = "$bmodify" ]; then + if [ "${url%\{@\}*}" = "${url}" ]; then cat <<-EOF -
- - - - -
+
+ Modify + + @${name} + + Move up + Move down +
EOF else cat <<-EOF -
+
Modify - ${name} -
+ + + ${name} + + Move up + Move down + EOF fi done @@ -254,7 +406,7 @@ foldermod(){ if [ -n "$fmodify" ]; then read fid fname order <"${BDB}/${fmodify}.bm" cat <<-EOF -
+

Rename Folder: ${fname}

@@ -270,7 +422,7 @@ foldermod(){ elif [ -n "$fdelete" ]; then read fid fname order <"${BDB}/${fdelete}.bm" cat <<-EOF - +

Delete Folder: ${fname}

Rename @@ -289,7 +441,7 @@ foldermod(){ elif [ -n "$fmove" ]; then read fid fname order <"${BDB}/${fmove}.bm" cat <<-EOF - +

Move Folder: ${fname}

Rename @@ -310,19 +462,20 @@ foldermod(){ show_folders(){ list_folders \ | while read fid fname order; do - cat <<-EOF + file="${BDB}/${fid}.bm" + cache="${BDB}/${fid}.cache" + if [ "${cache}" -nt "${file}" -a "${cache}" -nt "$0" ]; then + cat "$cache" + else + tee "$cache" <<-EOF

${fname}

- Modify - $(list_bookmarks "$fid") - - - - - - + Modify folder "${fname}" + $(show_bookmarks "$fid") + New Bookmark
EOF + fi done } @@ -336,6 +489,8 @@ cat < $(foldermod) + $(bookmarkmod) + $(bookmarkgen) $(show_folders)