Fixed geekandpoke

1 files changed, 18 insertions, 28 deletions

diff --git a/bin/comics/geekandpoke b/bin/comics/geekandpoke
index ad76c50..17beea3 100755
--- a/bin/comics/geekandpoke
+++ b/bin/comics/geekandpoke
@@ -15,34 +15,24 @@ cd "${tmp}"
 browser="Mozilla/4.06 [en] (X11; I; Linux 2.0.35 i586)"
 newn="${day}.jpg"
 
-wget ${wget_args} --user-agent="$browser" \
-    --header="Referer: http://geekandpoke.typepad.com/" \
-    "http://geekandpoke.typepad.com/" -O index.html
-
-export LC_ALL=C
-
-if [ -s index.html ]; then
-    date="$(LC_ALL=C date +"%B %d, %Y" -d "$daysago days ago")"
-    nomen="$(grep -A30 "$date" index.html | grep "img class" | head -1 | sed 's/.*img class=[^\/]*src="\([^"]\+\)".*/\1/')"
-    imgname="$(echo $nomen | tr '/' '\n' | tail -n 1)"
-    
-    if [[ "$nomen" != "http:"* ]]; then
-        echo "Kein geekandpoke fuer Datum: $(date -d"$daysago days ago" -I)"
-    else
-        echo "Dateiname: $imgname"
-        echo
-        echo "Hole geek&poke von $nomen"
-        echo "fuer Datum: $(date -d"$daysago days ago" -I)"
-        echo
-        wget ${wget_args} --header="Referer: http://geekandpoke.typepad.com/" \
-            --user-agent="$browser" "$nomen"
-
-        if [ -s "${tmp}/${imgname}" ]; then
-            mv "${tmp}/${imgname}" "${image_dir}/$newn"
-            rm -f "${comic_dir}/latest.jpg"
-            ln -s "${image_offset}/$newn" "${comic_dir}/latest.jpg"
-        fi
-    fi
+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]}
+
+	if [ -s "${tmp}/out.jpg" ]; then
+		mv "${tmp}/out.jpg" "${image_dir}/$newn"
+		echo "${COMIC[0]}" > "${image_dir}/${day}.title"
+		rm -f "${comic_dir}/latest.jpg"
+		ln -s "${image_offset}/$newn" "${comic_dir}/latest.jpg"
+	fi
 fi
 
 rm -rf "${tmp}"