From 5afde763a0e72e82adca82180114545d8c44f02f Mon Sep 17 00:00:00 2001
From: Phillip Berndt <pberndt@spline.de>
Date: Mon, 11 Mar 2013 13:30:59 +0100
Subject: Fixed feeds for Claybennett, Zits and Snoopy
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Appended on 26. April 2013:
 I have tested these changes locally for about 1½ months now and they
 seem to be stable.
---
 bin/comics/claybennett |  1 +
 bin/comics/geekandpoke |  2 ++
 bin/comics/zits        | 15 ++++++++++-----
 bin/gen.py             |  7 ++++++-
 etc/settings.sh        |  2 +-
 5 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/bin/comics/claybennett b/bin/comics/claybennett
index da8ca8c..3ea8ed3 100755
--- a/bin/comics/claybennett
+++ b/bin/comics/claybennett
@@ -12,6 +12,7 @@ source "${top}/etc/settings.sh"
 tmp="$(mktemp -d)"
 cd "${tmp}"
 
+export LC_ALL=C
 date="$(date -d "$daysago days ago" +"%a, %d %b %Y")"
 newn="${day}.jpg"
 
diff --git a/bin/comics/geekandpoke b/bin/comics/geekandpoke
index 11c4360..ad76c50 100755
--- a/bin/comics/geekandpoke
+++ b/bin/comics/geekandpoke
@@ -19,6 +19,8 @@ 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/')"
diff --git a/bin/comics/zits b/bin/comics/zits
index 579e745..b3399ce 100755
--- a/bin/comics/zits
+++ b/bin/comics/zits
@@ -12,22 +12,27 @@ source "${top}/etc/settings.sh"
 tmp="$(mktemp -d)"
 cd "${tmp}"
 
+export LC_ALL=C
+
 newn="${day}.gif"
 month="$(date -d "$daysago days ago" +%m)"
-server="http://est.rbma.com/content/Zits?date=$(date -d "$daysago days ago" +%Y%m%d)"
-referer="http://www.kingfeatures.com/features/comics/zits/about.htm"
+server="http://zitscomics.com/comics/$(date -d "$daysago days ago" +%B-%-d-%Y | tr '[:upper:]' '[:lower:]')/"
+imgregex="http://safr.kingfeatures.com/idn/etv/zone/xml/content.php\?file=[A-Za-z0-9]+"
 useragent="Mozilla/4.76 [de] (X11; U; Linux 2.2.18 i586)"
 
 echo "Dateiname: $newn"
 echo
 echo "Hole zits von $server"
-echo "mit Referer: $referer"
 echo "fuer Datum: $(date -d"$daysago days ago" -I)"
 echo
 
+imgurl=$(wget ${wget_args} -U "$useragent" -O - "$server" | grep -o -E "$imgregex" | head -n1)
+
+echo "Url zum Bild ist: ${imgurl}"
+
 wget ${wget_args} -U "$useragent" \
-    --header="Referer: $referer" --max-redirect=0 \
-    -O "$newn" "$server" 
+    --header="Referer: $server" --max-redirect=0 \
+    -O "$newn" "$imgurl" 
 
 if [ -s "${tmp}/${newn}" ]; then
     if file "$newn" | grep GIF > /dev/null 2>&1; then
diff --git a/bin/gen.py b/bin/gen.py
index 1f8625f..fcd4f65 100755
--- a/bin/gen.py
+++ b/bin/gen.py
@@ -60,13 +60,18 @@ comics = {
         "claybennett": {
             "name": "Clay Bennett",
             "url": "http://www.csmonitor.com/commentary/index.html",
-            "imageformat": "gif"
+            "imageformat": "jpg"
             },
         "geekandpoke": {
             "name": "Geek and Poke",
             "url": "http://geekandpoke.typepad.com/",
             "imageformat": "jpg"
             },
+        "snoopy": {
+            "name": "Snoopy",
+            "imageformat": "gif",
+            "url": "http://www.gocomics.com/peanuts"
+            },
         }
 
 
diff --git a/etc/settings.sh b/etc/settings.sh
index 00947ac..8a149ba 100644
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -24,4 +24,4 @@ if [ ! -d "${image_dir}" ]; then
     mkdir -p "${image_dir}"
 fi
 
-wget_args="--timeout 100 --wait=1000 --random-wait --no-cache"
+wget_args="--timeout 100 --wait=10 --random-wait --no-cache"
-- 
cgit v1.2.3-1-g7c22