version 1.17, 2015/02/19 14:56:10
|
version 1.19, 2015/07/13 12:56:58
|
Line 2
|
Line 2
|
|
|
############################################################################### |
############################################################################### |
# $Log$ |
# $Log$ |
|
# 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 |
# 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. |
# 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. |
# |
# |
Line 66 foreach my $comic ( sort keys %comics )
|
Line 72 foreach my $comic ( sort keys %comics )
|
} |
} |
close(IMG); |
close(IMG); |
|
|
|
|
system( "/usr/bin/convert -resize 640 $file $file" ) |
system( "/usr/bin/convert -resize 640 $file $file" ) |
if ( $size > 640 ) |
if ( $size > 640 ) |
} |
} |
Line 258 sub writeTitle ($$) {
|
Line 265 sub writeTitle ($$) {
|
<head> |
<head> |
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> |
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> |
<link href="/daily/comics/comics.css" type="text/css" rel="stylesheet" media="screen"> |
<link href="/daily/comics/comics.css" type="text/css" rel="stylesheet" media="screen"> |
|
<link rel="shortcut icon" href="./favicon.ico"> |
<title>Daily Comics for $today</title> |
<title>Daily Comics for $today</title> |
</head> |
</head> |
<body bgcolor="#FFFFFF"> |
<body bgcolor="#FFFFFF"> |
Line 285 sub directDownload ($$) {
|
Line 293 sub directDownload ($$) {
|
my $cDir = $date->{'mon2'} . $date->{'year2'}; |
my $cDir = $date->{'mon2'} . $date->{'year2'}; |
my $cDate = $date->{'day2'}; |
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); |
return system($cmd); |
} |
} |
Line 297 sub indexDownload ($$) {
|
Line 305 sub indexDownload ($$) {
|
my ( @lines, $comicLine, $mainURL ); |
my ( @lines, $comicLine, $mainURL ); |
my $comicIndex = "indexes/index.$comic"; |
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" ) { |
if ( ! open FILEN, "<$comicIndex" ) { |
return "ERROR: Can't open index file for " . $comics->{$comic}{'fullName'} . |
return "ERROR: Can't open index file for " . $comics->{$comic}{'fullName'} . |