From 01e89e4413bc09e10944cb80e4960ff8cf9c0937 Mon Sep 17 00:00:00 2001
From: bel <me@me.me>
Date: Sun, 28 Nov 2021 23:55:10 -0700
Subject: [PATCH] pass json instead of filenames around so no pull needed for
 strs

---
 posts.sh    | 22 ++++++++++------------
 rclone.conf |  2 +-
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/posts.sh b/posts.sh
index 7bdb37d..76acbab 100644
--- a/posts.sh
+++ b/posts.sh
@@ -13,7 +13,7 @@ main() {
    for b64_json in "$(list)"; do
       local json="$(echo "$b64_json" | base64 --decode)"
       local filename="$(echo "$json" | jq -r .Name)"
-      want+=("$(imported "$filename")")
+      want+=("$(imported "$json")")
       if up_to_date "$json"; then
          log "$filename: up to date"
          continue
@@ -21,11 +21,12 @@ main() {
       log "$filename: pull"
       pull "$json"
       log "$filename: extract"
-      extract "$filename"
+      extract "$json"
       log "$filename: import"
-      import "$filename"
+      import "$json"
       log "$filename: metadata"
       metadata "$json"
+      rm "$(pulled "$json")"
    done
    for d in "$HUGO_POSTS"/*; do
       if  [[ ! " ${want[*]} " =~ " $d " ]]; then
@@ -55,8 +56,7 @@ list() {
 }
 
 up_to_date() {
-   local filename="$(echo "$1" | jq -r .Name)"
-   local metadatad="$(metadatad "$filename")"
+   local metadatad="$(metadatad "$1")"
    if [ -f "$metadatad" ]; then
       if [ "$1" == "$(cat "$metadatad")" ]; then
          return 0
@@ -66,7 +66,7 @@ up_to_date() {
 }
 
 pulled() {
-   echo "$TMPDIR/$1"
+   echo "$TMPDIR/$(echo "$1" | jq -r .Name)"
 }
 
 pull() {
@@ -75,7 +75,8 @@ pull() {
 
 extracted() {
    local pulled_file="$(pulled "$1")"
-   local date="$(date -r "$pulled_file" +%Y-%m-%d)"
+   local date="$(echo "$1" | jq -r .ModTime)"
+   date="${date%%T*}"
    local pulled_file_safe_basename="$(basename "$pulled_file" | sed 's/.zip$//' | sed 's/[^a-zA-Z0-9]/_/g')"
    echo "$TMPDIR/${date}_${pulled_file_safe_basename}"
 }
@@ -85,7 +86,7 @@ extract() {
    local index_html="$extracted_dir/.index.html"
    local index_md="$extracted_dir/index.md"
    local pulled_file="$(pulled "$1")"
-   local u_date_iso="$(date -r "$pulled_file" -u +%Y-%m-%dT%H:%M:%S)-00:00"
+   local u_date_iso="$(echo "$1" | jq -r .ModTime)"
 
    if [ -d "$extracted_dir" ]; then
       rm -rf "$extracted_dir"
@@ -123,8 +124,6 @@ extract() {
       convert "$line" -ordered-dither o8x8,8,8,4 "$line.2"
       mv "$line.2" "$line"
    done
-
-   rm "$pulled_file"
 }
 
 imported() {
@@ -147,8 +146,7 @@ metadatad() {
 }
 
 metadata() {
-   local filename="$(echo "$1" | jq -r .Name)"
-   local metadatad="$(metadatad "$filename")"
+   local metadatad="$(metadatad "$1")"
    echo "$1" > "$metadatad"
 }
 
diff --git a/rclone.conf b/rclone.conf
index 2a45eb8..d777dcb 100644
--- a/rclone.conf
+++ b/rclone.conf
@@ -6,5 +6,5 @@ scope = drive
 #team_drive = 1-p043gwMk88rj4-Sm5otARi_AJZYskbj
 #root_folder_id = 1-p043gwMk88rj4-Sm5otARi_AJZYskbj
 formats = zip,html,rtf,odt,docx,xlsx,pptx,svg
-token = {"access_token":"ya29.a0ARrdaM930VBw2VaxVmaaocNmvkADbcKqyW6ujEUNtTjRKV09DcDSw76SCGcyYT1wdDT2053ZNPppWJdBmfSwj5XpuCNRT_zWQ4Ypn8k8u1CsYVlQD5muA5BZHyy1XqldWNnMsGkKRITK_5lVRQ120ebn607_","token_type":"Bearer","refresh_token":"1//04sQD4800FsqyCgYIARAAGAQSNwF-L9IrB1_7BV8ScFnqmIz8FNWgXfr80--6VG6KX1pTnneQKAz6Ss3YtxqmCdf2tRBy2ndkhek","expiry":"2021-11-28T23:46:47.90857501-07:00"}
+token = {"access_token":"ya29.a0ARrdaM_kpbDUGroFqB3HY6EW2xzX6tYkhtlHRPgaSJ6ytxMp7CLgao5SIF1cvABho-5YTaZtfpOWPIdySiPHIgrtV7YC9Yk3Y5nB0ZCM6WcG3_4dglc4D0bbd9AhEmnBRtYI7UjlEL3L0X3hh0K7CN11HzZXsQ","token_type":"Bearer","refresh_token":"1//04sQD4800FsqyCgYIARAAGAQSNwF-L9IrB1_7BV8ScFnqmIz8FNWgXfr80--6VG6KX1pTnneQKAz6Ss3YtxqmCdf2tRBy2ndkhek","expiry":"2021-11-29T00:48:36.393616466-07:00"}