|
|
| version 1.24, 2018/02/06 14:31:06 | version 1.26, 2018/04/22 14:03:54 |
|---|---|
| Line 2 | Line 2 |
| ############################################################################### | ############################################################################### |
| # $Log$ | # $Log$ |
| # 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. | |
| # | |
| # Revision 1.24 2018/02/06 14:31:06 nick | # Revision 1.24 2018/02/06 14:31:06 nick |
| # A status report is now generated in JSON that can easily be scanned so that | # A status report is now generated in JSON that can easily be scanned so that |
| # I can be alerted when there are failures that I miss if I don't read the | # I can be alerted when there are failures that I miss if I don't read the |
| Line 83 foreach my $comic ( sort keys %comics ) | Line 89 foreach my $comic ( sort keys %comics ) |
| ## Skip if this is Sunday and the comic is weekdays only | ## Skip if this is Sunday and the comic is weekdays only |
| next if ( $comic =~ m/config/ ); | next if ( $comic =~ m/config/ ); |
| if (($dates{'wday'} eq "Sunday") && | if (($dates{'wday'} eq "Sunday") && |
| ($comics{$comic}{'sunday'} == 0)) { | ($comics{$comic}{'not_sunday'} == 1)) { |
| print "Skipping '$comic'; Weekdays only.\n"; | print "Skipping '$comic'; Weekdays only.\n"; |
| next; | next; |
| } | } |
| Line 94 foreach my $comic ( sort keys %comics ) | Line 100 foreach my $comic ( sort keys %comics ) |
| print "Skipping '$comic' ($comics{$comic}{'sunday_only'}); Sunday only.\n"; | print "Skipping '$comic' ($comics{$comic}{'sunday_only'}); Sunday only.\n"; |
| next | next |
| } | } |
| $comics{$comic}{'error'} = &downloadComic ( \%comics, $comic, \%dates ); | $comics{$comic}{'error'} = &downloadComic ( \%comics, $comic, \%dates ); |
| &writeComic ( \%comics, $comic, \%dates ); | &writeComic ( \%comics, $comic, \%dates ); |
| Line 183 sub readComicConfig ($$) { | Line 189 sub readComicConfig ($$) { |
| $comicConfig{$res[0]}{'mode'} = $res[3]; | $comicConfig{$res[0]}{'mode'} = $res[3]; |
| $comicConfig{$res[0]}{'fullName'} = $res[4]; | $comicConfig{$res[0]}{'fullName'} = $res[4]; |
| $comicConfig{$res[0]}{'ext'} = $res[5]; | $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]}{'sunday_only'} = sprintf("%d", $res[7] || 0); |
| $comicConfig{$res[0]}{'remove_newlines'} = sprintf("%d", $res[8] || 0); | $comicConfig{$res[0]}{'remove_newlines'} = sprintf("%d", $res[8] || 0); |
| $comicConfig{$res[0]}{'error'} = 0; | $comicConfig{$res[0]}{'error'} = 0; |
| Line 202 sub readComicConfig ($$) { | Line 208 sub readComicConfig ($$) { |
| sub writeStatusReportJSON ($$) { | sub writeStatusReportJSON ($$) { |
| my ( $comicsRef, $filename ) = @_; | my ( $comicsRef, $filename ) = @_; |
| my %comics = %$comicsRef; | my %comics = %$comicsRef; |
| my %json = ('date' => $DATE, 'comics' => []); | my $shortDate = sprintf("%d%02d%02d", (localtime)[5] + 1900, |
| (localtime)[4] + 1, | |
| (localtime)[3]); | |
| my %json = ('date' => $shortDate, 'comics' => []); | |
| my $totalErrors = 0; | my $totalErrors = 0; |
| foreach my $comic (sort keys %comics) { | foreach my $comic (sort keys %comics) { |