From 71f20fb4dc2ebda1bef2e0621d9105fbe589d2e4 Mon Sep 17 00:00:00 2001 From: Aki Date: Thu, 6 Aug 2020 20:29:13 +0200 Subject: Changed phttp to collect more meta information --- phttp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/phttp b/phttp index eb69732..79e5df5 100755 --- a/phttp +++ b/phttp @@ -1,6 +1,6 @@ #!/bin/sh PHTTP_CACHE=${PHTTP_CACHE:-/dev/shm/phttp} -mkdir -p $PHTTP_CACHE/mimes $PHTTP_CACHE/files || exit 1 +mkdir -p $PHTTP_CACHE/meta $PHTTP_CACHE/files || exit 1 make_sum() { echo "$@" | sha512sum | head -c72 @@ -11,13 +11,13 @@ get_with_arguments() { local BASENAME BASENAME=$(make_sum $@) [ -e $PHTTP_CACHE/files/$BASENAME ] && { - echo "$(cat $PHTTP_CACHE/mimes/$BASENAME) $PHTTP_CACHE/files/$BASENAME" + echo "$(cat $PHTTP_CACHE/meta/$BASENAME) $PHTTP_CACHE/files/$BASENAME" return } - local TYPE - TYPE=$(curl -sL -w "%{content_type}\n" $@ -o "$PHTTP_CACHE/files/$BASENAME") && { - echo "$TYPE $PHTTP_CACHE/files/$BASENAME" - echo "$TYPE" > $PHTTP_CACHE/mimes/$BASENAME + local META + META=$(curl -sL -w "%{content_type} %{url_effective}\n" $@ -o "$PHTTP_CACHE/files/$BASENAME") && { + echo "$META $PHTTP_CACHE/files/$BASENAME" + echo "$META" > $PHTTP_CACHE/meta/$BASENAME return } return 1 -- cgit v1.1