--- comics/fetch.pl.new 2015/02/19 14:56:10 1.17
+++ comics/fetch.pl.new 2015/10/22 12:58:44 1.20
@@ -2,6 +2,15 @@
###############################################################################
# $Log: fetch.pl.new,v $
+# 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'.
+#
+# Revision 1.18 2015/05/07 12:31:43 nick
+# Added favicon
+#
# Revision 1.17 2015/02/19 14:56:10 nick
# Fixed a problem that forced everything to JPG. This would kill GIF animations, but would not display the gifs either because 'convert' appends an index number to the end of the file name for each from of the GIF animation. I fixed this to maintain GIF compatibilty as well as rewritting how the script fetches the size of the file. Additionally, I updated the configuration for Questionable Content to search for GIF or JPG, which is what triggered this entire update.
#
@@ -24,7 +33,7 @@ use Date::Calc qw/Date_to_Text_Long Toda
##
## Some default values
##
-my $ver = '$Id: fetch.pl.new,v 1.17 2015/02/19 14:56:10 nick Exp $';
+my $ver = '$Id: fetch.pl.new,v 1.20 2015/10/22 12:58:44 nick Exp $';
my $comicFile = "comics.conf";
my %comics = &readComicConfig ( $comicFile );
my %opts = &fetchOptions( );
@@ -48,9 +57,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{'day2'} 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{'day2'} ne "Sunday") &&
+ ($comics{$comic}{'sunday_only'} == 1)) {
+ print "Skipping '$comic'; Sunday only.\n";
+ next
+ }
+
$comics{$comic}{'error'} = &downloadComic ( \%comics, $comic, \%dates );
&writeComic ( \%comics, $comic, \%dates );
@@ -66,6 +88,7 @@ foreach my $comic ( sort keys %comics )
}
close(IMG);
+
system( "/usr/bin/convert -resize 640 $file $file" )
if ( $size > 640 )
}
@@ -132,6 +155,7 @@ sub readComicConfig ($$) {
$comicConfig{$res[0]}{'fullName'} = $res[4];
$comicConfig{$res[0]}{'ext'} = $res[5];
$comicConfig{$res[0]}{'sunday'} = $res[6] || 1;
+ $comicConfig{$res[0]}{'sunday_only'} = $res[7] || 0;
$comicConfig{$res[0]}{'error'} = 0;
}
elsif ( $_ =~ m/(.*)\s+=\s+(.*)/ ) {
@@ -258,6 +282,7 @@ sub writeTitle ($$) {
+
Daily Comics for $today
@@ -285,7 +310,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);
}
@@ -297,7 +322,10 @@ sub indexDownload ($$) {
my ( @lines, $comicLine, $mainURL );
my $comicIndex = "indexes/index.$comic";
- `wget -q $comics->{$comic}{'url'} -O $comicIndex`;
+ my $wget_cmd = "wget -q --referer=\"$comics->{$comic}{'url'}\" " .
+ "--user-agent=\"$USER_AGENT\" " .
+ "$comics->{$comic}{'url'} -O $comicIndex";
+ system($wget_cmd);
if ( ! open FILEN, "<$comicIndex" ) {
return "ERROR: Can't open index file for " . $comics->{$comic}{'fullName'} .