--- comics/fetch.pl.new	2013/02/25 13:48:21	1.9
+++ comics/fetch.pl.new	2015/02/05 18:05:58	1.16
@@ -1,15 +1,27 @@
 #!/usr/bin/perl -w
 
+###############################################################################
+# $Log: fetch.pl.new,v $
+# 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 Date::Calc qw/Date_to_Text_Long Today/;
+
 ## 
 ## Some default values
 ##
-my $ver		= q/$Id: fetch.pl.new,v 1.9 2013/02/25 13:48:21 nick Exp $/;
+my $ver		= '$Id: fetch.pl.new,v 1.16 2015/02/05 18:05:58 nick Exp $';
 my $comicFile   = "comics.conf";
 my %comics	= &readComicConfig ( $comicFile );
 my %opts        = &fetchOptions( );
@@ -22,7 +34,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";
 
@@ -35,6 +46,8 @@ print STDOUT "Starting comic fetch at $D
 
 foreach my $comic ( sort keys %comics ) {
   next if ( $comic =~ m/config/ );
+  if ( ( $dates{'day2'} eq "Sunday" ) && 
+       ( $comics{$comic}{'sunday'} == 0 ) ) { print "Skipping.\n"; next; }
   $comics{$comic}{'error'} = &downloadComic ( \%comics, $comic, \%dates );
   &writeComic ( \%comics, $comic, \%dates );
 }
@@ -92,15 +105,25 @@ 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/^#/ ) && ( $_ =~ 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'}   = $res[6] || 1;
 				$comicConfig{$res[0]}{'error'} 	  = 0;
 			}
 			elsif ( $_ =~ m/(.*)\s+=\s+(.*)/ ) {
@@ -116,9 +139,10 @@ sub readComicConfig ($$) {
 #######################################################################
 sub writeComic ($$) {
 	my ( $comics, $comic, $date ) = @_;
-	my $indexFile = $indexDir . "/index-" . $days[$date->{'dow'}] .
-                        "-" . $date->{'year2'} . $date->{'mon2'} .
-                        $date->{'day2'} . ".html";
+	my $sd = substr( join( '', $days[$date->{'dow'}] ), 0, 3 );
+	my $indexFile = $indexDir . "/index-" . $date->{'year2'} . 
+			$date->{'mon2'} . $date->{'day2'} . "-" . 
+			$sd . ".html";
 	my $content = <<EOF;
 
 <!-- ********* Begin $comic ($comics->{$comic}{'fullName'}) ******* -->
@@ -171,8 +195,10 @@ sub writeMainIndex ($$) {
 #######################################################################
 sub writeFooter {
 	my ( $date ) = @_;
-	my $indexFile = $indexDir . "/index-" . $date->{'year2'} . $date->{'mon2'} .
-                        $date->{'day2'} . ".html";
+	my $sd = substr( join( '', $days[$date->{'dow'}] ), 0, 3 );
+	my $indexFile = $indexDir . "/index-" . $date->{'year2'} . 
+			$date->{'mon2'} . $date->{'day2'} . "-" . 
+			$sd . ".html";
 	my $sysDate = `date`;
 
 	open INDEX, ">>$indexFile";
@@ -209,9 +235,12 @@ sub checkDir ($$) {
 #######################################################################
 sub writeTitle ($$) {
 	my ( $date ) = @_;
-	my $indexFile = $indexDir . "/index-" . $date->{'year2'} . $date->{'mon2'} .
-                         $date->{'day2'} . ".html";
+	my $sd = substr( join( '', $days[$date->{'dow'}] ), 0, 3 );
+	my $indexFile = $indexDir . "/index-" . $date->{'year2'} . 
+			$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;
@@ -220,11 +249,18 @@ sub writeTitle ($$) {
 <html xmlns="http://www.w3.org/1999/xhtml">
 <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">
     <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);
 }
@@ -242,6 +278,7 @@ sub directDownload ($$) {
         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";
+
         return system($cmd);
 }