X-Git-Url: https://git.danieliu.xyz/?p=pb.git;a=blobdiff_plain;f=pb;h=a221306aee845f6a6d9ec46ffccae0c60128f410;hp=c62e24d23c2b3911d3e718b8462ace7bd3c83de9;hb=afdc3b16d6d77fb03df04c5ed1883e48064e0672;hpb=0c0d61384bc81e685153b014b67de33cb514e8fd

diff --git a/pb b/pb
index c62e24d..a221306 100755
--- a/pb
+++ b/pb
@@ -12,47 +12,81 @@ data_dir="blog"
 
 
 init() {
-    echo "initing blog"
+    read -p "Initialize blog? [y/n] " ask
+    [ "$ask" != "y" ] && exit 0
+
     mkdir -p "$data_dir/drafts" &&\
     mkdir -p "$data_dir/published" &&\
-    touch "$data_dir/database" 
+    mkdir -p "$data_dir/html" 
+
+    echo "Created blog files"
 }
 
 refresh() {
-    echo 1
-    # add a confirmation of sorts here
+    start_token="<!-- BLOG START -->"
+    end_token="<!-- BLOG END -->"
+
+    read -p "Are you sure you want to refresh? [y/n] " ask
+    [ "$ask" != "y" ] && exit 0
+
+    # delete everything between tokens
+    sed -i "/$start_token/,/$end_token/{/$start_token/!{/$end_token/!d}}" "$blog_index_file"
+
+    # deletes all html files and republishes all published files
 }
 
 new() {
-    [ -z "$1" ] && echo "please supply a name" && exit 1 
+    [ -z "$1" ] && echo "Please give your blog post a name (you should put it inside quotations)" && exit 1 
 
     # sanitize input
     sanitized=`echo -n "$1" | sed -e 's/[^A-Za-z0-9 _-]//g'| sed -e 's/ /-/g'`
 
     # open in editor
-    $EDITOR "$data_dir/drafts/$sanitized"
-
+    $EDITOR "$data_dir/drafts/$sanitized.draft.html"
 }
 
 publish() {
-    echo "Select which post to publish"
-    ls -1 "$data_dir/drafts" | nl 
+    
+    drafts=`ls -1 "$data_dir/drafts" | sed -e 's/\.draft\.html$//'`
+    [ -z "$drafts" ] && echo "No drafts to publish" && exit 0
+
+    echo "Select which draft to publish"
+    echo "$drafts" | nl 
 
     read -p '> ' choice
     to_publish=`ls -1 "$data_dir/drafts/" | sed -n "$choice p"`
     [ -z "$to_publish" ] && echo "Invalid choice" && exit 1
 
     cat $template_file |\
-        sed -e "s/{{TITLE}}/$to_publish/g" |\
-        sed -e "s/{{DATE}}/`date +'%a, %b %d %H:%M'`/g" |\
+        sed -e "s/{{TITLE}}/$to_publish/g;
+            s/{{DATE}}/`date +'%a, %b %d %H:%M'`/g" |\
         sed -e "/{{BODY}}/r $data_dir/drafts/$to_publish" |\
-        sed -e "/{{BODY}}/d" # rly ugly for now
+        sed -e "/{{BODY}}/d" \
+       > "$data_dir/html/${to_publish%.draft.html}.html" 
+
+    mv "$data_dir/drafts/$to_publish" "$data_dir/published/"
+
+    # Add new entry to blog index (do something about indent??)
+    sed -i "/<!-- BLOG START -->/ a <h3>$to_publish<\\/h3>" "$blog_index_file"
 
 }
 
+
 delete() {
+    published=`ls -1 "$data_dir/published" | sed -e 's/\.draft\.html$//'`
+    [ -z "$published" ] && echo "No posts to delete" && exit 0
+
     echo "Select which post to delete"
-    ls -1 "$data_dir/published" | nl 
+    echo "$published" | nl 
+
+    read -p '> ' choice
+    to_delete=`ls -1 "$data_dir/published/" | sed -n "$choice p"`
+    [ -z "$to_delete" ] && echo "Invalid choice" && exit 1
+
+    mv "$data_dir/published/$to_delete" "$data_dir/drafts/" &&\
+        rm "$data_dir/html/${to_delete%.draft.html}.html"
+
+    # remove entry from blog index
 }
 
 # check to see if all required files are present
@@ -71,8 +105,8 @@ case $1 in
     i|init) init;;
     n|new) new "$2";;
     p|publish) publish;;
-    d|delete) echo "delete";;
-    r|refresh) echo "refresh";;
-    *) echo "helper" && exit 1;;
+    d|delete) delete;;
+    r|refresh) refresh;;
+    h|*) echo "helper";;
 esac