Fixed geekandpoke (again)

1 files changed, 13 insertions, 11 deletions

diff --git a/bin/comics/geekandpoke b/bin/comics/geekandpoke
index 17beea3..60800f2 100755
--- a/bin/comics/geekandpoke
+++ b/bin/comics/geekandpoke
@@ -12,20 +12,22 @@ source "${top}/etc/settings.sh"
 tmp="$(mktemp -d)"
 cd "${tmp}"
 
+LC_ALL=C
+
 browser="Mozilla/4.06 [en] (X11; I; Linux 2.0.35 i586)"
 newn="${day}.jpg"
 
-OLD_IFS="$IFS"
-IFS="ß"
-COMIC=(
-$(wget -q -O - "http://geek-and-poke.com/" | \
-	sed -nre ": b; s/.+ <a +href=\"\/geekandpoke\/`LC_ALL=C date +"%Y\\/%m\\/%d\\/" -d "$daysago days ago"`.+?>([^<]+).+/\1${IFS}/p; t m; d; : m; n; s/.+img src=\"([^\"]+).+/\1/p; t; b m")
-)
-IFS="$OLD_IFS"
-
-if [ -n "${COMIC[0]}" ]; then
-	echo "geeoandpoke: Hole comic: ${COMIC[0]} - ${COMIC[1]}"
-	wget -O ${tmp}/out.jpg ${wget_args} --header="Referer: http://geek-and-poke.com/" --user-agent="$browser" ${COMIC[1]}
+echo "debug: daysago=$daysago, i.e. day=$(date -d "$daysago days ago" +%m)"
+echo "debug: grep for /geekandpoke/`date -d "$daysago days ago" +%Y`/$(echo $[$(date -d "$daysago days ago" +%m)])/$(echo $[$(date -d "$daysago days ago" +%d)])/[^\"]+"
+
+posturl=$(wget -q -O - "http://geek-and-poke.com/" | grep -oE "/geekandpoke/`date -d "$daysago days ago" +%Y`/$(echo $[$(date -d "$daysago days ago" +%m)])/$(echo $[$(date -d "$daysago days ago" +%d)])/[^\"]+" | head -n 1)
+
+echo "posturl: $posturl"
+
+if [ -n "$posturl" ]; then
+	URL=$(wget -O - "http://geek-and-poke.com/$posturl" | sed -nre 's#.+<noscript><img[ \t]*src="(https?://static.squarespace.com[^"]+)".+#\1#p')
+	echo "URL: $URL"
+	wget -O ${tmp}/out.jpg ${wget_args} --header="Referer: http://geek-and-poke.com/" --user-agent="$browser" $URL
 
 	if [ -s "${tmp}/out.jpg" ]; then
 		mv "${tmp}/out.jpg" "${image_dir}/$newn"