--- comics/fetch.pl.new 2018/02/12 13:30:58 1.25 +++ comics/fetch.pl.new 2020/06/10 21:14:31 1.28 @@ -2,6 +2,15 @@ ############################################################################### # $Log: fetch.pl.new,v $ +# Revision 1.28 2020/06/10 21:14:31 nick +# Updated for w3 validation. +# +# Revision 1.27 2019/04/15 12:50:23 nick +# The script was unable to handle html '&' and convert it, so I added that. I probably should see if there's a library or something that handles all those automagically but I just tossed a regex in there for now that does the trick. +# +# Revision 1.26 2018/04/22 14:03:54 nick +# Changed the default for Sunday comics that was causing issues with some comics. +# # Revision 1.25 2018/02/12 13:30:58 nick # Added an easier to compare date string to determine if the status json file was updated today and report if it wasn't. # @@ -56,7 +65,7 @@ use Date::Calc qw/Date_to_Text_Long Toda ## ## Some default values ## -my $ver = '$Id: fetch.pl.new,v 1.25 2018/02/12 13:30:58 nick Exp $'; +my $ver = '$Id: fetch.pl.new,v 1.28 2020/06/10 21:14:31 nick Exp $'; my $comicFile = "comics.conf"; my $comicConfigVer = "Unknown"; my $reportFile = "/home/httpd/html/daily/comics/status_report.json"; @@ -86,7 +95,7 @@ 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)) { + ($comics{$comic}{'not_sunday'} == 1)) { print "Skipping '$comic'; Weekdays only.\n"; next; } @@ -97,7 +106,7 @@ foreach my $comic ( sort keys %comics ) print "Skipping '$comic' ($comics{$comic}{'sunday_only'}); Sunday only.\n"; next } - + $comics{$comic}{'error'} = &downloadComic ( \%comics, $comic, \%dates ); &writeComic ( \%comics, $comic, \%dates ); @@ -186,7 +195,7 @@ sub readComicConfig ($$) { $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]}{'not_sunday'} = sprintf("%d", $res[6] || 0); $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; @@ -208,7 +217,7 @@ sub writeStatusReportJSON ($$) { my $shortDate = sprintf("%d%02d%02d", (localtime)[5] + 1900, (localtime)[4] + 1, (localtime)[3]); - my %json = ('date' => $shortDate, 'comics' => []); + my %json = ('date' => $shortDate, 'comics' => ()); my $totalErrors = 0; foreach my $comic (sort keys %comics) { @@ -217,13 +226,13 @@ sub writeStatusReportJSON ($$) { my %error = ('comicName' => "$comics{$comic}{'fullName'}", 'error' => "$comics{$comic}{'error'}", 'status' => "Error"); - push $json{'comics'}, \%error; + push @{$json{'comics'}}, \%error; $totalErrors += 1; } else { my %status = ('comicName' => "$comics{$comic}{'fullName'}", 'error' => 0, 'status' => "Successfull"); - push $json{'comics'}, \%status; + push @{$json{'comics'}}, \%status; } } $json{'totalErrors'} = $totalErrors; @@ -241,6 +250,7 @@ sub writeComic ($$) { my $indexFile = $indexDir . "/index-" . $date->{'year2'} . $date->{'mon2'} . $date->{'day2'} . "-" . $sd . ".html"; + $comics->{$comic}{'fullName'} =~ s/&/&/g; my $content = <{$comic}{'fullName'}) ******* --> @@ -303,15 +313,13 @@ sub writeFooter { print INDEX <
- -Generated on: $sysDate
-Version: $ver
-Config Version: $comicConfigVer
-CVS: http://demandred.dyndns.org/cgi-bin/cvsweb/comics/ -

+Generated on: $sysDate
+Version: $ver
+Config Version: $comicConfigVer
+CVS: http://demandred.dyndns.org/cgi-bin/cvsweb/comics/ +
Valid XHTML 1.0 Transitional -

@@ -348,19 +356,15 @@ sub writeTitle ($$) { - - + + Daily Comics for $today - -
- + - - EOF close (INDEX); } @@ -377,7 +381,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 - 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); } @@ -389,7 +393,7 @@ sub indexDownload ($$) { my ( @lines, $comicLine, $mainURL ); my $comicIndex = "indexes/index.$comic"; - my $wget_cmd = "wget -q --referer=\"$comics->{$comic}{'url'}\" " . + my $wget_cmd = "wget -q --referer='$comics->{$comic}{'url'}' " . "--user-agent=\"$USER_AGENT\" " . "$comics->{$comic}{'url'} -O $comicIndex"; system($wget_cmd); @@ -400,11 +404,12 @@ sub indexDownload ($$) { } while () { my $line = $_; - $line =~ s/\R|\ \ +|\t//g if ( $comics->{$comic}{'remove_newliens'} ); + $line =~ s/\R|\ \ +|\t//g if ( $comics->{$comic}{'remove_newlines'} ); push @lines, $line; } close (FILEN); + unlink ("$comicIndex"); $mainURL = $comics->{$comic}{'url'}; @@ -415,6 +420,7 @@ 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'}/i ) { $comicLine = $1; chomp $comicLine; @@ -430,7 +436,9 @@ 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 images/$cDir/$comic-$cDate.$comics->{$comic}{'ext'}"; + # Strip & + $comicURL =~ s/\&\;/&/g; + 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; }
Comic Page Heading
$today_long