X-Git-Url: https://git.armaanb.net/?p=bin.git;a=blobdiff_plain;f=scoop-cgi;h=a54e15563e0a018abe3edae2311189c76db7c412;hp=8f56f3e37790bf4459fd09b6fbbb886ccead4af1;hb=27553617ac8b494b6a1cd3255ff24bd37c5e2ac7;hpb=2ace04e247de492f756967b927e6a785bce43ce4 diff --git a/scoop-cgi b/scoop-cgi index 8f56f3e..a54e155 100755 --- a/scoop-cgi +++ b/scoop-cgi @@ -12,6 +12,7 @@ acheam's IRC logs logged channels --------------- $(awk '{print " * " $0}' /etc/scoop-cgi/channels) +$(awk '{print " * " $0}' /etc/scoop-cgi/logbot) url format ---------- @@ -25,7 +26,11 @@ it's in the public domain!" exit 0 fi -channel=$(grep -x "$channel" /etc/scoop-cgi/channels) +time=$(echo "$PATH_INFO" | awk -F / -v date="$(date -I)" ' +{($3 != "" ) ? outp = $3 : outp = date; print outp}' | xargs date -I -d) + +all=$(cat /etc/scoop-cgi/channels /etc/scoop-cgi/logbot) +channel=$(echo "$all" | grep -x "$channel") if [ -z "$channel" ]; then echo "Status: 404" printf "Content-type: text/plain\n\n" @@ -33,11 +38,15 @@ if [ -z "$channel" ]; then exit 0 fi -time=$(echo "$PATH_INFO" | awk -F / '{print $3}' | xargs date -I -d) -today=$(date -I) -time=${time:-$today} -db=$(cat /etc/scoop-cgi/database) - printf "Content-type: text/plain\n\n" -PAGER=/dev/tty scoop -d "$db" -p "$channel" -D "$time" -F "%Y-%m-%d %H:%M:%S" \ - | awk '{$1=""; print substr($0, 2, length($0) - 1)}' + +if grep -qx "$channel" /etc/scoop-cgi/channels; then + db=$(cat /etc/scoop-cgi/database) + PAGER=/dev/tty scoop -d "$db" -p "$channel" -D "$time" \ + -F "%Y-%m-%d %H:%M:%S" \ + | awk '{$1=""; print substr($0, 2, length($0) - 1)}' +elif grep -qx "$channel" /etc/scoop-cgi/logbot; then + awk -v date="$time" 'substr($1, 0, 11) == date {outp = substr($1, 12); +for (i = 3; i <= NF; i++) outp = outp " " $i; print outp}' \ + "/srv/www/scoop-cgi/$channel" +fi