--- comics/comics.conf	2013/07/17 12:44:38	1.7
+++ comics/comics.conf	2018/01/27 14:39:47	1.20
@@ -1,34 +1,73 @@
 #  This file is a CSV of what to download
+#
+#  $Id: comics.conf,v 1.20 2018/01/27 14:39:47 nick Exp $
+#  $Log: comics.conf,v $
+#  Revision 1.20  2018/01/27 14:39:47  nick
+#  Added Cyanide & Happiness
+#
+#  Revision 1.19  2018/01/26 13:05:27  nick
+#  Added a new config option to remove all newline from the resulting index.html
+#  file.  This allows for easier parsing for certain comics.  I then updated
+#  the URLs to search for and enabled the newline removal for a handful
+#  of uComics.
+#
+#  I believe I've also properly fixed the Comic Config version displayed on
+#  the webpage itself.
+#
+#  Revision 1.18  2017/08/17 12:32:42  nick
+#  Updated For Better or For Worse URL change.
+#
+#  Revision 1.17  2017/01/16 13:53:10  nick
+#  Fixed ucomic due to website change.
+#
+#  Revision 1.16  2015/10/22 12:58:44  nick
+#  Added the ability for Sunday only comics.  Stonesoup is no longer weekdays, this has been added to Sunday only.  I also added Foxtrot Classics for weekdays and Foxtrot for Sundays.
+#
 # 
 #  This will be placed in to a hash like this:
 #
-#                 "userfriendly" => {
-#                                url     =>      "http://www.userfriendly.org/",
-#                                search  =>      ".*Latest Strip.*(\/cartoons\/archives\/.*gif|png|jpg).*",
-#                                mode    =>      "1",
-#                                fullName=>      "User Friendly",
-#                                ext     =>      "gif",
-#                                order   =>	 "1",
-#                           },
-#  Note: error should always be 0, and ext can be left blank.  The script will try to determine what it is
-#        but will fallback to whatever is in there by default if it can't get it.
+#      "userfriendly" => {
+#          url     =>      "http://www.userfriendly.org/",
+#          search  =>      ".*Latest Strip.*(\/cartoons\/archives\/.*gif|png|jpg).*",
+#          mode    =>      "1",
+#          fullName=>      "User Friendly",
+#          ext     =>      "gif",
+#          order   =>	   "1",
+#          Sunday_only     => "1",
+#          remove_newlines => "0",
+#      },
+#  Note: error should always be 0, and ext can be left blank.  The script
+#  will try to determine what it is but will fallback to whatever is in 
+#  there by default if it can't get it.
 
 base_directory = /home/httpd/html/daily/work
 index_directory = indexes
 image_directory = images
 
