X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=macros%2Fevent;h=4b3881057713f9edeb59abbbebe78544f3f20889;hb=fdfe0310c6bc644da671b847120e0bd84d923634;hp=2bf3b05770c50882a93756242737c8ca94ec4a4a;hpb=306aa2a7d304b7e430ac00ea65aba2dc2756c26e;p=shellwiki

diff --git a/macros/event b/macros/event
index 2bf3b05..4b38810 100755
--- a/macros/event
+++ b/macros/event
@@ -1,7 +1,22 @@
 #!/bin/sh
 
+# Copyright 2023 - 2024 Paul Hänsch
+# 
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+# 
+# THE SOFTWARE IS PROVIDED “AS IS” AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+# IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
 . $_EXEC/cgilite/cgilite.sh
-. $_EXEC/cgilite/session.sh
+. $_EXEC/cgilite/storage.sh
+. $_EXEC/datetime.sh
 
 _(){ printf %s\\n "$*"; }
 [ "${LANGUAGE}" -a -r "${_EXEC}/l10n/${LANGUAGE}.sh" ] && . "${_EXEC}/l10n/${LANGUAGE}.sh"
@@ -11,64 +26,6 @@ rec_freq= rec_int= error_msg= rec_end=
 title=
 start= end= nstart= nend=
 
-isdate(){
-  local date="$1" y m d
-
-  if   printf %s "$date" \
-    | grep -xEq '[0-9]{4}-((01|03|05|07|08|10|12)-(0[1-9]|[12][0-9]|3[01])|(04|06|09|11)-(0[1-9]|[12][0-9]|30)|02-(0[1-9]|[12][0-9]))'
-  then  # y-m-d (ISO Date)
-    y="${date%%-*}" d="${date##*-}" m="${date%-*}" m="${m#*-}"
-  elif printf %s "$date" \
-    | grep -xEq '((0?1|0?3|0?5|0?7|0?8|10|12)/(0?[1-9]|[12][0-9]|3[01])|(0?4|0?6|0?9|11)/(0?[1-9]|[12][0-9]|30)|0?2-(0[1-9]|[12][0-9]))/([0-9]{2}|[0-9]{4})'
-  then  # m/d/y (US Date)
-    y="${date##*/}" m="${date%%/*}" d="${date%/*}" d="${d#*/}"
-  elif printf %s "$date" \
-    | grep -xEq '((0?[1-9]|[12][0-9]|3[01])[\./](0?1|0?3|0?5|0?7|0?8|10|12)|(0?[1-9]|[12][0-9]|30)[\./](0?4|0?6|0?9|11)|(0[1-9]|[12][0-9])[\./]0?2)[\./]([0-9]{2}|[0-9]{4})'
-  then  # d/m/y or d.m.y (European Date / German Date)
-    y="${date##*.}" d="${date%%.*}" m="${date%.*}" m="${m#*.}"
-  else
-    return 1
-  fi
-  [ $y -lt 100 -a $y -gt 50 ] && y=$((y + 1900))
-  [ $y -lt 100 -a $y -le 50 ] && y=$((y + 2000))
-  date="$(printf "%04i-%02i-%02i" $y ${m#0} ${d#0})"
-
-  # leap year
-  if [ "$m" -eq 2 -a "$d" -eq 29 ]; then
-    if   [ "$((y % 400))" -eq 0 ]; then
-      :
-    elif [ "$((y % 100))" -eq 0 ]; then
-      return 1
-    elif [ "$((y % 4))" -eq 0 ]; then
-      :
-    else
-      return 1
-    fi
-  fi
-
-  printf '%04i-%02i-%02i\n' "$y" "${m#0}" "${d#0}"
-  return 0
-}
-
-istime(){
-  time="$1" h= m=
-
-  if   printf %s "$time" | grep -xEq '(0?[1-9]|1[012])(:[0-5][0-9])? ?(am|AM)\.?'; then
-    time="${time%?[aA][mM]}" h="${time%:*}" h="$(h % 12)"
-    [ "$h" != "$time" ] && m="${time#*:}" || m=0
-  elif printf %s "$time" | grep -xEq '(0?[1-9]|1[012])(:[0-5][0-9])? ?(pm|PM)\.?'; then
-    time="${time%?[aA][mM]}" h="${time%:*}" h="$(h % 12 + 12)"
-    [ "$h" != "$time" ] && m="${time#*:}" || m=0
-  elif printf %s "$time" | grep -xEq '(0?[0-9]|1[0-9]|2[0-3]):[0-5][0-9]'; then
-    time="${time%?[aA][mM]}" h="${time%:*}" m="${time#*:}"
-  else
-    return 1
-  fi
-
-  printf '%02i:%02i\n' "${h#0}" "${m#0}"
-  return 0
-}
-
 while [ $# -gt 0 ]; do case $1 in
   --from|from|--start|start)
     if   isdate "$2" && istime "$3" ; then
@@ -152,7 +109,7 @@ if [ ! "$end_date" -a "$end_time" -a "$start_time" ]; then
   if [ "$((${end_time%:*} * 60 + ${end_time#*:}))" -gt "$((${start_time%:*} * 60 + ${start_time#*:}))" ]; then
     end_date="$start_date"
   else
