--- comics/fetch.pl.new	2013/03/12 13:09:34	1.13
+++ comics/fetch.pl.new	2018/02/06 14:31:06	1.24
@@ -1,16 +1,62 @@
 #!/usr/bin/perl -w
 
+###############################################################################
+# $Log: fetch.pl.new,v $
+# Revision 1.24  2018/02/06 14:31:06  nick
+# A status report is now generated in JSON that can easily be scanned so that
+# I can be alerted when there are failures that I miss if I don't read the
+# comics that day.
+#
+# Revision 1.23  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.22  2017/12/05 13:37:40  nick
+# Added the CVS config version to the outpuit.
+#
+# Revision 1.21  2015/10/26 14:25:40  nick
+# Fixed a bug that was improperly including the day of week string preventing the weekend comics from fetching proproperly.
+#
+# Revision 1.20  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.
+#
+# Revision 1.19  2015/07/13 12:56:58  nick
+# Added Sally Forth and Pearls Before Swine.  Adding Sally Forth required a change in the 'wget' command for fetching the index file to include 'user-agent' and 'referer'.
+#
+# Revision 1.18  2015/05/07 12:31:43  nick
+# Added favicon
+#
+# Revision 1.17  2015/02/19 14:56:10  nick
+# Fixed a problem that forced everything to JPG.  This would kill GIF animations, but would not display the gifs either because 'convert' appends an index number to the end of the file name for each from of the GIF animation.  I fixed this to maintain GIF compatibilty as well as rewritting how the script fetches the size of the file.  Additionally, I updated the configuration for Questionable Content to search for GIF or JPG, which is what triggered this entire update.
+#
+# Revision 1.16  2015/02/05 18:05:58  nick
+# Changed the background and added a fancy title.
+#
+# Revision 1.15  2015/01/19 13:46:19  nick
+# *** empty log message ***
+#
+###############################################################################
+
 use strict;
 use File::Path;
 use Data::Dumper;
 use Pod::Usage;
 use Getopt::Long;
+use JSON::Create 'create_json';
+use Date::Calc qw/Date_to_Text_Long Today Day_of_Week Day_of_Week_to_Text/;
 
 ## 
 ## Some default values
 ##
-my $ver		= q/$Id: fetch.pl.new,v 1.13 2013/03/12 13:09:34 nick Exp $/;
+my $ver		= '$Id: fetch.pl.new,v 1.24 2018/02/06 14:31:06 nick Exp $';
 my $comicFile   = "comics.conf";
+my $comicConfigVer = "Unknown";
+my $reportFile = "/home/httpd/html/daily/comics/status_report.json";
 my %comics	= &readComicConfig ( $comicFile );
 my %opts        = &fetchOptions( );
 my $days_ago    = $opts{'days'} || 0;
