improvements: presentation
- collection label before time - UTF8 arrow insead of `->`
This commit is contained in:
20
src/main.sh
20
src/main.sh
@@ -123,7 +123,7 @@ if [ "${1:-}" = "--preview-event" ]; then
|
||||
start=$(datetime_str "$start" "%a ")
|
||||
end=$(datetime_str "$end" "%a ")
|
||||
location=$(awk -v field="LOCATION" "$AWK_GET" "$fpath")
|
||||
echo "📅 ${CYAN}$start${OFF} -> ${CYAN}$end${OFF}"
|
||||
echo "📅 ${CYAN}$start${OFF} → ${CYAN}$end${OFF}"
|
||||
if [ -n "${location:-}" ]; then
|
||||
echo "📍 ${CYAN}$location${OFF}"
|
||||
fi
|
||||
@@ -240,6 +240,8 @@ __view_day() {
|
||||
shift
|
||||
fpath="$(echo "$1" | sed 's/|/ /g')" # we will use | as delimiter (need to convert back!)
|
||||
shift
|
||||
collection="$1"
|
||||
shift
|
||||
description="$(echo "$*" | sed 's/|/:/g')" # we will use | as delimiter
|
||||
#
|
||||
daystart=$(date -d "$today 00:00:00" +"%s")
|
||||
@@ -259,7 +261,7 @@ __view_day() {
|
||||
else
|
||||
continue
|
||||
fi
|
||||
echo "$s|$e|$starttime|$endtime|$fpath|$description"
|
||||
echo "$s|$e|$starttime|$endtime|$fpath|$collection|$description"
|
||||
done)
|
||||
fi
|
||||
echo "$sef" | sort -n | awk -v today="$today" -v daystart="$DAY_START" -v dayend="$DAY_END" "$AWK_DAYVIEW"
|
||||
@@ -995,13 +997,19 @@ while true; do
|
||||
)+transform(
|
||||
[ -n \"\${TZ:-}\" ] && echo \"change-list-label:\$WHITE\$ITALIC(\$TZ)\$OFF\"
|
||||
)+transform(
|
||||
echo {} | grep \|\| || echo show-preview
|
||||
[ -n \"\$(echo {} | cut -d '|' -f 5)\" ] && echo show-preview
|
||||
)" \
|
||||
--bind="start:hide-preview" \
|
||||
--bind="j:down+hide-preview+transform:echo {} | grep \|\| || echo show-preview" \
|
||||
--bind="k:up+hide-preview+transform:echo {} | grep \|\| || echo show-preview" \
|
||||
--bind="j:down+hide-preview+transform([ -n \"\$(echo {} | cut -d '|' -f 5)\" ] && echo show-preview)" \
|
||||
--bind="k:up+hide-preview+transform([ -n \"\$(echo {} | cut -d '|' -f 5)\" ] && echo show-preview)" \
|
||||
--bind="ctrl-j:down+hide-preview+transform([ -n \"\$(echo {} | cut -d '|' -f 5)\" ] && echo show-preview)" \
|
||||
--bind="ctrl-k:up+hide-preview+transform([ -n \"\$(echo {} | cut -d '|' -f 5)\" ] && echo show-preview)" \
|
||||
--bind="down:down+hide-preview+transform([ -n \"\$(echo {} | cut -d '|' -f 5)\" ] && echo show-preview)" \
|
||||
--bind="up:up+hide-preview+transform([ -n \"\$(echo {} | cut -d '|' -f 5)\" ] && echo show-preview)" \
|
||||
--bind="l:hide-preview+reload:$0 --reload-day {1} '+1 day'" \
|
||||
--bind="h:hide-preview+reload:$0 --reload-day {1} '-1 day'" \
|
||||
--bind="right:hide-preview+reload:$0 --reload-day {1} '+1 day'" \
|
||||
--bind="left:hide-preview+reload:$0 --reload-day {1} '-1 day'" \
|
||||
--bind="ctrl-l:hide-preview+reload:$0 --reload-day {1} '+1 week'" \
|
||||
--bind="ctrl-h:hide-preview+reload:$0 --reload-day {1} '-1 week'" \
|
||||
--bind="alt-l:hide-preview+reload:$0 --reload-day {1} '+1 month'" \
|
||||
@@ -1074,6 +1082,8 @@ while true; do
|
||||
--bind="k:up" \
|
||||
--bind="l:unbind(load)+reload:$0 --reload-week {2} '+1 week'" \
|
||||
--bind="h:unbind(load)+reload:$0 --reload-week {2} '-1 week'" \
|
||||
--bind="right:unbind(load)+reload:$0 --reload-week {2} '+1 week'" \
|
||||
--bind="left:unbind(load)+reload:$0 --reload-week {2} '-1 week'" \
|
||||
--bind="ctrl-l:unbind(load)+reload:$0 --reload-week {2} '+1 month'" \
|
||||
--bind="ctrl-h:unbind(load)+reload:$0 --reload-week {2} '-1 month'" \
|
||||
--bind="alt-l:unbind(load)+reload:$0 --reload-week {2} '+1 year'" \
|
||||
|
Reference in New Issue
Block a user