Welcome :)
\ No newline at end of file diff --git a/meta/config.yaml b/meta/config.yaml index b3312ee..fa59bc3 100644 --- a/meta/config.yaml +++ b/meta/config.yaml @@ -1,9 +1,9 @@ -baseURL: '' -languageCode: 'en-us' -title: 'Site Title' -theme: "anubis" +baseURL: "" +languageCode: en-us +title: the title of my blog +theme: anubis paginate: 5 -paginatePath: "posts/-/pages" +paginatePath: posts/-/pages enableRobotsTXT: true disableLiveReload: true minify: true @@ -12,43 +12,32 @@ disableFastRender: true rssLimit: 5 canonifyurls: true relativeurls: false - params: - toc: true - author: "me" - email: "" - avatar: "" - description: "" - #customJS: [ "js/main.js" ] # relative to ./assets/ - dateFormat: "2006-01-02" - paginationSinglePost: false - style: light - #style: auto-without-switcher - #style: light-without-switcher - readMore: true - disableSummary: false - social: - - id: email - name: contact - #- id: linkedin - # name: lapoba16 - #- id: rss - # name: rss - # url: '/index.xml' - + toc: true + author: bel + email: bel@bel.bel + avatar: "" + description: "" + dateFormat: "2006-01-02" + paginationSinglePost: false + style: light + readMore: true + disableSummary: false + social: + - id: email + name: bel@bel.bel menu: main: - - identifier: archive - name: Archive - title: Archive - url: /posts/ - weight: 0 - - identifier: about - name: About - title: About - url: /about/ - weight: 1 - + - identifier: archive + name: Archive + title: Archive + url: /posts/ + weight: 0 + - identifier: about + name: About + title: About + url: /about/ + weight: 1 markup: defaultMarkdownHandler: goldmark goldmark: @@ -61,7 +50,7 @@ markup: autoHeadingID: true autoHeadingIDType: github renderer: - unsafe: true # raw HTML OK + unsafe: true highlight: anchorLineNos: true guessSyntax: true @@ -71,6 +60,5 @@ markup: endLevel: 3 ordered: false startLevel: 2 - permalinks: posts: /posts/:year-:month-:day-:filename diff --git a/posts.sh b/posts.sh index 76f1d58..d04860e 100644 --- a/posts.sh +++ b/posts.sh @@ -11,7 +11,7 @@ TMPDIR="${TMPDIR:-"/tmp"}" main() { flags "$@" - #posts + posts meta } @@ -161,11 +161,11 @@ meta() { } meta_file() { - echo "$TMPDIR/.meta.$(echo "$1" | jq -r .Name)" + echo "./meta/.overrides/$(echo "$1" | jq -r .Name)/.meta" } up_to_date() { - test -f "$(meta_file "$1")" && test "$1" == "$(cat "$(meta_file "$1")")" + test -f "$(meta_file "$1")" && test "$1" == "$(cat "$(meta_file "$1")")" && test -e "$(must "$1")" } extracted_dir() { @@ -176,6 +176,10 @@ meta() { echo "./meta/.overrides/$(echo "$1" | jq -r .Name | sed 's/.zip$//')" } + must() { + echo "./meta/$(basename "$(extracted "$1")")" + } + extract() { local extracted_dir="$(extracted_dir "$1")" rm -rf "$extracted_dir" "${extracted_dir%.zip}" @@ -197,6 +201,38 @@ meta() { cat "$extracted" | html_to_plaintext > "$extracted.2"; mv "$extracted.2" "$extracted" } + merge() { + local extracted="$(extracted "$1")" + case "${extracted##*.}" in + yaml ) merge_yaml "$1" ;; + * ) + esac + } + + merge_yaml() { + local override="$(extracted "$1")" + local default="$(echo "$override" | sed 's/\.overrides/\.default/')" + if [ ! -f "$default" ]; then + return + fi + cat "$override" | yq -j eval - | jq > "$override.json" + cat "$default" | yq -j eval - | jq > "$default.json" + jq -s '.[0] * .[1]' "$default.json" "$override.json" | yq -P eval - > ./meta/"$(basename "$override")" + } + + import() { + local must="$(must "$1")" + if [ -f "$must" ]; then + rm "$must" + fi + merge "$1" + if [ -f "$must" ]; then + return + fi + log cp -r "${must%/*}/.overrides/${must##*/}" "$must" + cp -r "${must%/*}/.overrides/${must##*/}" "$must" + } + for b64_json in $(list); do local json="$(echo "$b64_json" | base64 --decode | jq .)" local filename="$(echo "$json" | jq -r .Name)" @@ -208,10 +244,9 @@ meta() { pull "$json" log "$filename: extracting" extract "$json" - merge "$json" - # todo: echo "$json" > "$(meta_file $json)" + import "$json" + echo "$json" > "$(meta_file "$json")" done - false } fatal() { diff --git a/rclone.conf b/rclone.conf index 08959cd..3d25573 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.a0ARrdaM-P6wKzub3feWIaQlG3YXq2REc0rfS1LDxfeV1m1rr5Zwhe_XqYTInCEcCHP4bHNPvcBcZufAnJpgLZlVBte-abfEOvwfk4Qz25__FboaddAXthlv_EeIxPwVTlKJTy7MOKGLz2Rhg47CjjagfFYMcCKw","token_type":"Bearer","refresh_token":"1//04sQD4800FsqyCgYIARAAGAQSNwF-L9IrB1_7BV8ScFnqmIz8FNWgXfr80--6VG6KX1pTnneQKAz6Ss3YtxqmCdf2tRBy2ndkhek","expiry":"2021-11-29T14:49:21.903576-07:00"} +token = {"access_token":"ya29.a0ARrdaM-gyIY7jtRZuCMXsXx0apjLSVmd1dpGeuluOlVHoOcEPNpghYjqOfWK7aM_RQRC2xwomdQqLgsSzEHNAkQ0Jv9v6_QqiGwbqscPxTnVIaeMpmDLsxMFVYse29Ofba9bSsOyqfOhb1BeS_7KW3CVtDlTuA","token_type":"Bearer","refresh_token":"1//04sQD4800FsqyCgYIARAAGAQSNwF-L9IrB1_7BV8ScFnqmIz8FNWgXfr80--6VG6KX1pTnneQKAz6Ss3YtxqmCdf2tRBy2ndkhek","expiry":"2021-11-29T15:49:20.965947-07:00"}