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

diff --git a/pb b/pb
index c62e24d..0f87d74 100755
--- a/pb
+++ b/pb
@@ -2,64 +2,120 @@
 
 # pinosaur's blog script
 
+data_dir="blog"
+website_url="https://www.youtube.com/watch?v=oHg5SJYRHA0/" 
+
 blog_index_file="blogindex.html"
 rolling_file="rolling.html"
-template_file="template.html"
 rss_file="rss.xml"
-data_dir="blog"
 
-[ ! -z "$EDITOR" ] && EDITOR="vim"
+blog_template="template.html"
+index_template="index_entry.html"
+rolling_template="rolling_entry.html"
+rss_template="rss_entry.html"
+
+start_token="<!-- BLOG START -->"
+end_token="<!-- BLOG END -->"
 
+[ ! -z "$EDITOR" ] && EDITOR="vim"
 
 init() {
-    echo "initing blog"
-    mkdir -p "$data_dir/drafts" &&\
-    mkdir -p "$data_dir/published" &&\
-    touch "$data_dir/database" 
+    read -p "Initialize blog? [y/n] " ask
+    [ "$ask" != "y" ] && exit 0
+
+    mkdir -p "$data_dir/drafts" "$data_dir/published" "$data_dir/html" "$data_dir/templates" 
+
+    echo '<p id="{{TITLE}}">{{TITLE}}</p>' >> "$data_dir/templates/$index_template"
+    echo -e '<div id="{{TITLE}}">\n<h2>{{TITLE}}</h2>\n<p>{{DATE}}</p></div>' >> "$data_dir/templates/$rolling_template"
+    echo -e '<item>\n<title>{{TITLE}}</title>\n<link></link>\n<description><\description>\n<\item>' \
+        >> "$data_dir/templates/$rss_template"
+
+    echo "Created blog files"
 }
 
 refresh() {
-    echo 1
-    # add a confirmation of sorts here
+
+    read -p "Are you sure you want to refresh? [y/n] " ask
+    [ "$ask" != "y" ] && exit 0
+
+    # delete everything between tokens (remove dupe code)
+    sed -i "/$start_token/,/$end_token/{/$start_token/!{/$end_token/!d}}" "$blog_index_file"
+    sed -i "/$start_token/,/$end_token/{/$start_token/!{/$end_token/!d}}" "$rolling_file"
+    sed -i "/$start_token/,/$end_token/{/$start_token/!{/$end_token/!d}}" "$rss_file"
+
+    # deletes all html files and republishes all published files
+    echo "Refreshed."
 }
 
 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"
+}
 
+sub() {
+    cat - |\
+        sed "s/{{TITLE}}/$1/g;
+            s/{{DATE}}/`date +'%a, %b %d %H:%M'`/g;
+            s/{{URL}}/$website_url\\/$1/g" |\
+        sed "/{{BODY}}/r $data_dir/drafts/$1" |\
+        sed "/{{BODY}}/d" 
 }
 
 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"`
+    to_publish=${to_publish%.draft.html}
     [ -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 "/{{BODY}}/r $data_dir/drafts/$to_publish" |\
-        sed -e "/{{BODY}}/d" # rly ugly for now
+    cat $blog_template | sub "$to_publish" \
+       > "$data_dir/html/$to_publish.html" 
+
+    # Add new entry to blog index (do something about indent??)
+    sed -i "/$start_token/ a\
+        <!-- ID:$to_publish START -->\n`cat "$data_dir/templates/$index_template" | sub "$to_publish"`\n<!-- ID:$to_publish END -->" "$blog_index_file"
+
+    sed -i "/$start_token/ a\
+        <!-- ID:$to_publish START -->\n`cat "$data_dir/templates/$rolling_template" | sub "$to_publish"`\n<!-- ID:$to_publish END -->" "$rolling_file"
+
+    mv "$data_dir/drafts/$to_publish.draft.html" "$data_dir/published/"
 
 }
 
 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"`
+    to_delete=${to_delete%.draft.html}
+    [ -z "$to_delete" ] && echo "Invalid choice" && exit 1
+
+    mv "$data_dir/published/$to_delete.draft.html" "$data_dir/drafts/" &&\
+        rm "$data_dir/html/$to_delete.html"
+
+    # remove entry from blog index 
+    sed -i "/<!-- ID:$to_delete START -->/,/<!-- ID:$to_delete END -->/ d" "$blog_index_file"
+    sed -i "/<!-- ID:$to_delete START -->/,/<!-- ID:$to_delete END -->/ d" "$rolling_file"
+
 }
 
 # check to see if all required files are present
-[ ! -f $blog_index_file ] && echo "missing $blog_index_file" && exit 1
-[ ! -f $rolling_file ] && echo "missing $rolling_file" && exit 1
-[ ! -f $template_file ] && echo "missing $template_file" && exit 1
-[ ! -f $rss_file ] && echo "missing $rss_file" && exit 1
+[ -f $blog_index_file ] && [ -f $rolling_file ] && [ -f $blog_template ] && [ -f $rss_file ] || { echo "You are missing a file, please check that you have $blog_index_file, $template_file, $rolling_file and $rss_file in your home directory" && exit 1; }
 
 # possibly also check to see if index and rolling have the proper headers
 
@@ -71,8 +127,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