diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2012-05-09 18:34:48 +0000 |
|---|---|---|
| committer | root <root@vm-staticweb.spline.inf.fu-berlin.de> | 2012-05-09 18:34:48 +0000 |
| commit | 74583eda6f50745360c80e26f5e6513969425372 (patch) | |
| tree | eee79d57c0e63c7521e0cba5795f7556ea23c2f8 | |
| parent | 0b2ac3ce9f1a26798d4bd9493bc5cd2f392b457d (diff) | |
| download | comics-74583eda6f50745360c80e26f5e6513969425372.tar.gz comics-74583eda6f50745360c80e26f5e6513969425372.tar.bz2 comics-74583eda6f50745360c80e26f5e6513969425372.zip | |
bin/comics: externalize wget_args
| -rwxr-xr-x | bin/comics/calvin | 2 | ||||
| -rwxr-xr-x | bin/comics/claybennett | 6 | ||||
| -rwxr-xr-x | bin/comics/dilbert | 22 | ||||
| -rw-r--r-- | etc/settings.sh | 1 |
4 files changed, 7 insertions, 24 deletions
diff --git a/bin/comics/calvin b/bin/comics/calvin index 054cfbd..e723747 100755 --- a/bin/comics/calvin +++ b/bin/comics/calvin @@ -14,7 +14,7 @@ echo "Hole c+h von $server" echo "fuer Datum: $(date -d"$daysago days ago" -I)" echo -wget -t 0 --cache=off $server +wget ${wget_args} "$server" if [ -e "${tmp}/${nomen}" ]; then mv "${tmp}/${nomen}" "${image_dir}/$newn" diff --git a/bin/comics/claybennett b/bin/comics/claybennett index ba6e4dd..5862d1a 100755 --- a/bin/comics/claybennett +++ b/bin/comics/claybennett @@ -12,10 +12,10 @@ rss="http://www.timesfreepress.com/rss/headlines/opinion/cartoons/" rss_regex="<pubDate>${date}[^<]*</pubDate><guid>[^<]*</guid>" url_regex=".*<guid>\([^<]*\)</guid>.*" -post=$(wget -O - "${rss}" | grep "${rss_regex}" | sed "s#${url_regex}#\1#") +post=$(wget ${wget_args} -O - "${rss}" | grep "${rss_regex}" | sed "s#${url_regex}#\1#") # get img url from post -img=$(wget -O - "${post}" | grep '<div class="story_lead_photo">' -A 3 | \ +img=$(wget ${wget_args} -O - "${post}" | grep '<div class="story_lead_photo">' -A 3 | \ sed -n 's#.*<img.*src="\([^"]*\)".*#\1#p') echo "Hole claybennett von $server" @@ -23,7 +23,7 @@ echo "fuer Datum: $(date -d"$daysago days ago" -I)" echo "URL: $img" echo -wget -t 0 --cache=off "${img}" -O "${newn}" +wget ${wget_args} "${img}" -O "${newn}" echo ${image_dir} diff --git a/bin/comics/dilbert b/bin/comics/dilbert index 20fb22f..32689ec 100755 --- a/bin/comics/dilbert +++ b/bin/comics/dilbert @@ -9,25 +9,7 @@ webaddress="$server/strips/$(date -d"$daysago days ago" +%Y-%m-%d)/index.html" browser="Mozilla/4.06 [en] (X11; I; Linux 2.0.35 i586)" newn="${day}.gif" - -i=0 -while [ ! -e "index.html" ]; do - i=i+1 - - echo - echo "$i. Versuch:" - wget --wait=1000 -t 0 --cache=off --user-agent="$browser" "$webaddress" - - if [ "$i" = "10" ]; then - echo "Nach zehn Versuchen nichts bekommen. Break" - break - fi - - if [ ! -e "index.html" ]; then - echo Sleeping for 20 seconds ... - sleep 20 - fi -done +wget ${wget_args} --user-agent="$browser" "$webaddress" if [ -e index.html ]; then nomen=$(grep -A1 "strips/comic/$(date -d"$daysago days ago" -I)" index.html | \ @@ -39,7 +21,7 @@ if [ -e index.html ]; then echo "Hole dilbert von $nomen" echo "fuer Datum: $(date -d"$daysago days ago" -I)" echo - wget -t 0 --cache=off --user-agent="$browser" "$nomen" + wget ${wget_args} --user-agent="$browser" "$nomen" if [ -e "${tmp}/${gifname}" ]; then mv "${tmp}/${gifname}" "${image_dir}/$newn" diff --git a/etc/settings.sh b/etc/settings.sh index 4116d11..d1f5486 100644 --- a/etc/settings.sh +++ b/etc/settings.sh @@ -19,3 +19,4 @@ if [ ! -d "${image_dir}" ]; then mkdir -p "${image_dir}" fi +wget_args="--timeout 100 --wait=1000 --no-cache" |