X-Git-Url: https://git.danieliu.xyz/?p=pb.git;a=blobdiff_plain;f=pb;h=5f85f3cb2e31af714815d95a6631dbeca60b66be;hp=64972875d8d95ac5761e06ed23d5e44377fae8ab;hb=4cf95efbc3d417d5fe04a038f7fe9a5c0907d364;hpb=2a037724047c4f54023651b5bf81b4171356409e

diff --git a/pb b/pb
index 6497287..5f85f3c 100755
--- a/pb
+++ b/pb
@@ -1,14 +1,11 @@
 #!/bin/sh
-
 # pinosaur's blog script
 
 data_dir="blog"
-website_url="https://www.youtube.com/watch?v=oHg5SJYRHA0/" 
-
+website_url="https://www.youtube.com/watch?v=oHg5SJYRHA0/" # no ending slash
 blog_index_file="blogindex.html"
 rolling_file="rolling.html"
 rss_file="rss.xml"
-
 blog_template="template.html"
 index_template="index_entry.html"
 rolling_template="rolling_entry.html"
@@ -18,34 +15,35 @@ rss_template="rss_entry.html"
 
 init() {
     read -p "Initialize blog here? [y/n] " ask
-    [ "$ask" != "y" ] && exit 0
-
-    mkdir -p "$data_dir/drafts" "$data_dir/published" "$data_dir/html" "$data_dir/templates" 
+    [ "$ask" != "y" ] && echo "Cancelled init" && exit 0
 
-    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"
+    mkdir -p "$data_dir/drafts" "$data_dir/published" "$data_dir/html" "$data_dir/templates" "$data_dir/backups"
+    echo '<a href="{{URL}}">{{TITLE}}</a>' >> "$data_dir/templates/$index_template"
+    echo -e '<div>\n<h2>{{TITLE}}</h2>\n<p>{{DATE}}</p>\n<p>{{BODY}}</p>\n</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"
+    echo "Successfully created blog files."
 }
-
 refresh() {
-
     read -p "Are you sure you want to refresh? [y/n] " ask
-    [ "$ask" != "y" ] && exit 0
+    [ "$ask" != "y" ] && echo "Aborting..." && exit 0
 
-    # delete everything between tokens (remove dupe code)
     echo -e "$blog_index_file\n$rolling_file\n$rss_file" | xargs sed -i "/<!-- BLOG START -->/,/<!-- BLOG END -->/{/<!-- BLOG START -->/!{/<!-- BLOG END -->/!d}}"
+    echo "Successfully refreshed."
+}
 
-    # deletes all html files and republishes all published files
-
-    echo "Refreshed."
+backup() {
+    backup_name=`mktemp --tmpdir="$data_dir/backups" -d "backup_$(date +'%b-%d')_XXX"`
+    echo "Creating backup, will be placed in $backup_name"
+    cp -r "$data_dir/drafts/" "$backup_name"
+    cp -r "$data_dir/published/" "$backup_name"
 }
 
 new() {
     [ -z "$1" ] && echo "Please give your blog post a name (you should put it inside quotations)" && exit 1 
-    sanitized=`echo -n "$1" | sed -e 's/[^A-Za-z0-9 _-]//g'| sed -e 's/ /-/g'`
+    sanitized=`echo -n "$1" | sed -e 's/[^A-Za-z0-9 _-]//g'`
+    [ -f "$data_dir/drafts/$sanitized.draft.html" ] && echo "Blog of that name already exists." && exit 1
     $EDITOR "$data_dir/drafts/$sanitized.draft.html"
 }
 
@@ -55,13 +53,13 @@ sub() {
         sed  "\$a <!-- ID:$1 END -->" |\
         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" |\
+            s|{{URL}}|$website_url/blog/html/$1.html|g" |\
+        sed "/{{BODY}}/r $data_dir/drafts/$1.draft.html" |\
         sed "/{{BODY}}/d" 
 }
 
 # $1 is directory
-choose() { # working on abstraction
+choose() { 
     options=`ls -1 "$1" | sed 's/\.draft\.html$//;s/\.html$//'` 
     [ -z "$options" ] && echo "No drafts to publish" && exit 0
     echo "$options" | nl
@@ -71,14 +69,13 @@ choose() { # working on abstraction
 }
 
 publish() {
-    
     choose "$data_dir/drafts"
     to_publish=${chosen%.draft.html}
 
-    cat $blog_template | sub "$to_publish" \
-       > "$data_dir/html/$to_publish.html" 
+    cat $blog_template | sub "$to_publish" > "$data_dir/html/$to_publish.html" 
 
-    temp_index="$(mktemp)" # probably bad idea
+    # make this part less horrendous
+    temp_index="$(mktemp)" 
     cat "$data_dir/templates/$index_template" | sub "$to_publish" >> $temp_index
     temp_rolling="$(mktemp)" 
     cat "$data_dir/templates/$rolling_template" | sub "$to_publish" >> $temp_rolling
@@ -91,9 +88,7 @@ publish() {
     sed -i "/<!-- BLOG START -->/r $temp_rss" "$rss_file"
 
     mv "$data_dir/drafts/$to_publish.draft.html" "$data_dir/published/"
-
     echo "Successfully published $to_publish"
-
 }
 
 delete() {
@@ -110,19 +105,16 @@ delete() {
 }
 
 # check to see if all required files are present
-[ -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
-
+[ -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, $blog_template, $rolling_file and $rss_file in your home directory" && exit 1; }
 
 # check if blog dir exists
-[ ! -d $data_dir ]  && init && exit
+[ ! -d $data_dir ]  && init && exit 0
 
 case $1 in
     n|new) new "$2";;
     p|publish) publish;;
     d|delete) delete;;
+    b|backup) backup;;
     r|refresh) refresh;;
-    h|*) echo "helper";;
+    h|*) echo -e "=-=-=-=-=-=-= Pb =-=-=-=-=-=-=\nAvailable commands:\nn - new blog post\np - publish existing blog post\nd - deletes published post\nb - creates a backup";;
 esac
-