@@ -22,7 +68,6 @@ my $indexDir    = $baseDir . "/" . ( $co
 my $USER_AGENT  = "Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.18) Gecko/20110628 Ubuntu/10.10 (maverick) Firefox/3.6.18";
 my @days        = qw/ Sunday Monday Tuesday Wednesday Thursday Friday Saturday /;
 
-
 my $DATE=`date`; chomp $DATE;
 print STDOUT "Starting comic fetch at $DATE\n";
 
@@ -34,16 +79,37 @@ print STDOUT "Starting comic fetch at $D
 &writeTitle ( \%dates );
 
 foreach my $comic ( sort keys %comics ) {
+
+  ## Skip if this is Sunday and the comic is weekdays only
   next if ( $comic =~ m/config/ );
+  if (($dates{'wday'} eq "Sunday") && 
+      ($comics{$comic}{'sunday'} == 0)) {
+    print "Skipping '$comic'; Weekdays only.\n";
+    next;
+  }
+
+  ## Skip if Sunday only comic and it's not Sunday.
+  if (($dates{'wday'} ne "Sunday") &&
+      ($comics{$comic}{'sunday_only'} == 1)) {
+    print "Skipping '$comic' ($comics{$comic}{'sunday_only'}); Sunday only.\n";
+    next
+  }
+
   $comics{$comic}{'error'} = &downloadComic ( \%comics, $comic, \%dates );
   &writeComic ( \%comics, $comic, \%dates );
-}
 
-print "Finding in $imageDir/*-$dates{'day2'}.jpg\n";
-foreach my $file ( glob( "$imageDir/*-$dates{'day2'}.jpg" ) ) 
-{
-	my $size = `/usr/bin/identify $file`;
-	$size =~ s/.*\s(\d+)x\d+.*/$1/;
+    my $file = "$imageDir/$comic-$dates{'day2'}.$comics{$comic}{'ext'}";
+    my $size = 0;    
+
+    my $cmd = "/usr/bin/identify -verbose $file|";
+    open(IMG, $cmd) || die ("Can't open: $!\n");
+    while(<IMG>) {
+        if ($_ =~ m/^\s+geometry:\s+(\d+)x\d+.*/i) {
+            $size = $1 if ( $size == 0);
+        }
+    }
+    close(IMG);
+
 
 	system( "/usr/bin/convert -resize 640 $file $file" )
 		if ( $size > 640 ) 
@@ -53,6 +119,9 @@ foreach my $file ( glob( "$imageDir/*-$d
 
 &writeFooter( \%dates );
 
+print STDOUT "Status written to $reportFile.\n"
+    if (&writeStatusReportJSON(\%comics, $reportFile));
+
 $DATE=`date`;  chomp( $DATE );
 print STDOUT "Completed comic fetch at $DATE\n";
 
@@ -92,15 +161,31 @@ sub readComicConfig ($$) {
 	my %comicConfig   = ( );
 	my %config        = ( );
 
+    my ($year, $mon, $day) =( localtime(time))[5,4,3];
+    $year += 1900;
+    $mon = sprintf("%02d", ($mon + 1));
+    $day = sprintf("%02d", $day);
+
 	open FILEN, "<$comicFile";
 		while (<FILEN>) {
+            #if ($_ =~ m/^#.* \$[Ii][Dd]: fetch.pl.new,v 1.23 2018/01/26 13:05:27 nick Exp $/) {
+            if ($_ =~ m/^#.* \$[Ii][dD]: .*,v\ (.*)\ \d{4}\/.*\$$/) {
+                $comicConfigVer = $1;
+            }
 			if ( ( $_ !~ m/^#/ ) && ( $_ =~ m/,.*,/) ){
+                $_ =~ s/__YEAR__/$year/g;
+                $_ =~ s/__MON__/$mon/g;
+                $_ =~ s/__DAY__/$day/g;
+                
 				my @res = split /,/, $_;
 				$comicConfig{$res[0]}{'url'} 	  = $res[1];
 				$comicConfig{$res[0]}{'search'}   = $res[2];
 				$comicConfig{$res[0]}{'mode'} 	  = $res[3];
 				$comicConfig{$res[0]}{'fullName'} = $res[4];
 				$comicConfig{$res[0]}{'ext'} 	  = $res[5];
+                $comicConfig{$res[0]}{'sunday'}   = sprintf("%d", $res[6] || 1);
+                $comicConfig{$res[0]}{'sunday_only'} = sprintf("%d", $res[7] || 0);
+                $comicConfig{$res[0]}{'remove_newlines'} = sprintf("%d", $res[8] || 0);
 				$comicConfig{$res[0]}{'error'} 	  = 0;
 			}
 			elsif ( $_ =~ m/(.*)\s+=\s+(.*)/ ) {
@@ -114,6 +199,36 @@ sub readComicConfig ($$) {
 
 #######################################################################
 #######################################################################
+sub writeStatusReportJSON ($$) {
+	my ( $comicsRef, $filename ) = @_;
+    my %comics = %$comicsRef;
+    my %json = ('date' => $DATE, 'comics' => []);
+    my $totalErrors = 0;
+
+    foreach my $comic (sort keys %comics) {
+      next unless $comics{$comic}{'fullName'};
+      if ($comics{$comic}{'error'}) {
+        my %error = ('comicName' => "$comics{$comic}{'fullName'}",
+                     'error' => "$comics{$comic}{'error'}",
+                     'status' => "Error");
+        push $json{'comics'}, \%error;
+        $totalErrors += 1;
+      } else {
+        my %status = ('comicName' => "$comics{$comic}{'fullName'}",
+                      'error' => 0,
+                      'status' => "Successfull");
+        push $json{'comics'}, \%status;
+      }
+    }
+    $json{'totalErrors'} = $totalErrors;    
+
+    open SR, ">$filename" or die ("ERROR: Failed to create status report: $!\n");
+    print SR create_json (\%json);
+    close(SR); 
+}
+
+#######################################################################
+#######################################################################
 sub writeComic ($$) {
 	my ( $comics, $comic, $date ) = @_;
 	my $sd = substr( join( '', $days[$date->{'dow'}] ), 0, 3 );
@@ -131,7 +246,7 @@ sub writeComic ($$) {
 		$comics->{$comic}{'url'}
 	</a>
 </font><br/>
-<img src="../images/$date->{'mon2'}$date->{'year2'}/$comic-$date->{'day2'}.jpg" alt="$comic-$date->{'day2'}" />
+<img src="../images/$date->{'mon2'}$date->{'year2'}/$comic-$date->{'day2'}.$comics->{$comic}{'ext'}" alt="$comic-$date->{'day2'}" />
 <br/><br/>
 </td></tr>
 <!-- ********* Finish $comic ($comics->{$comic}{'fullName'}) ******* -->
@@ -185,6 +300,7 @@ sub writeFooter {
 <font size="2">
 Generated on: <font color="green">$sysDate</font><br/>
 Version: <font color="green">$ver</font><br />
+Config Version: <font color="green">$comicConfigVer</font><br />
 CVS: <a href="http://demandred.dyndns.org/cgi-bin/cvsweb/comics/">http://demandred.dyndns.org/cgi-bin/cvsweb/comics/</a>
   <p>
     <a href="http://validator.w3.org/check?uri=referer"><img
@@ -217,6 +333,7 @@ sub writeTitle ($$) {
 			$date->{'mon2'} . $date->{'day2'} . "-" . 
 			$sd . ".html";
 	my $today     = $days[$date->{'dow'}] . " " . $date->{'mon'} . "/" . $date->{'day'} . "/" . $date->{'year'};
+    my $today_long = Date_to_Text_Long(Today());
 
 	open INDEX, ">$indexFile";
 	print INDEX <<EOF;
@@ -226,11 +343,18 @@ sub writeTitle ($$) {
 <head>
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <link href="/daily/comics/comics.css" type="text/css" rel="stylesheet" media="screen">
+<link rel="shortcut icon" href="./favicon.ico">
     <title>Daily Comics for $today</title>
   </head>
 <body bgcolor="#FFFFFF">
-<h1>Daily Comics for $today</h1>
 <table align="center" cellpadding="5" cellspacing="0">
+<tr><td>
+<table cellpadding="0" cellspacing="0" border="0">
+<tr><td align="Left"><img src="images/daily_comics_heading01.png"></td></tr>
+<tr><td align="left">$today_long</td></tr>
+<tr><td>&nbsp;</td></tr>
+</td</tr>
+
 EOF
 	close (INDEX);
 }
@@ -247,7 +371,8 @@ sub directDownload ($$) {
         my $cDir  = $date->{'mon2'} . $date->{'year2'};
         my $cDate = $date->{'day2'};
 
-	my $cmd = "wget -q $file --referer=\"" . $comics->{$comic}{'url'} ."\" --user-agent=\"$USER_AGENT\" -O - | /usr/bin/convert - jpeg:images/$cDir/$comic-$cDate.jpg";
+    	my $cmd = "wget -q $file --referer=\"" . $comics->{$comic}{'url'} ."\" --user-agent=\"$USER_AGENT\" -O - | /usr/bin/convert - jpeg:images/$cDir/$comic-$cDate.jpg";
+
         return system($cmd);
 }
 
@@ -258,13 +383,20 @@ sub indexDownload ($$) {
 	my ( @lines, $comicLine, $mainURL );
 	my $comicIndex = "indexes/index.$comic";
 
-	`wget -q $comics->{$comic}{'url'} -O $comicIndex`;
+    my $wget_cmd = "wget -q --referer=\"$comics->{$comic}{'url'}\" " .
+                   "--user-agent=\"$USER_AGENT\" " .
+                   "$comics->{$comic}{'url'} -O $comicIndex";
+    system($wget_cmd);
 
 	if ( ! open FILEN, "<$comicIndex" ) {  
         	return "ERROR: Can't open index file for " . $comics->{$comic}{'fullName'} . 
 		       " (" . $comics->{$comic}{'url'} . ")"; 
 	} 
-		@lines = <FILEN>;
+    while (<FILEN>) {
+        my $line = $_;
+        $line =~ s/\R|\ \ +|\t//g if ( $comics->{$comic}{'remove_newliens'} );
+    	push @lines, $line;
+    }
 	close (FILEN);	
 
 	unlink ("$comicIndex");
@@ -278,10 +410,10 @@ sub indexDownload ($$) {
 	## Find the comic strip URL based on the specified regex in the search
 	##
 	foreach my $line (@lines) {
-		if ( $line =~ m/$comics->{$comic}{'search'}/ ) {
+		if ( $line =~ m/$comics->{$comic}{'search'}/i ) {
 			$comicLine = $1; chomp $comicLine;
 		}
-        }
+    }
 
 	##
 	## Save the file to the appropriate directory
@@ -292,7 +424,7 @@ sub indexDownload ($$) {
 	if ( $comicLine ) {
 		if ( $comicLine =~ m/(gif|jpg|png)/i ) { $comics->{$comic}{'ext'} = $1; }
 		my $comicURL = ( $comicLine =~ m/http/ ) ? $comicLine : $mainURL . $comicLine;
-		my $cmd = "wget --user-agent=\"$USER_AGENT\" --referer=\"" . $comics->{$comic}{'url'} . "\" -q $comicURL -O - | /usr/bin/convert - jpeg:images/$cDir/$comic-$cDate.jpg";
+		my $cmd = "wget --user-agent=\"$USER_AGENT\" --referer=\"" . $comics->{$comic}{'url'} . "\" -q $comicURL -O images/$cDir/$comic-$cDate.$comics->{$comic}{'ext'}";
 		system( $cmd );
 		return 0;
 	}
@@ -332,6 +464,8 @@ sub fetchDates () {
 	$dates{'day2'}  = ( $dates{'day'} < 10 ) ? "0" . $dates{'day'} : $dates{'day'}; 
 	$dates{'mon'}++;
 	$dates{'mon2'}  = ( $dates{'mon'} < 10 ) ? "0".$dates{'mon'} : $dates{'mon'};
+    my @days = qw/ Sunday Monday Tuesday Wednesday Thursday Friday Saturday /;
+    $dates{'wday'} = $days[$dates{'dow'}];
 
 	return %dates;
 }