From 78772fbebff9cc6325f7a712fc835fabafaa3e3e Mon Sep 17 00:00:00 2001 From: Phillip Berndt Date: Tue, 26 May 2015 09:48:27 +0200 Subject: SMBC: Fixed with new format --- bin/comics/smbc | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/bin/comics/smbc b/bin/comics/smbc index a83e242..ff5a305 100755 --- a/bin/comics/smbc +++ b/bin/comics/smbc @@ -16,12 +16,31 @@ export LANG=C export LC_ALL=C export LC_TIME=C -wget ${wget_args} -O "$day.png" "http://www.smbc-comics.com/comics/`date -d "$daysago days ago 00:00:00" +%Y%m%d`.png" +SEARCH_DATE=`date -d "$daysago days ago 00:00:00" +%b.%d.%y` +CID=`wget ${wget_args} -O - "http://www.smbc-comics.com/archives.php" | grep -oE 'value="([^"]+)">'$SEARCH_DATE | sed -nre 's#value="([^"]+).+#\1#p' | head -n1` -if [ -s "${day}.png" ]; then - mv ${day}.png "${image_dir}/$day.png" - rm -f "${comic_dir}/latest.png" - ln -s "${image_offset}/$day.png" "${comic_dir}/latest.png" +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" + + COMIC_URL=`sed -nre 's#.+src="(comics/.+.png)".+#\1#p' <<<$COMIC_LINE` + COMIC_TITLE=`sed -nre 's#.+title="([^"]+)".+#\1#p' <<<$COMIC_LINE` + + echo " url is $COMIC_URL" + echo " title is $COMIC_TITLE" + + if [ -n $COMIC_URL ]; then + wget ${wget_args} -O "$day.png" http://www.smbc-comics.com/$COMIC_URL + if [ -s "${day}.png" ]; then + mv ${day}.png "${image_dir}/$day.png" + echo "$COMIC_TITLE" > "${image_dir}/$day.title" + rm -f "${comic_dir}/latest.png" + ln -s "${image_offset}/$day.png" "${comic_dir}/latest.png" + fi + fi fi +echo "tmp" rm -rf "${tmp}" +echo "Done" -- cgit v1.2.3-1-g7c22