-    end_date="$(date -d "@$(($(date -d "$start_date" +%s) + 86400))" +%F)"
+    end_date="$(date -ud "@$(($(date -ud "$start_date" +%s) + 86400))" +%F)"
   fi
 fi
 
@@ -180,74 +137,19 @@ case $rec_int in
     rec_int="year";;
 esac
 
-if [ "$rec_end" ]; then
-  rec_end="$(date -d "$rec_end" +%s)"
-fi
-
-if [ -s './#events' ]; then
-  t1="$(stat -c %Y './#page.md')"
-  read t2 junk <"./#events"
-  if [ "$t1" -ge "$t2" ]; then
-    truncate -s 0 "./#events"
-  fi
-fi
-
-printf '%i	%i	%i	%i	%s	%i\n' \
-  "$_DATE" "$(date -d "$start_date $start_time" +%s)" "$(date -d "$end_date $end_time" +%s)" \
-  "${rec_freq:-0}" "${rec_int:-\\}" "${rec_end:--1}" \
-  >>'./#events'
-
-start="$(date -d "$start_date $start_time" +%s)"
-  end="$(date -d "$end_date $end_time" +%s)"
+[ "$rec_end" ] && rec_end="$(date -ud "$rec_end" +%s)" \
 
-if [ $_DATE -le $end ]; then
-  nstart="$start" nend="$end"
+if LOCK './#events'; then
+  sed -i "/^${_DATE}	/!d" './#events'
+  evid="$(wc -l <'./#events' || printf 0)"
+  printf '%i	%i	%i	%i	%s	%i	%s	%s\n' \
+    "$_DATE" "$(date -ud "$start_date $start_time" +%s)" "$(date -ud "$end_date $end_time" +%s)" \
+    "${rec_freq:-0}" "${rec_int:-\\}" "${rec_end:--1}" "$(STRING "${title}")" "$(STRING "${PATH_INFO}#event${evid}")" \
+    >>'./#events'
+  RELEASE './#events'
 fi
 
-[ $_DATE -gt $end ] && case $rec_int in
-  day)
-    nend=$(( rec_freq * 86400 - (_DATE - end) % (rec_freq * 86400) + _DATE ))
-    nstart=$(( start - end + nend))
-    ;;
-  week)
-    nend=$(( rec_freq * 604800 - (_DATE - end) % (rec_freq * 604800) + _DATE ))
-    nstart=$(( start - end + nend))
-    ;;
-  month)
-    { read _y _m _d; read y m d; } <<-EOF
-	$(date -d @$_DATE +"%Y %_m %_d"
-	  date -d @$start +"%Y %_m %_d"
-	)
-	EOF
-    _m=$((_y * 12 + _m)) m=$((y * 12 + m))
-    while :; do
-      mod=$(( (_m - m) % rec_freq )); [ $mod -eq 0 ] && mod="$rec_freq";
-      m=$(( rec_freq - mod + _m ))
-      y=$((m / 12)) m=$((m % 12)); [ $m -eq 0 ] && y=$((y - 1)) m=12;
-      nstart="$(printf '%04i-%02i-%02i' "$y" "$m" "$d")"
-      isdate "$nstart" >/dev/null && [ $(date -d "$nstart" +%s) -ge $_DATE ] && break
-      debug loop
-      m=$((y * 12 + m)) _m="$((_m + rec_freq))"
-    done
-    nstart="$(date -d "$nstart $start_time" +%s)"
-      nend="$((end - start + nstart))"
-    ;;
-  year)
-    ;;
-  '')
-    nstart="$start" nend="$end"
-    ;;
-esac
-
-"$_EXEC/cgilite/html-sh.sed" <<-EOF
-  [div .macro .event
-    [label . $(HTML "$title")]
-    [dl
-      [dt $(_ Start:)][dd $(date -d @$nstart +"%F %T")]
-      [dt   $(_ End:)][dd $(date -d @$nend +"%F %T")]
-    ]
-  ]
-EOF
+printf '<div class="macro event" id="#event%s"></div>' "${evid}"
 
 # uid="$(timeid)"
 # tzid="$(cat /etc/timezone || printf 'UTC')"
@@ -258,10 +160,10 @@ EOF
 # PRODID:ShellWiki Event Macro
 # BEGIN:VEVENT
 # UID:$uid@$(HEADER Host)
-# DTSTAMP:TZID=${tzid}:$(date +%Y%m%dT%H%M%S)
-# DTSTART:TZID=${tzid}:$(date +%Y%m%dT%H%M%S -d "$start_date $start_time")
+# DTSTAMP:TZID=${tzid}:$(date -u +%Y%m%dT%H%M%S)
+# DTSTART:TZID=${tzid}:$(date -u +%Y%m%dT%H%M%S -d "$start_date $start_time")
 # DURATION:
-# RRULE:FREQ=$ec_freq;INTERVAL=$rec_int;UNTIL=$(date +%Y%m%dT000000Z -d "$rec_end")
+# RRULE:FREQ=$ec_freq;INTERVAL=$rec_int;UNTIL=$(date -u +%Y%m%dT000000Z -d "$rec_end")
 # SUMMARY:
 # COMMENT:
 # END:VEVENT