added git tracking

[bookman] / index.cgi

diff --git a/index.cgi b/index.cgi
index 98e6719e4f9edbe986d984716c9ac3a146906096..4f24149bd8f53024b5903c7e4a1ed37196185b22 100755 (executable)
--- 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}"
     ;;
@@ -161,6 +162,8 @@ case "$(GET action)" in
     file="${BDB}/${fid}.bm"
     if [ "$(POST control)" = confirm -a -n "$name" -a -f "$file" ]; then
       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}"
     ;;
@@ -171,7 +174,8 @@ case "$(GET action)" in
     tfile="${BDB}/${target}.bm"
     if [ "$(POST control)" = confirm -a -f "$file" ]; then
       if [ "$target" = "____________" ] || tail -n+2 "$file" >>"$tfile"; then
-        rm -f "$file"
+        rm -f "$file" >&-
+        git -C "${BDB}" commit -m "Deleted folder ${fid}" -- "${fid}.bm" "${target}.bm" >&-
       fi
     fi
     REDIRECT "${SCRIPT_NAME}#${target}"
@@ -189,6 +193,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)
@@ -199,6 +204,7 @@ case "$(GET action)" in
     bid="$(timeid)"
     if [ -n "$name" -a -f "${file}" ]; 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" >&-
     fi
     getFavicon "$url" "$bid"
     REDIRECT "${SCRIPT_NAME}#${fid}"
@@ -210,6 +216,7 @@ case "$(GET action)" in
     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}"
@@ -223,6 +230,8 @@ case "$(GET action)" in
     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}"
     ;;
@@ -233,6 +242,7 @@ case "$(GET action)" in
 
     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}"
     ;;
@@ -243,6 +253,7 @@ case "$(GET action)" in
 
     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}"
     ;;
@@ -316,9 +327,11 @@ show_bookmarks(){
       cat <<-EOF
        <div class="bookmark">
          <a class="modify" href="${SCRIPT_NAME}?bmodify=${bid}">Modify</a>
-         <a class="link" target="_blank" href="$(HTML "${url}")")"><img src="${BDB}/favicons/${bid}.ico"/>${name}</a>
-         <a class="bmove" href="${SCRIPT_NAME}?action=bmup&fid=${fid}&bid=${bid}">move left</a>
-         <a class="bmove" href="${SCRIPT_NAME}?action=bmdn&fid=${fid}&bid=${bid}">move right</a>
+         <a class="link" target="_blank" href="$(HTML "${url}")")">
+           <img alt="@" src="${BDB}/favicons/${bid}.ico"/>${name}
+         </a>
+         <a class="bmove" href="${SCRIPT_NAME}?action=bmup&fid=${fid}&bid=${bid}">Move up</a>
+         <a class="bmove" href="${SCRIPT_NAME}?action=bmdn&fid=${fid}&bid=${bid}">Move down</a>
        </div>
        EOF
     else
@@ -327,9 +340,10 @@ show_bookmarks(){
          <a class="modify" href="${SCRIPT_NAME}?bmodify=${bid}">Modify</a>
          <input type="hidden" name="fid" value="$fid" />
          <input type="hidden" name="bid" value="$bid" />
-         <img src="${BDB}/favicons/${bid}.ico"/><input name="query" placeholder="$name"/>
-         <a class="bmove" href="${SCRIPT_NAME}?action=bmup&fid=${fid}&bid=${bid}">move left</a>
-         <a class="bmove" href="${SCRIPT_NAME}?action=bmdn&fid=${fid}&bid=${bid}">move right</a>
+         <img alt="${name}" src="${BDB}/favicons/${bid}.ico"/>
+         <input name="query" placeholder="$name"/>
+         <a class="bmove" href="${SCRIPT_NAME}?action=bmup&fid=${fid}&bid=${bid}">Move up</a>
+         <a class="bmove" href="${SCRIPT_NAME}?action=bmdn&fid=${fid}&bid=${bid}">Move down</a>
        </form>
        EOF
     fi
@@ -408,7 +422,7 @@ show_folders(){
       tee "$cache" <<-EOF
        <section class="folder" id="${fid}">
          <h1>${fname}</h1>
-         <a class="modify" href="${SCRIPT_NAME}?fmodify=${fid}">Modify</a>
+         <a class="modify" href="${SCRIPT_NAME}?fmodify=${fid}">Modify folder "${fname}"</a>
          $(show_bookmarks "$fid")
           <form class="newbookmark" method="POST" action="${SCRIPT_NAME}?action=newbookmark">
            <input type="hidden" name="fid" value="${fid}" />