--- comics/fetch.pl.new 2015/07/13 12:56:58 1.19 +++ comics/fetch.pl.new 2015/10/26 14:25:40 1.21 @@ -2,6 +2,12 @@ ############################################################################### # $Log: fetch.pl.new,v $ +# Revision 1.21 2015/10/26 14:25:40 nick +# Fixed a bug that was improperly including the day of week string preventing the weekend comics from fetching proproperly. +# +# Revision 1.20 2015/10/22 12:58:44 nick +# Added the ability for Sunday only comics. Stonesoup is no longer weekdays, this has been added to Sunday only. I also added Foxtrot Classics for weekdays and Foxtrot for Sundays. +# # Revision 1.19 2015/07/13 12:56:58 nick # Added Sally Forth and Pearls Before Swine. Adding Sally Forth required a change in the 'wget' command for fetching the index file to include 'user-agent' and 'referer'. # @@ -25,12 +31,12 @@ use Data::Dumper; use Pod::Usage; use Getopt::Long; -use Date::Calc qw/Date_to_Text_Long Today/; +use Date::Calc qw/Date_to_Text_Long Today Day_of_Week Day_of_Week_to_Text/; ## ## Some default values ## -my $ver = '$Id: fetch.pl.new,v 1.19 2015/07/13 12:56:58 nick Exp $'; +my $ver = '$Id: fetch.pl.new,v 1.21 2015/10/26 14:25:40 nick Exp $'; my $comicFile = "comics.conf"; my %comics = &readComicConfig ( $comicFile ); my %opts = &fetchOptions( ); @@ -54,9 +60,22 @@ print STDOUT "Starting comic fetch at $D &writeTitle ( \%dates ); foreach my $comic ( sort keys %comics ) { + + ## Skip if this is Sunday and the comic is weekdays only next if ( $comic =~ m/config/ ); - if ( ( $dates{'day2'} eq "Sunday" ) && - ( $comics{$comic}{'sunday'} == 0 ) ) { print "Skipping.\n"; next; } + if (($dates{'wday'} eq "Sunday") && + ($comics{$comic}{'sunday'} == 0)) { + print "Skipping '$comic'; Weekdays only.\n"; + next; + } + + ## Skip if Sunday only comic and it's not Sunday. + if (($dates{'wday'} ne "Sunday") && + ($comics{$comic}{'sunday_only'} == 1)) { + print "Skipping '$comic' ($comics{$comic}{'sunday_only'}); Sunday only.\n"; + next + } + $comics{$comic}{'error'} = &downloadComic ( \%comics, $comic, \%dates ); &writeComic ( \%comics, $comic, \%dates ); @@ -138,7 +157,8 @@ sub readComicConfig ($$) { $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]}{'sunday'} = sprintf("%d", $res[6] || 1); + $comicConfig{$res[0]}{'sunday_only'} = sprintf("%d", $res[7] || 0); $comicConfig{$res[0]}{'error'} = 0; } elsif ( $_ =~ m/(.*)\s+=\s+(.*)/ ) { @@ -382,6 +402,8 @@ sub fetchDates () { $dates{'day2'} = ( $dates{'day'} < 10 ) ? "0" . $dates{'day'} : $dates{'day'}; $dates{'mon'}++; $dates{'mon2'} = ( $dates{'mon'} < 10 ) ? "0".$dates{'mon'} : $dates{'mon'}; + my @days = qw/ Sunday Monday Tuesday Wednesday Thursday Friday Saturday /; + $dates{'wday'} = $days[$dates{'dow'}]; return %dates; }