From 0165e977bd372d0c1e162867961a1102ec6eadce Mon Sep 17 00:00:00 2001
From: Daniel Liu <mr.picklepinosaur@gmail.com>
Date: Sun, 22 Nov 2020 00:19:33 -0500
Subject: [PATCH] abstracted choosing file

---
 blog/templates/index_entry.html   |  1 +
 blog/templates/rolling_entry.html |  3 ++
 blog/templates/rss_entry.html     |  5 +++
 pb                                | 62 +++++++++++--------------------
 4 files changed, 31 insertions(+), 40 deletions(-)
 create mode 100644 blog/templates/index_entry.html
 create mode 100644 blog/templates/rolling_entry.html
 create mode 100644 blog/templates/rss_entry.html

diff --git a/blog/templates/index_entry.html b/blog/templates/index_entry.html
new file mode 100644
index 0000000..428e697
--- /dev/null
+++ b/blog/templates/index_entry.html
@@ -0,0 +1 @@
+<p id="{{TITLE}}">{{TITLE}}</p>
diff --git a/blog/templates/rolling_entry.html b/blog/templates/rolling_entry.html
new file mode 100644
index 0000000..89d7419
--- /dev/null
+++ b/blog/templates/rolling_entry.html
@@ -0,0 +1,3 @@
+<div id="{{TITLE}}">
+<h2>{{TITLE}}</h2>
+<p>{{DATE}}</p></div>
diff --git a/blog/templates/rss_entry.html b/blog/templates/rss_entry.html
new file mode 100644
index 0000000..3aa997a
--- /dev/null
+++ b/blog/templates/rss_entry.html
@@ -0,0 +1,5 @@
+<item>
+<title>{{TITLE}}</title>
+<link></link>
+<description><\description>
+<\item>
diff --git a/pb b/pb
index 0f87d74..a79e1c7 100755
--- a/pb
+++ b/pb
@@ -14,9 +14,6 @@ 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() {
@@ -39,78 +36,63 @@ refresh() {
     [ "$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"
+    echo -e "$blog_index_file\n$rolling_file\n$rss_file" | xargs sed -i "/<!-- BLOG START -->/,/<!-- BLOG END -->/{/<!-- BLOG START -->/!{/<!-- BLOG END -->/!d}}"
 
     # deletes all html files and republishes all published files
+
     echo "Refreshed."
 }
 
 new() {
     [ -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.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 "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" 
 }
 
+# $1 is directory
+choose() { # working on abstraction
+    options=`ls -1 "$1" | sed 's/\.draft\.html$//;s/\.html$//'` 
+    [ -z "$options" ] && echo "No drafts to publish" && exit 0
+    echo "$options" | nl
+    read -p 'Choose an entry by number > ' choice
+    chosen=`ls -1 "$1" | sed -n "$choice p"`
+    [ -z "$chosen" ] && echo "Invalid choice" && exit 1
+}
+
 publish() {
     
-    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
+    choose "$data_dir/drafts"
+    to_publish=${chosen%.draft.html}
 
     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\
+    sed -i "/<!-- BLOG START -->/ 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"
-    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
+    choose "$data_dir/published"
+    to_delete=${chosen%.draft.html}
 
     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"
+    # remove entries from files 
+    echo -e "$blog_index_file\n$rolling_file\n$rss_file" | xargs sed -i "/<!-- ID:$to_delete START -->/,/<!-- ID:$to_delete END -->/ d"
 
 }
 
-- 
2.20.1