From 597527698d9bc2d52e05b4335c5f7cc52867c306 Mon Sep 17 00:00:00 2001 From: Phillip Berndt Date: Tue, 28 Jun 2016 14:50:49 +0200 Subject: Fixed several comics --- bin/comics/MANvsMAGIC | 46 ---------------------------------------------- bin/comics/claybennett | 15 ++------------- bin/comics/cyanide | 2 +- bin/comics/jeremykaye | 39 --------------------------------------- bin/comics/smbc | 23 ++++++++++------------- bin/comics/zits | 4 ++-- 6 files changed, 15 insertions(+), 114 deletions(-) delete mode 100755 bin/comics/MANvsMAGIC delete mode 100755 bin/comics/jeremykaye diff --git a/bin/comics/MANvsMAGIC b/bin/comics/MANvsMAGIC deleted file mode 100755 index a1aa77c..0000000 --- a/bin/comics/MANvsMAGIC +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash - -if [ -z "$1" -o ! -d "$1" ]; then - echo "Usage: $0 []" 1>&2 - exit 1 -fi - -top="${1}" -shift - -source "${top}/etc/settings.sh" -tmp="$(mktemp -d)" -cd "${tmp}" - -browser="Mozilla/4.76 [de] (X11; U; Linux 2.2.18 i586)" - -TARGET_URL=$(wget ${wget_args} -q -U "$browser" "http://www.manvsmagic.com/archive/" -O - | sed -nre "s#.+href=\"(/`date -d "$daysago days ago" +%Y/%m/%d`/[^\"]+)\".+#\1#p") -newn="${day}.png" - -if [ -n "$TARGET_URL" ]; then - echo "Found $TARGET_URL" - wget ${wget_args} -U "$browser" http://www.manvsmagic.com$TARGET_URL -q -O index.html - - IMG_URL=`sed -nre 's#.+img src="(/images/[^"]+)".+#\1#p' index.html` - if [ -n "$IMG_URL" ]; then - IMG_URL=http://www.manvsmagic.com$IMG_URL - ALT=`sed -nre 's#.+img src="/images.+alt="([^"]+).+#\1#p' index.html` - - echo "Img is $IMG_URL" - echo "Alt is $ALT" - - wget ${wget_args} -U "$browser" -O "${tmp}/${newn}" --header="Referer: http://www.manvsmagic.com/" "$IMG_URL" - - if [ -s "${tmp}/${newn}" ]; then - mv "${tmp}/${newn}" "${image_dir}/$newn" - echo "$ALT" > "${image_dir}/${day}.alt" - - # update symlinks - rm -f "${comic_dir}/latest.png" "${comic_dir}/latest.title" "${comic_dir}/latest.alt" - ln -s "${image_offset}/$newn" "${comic_dir}/latest.png" - ln -s "${image_offset}/${day}.alt" "${comic_dir}/latest.alt" - fi - fi -fi - -rm -rf ${tmp} diff --git a/bin/comics/claybennett b/bin/comics/claybennett index 3ea8ed3..b698b39 100755 --- a/bin/comics/claybennett +++ b/bin/comics/claybennett @@ -13,21 +13,10 @@ tmp="$(mktemp -d)" cd "${tmp}" export LC_ALL=C -date="$(date -d "$daysago days ago" +"%a, %d %b %Y")" +date="$(date -d "$daysago days ago" +"%Y/%b/%d/" | tr "[:upper:]" "[:lower:]")" newn="${day}.jpg" -# get post link -rss="http://www.timesfreepress.com/rss/headlines/opinion/cartoons/" -rss_regex="${date}[^<]*[^<]*" -url_regex=".*\([^<]*\).*" - -post=$(wget ${wget_args} -O - "${rss}" | grep "${rss_regex}" | sed "s#${url_regex}#\1#") - -if [ -n "${post}" ]; then - # get img url from post - img=$(wget ${wget_args} -O - "${post}" | grep '
' -A 3 | \ - sed -n 's#.*" | sed -nre 's#.+src=\"([^\"]+).+#\1#p' | head -1) if [ -n "${img}" ]; then echo "Hole claybennett von $server" diff --git a/bin/comics/cyanide b/bin/comics/cyanide index 969a44d..90e536d 100755 --- a/bin/comics/cyanide +++ b/bin/comics/cyanide @@ -19,7 +19,7 @@ year=`date -d "$daysago days ago 00:00:00" +%Y` month=`date -d "$daysago days ago 00:00:00" +%m` day=`date -d "$daysago days ago 00:00:00" +%d` -part=`curl -s "http://explosm.net/comics/archive/$year/$month" | sed -nre "s#.+/comics/([0-9]+)\">$year.$month.$day.+#\1#p"` +part=`curl -s "http://explosm.net/comics/archive/$year/$month" | sed -nre "s#.+/comics/([0-9]+)/?\">$year.$month.$day.+#\1#p"` if [ -z "$part" ]; then echo "Cyanide and Happyness: Kein Comic für $year, $month $day" rm -rf "${tmp}" diff --git a/bin/comics/jeremykaye b/bin/comics/jeremykaye deleted file mode 100755 index abe0150..0000000 --- a/bin/comics/jeremykaye +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -if [ -z "$1" -o ! -d "$1" ]; then - echo "Usage: $0 []" 1>&2 - exit 1 -fi - -top="${1}" -shift - -source "${top}/etc/settings.sh" -tmp="$(mktemp -d)" -cd "${tmp}" - -export LC_ALL=C - -searchdate="$(date -d "$daysago days ago" "+%b %d, %Y")" - -echo "searching on $searchdate" - -posturl="$(wget -O - http://jeremykaye.tumblr.com/archive | sed -nre "s#.*(http://[^\"]+)\">.+post_date\">${searchdate}.*#\1#p")" - -echo "post url: $posturl" - -if [ -n "$posturl" ]; then - read URL TITLE <'$SEARCH_DATE | sed -nre 's#value="([^"]+).+#\1#p' | head -n1` +SEARCH_DATE=`date -d "$daysago days ago 00:00:00" +"%B %d, %Y"` -if [ -n "$CID" ]; then - echo "CID is '$CID'" - COMIC_LINE=`wget ${wget_args} -O - "http://www.smbc-comics.com/index.php?id="$CID | grep 'id="comicbody"'` - echo "Comic line is $COMIC_LINE" +echo Search for: $SEARCH_DATE - COMIC_URL=`sed -nre 's#.+src="(comics/.+.png)".+#\1#p' <<<$COMIC_LINE` - COMIC_TITLE=`sed -nre 's#.+title="([^"]+)".+#\1#p' <<<$COMIC_LINE` +SYM=$(wget ${wget_args} -O - "http://www.smbc-comics.com/comic/archive" | sed -nre "s#.+