X-Git-Url: http://git.plutz.net/?p=bookman;a=blobdiff_plain;f=index.cgi;h=98e6719e4f9edbe986d984716c9ac3a146906096;hp=0c563eae531e062cb42b899b95bb61caf83c7d7a;hb=206364757997f75d7fb6f26fd86714b477cc7329;hpb=3ecee15fc19ec1a2d4b44d965e63412860ea01b6

diff --git a/index.cgi b/index.cgi
index 0c563ea..98e6719 100755
--- a/index.cgi
+++ b/index.cgi
@@ -160,10 +160,7 @@ 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"
     fi
     REDIRECT "${SCRIPT_NAME}#${fid}"
     ;;
@@ -201,7 +198,7 @@ case "$(GET action)" in
     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}"
+      printf '%s\t%s\t%s\n' "$bid" "$(HTML "$name")" "$url" >>"${file}"
     fi
     getFavicon "$url" "$bid"
     REDIRECT "${SCRIPT_NAME}#${fid}"
@@ -210,38 +207,131 @@ case "$(GET action)" in
     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"
     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"
+    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"
+    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"
+    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(){
-  fid="$1"
-  bmodify="$(GET bmodify |checkid)"
+bookmarkmod(){
+  bmod="$(GET bmodify |checkid)"
+  bmove="$(GET bmove |checkid)"
 
-  tail -n+2 "${BDB}/${fid}.bm" \
-  | while read bid name url; do
-    if [ "${bid}" = "$bmodify" ]; then
-      cat <<-EOF
+  if [ -n "$bmod" ]; then
+    file="$(grep -lm1 "^${bmod}" "${BDB}/"????????????.bm |head -n1)"
+    read bid name url <<-EOF
+	$(grep -m1 "^${bmod}" "$file")
+	EOF
+    cat <<-EOF
 	<form class="modbookmark" method="POST" action="${SCRIPT_NAME}?action=modbookmark">
 	  <input type="hidden" name="bid" value="${bid}" />
+	  <h1>Modify: ${name}</h1>
+	  <label class="tab">Modify</label>
+	  <a class="tab" href="${SCRIPT_NAME}?bmove=${bid}">Move</a>
+	  <label>Name:</label>
 	  <input type="text" name="name" value="${name}")" placeholder="Name" />
-	  <input type="text" name="url"  value="${url}")" placeholder="URL" />
-	  <button type="submit">Modify</button>
+	  <label>URL:</label>
+	  <input type="text" name="url"  value="$(HTML "${url}")")" placeholder="URL" />
+	  <button type="submit" name="control" value="confirm">OK</button>
+	  <button type="submit" name="control" value="cancel">Cancel</button>
 	</form>
 	EOF
-    else
+  elif [ -n "$bmove" ]; then
+    file="$(grep -lm1 "^${bmove}" "${BDB}/"????????????.bm |head -n1)"
+    read bid name url <<-EOF
+	$(grep -m1 "^${bmove}" "$file")
+	EOF
+    cat <<-EOF
+	<form class="modbookmark" method="POST" action="${SCRIPT_NAME}?action=movebookmark">
+	  <input type="hidden" name="bid" value="${bid}" />
+	  <h1>Move: ${name}</h1>
+	  <a class="tab" href="${SCRIPT_NAME}?bmodify=${bid}">Modify</a>
+	  <label class="tab">Move</label>
+	  <label>Move to Folder:</label>
+	  <select name="target">
+	    $(printf '<option value="%s">%s</option>' $(list_folders))
+	  </select>
+	  <button type="submit" name="control" value="confirm">OK</button>
+	  <button type="submit" name="control" value="cancel">Cancel</button>
+	</form>
+	EOF
+  fi
+}
+
+show_bookmarks(){
+  fid="$1"
+  bmodify="$(GET bmodify |checkid)"
+
+  tail -n+2 "${BDB}/${fid}.bm" \
+  | while read bid name url; do
+    if [ "${url%\{@\}*}" = "${url}" ]; then
       cat <<-EOF
 	<div class="bookmark">
 	  <a class="modify" href="${SCRIPT_NAME}?bmodify=${bid}">Modify</a>
-	  <a class="link" href="${url}")"><img src="${BDB}/favicons/${bid}.ico"/>${name}</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>
 	</div>
 	EOF
+    else
+      cat <<-EOF
+	<form class="bookmark" target="_blank" method="POST" action="${SCRIPT_NAME}?action=query">
+	  <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>
+	</form>
+	EOF
     fi
   done
 }
@@ -310,11 +400,16 @@ 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}" ]; then
+      cat "$cache"
+    else
+      tee "$cache" <<-EOF
 	<section class="folder" id="${fid}">
 	  <h1>${fname}</h1>
 	  <a class="modify" href="${SCRIPT_NAME}?fmodify=${fid}">Modify</a>
-	  $(list_bookmarks "$fid")
+	  $(show_bookmarks "$fid")
           <form class="newbookmark" method="POST" action="${SCRIPT_NAME}?action=newbookmark">
 	    <input type="hidden" name="fid" value="${fid}" />
 	    <input type="text" name="name" value="" placeholder="Name" />
@@ -323,6 +418,7 @@ show_folders(){
           </form>
 	</section>
 	EOF
+    fi
   done
 }
 
@@ -336,6 +432,7 @@ cat <<EOF
   <link rel="stylesheet" type="text/css" href="bookmarks.css" />
 </head><body id="collection">
   $(foldermod)
+  $(bookmarkmod)
   $(show_folders)
   <form class="newfolder" method="POST" action="${SCRIPT_NAME}?action=newfolder">
     <input type="text" name="name" value="" placeholder="New Folder" />