--- comics/fetch.pl.new	2011/08/18 12:39:12	1.1.1.1
+++ comics/fetch.pl.new	2011/09/23 01:36:54	1.4
@@ -7,7 +7,7 @@ use Data::Dumper;
 ## 
 ## Some default values
 ##
-my $ver		= q/$Id: fetch.pl.new,v 1.1.1.1 2011/08/18 12:39:12 nick Exp $/;
+my $ver		= q/$Id: fetch.pl.new,v 1.4 2011/09/23 01:36:54 nick Exp $/;
 my $comicFile   = "comics.conf";
 my %comics	= &readComicConfig ( $comicFile );
 my %dates 	= &fetchDates();
@@ -15,7 +15,7 @@ my $baseDir     = $comics{'configs'}{'ba
 my $imageDir    = $baseDir . "/" . ( $comics{'configs'}{'image_directory'} || "images" ) . 
 		  "/$dates{'mon2'}$dates{'year2'}";
 my $indexDir    = $baseDir . "/" . ( $comics{'configs'}{'index_directory'} || "indexes" );
-my $USER_AGENT  = "ozilla/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 $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 $DATE=`date`; chomp $DATE;
@@ -26,7 +26,7 @@ print STDOUT "Starting comic fetch at $D
 ##
 &checkDir ( [ $imageDir, $indexDir ] );
 
-&writeTitle ( \%dates );
+#&writeTitle ( \%dates );
 
 foreach my $comic ( sort keys %comics ) {
   next if ( $comic =~ m/config/ );
@@ -34,6 +34,17 @@ foreach my $comic ( sort keys %comics )
   &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/;
+
+	system( "/usr/bin/convert -resize 640 $file $file" )
+		if ( $size > 640 ) 
+}
+
 ## &writeMainIndex ( \%dates );
 
 &writeFooter( \%dates );
@@ -162,7 +173,10 @@ sub writeFooter {
 	open INDEX, ">>$indexFile";
 	print INDEX <<EOF;
 </table>
-<center>Generated at $sysDate
+<center>
+<font size="2">
+Generated on: <font color="green">$sysDate</font><br/>
+Version: <font color="green">$ver</font></font>
   <p>
     <a href="http://validator.w3.org/check?uri=referer"><img
       src="http://www.w3.org/Icons/valid-xhtml10-blue" alt="Valid XHTML 1.0 Transitional" height="31" width="88" border="0" /></a>
@@ -221,7 +235,7 @@ 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 -resize 640 - 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);
 }
 
@@ -266,7 +280,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 -resize 640 - jpeg:images/$cDir/$comic-$cDate.jpg";
+		my $cmd = "wget --user-agent=\"$USER_AGENT\" --referer=\"" . $comics->{$comic}{'url'} . "\" -q $comicURL -O - | /usr/bin/convert - jpeg:images/$cDir/$comic-$cDate.jpg";
 		system( $cmd );
 		return 0;
 	}