--- comics/fetch.pl.new 2020/06/10 21:14:31 1.28
+++ comics/fetch.pl.new 2022/10/04 12:02:03 1.30
@@ -2,6 +2,12 @@
###############################################################################
# $Log: fetch.pl.new,v $
+# Revision 1.30 2022/10/04 12:02:03 nick
+# Added --no-check-certificate for wget calls as arcamax was failing its cert check. Meh, whatever. It's just comics.
+#
+# Revision 1.29 2020/06/10 21:32:52 nick
+# Centered page
+#
# Revision 1.28 2020/06/10 21:14:31 nick
# Updated for w3 validation.
#
@@ -61,11 +67,12 @@ use Pod::Usage;
use Getopt::Long;
use JSON::Create 'create_json';
use Date::Calc qw/Date_to_Text_Long Today Day_of_Week Day_of_Week_to_Text/;
+use Data::Dumper;
##
## Some default values
##
-my $ver = '$Id: fetch.pl.new,v 1.28 2020/06/10 21:14:31 nick Exp $';
+my $ver = '$Id: fetch.pl.new,v 1.30 2022/10/04 12:02:03 nick Exp $';
my $comicFile = "comics.conf";
my $comicConfigVer = "Unknown";
my $reportFile = "/home/httpd/html/daily/comics/status_report.json";
@@ -123,8 +130,8 @@ foreach my $comic ( sort keys %comics )
close(IMG);
- system( "/usr/bin/convert -resize 640 $file $file" )
- if ( $size > 640 )
+ system( "/usr/bin/convert -resize 800 $file $file" )
+ if ( $size > 800 )
}
## &writeMainIndex ( \%dates );
@@ -361,7 +368,7 @@ sub writeTitle ($$) {
Daily Comics for $today
-
+
 |
| $today_long |
| |
@@ -381,7 +388,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 --no-check-certificate -q $file --referer='" . $comics->{$comic}{'url'} ."' --user-agent=\"$USER_AGENT\" -O - | /usr/bin/convert - jpeg:images/$cDir/$comic-$cDate.jpg";
return system($cmd);
}
@@ -393,10 +400,19 @@ sub indexDownload ($$) {
my ( @lines, $comicLine, $mainURL );
my $comicIndex = "indexes/index.$comic";
- my $wget_cmd = "wget -q --referer='$comics->{$comic}{'url'}' " .
- "--user-agent=\"$USER_AGENT\" " .
+ print("Getching Index $comicIndex.\n");
+ print("comic url: $comics->{$comic}{'url'}\n");
+
+ print Dumper($comics->{$comic});
+
+ my $wget_cmd = "wget --referer='$comics->{$comic}{'url'}' " .
+ "--no-check-certificate --user-agent=\"$USER_AGENT\" " .
"$comics->{$comic}{'url'} -O $comicIndex";
- system($wget_cmd);
+ print ("Using wget command:\n$wget_cmd\n");
+
+ my $status = system($wget_cmd);
+
+ print ("Return status: $status\n");
if ( ! open FILEN, "<$comicIndex" ) {
return "ERROR: Can't open index file for " . $comics->{$comic}{'fullName'} .
@@ -438,7 +454,7 @@ sub indexDownload ($$) {
my $comicURL = ( $comicLine =~ m/http/ ) ? $comicLine : $mainURL . $comicLine;
# Strip &
$comicURL =~ s/\&\;/&/g;
- my $cmd = "wget --user-agent=\"$USER_AGENT\" --referer='" . $comics->{$comic}{'url'} . "' -q '$comicURL' -O images/$cDir/$comic-$cDate.$comics->{$comic}{'ext'}";
+ my $cmd = "wget --no-check-certificate --user-agent=\"$USER_AGENT\" --referer='" . $comics->{$comic}{'url'} . "' -q '$comicURL' -O images/$cDir/$comic-$cDate.$comics->{$comic}{'ext'}";
system( $cmd );
return 0;
}