[BACK]Return to fetch.pl.new CVS log [TXT] [DIR] Up to [Local Repository] / comics

Diff for /comics/fetch.pl.new between versions 1.20 and 1.21

version 1.20, 2015/10/22 12:58:44 version 1.21, 2015/10/26 14:25:40
Line 2 Line 2
   
 ###############################################################################  ###############################################################################
 # $Log$  # $Log$
   # 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  # 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.  # 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.
 #  #
Line 28  use Data::Dumper; Line 31  use Data::Dumper;
 use Pod::Usage;  use Pod::Usage;
 use Getopt::Long;  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  ## Some default values
Line 60  foreach my $comic ( sort keys %comics ) Line 63  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{'day2'} eq "Sunday") &&     if (($dates{'wday'} eq "Sunday") && 
       ($comics{$comic}{'sunday'} == 0)) {        ($comics{$comic}{'sunday'} == 0)) {
     print "Skipping '$comic'; Weekdays only.\n";      print "Skipping '$comic'; Weekdays only.\n";
     next;      next;
   }    }
   
   ## Skip if Sunday only comic and it's not Sunday.    ## Skip if Sunday only comic and it's not Sunday.
   if (($dates{'day2'} ne "Sunday") &&    if (($dates{'wday'} ne "Sunday") &&
       ($comics{$comic}{'sunday_only'} == 1)) {        ($comics{$comic}{'sunday_only'} == 1)) {
     print "Skipping '$comic'; Sunday only.\n";      print "Skipping '$comic' ($comics{$comic}{'sunday_only'}); Sunday only.\n";
     next      next
   }    }
   
Line 154  sub readComicConfig ($$) { Line 157  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'}   = $res[6] || 1;                  $comicConfig{$res[0]}{'sunday'}   = sprintf("%d", $res[6] || 1);
                 $comicConfig{$res[0]}{'sunday_only'} = $res[7] || 0;                  $comicConfig{$res[0]}{'sunday_only'} = sprintf("%d", $res[7] || 0);
                                 $comicConfig{$res[0]}{'error'}    = 0;                                  $comicConfig{$res[0]}{'error'}    = 0;
                         }                          }
                         elsif ( $_ =~ m/(.*)\s+=\s+(.*)/ ) {                          elsif ( $_ =~ m/(.*)\s+=\s+(.*)/ ) {
Line 399  sub fetchDates () { Line 402  sub fetchDates () {
         $dates{'day2'}  = ( $dates{'day'} < 10 ) ? "0" . $dates{'day'} : $dates{'day'};           $dates{'day2'}  = ( $dates{'day'} < 10 ) ? "0" . $dates{'day'} : $dates{'day'}; 
         $dates{'mon'}++;          $dates{'mon'}++;
         $dates{'mon2'}  = ( $dates{'mon'} < 10 ) ? "0".$dates{'mon'} : $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;          return %dates;
 }  }
Removed from v.1.20  
changed lines
  Added in v.1.21

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>