bug fix: recognize all-day events, improvment: view source with v
This commit is contained in:
parent
e09c38ee29
commit
16193b5554
@ -49,17 +49,23 @@ END {
|
|||||||
# If nanoseconds are not 0, then we assume user enterd "tomorrow" or
|
# If nanoseconds are not 0, then we assume user enterd "tomorrow" or
|
||||||
# something the like, and we make this a date entry, as opposed to a
|
# something the like, and we make this a date entry, as opposed to a
|
||||||
# date-time entry.
|
# date-time entry.
|
||||||
|
# Similalry, if the time is 00:00, we make this a date, as opposed to a
|
||||||
|
# date-time entry.
|
||||||
gsub("\"", "\\\"", from)
|
gsub("\"", "\\\"", from)
|
||||||
cmd = "date -d \"" from "\" +\"%N\"";
|
cmd = "date -d \"" from "\" +\"%N\"";
|
||||||
|
cmd | getline n
|
||||||
|
close(cmd)
|
||||||
|
n = n + 0
|
||||||
|
cmd = "date -d \"" from "\" +\"%H%M\"";
|
||||||
cmd | getline t
|
cmd | getline t
|
||||||
close(cmd)
|
close(cmd)
|
||||||
t = t + 0
|
t = t + 0
|
||||||
if (t == 0) {
|
if (n != 0 || t == 0) {
|
||||||
from_type = "DATE-TIME"
|
|
||||||
cmd = "date -d \"" from "\" +\"@%s\" | xargs date -u +\"%Y%m%dT%H%M00Z\" -d"
|
|
||||||
} else {
|
|
||||||
from_type = "DATE"
|
from_type = "DATE"
|
||||||
cmd = "date -d \"" from "\" +\"%Y%m%d\"";
|
cmd = "date -d \"" from "\" +\"%Y%m%d\"";
|
||||||
|
} else {
|
||||||
|
from_type = "DATE-TIME"
|
||||||
|
cmd = "date -d \"" from "\" +\"@%s\" | xargs date -u +\"%Y%m%dT%H%M00Z\" -d"
|
||||||
}
|
}
|
||||||
suc = cmd | getline from
|
suc = cmd | getline from
|
||||||
close(cmd)
|
close(cmd)
|
||||||
@ -69,15 +75,19 @@ END {
|
|||||||
#
|
#
|
||||||
gsub("\"", "\\\"", to)
|
gsub("\"", "\\\"", to)
|
||||||
cmd = "date -d \"" to "\" +\"%N\"";
|
cmd = "date -d \"" to "\" +\"%N\"";
|
||||||
|
cmd | getline n
|
||||||
|
close(cmd)
|
||||||
|
n = n + 0
|
||||||
|
cmd = "date -d \"" to "\" +\"%H%M\"";
|
||||||
cmd | getline t
|
cmd | getline t
|
||||||
close(cmd)
|
close(cmd)
|
||||||
t = t + 0
|
t = t + 0
|
||||||
if (t == 0) {
|
if (n != 0 || t == 0) {
|
||||||
to_type = "DATE-TIME"
|
|
||||||
cmd = "date -d \"" to "\" +\"@%s\" | xargs date -u +\"%Y%m%dT%H%M00Z\" -d"
|
|
||||||
} else {
|
|
||||||
to_type = "DATE"
|
to_type = "DATE"
|
||||||
cmd = "date -d \"" to "\" +\"%Y%m%d\"";
|
cmd = "date -d \"" to "\" +\"%Y%m%d\"";
|
||||||
|
} else {
|
||||||
|
to_type = "DATE-TIME"
|
||||||
|
cmd = "date -d \"" to "\" +\"@%s\" | xargs date -u +\"%Y%m%dT%H%M00Z\" -d"
|
||||||
}
|
}
|
||||||
suc = cmd | getline to
|
suc = cmd | getline to
|
||||||
close(cmd)
|
close(cmd)
|
||||||
|
@ -38,15 +38,19 @@ ENDFILE {
|
|||||||
# date-time entry.
|
# date-time entry.
|
||||||
gsub("\"", "\\\"", from)
|
gsub("\"", "\\\"", from)
|
||||||
cmd = "date -d \"" from "\" +\"%N\"";
|
cmd = "date -d \"" from "\" +\"%N\"";
|
||||||
|
cmd | getline n
|
||||||
|
close(cmd)
|
||||||
|
n = n + 0
|
||||||
|
cmd = "date -d \"" from "\" +\"%H%M\"";
|
||||||
cmd | getline t
|
cmd | getline t
|
||||||
close(cmd)
|
close(cmd)
|
||||||
t = t + 0
|
t = t + 0
|
||||||
if (t == 0) {
|
if (n != 0 || t == 0) {
|
||||||
from_type = "DATE-TIME"
|
|
||||||
cmd = "date -d \"" from "\" +\"@%s\" | xargs date -u +\"%Y%m%dT%H%M00Z\" -d"
|
|
||||||
} else {
|
|
||||||
from_type = "DATE"
|
from_type = "DATE"
|
||||||
cmd = "date -d \"" from "\" +\"%Y%m%d\"";
|
cmd = "date -d \"" from "\" +\"%Y%m%d\"";
|
||||||
|
} else {
|
||||||
|
from_type = "DATE-TIME"
|
||||||
|
cmd = "date -d \"" from "\" +\"@%s\" | xargs date -u +\"%Y%m%dT%H%M00Z\" -d"
|
||||||
}
|
}
|
||||||
suc = cmd | getline from
|
suc = cmd | getline from
|
||||||
close(cmd)
|
close(cmd)
|
||||||
@ -56,15 +60,19 @@ ENDFILE {
|
|||||||
#
|
#
|
||||||
gsub("\"", "\\\"", to)
|
gsub("\"", "\\\"", to)
|
||||||
cmd = "date -d \"" to "\" +\"%N\"";
|
cmd = "date -d \"" to "\" +\"%N\"";
|
||||||
|
cmd | getline n
|
||||||
|
close(cmd)
|
||||||
|
n = n + 0
|
||||||
|
cmd = "date -d \"" to "\" +\"%H%M\"";
|
||||||
cmd | getline t
|
cmd | getline t
|
||||||
close(cmd)
|
close(cmd)
|
||||||
t = t + 0
|
t = t + 0
|
||||||
if (t == 0) {
|
if (n != 0 || t == 0) {
|
||||||
to_type = "DATE-TIME"
|
|
||||||
cmd = "date -d \"" to "\" +\"@%s\" | xargs date -u +\"%Y%m%dT%H%M00Z\" -d"
|
|
||||||
} else {
|
|
||||||
to_type = "DATE"
|
to_type = "DATE"
|
||||||
cmd = "date -d \"" to "\" +\"%Y%m%d\"";
|
cmd = "date -d \"" to "\" +\"%Y%m%d\"";
|
||||||
|
} else {
|
||||||
|
to_type = "DATE-TIME"
|
||||||
|
cmd = "date -d \"" to "\" +\"@%s\" | xargs date -u +\"%Y%m%dT%H%M00Z\" -d"
|
||||||
}
|
}
|
||||||
suc = cmd | getline to
|
suc = cmd | getline to
|
||||||
close(cmd)
|
close(cmd)
|
||||||
|
@ -989,7 +989,7 @@ while true; do
|
|||||||
--with-nth='{6}' \
|
--with-nth='{6}' \
|
||||||
--accept-nth='1,2,3,4,5' \
|
--accept-nth='1,2,3,4,5' \
|
||||||
--preview="$0 --preview-event {}" \
|
--preview="$0 --preview-event {}" \
|
||||||
--expect="ctrl-n,ctrl-alt-d,ctrl-t,ctrl-g,esc,backspace,q" \
|
--expect="ctrl-n,ctrl-alt-d,ctrl-t,ctrl-g,esc,backspace,q,v" \
|
||||||
--bind="load:pos(1)+transform(
|
--bind="load:pos(1)+transform(
|
||||||
echo change-border-label:🗓️ \$(date -d {1} +\"%A %e %B %Y\")
|
echo change-border-label:🗓️ \$(date -d {1} +\"%A %e %B %Y\")
|
||||||
)+transform(
|
)+transform(
|
||||||
@ -1033,6 +1033,8 @@ while true; do
|
|||||||
set -- "--set-tz" "--day" "$DISPLAY_DATE"
|
set -- "--set-tz" "--day" "$DISPLAY_DATE"
|
||||||
elif [ "$key" = "esc" ] || [ "$key" = "backspace" ] || [ "$key" = "q" ]; then
|
elif [ "$key" = "esc" ] || [ "$key" = "backspace" ] || [ "$key" = "q" ]; then
|
||||||
set -- "--week" "$DISPLAY_DATE"
|
set -- "--week" "$DISPLAY_DATE"
|
||||||
|
elif [ "$key" = "v" ] && [ -f "$ROOT/$fpath" ]; then
|
||||||
|
$EDITOR "$ROOT/$fpath"
|
||||||
elif [ -z "$key" ] && [ -n "$fpath" ]; then
|
elif [ -z "$key" ] && [ -n "$fpath" ]; then
|
||||||
__edit "$start" "$end" "$fpath"
|
__edit "$start" "$end" "$fpath"
|
||||||
set -- "--day" "$DISPLAY_DATE"
|
set -- "--day" "$DISPLAY_DATE"
|
||||||
|
Loading…
Reference in New Issue
Block a user