--- comics/fetch.pl.new	2013/01/10 14:25:57	1.7
+++ comics/fetch.pl.new	2015/05/07 12:31:43	1.18
@@ -1,23 +1,44 @@
 #!/usr/bin/perl -w
 
+###############################################################################
+# $Log: fetch.pl.new,v $
+# 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 Date::Calc qw/Date_to_Text_Long Today/;
 
 ## 
 ## Some default values
 ##
-my $ver		= q/$Id: fetch.pl.new,v 1.7 2013/01/10 14:25:57 nick Exp $/;
+my $ver		= '$Id: fetch.pl.new,v 1.18 2015/05/07 12:31:43 nick Exp $';
 my $comicFile   = "comics.conf";
 my %comics	= &readComicConfig ( $comicFile );
-my $days_ago    = 0;  # Set this to fetch comics from X days ago
+my %opts        = &fetchOptions( );
+my $days_ago    = $opts{'days'} || 0;
 my %dates 	= &fetchDates();
 my $baseDir     = $comics{'configs'}{'base_directory'} || ".";
 my $imageDir    = $baseDir . "/" . ( $comics{'configs'}{'image_directory'} || "images" ) . 
 		  "/$dates{'mon2'}$dates{'year2'}";
 my $indexDir    = $baseDir . "/" . ( $comics{'configs'}{'index_directory'} || "indexes" );
 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";
@@ -31,16 +52,22 @@ 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 );
-}
 
-my $D  = `date +%d`; chomp $D;
-print "Finding in $imageDir/*-$D.jpg\n";
-foreach my $file ( glob( "$imageDir/*-$D.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 ) 
@@ -89,15 +116,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+(.*)/ ) {
@@ -113,8 +150,10 @@ sub readComicConfig ($$) {
 #######################################################################
 sub writeComic ($$) {
 	my ( $comics, $comic, $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 $content = <<EOF;
 
 <!-- ********* Begin $comic ($comics->{$comic}{'fullName'}) ******* -->
@@ -126,7 +165,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'}) ******* -->
@@ -167,8 +206,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";
@@ -205,9 +246,12 @@ sub checkDir ($$) {
 #######################################################################
 sub writeTitle ($$) {
 	my ( $date ) = @_;
-	my $indexFile = $indexDir . "/index-" . $date->{'year2'} . $date->{'mon2'} .
-                         $date->{'day2'} . ".html";
-	my $today     = $date->{'mon'} . "/" . $date->{'day'} . "/" . $date->{'year'};
+	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;
@@ -216,11 +260,19 @@ 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">
+<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);
 }
@@ -237,7 +289,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);
 }
 
@@ -268,10 +321,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
@@ -282,7 +335,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;
 	}
@@ -315,10 +368,7 @@ sub parseComic ($$) {
 sub fetchDates () {
 	my %dates = ();
 
-	($dates{'day'}, $dates{'mon'}, $dates{'year'}, $dates{'dow'}) = (localtime)[3,4,5,6];
-
-	## If you missed a day or two, reflect it here:
-	$dates{'day'} -= $days_ago;  ## <-- 5 days ago
+	($dates{'day'}, $dates{'mon'}, $dates{'year'}, $dates{'dow'}) = (localtime(time - (86400 * $days_ago )))[3,4,5,6];
 
 	$dates{'year'} += 1900;
 	$dates{'year2'} = substr $dates{'year'}, 2, 2;
@@ -328,3 +378,59 @@ sub fetchDates () {
 
 	return %dates;
 }
+
+###############################################################################
+##
+## &fetchOptions( );
+##
+##      Grab our command line arguments and toss them in to a hash
+##
+###############################################################################
+sub fetchOptions {
+        my %opts;
+
+        &GetOptions(
+                        "days:i"        => \$opts{'days'},
+                        "help|?"        => \$opts{'help'},
+                        "man"           => \$opts{'man'},
+                   ) || &pod2usage( );
+        &pod2usage( ) if defined $opts{'help'};
+        &pod2usage( { -verbose => 2, -input => \*DATA } ) if defined $opts{'man'};
+
+        return %opts;
+}
+
+__END__
+
+=head1 NAME
+
+fetch.pl - Fetches comics and places them all locally in a single html file.
+
+=head1 SYNOPSIS
+
+fetch.pl [options]
+
+Options:
+        --days,d        Fetch comics from X days ago
+        --help,?        Display the basic help menu
+        --man,m         Display the detailed man page
+
+=head1 DESCRIPTION
+
+=head1 HISTORY
+
+=head1 AUTHOR
+
+Nicholas DeClario <nick@declario.com>
+
+=head1 BUGS
+
+This is a work in progress.  Please report all bugs to the author.
+
+=head1 SEE ALSO
+
+=head1 COPYRIGHT
+
+=cut
+
+