notedux 1.0.1 → 1.0.2

package/notedux

@@ -2,7 +2,6 @@
 
 CONFIG_FILE="$HOME/.notedux.conf"
 API="https://notedux.com/api/note"
-
 show_help() {
 cat <<EOF
 
@@ -52,8 +51,17 @@ save_token() {
 
 
 delete_token() {
-    rm -f "$CONFIG_FILE"
-    echo "Token deleted."
+    read -p "Are you sure you want to delete the token? [y/N] " answer
+
+    case "$answer" in
+        [Yy]|[Yy][Ee][Ss])
+            rm -f "$CONFIG_FILE"
+            echo "Token deleted."
+            ;;
+        *)
+            echo "Operation cancelled."
+            ;;
+    esac
 }
 
 
@@ -73,6 +81,10 @@ confirm() {
 
 generate_token() {
 
+    if grep -q '^DEFAULT_TOKEN=' "$CONFIG_FILE" 2>/dev/null; then
+        echo "Default token is already set."
+        return 1
+    fi
     echo "Generating token..."
 
     RESPONSE=$(curl -s -X POST "$API/create")
@@ -115,16 +127,25 @@ show_note() {
     HEADERS=$(mktemp)
 
     RESPONSE=$(curl -s -D "$HEADERS" \
+        -w "\n%{http_code}" \
         -X POST \
         "$API/get" \
-            --data-urlencode "token=$TOKEN" )
-    echo ""
-
-    echo "$RESPONSE"| nl -ba
+        --data-urlencode "token=$TOKEN")
     echo ""
+    HTTP_CODE=$(echo "$RESPONSE" | tail -n1)
+    RESPONSE=$(echo "$RESPONSE" | sed '$d')
+    
     LINK=$(grep -i '^x-note-link:' "$HEADERS" | cut -d' ' -f2- | tr -d '\r')
-    echo -e "Link: \033[1;34m$LINK\033[0m (Copied to clipboard.)"
-    echo "$LINK" | pbcopy
+    if [ "$HTTP_CODE" == "200" ]; then
+        echo "$RESPONSE"| nl -ba
+        echo ""
+        echo -e "Link: \033[1;34m$LINK\033[0m (Copied to clipboard.)"
+        echo "$LINK" | pbcopy
+    else
+        echo "$RESPONSE"
+        echo ""
+    fi
+
 }
 
 
@@ -141,60 +162,89 @@ add_note() {
 
     HEADERS=$(mktemp)
 
-    NOTE=$(curl -s -D "$HEADERS" \
+    RESPONSE=$(curl -s -D "$HEADERS" \
+        -w "\n%{http_code}" \
         -X POST \
         "$API/add" \
             --data-urlencode "token=$TOKEN" \
             --data-urlencode "text=$TEXT")
-
-    LINK=$(grep -i '^x-note-link:' "$HEADERS" | cut -d' ' -f2- | tr -d '\r')
-    echo 'Saved.'
+    HTTP_CODE=$(echo "$RESPONSE" | tail -n1)
+    RESPONSE=$(echo "$RESPONSE" | sed '$d')
     echo ""
-    echo -e "Link: \033[1;34m$LINK\033[0m (Copied to clipboard.)"
-    echo "$LINK" | pbcopy
+    echo "$RESPONSE"
+    echo ""
+    LINK="https://notedux.com/n/$TOKEN"
+    if [ "$HTTP_CODE" = "200" ]; then
+        echo -e "Link: \033[1;34m$LINK\033[0m (Copied to clipboard.)"
+        echo "$LINK" | pbcopy
+    fi
 }
 
 
 set_note() {
 
-    TEXT="$*"
+    read -p "The content of the note will be overwritten. Are you sure ? [y/N] " answer
 
-    if [ -z "$TEXT" ]; then
-        echo "Error: text missing."
-        exit 1
-    fi
-
-
-    RESPONSE=$(curl -s -X POST "$API/set" \
-        --data-urlencode "token=$TOKEN" \
-        --data-urlencode "text=$TEXT")
-
-    echo "$RESPONSE"
-    # get and show the link to the note 
-    LINK=$(echo "$RESPONSE" | grep -o '"link"[ ]*:[ ]*"[^"]*"' | sed 's/.*:\s*"//;s/"//')
-    echo "$LINK" | pbcopy
-    echo -e "\033[1;34m$LINK\033[0m"
-    echo "Copied to clipboard."
+    case "$answer" in
+        [Yy]|[Yy][Ee][Ss])
+            TEXT="$*"
+            if [ -z "$TEXT" ]; then
+                echo "Error: text missing."
+                exit 1
+            fi
+            HEADERS=$(mktemp)
+            RESPONSE=$(curl -s -D "$HEADERS" \
+                -w "\n%{http_code}" \
+                -X POST \
+                "$API/set" \
+                    --data-urlencode "token=$TOKEN" \
+                    --data-urlencode "text=$TEXT")
+            HTTP_CODE=$(echo "$RESPONSE" | tail -n1)
+            RESPONSE=$(echo "$RESPONSE" | sed '$d')
+            echo ""
+            echo "$RESPONSE"
+            echo ""
+            LINK="https://notedux.com/n/$TOKEN"
+            if [ "$HTTP_CODE" = "200" ]; then
+                echo -e "Link: \033[1;34m$LINK\033[0m (Copied to clipboard.)"
+                echo "$LINK" | pbcopy
+            fi
+            ;;
+        *)
+            echo "Operation cancelled."
+            ;;
+    esac
 }
 
 
