From b5682bf4351070501ff3150ae2427cb34d9089d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=84min=20Baumeler?= Date: Fri, 6 Jun 2025 10:54:38 +0200 Subject: [PATCH] preview --- src/awk/{preview.awk => get.awk} | 6 +++--- src/main.sh | 28 ++++++++++++++++++---------- 2 files changed, 21 insertions(+), 13 deletions(-) rename src/awk/{preview.awk => get.awk} (80%) diff --git a/src/awk/preview.awk b/src/awk/get.awk similarity index 80% rename from src/awk/preview.awk rename to src/awk/get.awk index a12f89c..b8f9cec 100644 --- a/src/awk/preview.awk +++ b/src/awk/get.awk @@ -1,12 +1,12 @@ # print content of field `field` BEGIN { FS = ":"; regex = "^" field; } /^BEGIN:VEVENT$/ { inside = 1 } -/^END:VEVENT/ && inside { exit } -$0 ~ field { content = $0; next; } +/^END:VEVENT$/ { exit } +$0 ~ regex { content = $0; next; } /^ / && content { content = content substr($0, 2); next; } /^[^ ]/ && content { exit } END { - if (!type) { exit } + if (!inside) { exit } # Process content line content = substr(content, index(content, ":") + 1); gsub("\\\\n", "\n", content); diff --git a/src/main.sh b/src/main.sh index 788e84c..a84c07b 100755 --- a/src/main.sh +++ b/src/main.sh @@ -87,15 +87,24 @@ EOF ) export AWK_DAYVIEW - AWK_PREVIEW=$( + AWK_GET=$( cat <<'EOF' -@@include src/awk/preview.awk +@@include src/awk/get.awk EOF ) - export AWK_DAYVIEW + export AWK_GET ### END OF AWK SCRIPTS - FZF_VJOUR_USE_EXPORTED="yes" - export FZF_VJOUR_USE_EXPORTED + + ## Colors + export GREEN="\033[1;32m" + export RED="\033[1;31m" + export WHITE="\033[1;97m" + export CYAN="\033[1;36m" + export ITALIC="\033[3m" + export FAINT="\033[2m" + export OFF="\033[m" + + export FZF_VJOUR_USE_EXPORTED="yes" fi __load_approx_data() { @@ -160,8 +169,6 @@ __show_day() { echo "$s|$e|$starttime|$endtime|$fpath|$description" done) fi - GREEN="\033[1;32m" - OFF="\033[m" echo "||||🗓️ $GREEN $(date -d "$DISPLAY_DATE" +"%a %e %b %Y")$OFF" echo "" ( @@ -259,10 +266,11 @@ if [ "${1:-}" = "--preview" ]; then dfmt="$dfmt %Y %R %Z" fi end=$(date -d "@$end" +"$dfmt") - echo "START @ $start, END @ $end" + echo "${GREEN}From: ${OFF}${CYAN}$start${OFF}" + echo "${GREEN}To: ${OFF}${CYAN}$end${OFF}" + echo "" + awk -v field="DESCRIPTION" "$AWK_GET" "$fpath" | $CAT fi - #awk -v field="DESCRIPTION" "$AWK_PREVIEW" "$fpath" | - # $CAT exit fi