--- comics/fetch.pl.new 2013/03/01 14:38:47 1.12 +++ comics/fetch.pl.new 2015/01/19 13:46:19 1.15 @@ -1,5 +1,12 @@ #!/usr/bin/perl -w +############################################################################### +# $Log: fetch.pl.new,v $ +# Revision 1.15 2015/01/19 13:46:19 nick +# *** empty log message *** +# +############################################################################### + use strict; use File::Path; use Data::Dumper; @@ -9,7 +16,7 @@ use Getopt::Long; ## ## Some default values ## -my $ver = q/$Id: fetch.pl.new,v 1.12 2013/03/01 14:38:47 nick Exp $/; +my $ver = '$Id: fetch.pl.new,v 1.15 2015/01/19 13:46:19 nick Exp $'; my $comicFile = "comics.conf"; my %comics = &readComicConfig ( $comicFile ); my %opts = &fetchOptions( ); @@ -35,6 +42,8 @@ print STDOUT "Starting comic fetch at $D foreach my $comic ( sort keys %comics ) { next if ( $comic =~ m/config/ ); + if ( ( $dates{'day2'} eq "Sunday" ) && + ( $comics{$comic}{'sunday'} == 0 ) ) { print "Skipping.\n"; next; } $comics{$comic}{'error'} = &downloadComic ( \%comics, $comic, \%dates ); &writeComic ( \%comics, $comic, \%dates ); } @@ -92,15 +101,25 @@ sub readComicConfig ($$) { my %comicConfig = ( ); my %config = ( ); + my ($year, $mon, $day) =( localtime(time))[5,4,3]; + $year += 1900; + $mon = sprintf("%02d", ($mon + 1)); + $day = sprintf("%02d", $day); + open FILEN, "<$comicFile"; while () { if ( ( $_ !~ m/^#/ ) && ( $_ =~ m/,.*,/) ){ + $_ =~ s/__YEAR__/$year/g; + $_ =~ s/__MON__/$mon/g; + $_ =~ s/__DAY__/$day/g; + my @res = split /,/, $_; $comicConfig{$res[0]}{'url'} = $res[1]; $comicConfig{$res[0]}{'search'} = $res[2]; $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]}{'error'} = 0; } elsif ( $_ =~ m/(.*)\s+=\s+(.*)/ ) { @@ -225,6 +244,7 @@ sub writeTitle ($$) { + Daily Comics for $today @@ -247,6 +267,7 @@ sub directDownload ($$) { 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"; + return system($cmd); }