-dilbert,http://www.dilbert.com,.*textarea class=\"STR_EmbedCode\".*<img src=\"(.*gif|jpg)\" border.*,1,Dilbert,gif
-babyblues,http://www.arcamax.com/thefunnies/babyblues/,img src=\"(/newspics/.*gif)\",1,Baby Blues,gif
-userfriendly,http://www.userfriendly.org/,.*Latest Strip.*(\/cartoons\/archives\/.*gif|png|jpg).*,1,User Friendly,gif
-luann,http://www.arcamax.com/thefunnies/luann/,img src=\"(/newspics/.*gif)\",1,Luann,gif
-andycapp,http://www.arcamax.com/thefunnies/andycapp/,img src=\"(/newspics/.*gif)\",1,Andy Capp,gif
-fbofw,http://www.ucomics.com/fbofw,http://images.ucomics.com/comics/fb/__year__/fb__year2____mon2____day2__.__ext__,2,For Better or For Worse,gif
-stonesoup,http://www.ucomics.com/stonesoup,http://images.ucomics.com/comics/ss/__year__/ss__year2____mon2____day2__.__ext__,2,StoneSoup,gif
-xkcd,http://xkcd.com,.*embedding\): (.*\.png).*,1,xkcd,png
-penny_arcade,http://penny-arcade.com/comic,.\s*<img src=\"(.*com\/photos.*)\" alt.*,1,Penny Arcade,png
-questionable_content,http://questionablecontent.net/,<img id=\"strip\" src=\"(.*)\">.*,1,Questionable Content,gif
-hagar_the_horrible,http://www.arcamax.com/thefunnies/hagarthehorrible/,img src=\"(/newspics/.*gif)\",1,Hagar the Horrible,gif
-the_lockhorns,http://www.arcamax.com/thefunnies/thelockhorns/,img src=\"(/newspics/.*gif)\",1,The Lockhorns,gif
-zits,http://www.arcamax.com/thefunnies/zits/,img src=\"(/newspics/.*gif)\",1,Zits,gif
-blondie,http://www.arcamax.com/thefunnies/blondie/,img src=\"(/newspics/.*gif)\",1,Blondie,gif
-wizard_of_id,http://www.arcamax.com/thefunnies/wizardofid/,img src=\"(/newspics/.*gif)\",1,Wizard Of Id,gif
+cyanideandhappiness,http://explosm.net/comics/latest/,.*erty=\"og:image\" content=\"(.*)\">.*,1,Cyanide & Happiness,gif,0,0,1
+
+forbetterorforworse,http://www.ucomics.com/forbetterorforworse,.*og:image.*(htt.*assets.amuniversal.*)\" ,1,For Better or For Worse,gif,1,0,1
+
+foxtrot,http://www.ucomics.com/foxtrot,.*og:image.*(htt.*assets.amuniversal.*)\" ,1,FoxTrot,gif,1,1,1
+foxtrotclassics,http://www.ucomics.com/foxtrotclassics,.*og:image.*(htt.*assets.amuniversal.*)\" ,1,FoxTrot Classics,gif,0,0,1
+dilbert,http://www.dilbert.com/strip/__YEAR__-__MON__-__DAY__,<meta property=\"og:image\" content=\"(.*?)\"\/>,1,Dilbert,gif,1,0
+sallyforth,http://sallyforth.com,<meta property=\"og:image\" content=\"(.*?)\"\/>,1,Sally Forth,gif,0,0
+bizarro,http://www.arcamax.com/thefunnies/bizarro/,data-zoom-image=\"(.*/newspics/.*/\d+\.(?:gif|jpg))\".*src,1,Bizarro,gif,0,0
+pbs,http://www.arcamax.com/thefunnies/pearlsbeforeswine/,data-zoom-image=\"(.*/newspics/.*/\d+\.(?:gif|jpg))\".*src,1,Pearls Before Swine,gif,0,0
+questionable_content,http://questionablecontent.net/,<img src=\"(http:\/\/www.questionablecontent.net\/comics\/.*.[png|gif])\">.*,1,Questionable Content,gif,1,0
+babyblues,http://www.arcamax.com/thefunnies/babyblues/,data-zoom-image=\"(.*/newspics/.*/\d+\.(?:gif|jpg))\".*src,1,Baby Blues,gif,0,0
+luann,http://www.arcamax.com/thefunnies/luann/,data-zoom-image=\"(.*/newspics/.*/\d+\.(?:gif|jpg))\".*src,1,Luann,gif,0,0
+andycapp,http://www.arcamax.com/thefunnies/andycapp/,data-zoom-image=\"(.*/newspics/.*/\d+\.(?:gif|jpg))\".*src,1,Andy Capp,gif,0,0
+stonesoup,http://www.ucomics.com/stonesoup/,.*og:image.*(htt.*assets.amuniversal.*)\" ,1,StoneSoup,gif,1,1,1
+xkcd,http://xkcd.com,.*embedding\): (.*\.png).*,1,xkcd,png,1,0
+questionable_content,http://questionablecontent.net/,<img src=\"(http:\/\/www.questionablecontent.net\/comics\/.*.[png|gif])\">.*,1,Questionable Content,gif,0,0
+the_lockhorns,http://www.arcamax.com/thefunnies/thelockhorns/,data-zoom-image=\"(.*/newspics/.*/\d+\.(?:gif|jpg))\".*src,1,The Lockhorns,gif,0,0
+zits,http://www.arcamax.com/thefunnies/zits/,data-zoom-image=\"(.*/newspics/.*/\d+\.(?:gif|jpg))\".*src,1,Zits,gif,0,0
+
+#### OLD COMICS ####
+#dilbert,http://www.dilbert.com,.*textarea class=\"STR_EmbedCode\".*<img src=\"(.*gif|jpg)\" border.*,1,Dilbert,gif,1
+#userfriendly,http://www.userfriendly.org/,.*Latest Strip.*(\/cartoons\/archives\/.*gif|png|jpg).*,1,User Friendly,gif
+#penny_arcade,http://penny-arcade.com/comic,.\s*<img src=\"(.*com\/photos.*)\" alt.*,1,Penny Arcade,png
+#blondie,http://www.arcamax.com/thefunnies/blondie/,img src=\"(.*/newspics/.*gif)\",1,Blondie,gif,0
+#wizard_of_id,http://www.arcamax.com/thefunnies/wizardofid/,img src=\"(.*/newspics/.*gif)\",1,Wizard Of Id,gif,0
+#hagar_the_horrible,http://www.arcamax.com/thefunnies/hagarthehorrible/,img src=\"(.*/newspics/.*gif)\",1,Hagar the Horrible,gif,0