-delete_all() {
-
-    if ! confirm "Delete complete note"; then
-        echo "Cancelled."
-        exit
-    fi
 
+delete_all() {
 
-    RESPONSE=$(curl -s -X POST "$API/delall" \
-        --data-urlencode "token=$TOKEN")
+    read -p "Delete complete note. Are you sure ? [y/N] " answer
 
-    echo "$RESPONSE"
-    # get and show the link to the note 
-    LINK=$(echo "$RESPONSE" | grep -o '"link"[ ]*:[ ]*"[^"]*"' | sed 's/.*:\s*"//;s/"//')
-    echo "$LINK" | pbcopy
-    echo -e "\033[1;34m$LINK\033[0m"
-    echo "Copied to clipboard."
+    case "$answer" in
+        [Yy]|[Yy][Ee][Ss])
+            HEADERS=$(mktemp)
+            RESPONSE=$(curl -s -D "$HEADERS" \
+                -w "\n%{http_code}" \
+                -X POST \
+                "$API/deleteall" \
+                    --data-urlencode "token=$TOKEN")
+            HTTP_CODE=$(echo "$RESPONSE" | tail -n1)
+            RESPONSE=$(echo "$RESPONSE" | sed '$d')
+            echo ""
+            echo "$RESPONSE"
+            echo ""
+            LINK="https://notedux.com/n/$TOKEN"
+            if [ "$HTTP_CODE" = "200" ]; then
+                echo -e "Link: \033[1;34m$LINK\033[0m (Copied to clipboard.)"
+                echo "$LINK" | pbcopy
+            fi
+            ;;
+        *)
+            echo "Operation cancelled."
+            ;;
+    esac
 }
 
 
@@ -216,30 +266,69 @@ delete_last() {
     echo -e "\033[1;34m$LINK\033[0m"
     echo "Copied to clipboard."
 }
+delete_last() {
 
+    read -p "Delete last line. Are you sure ? [y/N] " answer
 
-delete_line() {
+    case "$answer" in
+        [Yy]|[Yy][Ee][Ss])
+            HEADERS=$(mktemp)
+            RESPONSE=$(curl -s -D "$HEADERS" \
+                -w "\n%{http_code}" \
+                -X POST \
+                "$API/deletelast" \
+                    --data-urlencode "token=$TOKEN")
+            HTTP_CODE=$(echo "$RESPONSE" | tail -n1)
+            RESPONSE=$(echo "$RESPONSE" | sed '$d')
+            echo ""
+            echo "$RESPONSE"
+            echo ""
+            LINK="https://notedux.com/n/$TOKEN"
+            if [ "$HTTP_CODE" = "200" ]; then
+                echo -e "Link: \033[1;34m$LINK\033[0m (Copied to clipboard.)"
+                echo "$LINK" | pbcopy
+            fi
+            ;;
+        *)
+            echo "Operation cancelled."
+            ;;
+    esac
+}
 
+delete_line() {
+    
     NUMBER="$1"
-
-
     if [ -z "$NUMBER" ]; then
         echo "Error: line number required."
         echo "Usage: notedux dell <number>"
         exit 1
     fi
+    read -p "Delete line $NUMBER. Are you sure ? [y/N] " answer
 
-
-    RESPONSE=$(curl -s -X POST "$API/dell" \
-        --data-urlencode "token=$TOKEN" \
-        --data-urlencode "line=$NUMBER")
-
-    echo "$RESPONSE"
-    # get and show the link to the note 
-    LINK=$(echo "$RESPONSE" | grep -o '"link"[ ]*:[ ]*"[^"]*"' | sed 's/.*:\s*"//;s/"//')
-    echo "$LINK" | pbcopy
-    echo -e "\033[1;34m$LINK\033[0m"
-    echo "Copied to clipboard."
+    case "$answer" in
+        [Yy]|[Yy][Ee][Ss])
+            HEADERS=$(mktemp)
+            RESPONSE=$(curl -s -D "$HEADERS" \
+                -w "\n%{http_code}" \
+                -X POST \
+                "$API/deleten" \
+                    --data-urlencode "token=$TOKEN" \
+                    --data-urlencode "line=$NUMBER")
+            HTTP_CODE=$(echo "$RESPONSE" | tail -n1)
+            RESPONSE=$(echo "$RESPONSE" | sed '$d')
+            echo ""
+            echo "$RESPONSE"
+            echo ""
+            LINK="https://notedux.com/n/$TOKEN"
+            if [ "$HTTP_CODE" = "200" ]; then
+                echo -e "Link: \033[1;34m$LINK\033[0m (Copied to clipboard.)"
+                echo "$LINK" | pbcopy
+            fi
+            ;;
+        *)
+            echo "Operation cancelled."
+            ;;
+    esac
 }
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "notedux",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Take notes from terminal",
   "bin": {
     "notedux": "notedux"