X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=cards%2Flist.sh;h=0ed8af46297cc72abe6ae1202869e21db1501c3c;hp=ab2be506a8c9b9c25fdc9089f497ac8e3c1b6aea;hb=670da503edafe7206002ccf2c469285ee8f61bda;hpb=bab7cadaeae32434eb16872bd8e09449817d4f90 diff --git a/cards/list.sh b/cards/list.sh index ab2be50..0ed8af4 100755 --- a/cards/list.sh +++ b/cards/list.sh @@ -2,177 +2,6 @@ . "${_EXEC}"/pdiread.sh -unescape() { [ $# = 0 ] && sed -E 's;\\(.);\1;g' || printf %s "$*" |sed -E 's;\\(.);\1;g'; } -upcase=' y;abcdefghijklmnopqrstuvwxyzäöüé;ABCDEFGHIJKLMNOPQRSTUVWXYZÄÖÜÉ;; ' - -card_item(){ - local card="$1" - local item cnt c - shift 1 - - for item in $@; do - cnt="$(pdi_count "$card" "$item")" - - case $item in - FN) printf '[h2 .item .FN ­%s]' "$(pdi_value "$card" FN |unescape |HTML)" - ;; - GENDER) printf '[span .item .GENDER ­%s]' "$(pdi_value "$card" GENDER |l10n)" - ;; - NICKNAME) seq 1 $cnt |while read c; do - printf '[span .item .NICKNAME ­aka. "%s"]' \ - "$(pdi_value "$card" NICKNAME $c |unescape |HTML)" - done - ;; - X-ZACK-JOINDATE|X-ZACK-LEAVEDATE) if [ $cnt -gt 0 ]; then - printf '[span .item .%s [b %s:] %s]' \ - "$item" "$(l10n "${item}_short")" \ - "$(pdi_value "$card" "$item" |HTML)" - fi - ;; - BDAY) if [ $cnt -gt 0 ]; then - printf '[span .item .BDAY [b *:] %s]' \ - "$(pdi_value "$card" BDAY |grep -xE '[0-9-]+')" - fi - ;; - SOUND) if [ $cnt -gt 0 ]; then - printf '[audio .item .SOUND controls="controls" - [source type="audio/ogg" src="data:audio/ogg;base64,%s"] - ]' \ - "$(pdi_value "$card" SOUND |grep -xE '[a-zA-Z0-9/+=]+')" - fi - ;; - PHOTO|LOGO) if [ $cnt -gt 0 ]; then - printf '[img .item .%s src="data:image/%s;base64,%s"]' "$item" \ - "$(pdi_attrib "$card" "$item" |sed -E 's;^(.*;)?TYPE="?(.+)"?(;.*)?$;\2;')" \ - "$(pdi_value "$card" "$item" |grep -xE '[a-zA-Z0-9/+=]+')" - fi - ;; - EMAIL) if [ $cnt -gt 0 ]; then - printf '[h3 %s]' "$(l10n EMAIL)" - seq 1 $cnt |while read c; do - printf '[a .item .EMAIL href="mailto:%s" ­%s]' \ - "$(pdi_value "$card" EMAIL $c |unescape |HTML)" \ - "$(pdi_value "$card" EMAIL $c |unescape |HTML)" - done - fi - ;; - TEL) if [ $cnt -gt 0 ]; then - printf '[h3 %s]' "$(l10n TEL)" - seq 1 $cnt |while read c; do - teltype="$(pdi_attrib "$card" TEL $c TYPE)" - [ "$teltype" ] \ - && printf '[span .item .TEL [span .type ­%s:] %s]' \ - "$(l10n "TYPE=$teltype" |HTML)" \ - "$(pdi_value "$card" TEL $c |unescape |HTML)" \ - || printf '[span .item .TEL ­%s]' \ - "$(pdi_value "$card" TEL $c |unescape |HTML)" - done - fi - ;; - *) if [ $cnt -gt 0 ]; then - printf '[h3 %s]' "$(l10n "$item")" - seq 1 $cnt |while read c; do - printf '[span .item .%s ­%s]' "$item" \ - "$(pdi_value "$card" "$item" $c |unescape |HTML)" - done - fi - ;; - esac - done -} - -edit_item(){ - local card="$1" - local item cnt c - shift 1 - - for item in $@; do - cnt="$(pdi_count "$card" "$item")" - [ $cnt -lt 1 ] && cnt=1 - - case $item in - N)N="$(pdi_value "$card" N)" - if [ "$N" ]; then - IFS=\; read n1 n2 n3 n4 n5 <<-EOF - $N - EOF - else - N="$(pdi_value "$card" FN |unescape)" - n1="${N%%[a-z]*}" n1="${N#$n1}" - [ "$n1" ] || n1="${N##* }" - n2="${N%$n1}" - fi - printf ' - [h3 %s] - [input .item .N name="4N" placeholder="%s" value="%s"] - [input .item .N name="2N" placeholder="%s" value="%s"] - [input .item .N name="1N" placeholder="%s" value="%s"] - [input .item .N name="5N" placeholder="%s" value="%s"] - ' "$(l10n "$item")" \ - "$(l10n n_pre)" "$(HTML "$n4")" \ - "$(l10n n_first)" "$(HTML "$n2" "$n3")" \ - "$(l10n n_last)" "$(HTML "$n1")" \ - "$(l10n n_post)" "$(HTML "$n5")" - ;; - GENDER) - gender="$(pdi_value "$card" GENDER)" - printf ' - [select .item .GENDER name="GENDER" - [option value="" disabled="disabled" %s %s] - [option value="female" %s %s] - [option value="male" %s %s] - [option value="other" %s %s] - [option value="none" %s %s] - ]\n' \ - "$([ "$gender" = '' ] && printf 'selected="selected"')" "$(l10n GENDER)" \ - "$([ "$gender" = 'female' ] && printf 'selected="selected"')" "$(l10n gender_female)" \ - "$([ "$gender" = 'male' ] && printf 'selected="selected"')" "$(l10n gender_male)" \ - "$([ "$gender" = 'other' ] && printf 'selected="selected"')" "$(l10n gender_other)" \ - "$([ "$gender" = 'none' ] && printf 'selected="selected"')" "$(l10n gender_none)" - ;; - BDAY|X-ZACK-JOINDATE|X-ZACK-LEAVEDATE) - printf '[h3 %s] - [input .item .%s name="%s" value="%s" placeholder="YYYY-MM-DD"] - ' \ - "$(l10n "$item")" "$item" "$item" "$(pdi_value "$card" "$item" |grep -xE '[0-9-]+')" - ;; - ADR|NOTE) - printf '[h3 %s]' "$(l10n "$item")" - seq 1 $cnt |while read c; do - printf '' \ - "$item" "$item" "$(pdi_value "$card" "$item" $c |unescape |HTML)" - done - ;; - TEL) printf '[h3 %s]' "$(l10n "$item")" - seq 1 $cnt |while read c; do - teltype="$(pdi_attrib "$card" TEL $c TYPE)" - printf '[select .item .teltype name="teltype" - [option value="" disabled="disabled" %s %s] - [option value="HOME" %s %s] - [option value="WORK" %s %s] - [option value="CELL" %s %s] - [option value="FAX" %s %s] - ]\n' \ - "$([ "$teltype" = '' ] && printf 'selected="selected"')" "$(l10n teltype)" \ - "$([ "$teltype" = 'HOME' ] && printf 'selected="selected"')" "$(l10n TYPE=HOME)" \ - "$([ "$teltype" = 'WORK' ] && printf 'selected="selected"')" "$(l10n TYPE=WORK)" \ - "$([ "$teltype" = 'CELL' ] && printf 'selected="selected"')" "$(l10n TYPE=CELL)" \ - "$([ "$teltype" = 'FAX' ] && printf 'selected="selected"')" "$(l10n TYPE=FAX)" - - printf '[input .item .%s name="%s" value="%s" placeholder="%s"]' \ - "$item" "$item" "$(pdi_value "$card" "$item" $c |unescape |HTML)" "$(l10n "$item")" - done - ;; - *) printf '[h3 %s]' "$(l10n "$item")" - seq 1 $cnt |while read c; do - printf '[input .item .%s name="%s" value="%s" placeholder="%s"]' \ - "$item" "$item" "$(pdi_value "$card" "$item" $c |unescape |HTML)" "$(l10n "$item")" - done - ;; - esac - done -} - edit_card(){ local cardfile="$_DATA/vcard/$1" local tempfile card @@ -205,36 +34,43 @@ edit_card(){ [div .section .address $(edit_item "$card" ADR)] [div .section .note $(edit_item "$card" NOTE)] [div .section .attendance - [h3 $(l10n course_attendance) ] $( - for course in "$_DATA"/ical/*.ics; do - printf '[label [input type="checkbox" name="attendance" value="%s" %s] %s]' \ - "${course##*/}" \ - "$(grep -qF "${course##*/} ${cardfile##*/}" "$_DATA/mappings/attendance" \ + [h3 $(l10n course_attendance) ] [div .attendance $( + list_courses |while IFS=/ read course coursename; do + courseH="$(HTML "$course")" + printf '[input type="checkbox" id="cour%s" name="attendance" value="%s" %s][label for="cour%s" . %s]' \ + "$courseH" "$courseH" \ + "$(grep -qF "${course} ${cardfile##*/}" "$_DATA/mappings/attendance" \ && printf 'checked="checked"' - )" \ - "$(pdi_value "$(pdi_load "$course")" SUMMARY |unescape |HTML)" - done) - [h3 $(l10n CATEGORIES) ] $( + )" \ + "$courseH" "$coursename" + done)] + [h3 $(l10n CATEGORIES) ] [div .categories $( grep -xE '[^ ]+' "$_DATA"/mappings/categories |while read -r cat; do - printf '[label [input type="checkbox" name="attendance" value="%s" %s] %s]' \ - "$(HTML "$cat")" \ + catH="$(HTML "$cat")" + printf '[input type="checkbox" id="cat%s" name="CATEGORIES" value="%s" %s][label for="cat%s" . %s]' \ + "$catH" "$catH" \ "$(seq 1 $(pdi_count "$card" CATEGORIES) |while read c; do pdi_value "$card" CATEGORIES $c |grep -qxF "$cat" \ && printf 'checked="checked"' && break done)" \ - "$(HTML "$cat")" - done) + "$catH" "$catH" + done)] ] [div .control - [select .item name="newfield" - [option value="" disabled="disabled" selected="selected" $(l10n edit_addfieldtext)] - $(for f in NICKNAME EMAIL TEL IMPP ADR URL NOTE; do - printf '[option value="%s" %s] ' "$f" "$(l10n "$f")" - done) - ][button .item type="submit" name="action" value="addfield" $(l10n edit_addfield)] + [div .item .delete label="$(l10n edit_delete)" + [input type="checkbox" #delete] + [label for="delete" $(l10n edit_delete)] + [button type="submit" name="action" value="delete" $(l10n edit_delete)] + ] + [div .item .newfield + [select name="newfield" + [option value="" disabled="disabled" selected="selected" $(l10n edit_addfieldtext)] + $(for f in NICKNAME EMAIL TEL IMPP ADR URL NOTE; do + printf '[option value="%s" %s] ' "$f" "$(l10n "$f")" + done) + ][button type="submit" name="action" value="addfield" $(l10n edit_addfield)] + ] [button .item type="submit" name="action" value="update" $(l10n edit_update)] - [input type="checkbox" #delete] [label .item for="delete" $(l10n edit_delete)] - [button .item type="submit" name="action" value="delete"] [button .item type="submit" name="action" value="cancel" $(l10n edit_cancel)] ] [input type="hidden" name="UID" value="$(pdi_value "$card" UID |HTML)"] @@ -249,24 +85,24 @@ print_card(){ local card="$(pdi_load "$cardfile")" cat <<-EOF [div .card #${cardfile##*/} - [div .section .basic ­$( + [div .section .basic . $( card_item "$card" FN GENDER NICKNAME BDAY X-ZACK-JOINDATE X-ZACK-LEAVEDATE SOUND PHOTO LOGO )] - [div .section .phone ­$(card_item "$card" TEL)] - [div .section .message ­$(card_item "$card" EMAIL IMPP URL)] - [div .section .address ­$(card_item "$card" ADR)] - [div .section .note ­$(card_item "$card" NOTE)] - [div .section .attendance [h3 $(l10n course_attendance) ] [ul ­ + [div .section .phone . $(card_item "$card" TEL)] + [div .section .message . $(card_item "$card" EMAIL IMPP URL)] + [div .section .address . $(card_item "$card" ADR)] + [div .section .note . $(card_item "$card" NOTE)] + [div .section .attendance [h3 $(l10n course_attendance) ] [ul $(grep -F " ${cardfile##*/}" "$_DATA/mappings/attendance" |while read each discard; do - printf '[li [a .item .attendance href="/courses#%s" ­%s]]' \ + printf '[li [a .item .attendance href="/courses#%s" . %s]]' \ "$each" \ - "$(pdi_value "$(pdi_load "$_DATA/ical/$each")" SUMMARY |unescape |HTML)" - done)] + "$(pdi_value "$(pdi_load "$_DATA/ical/$each")" SUMMARY || l10n "(unnamed course)" |unescape |HTML)" + done |sort -k7)] $(card_item "$card" CATEGORIES) ] [div .control - [a .item href="/cards/edit_card.sh?card=${cardfile##*/}" $(l10n edit)] - [a .item href="/cards/?x=${cardfile##*/}" $(l10n vcf_export)] + [a .button .item href="/cards/edit_card.sh?card=${cardfile##*/}" $(l10n edit)] + [a .button .item href="/cards/export_card.sh?card=${cardfile##*/}" $(l10n vcf_export)] ] ] EOF @@ -277,8 +113,9 @@ print_cards(){ while read cardfile; do cachefile="${_DATA}/cache/${cardfile##*/}.cache" - if [ -s "$cachefile" -a "$cachefile" -nt "$cardfile" \ - -a "$cachefile" -nt "${_EXEC}/cards" ]; then + # if [ -s "$cachefile" -a "$cachefile" -nt "$cardfile" \ + # -a "$cachefile" -nt "${_EXEC}/cards" ]; then + if [ -s "$cachefile" -a "$cachefile" -nt "$cardfile" ]; then cat "$cachefile" else print_card "$cardfile" |tee "$cachefile" @@ -286,11 +123,36 @@ print_cards(){ done } +filter_attendance(){ + fatt="$1" + attfile="$_DATA/mappings/attendance" + + if [ ! "$fatt" ]; then + # debug 'list all' + printf '%s\n' "$_DATA/vcard"/*.vcf + elif [ "${fatt#* }" = "${fatt}" ]; then + # debug "list $fatt" + grep -xiE "(${fatt}) .+vcf" "$attfile" \ + | while read vcf; do + printf '%s/vcard/%s\n' "$_DATA" "${vcf##* }" + done + else + # debug "filter ${fatt%% *}" + filter_attendance "${fatt#* }" \ + | while read vcf; do + grep -xiE "(${fatt%% *}) ${vcf##*/}" "$attfile" + done \ + | while read vcf; do + printf '%s/vcard/%s\n' "$_DATA" "${vcf##* }" + done + fi +} + filter_cards(){ local filter f fex='x;p;' filter="$(printf %s "${filter}" \ - | sed -E 's;[]\/\(\)\\\$\?\.\+\*\;\[\{\}];\\\\&;g; + | sed -E 's;[]\/\(\)\\\$\?\.\+\*\;\[\{\}];\\&;g; '"$upcase" )^" @@ -299,22 +161,25 @@ filter_cards(){ case $f in '') break ;; - ANY:*) fex="/\n.*(\;[^:]*)?:.*(${f#*:}).*\r?\n/{${fex}}" + COURSE:*) fatt="${fatt}${fatt:+ }${f#*:}" + ;; + ANY:*) fex="/\n.*(\;[^:]*)?:[^\n]*(${f#*:})[^\n]*\r?\n/{${fex}}" ;; - NAME:*) fex="/\n(N|FN|NICKNAME)(\;[^:]*)?:.*(${f#*:}).*\r?\n/{${fex}}" + NAME:*) fex="/\n(N|FN|NICKNAME)(\;[^:]*)?:[^\n]*(${f#*:})[^\n]*\r?\n/{${fex}}" ;; - STREET:*|ZIP:*) fex="/\nADR(\;[^:]*)?:.*(${f#*:}).*\r?\n/{${fex}}" + STREET:*|ZIP:*) fex="/\nADR(\;[^:]*)?:[^\n]*(${f#*:})[^\n]*\r?\n/{${fex}}" ;; - *) fex="/\n${f%%:*}(\;[^:]*)?:.*(${f#*:}).*\r?\n/{${fex}}" + *) fex="/\n${f%%:*}(\;[^:]*)?:[^\n]*(${f#*:})[^\n]*\r?\n/{${fex}}" ;; esac done - for cardfile in "${_DATA}"/vcard/*.vcf; do + # for cardfile in "${_DATA}"/vcard/*.vcf; do + filter_attendance "$fatt" |while read cardfile; do printf '%s\n' "$cardfile" cat "$cardfile" done \ - | sed -En ':X; /\nEND:VCARD\r?$/!{ N; bX; }; h; s;\n.*$;;; x; s;^[^\n]+\n;;; + | sed -nE ':X; /\nEND\;?:VCARD\r?$/!{ N; bX; }; h; s;\n.*$;;; x; s;^[^\n]+\n;;; '"$upcase""$fex" }