1 files changed, 16 insertions, 32 deletions
diff --git a/generate.sh b/generate.sh
index 91c5e3b..83f5c88 100755
--- a/generate.sh
+++ b/generate.sh
@@ -6,21 +6,7 @@ INDEX_BLOG_COUNT=0
 INDEX_ART_LIMIT=1
 INDEX_ART_COUNT=0
-title_wrapper() {
+source ./scripts.sh
-    # remove extension
-    # snake to title case
-    echo "$1" | sed -E -e "s/\..+$//g"  -e "s/_(.)/ \u\1/g" -e "s/^(.)/\u\1/g"
-}
-read_time() {
-    minu="$(eva -f 1 $1/150 | xargs)"
-    echo "$minu"
-}
-height() {
-    cm="$(eva -f 2 $1*18*0.0222 | xargs)"
-    echo "$cm"
-}
 link_wrapper() {
    # 1 - id
@@ -133,7 +119,7 @@ mkdir -p docs/art
 cp -r ./art/* docs/art/
-cat << EOF | tee ./docs/posts/index.html ./docs/art/index.html ./docs/index.html > /dev/null
+cat << EOF | tee ./docs/posts/index.html ./docs/index.html > /dev/null
 <!DOCTYPE html>
 <html lang="en">
 <head>
@@ -210,7 +196,7 @@ for f in $posts; do
    mkdir -p "docs/posts/$id"
    esh  \
        -o "docs/posts/$id/index.html" \
-        "./post.esh" \
+        post.esh \
        file="$file" \
        date="$post_date" \
        title="$post_title" \
@@ -223,25 +209,22 @@ echo "$(more_links posts)" >> ./docs/index.html
 echo "$(recent_link Art)" >> ./docs/index.html
 # art
-echo -ne "
-    <h1>Art</h1>
-    <div class=\"separator\"></div>
-    <table>
-    " >> ./docs/art/index.html
 echo
 echo "[+] ART"
-for f in $art; do
+esh  \
-    file="./art/"$f
+    -o "docs/art/index.html" \
-    id="${file##*/}"
+    art.esh
-    art_title=$(title_wrapper "$id")
-    art_date=$(date -r "$file" "+%d/%m — %Y")
-    art_post=$(art_block "$f" "$art_title" "$art_date")
-    echo "[~] $art_title"
-    echo -ne "$art_post" >> docs/art/index.html
+for f in $art; do
    if [[ $INDEX_ART_COUNT -lt $INDEX_ART_LIMIT ]]; then
+        file="./art/"$f
+        id="${file##*/}"
+        art_title=$(title_wrapper "$id")
+        art_date=$(date -r "$file" "+%d/%m — %Y")
+        art_post=$(art_block "$f" "$art_title" "$art_date")
+        echo "[~] $art_title"
        echo -ne "$art_post" >> ./docs/index.html
        ((INDEX_ART_COUNT+=1))
    fi
@@ -250,12 +233,13 @@ done
 echo "$(more_links art)" >> ./docs/index.html 
 # generate rss feeds
-echo "generating RSS feeds ..."
+echo
+echo "[+] Generating RSS feeds ..."
 esh  \
    -o "./docs/index.xml" \
    "rss.esh"
-cat << EOF | tee -a ./docs/posts/index.html ./docs/art/index.html ./docs/index.html > /dev/null
+cat << EOF | tee -a ./docs/posts/index.html ./docs/index.html > /dev/null
    </table>
    <div class="separator"></div>
    <div class="footer">