From f6efa946c20bdd5c9fee3eb22aca9c752c47fd8e Mon Sep 17 00:00:00 2001 From: Flyounet Date: Fri, 20 Nov 2015 11:13:42 +0100 Subject: [PATCH 1/4] Baker now creates a Draft dir and generate post for drafted post. --- baker | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/baker b/baker index bf1f5a3..a3e07e2 100755 --- a/baker +++ b/baker @@ -10,6 +10,9 @@ readonly POST_DIR=post # OUTPUT_DIR stores all compiled html readonly OUTPUT_DIR=out +# DRAFT_DIR stores all compiled html +readonly DRAFT_DIR=draft + # LAYOUT_DIR stores all layout markdown files readonly LAYOUT_DIR=layout @@ -279,11 +282,15 @@ usage() { case "$1" in bake) + rm -rf "$DRAFT_DIR" + mkdir -p "$DRAFT_DIR" rm -rf "$OUTPUT_DIR" mkdir -p "$OUTPUT_DIR" [[ -d "$POST_DIR" ]] || usage [[ -d "$PUBLIC_DIR" ]] && cp -r "$PUBLIC_DIR"/. "$OUTPUT_DIR" + [[ -d "$PUBLIC_DIR" ]] && cp -r "$PUBLIC_DIR"/. "$DRAFT_DIR" + touch "$DRAFT_DIR/index.html" readarray -t posts < <(find "$POST_DIR" -name '*.md' | sort -r) @@ -291,7 +298,9 @@ bake) time for post in "${posts[@]}"; do id="$(basename "$post" .md)" # skip drafts - [[ "$(header draft < "$post")" == false ]] || continue + if [ "$(header draft < "$post")" != false ]; then + render_file "$post" > "$DRAFT_DIR/$id.html"; continue; + fi echo "$id" render_file "$post" > "$OUTPUT_DIR/$id.html" & From 6e973bf6b3884ba1ff337a2dff5774479720c6c3 Mon Sep 17 00:00:00 2001 From: Flyounet Date: Fri, 20 Nov 2015 11:18:40 +0100 Subject: [PATCH 2/4] =?UTF-8?q?For=20people=20like=20me=20(who's=20speakin?= =?UTF-8?q?g=20french),=20accent=20are=20important.=20Previously=20the=20s?= =?UTF-8?q?lug=20function=20didn't=20handled=20accent=20:=20echo=20'Baker?= =?UTF-8?q?=20est=20tr=C3=A8s=20bien'=20|=20tr=20-cs=20'[:alnum:]\n'=20-?= =?UTF-8?q?=20|=20tr=20'[:upper:]'=20'[:lower:]'=20|=20sed=20's|^-*||;s|-*?= =?UTF-8?q?$||'=20baker-est-tr-s-bien?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now it handles them : echo 'Baker est très bien' | iconv -f utf8 -t ascii//TRANSLIT | tr -cs '[:alnum:]\n' - | tr '[:upper:]' '[:lower:]' | sed 's|^-*||;s|-*$||' baker-est-tres-bien --- baker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/baker b/baker index a3e07e2..e520935 100755 --- a/baker +++ b/baker @@ -59,7 +59,7 @@ body() { # slug creates a friendly URL like 'hello-world' slug() { - tr -cs '[:alnum:]\n' - | tr '[:upper:]' '[:lower:]' | sed 's|^-*||;s|-*$||' + iconv -f utf8 -t ascii//TRANSLIT | tr -cs '[:alnum:]\n' - | tr '[:upper:]' '[:lower:]' | sed 's|^-*||;s|-*$||' } # From 602ace3e567861f381b67314c4867af60239ee2e Mon Sep 17 00:00:00 2001 From: Flyounet Date: Fri, 20 Nov 2015 11:30:41 +0100 Subject: [PATCH 3/4] Starting to implement a sort of Prev/Next button for each post. The idea is when you're on a Post, you can go to the older or the newer. If the there is no newer or no older, you go to the index. --- layout/post.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/layout/post.md b/layout/post.md index 23f19d9..e5a926f 100644 --- a/layout/post.md +++ b/layout/post.md @@ -12,6 +12,8 @@ From f76bb1804d1c210523001f30b804acf45c3de7db Mon Sep 17 00:00:00 2001 From: Flyounet Date: Fri, 20 Nov 2015 12:21:52 +0100 Subject: [PATCH 4/4] When posts are baked, they now points to older are newer posts. --- baker | 36 +++++++++++++++++++++++++---- post/2015-11-20-welcome-to-baker.md | 11 +++++++++ 2 files changed, 43 insertions(+), 4 deletions(-) create mode 100644 post/2015-11-20-welcome-to-baker.md diff --git a/baker b/baker index e520935..2506261 100755 --- a/baker +++ b/baker @@ -293,22 +293,50 @@ bake) touch "$DRAFT_DIR/index.html" readarray -t posts < <(find "$POST_DIR" -name '*.md' | sort -r) - + echo "Rendering Posts..." >&2 idx=0 + id_all=0 time for post in "${posts[@]}"; do + idx_prev=1;idx_next=1 id="$(basename "$post" .md)" # skip drafts if [ "$(header draft < "$post")" != false ]; then - render_file "$post" > "$DRAFT_DIR/$id.html"; continue; + (( id_all++ )) + POST_PREV='index.html';POST_NEXT='index.html'; render_file "$post" > "$DRAFT_DIR/$id.html"; continue; + fi + if [ ${idx} -eq 0 ]; then # It's the first post, so the newer one is index + id_prev=0 + else # search for the previous post not draft + while [ -f "${posts[$((id_all-idx_prev))]}" -a "$(header draft < "${posts[$((id_all-idx_prev))]}" 2>/dev/null)" != false ]; do + (( idx_prev++ )) + if [ ${idx_prev} -gt ${id_all} ]; then idx_prev=${id_all}; break; fi + done 2>/dev/null + fi + # look for the next older post not draft + while [ -f "${posts[$((id_all+idx_next))]}" -a "$(header draft < "${posts[$((id_all+idx_next))]}" 2>/dev/null)" != false ]; do + (( idx_next++ )) + done 2>/dev/null + + if [ ${idx} -eq 0 -o $((idx_all-idx_prev)) -eq 0 -a ${id_all} -eq 0 ]; then + POST_PREV="index.html" + else + POST_PREV="$( basename "${posts[$((id_all-idx_prev))]}" )" + POST_PREV="${POST_PREV%*.md}.html" fi + POST_NEXT="$( basename "${posts[$((id_all+idx_next))]}" )" + [[ -z "${POST_PREV:=}" ]] && POST_PREV='index.html' + [[ -z "${POST_NEXT:=}" ]] && POST_NEXT='index.md' + echo "$idx - $idx_next - $id [Prev:${POST_PREV}][Next:${POST_NEXT}]" + POST_NEXT="${POST_NEXT%*.md}.html" - echo "$id" render_file "$post" > "$OUTPUT_DIR/$id.html" & declare "posts_${idx}_id"="$id" export_headers "$post" "posts_${idx}_" + POST_PREV="$id.html" + (( id_all++ )) (( idx++ )) done - + echo "Rendering Index..." >&2 render_file "$LAYOUT_DIR/index.md" > "$OUTPUT_DIR/index.html" & wait ;; diff --git a/post/2015-11-20-welcome-to-baker.md b/post/2015-11-20-welcome-to-baker.md new file mode 100644 index 0000000..7ba852f --- /dev/null +++ b/post/2015-11-20-welcome-to-baker.md @@ -0,0 +1,11 @@ +--- +title: Welcome to Baker! +date: 2015-11-20T11:06:07Z +layout: post +draft: false +summary: This is your second post. +--- + +With the **Markdown** syntax, expect more readbility. Be prepared to start blogging! + +