--- comics/fetch.pl.new 2011/08/18 12:50:06 1.2 +++ 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.2 2011/08/18 12:50:06 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(); @@ -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,8 +173,10 @@ sub writeFooter { open INDEX, ">>$indexFile"; print INDEX < -
Generated at $sysDate
-Version: $ver +
+ +Generated on: $sysDate
+Version: $ver

Valid XHTML 1.0 Transitional @@ -222,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); } @@ -267,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; }