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

Diff for /comics/fetch.pl.new between versions 1.29 and 1.30

version 1.29, 2020/06/10 21:32:52 version 1.30, 2022/10/04 12:02:03
Line 2 Line 2
   
 ###############################################################################  ###############################################################################
 # $Log$  # $Log$
   # 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  # Revision 1.29  2020/06/10 21:32:52  nick
 # Centered page  # Centered page
 #  #
Line 64  use Pod::Usage; Line 67  use Pod::Usage;
 use Getopt::Long;  use Getopt::Long;
 use JSON::Create 'create_json';  use JSON::Create 'create_json';
 use Date::Calc qw/Date_to_Text_Long Today Day_of_Week Day_of_Week_to_Text/;  use Date::Calc qw/Date_to_Text_Long Today Day_of_Week Day_of_Week_to_Text/;
   use Data::Dumper;
   
 ##   ## 
 ## Some default values  ## Some default values
Line 126  foreach my $comic ( sort keys %comics ) Line 130  foreach my $comic ( sort keys %comics )
     close(IMG);      close(IMG);
   
   
         system( "/usr/bin/convert -resize 640 $file $file" )          system( "/usr/bin/convert -resize 800 $file $file" )
                 if ( $size > 640 )                   if ( $size > 800 ) 
 }  }
   
 ## &writeMainIndex ( \%dates );  ## &writeMainIndex ( \%dates );
Line 384  sub directDownload ($$) { Line 388  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 --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);          return system($cmd);
 }  }
Line 396  sub indexDownload ($$) { Line 400  sub indexDownload ($$) {
         my ( @lines, $comicLine, $mainURL );          my ( @lines, $comicLine, $mainURL );
         my $comicIndex = "indexes/index.$comic";          my $comicIndex = "indexes/index.$comic";
   
     my $wget_cmd = "wget -q --referer='$comics->{$comic}{'url'}' " .      print("Getching Index $comicIndex.\n");
                    "--user-agent=\"$USER_AGENT\" " .      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";                     "$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" ) {            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'} . 
Line 441  sub indexDownload ($$) { Line 454  sub indexDownload ($$) {
                 my $comicURL = ( $comicLine =~ m/http/ ) ? $comicLine : $mainURL . $comicLine;                  my $comicURL = ( $comicLine =~ m/http/ ) ? $comicLine : $mainURL . $comicLine;
         # Strip &amp;          # Strip &amp;
         $comicURL =~ s/\&amp\;/&/g;          $comicURL =~ s/\&amp\;/&/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 );                  system( $cmd );
                 return 0;                  return 0;
         }          }
Removed from v.1.29  
changed lines
  Added in v.1.30

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