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

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

version 1.30, 2022/10/04 12:02:03 version 1.31, 2024/12/13 16:03:49
Line 2 Line 2
   
 ###############################################################################  ###############################################################################
 # $Log$  # $Log$
   # Revision 1.31  2024/12/13 16:03:49  nick
   # This adds the ability to specify a comic as a link only with a default splash image.
   #
 # Revision 1.30  2022/10/04 12:02:03  nick  # 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.  # Added --no-check-certificate for wget calls as arcamax was failing its cert check.  Meh, whatever.  It's just comics.
 #  #
Line 69  use JSON::Create 'create_json'; Line 72  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;  use Data::Dumper;
   
   print("Running");
   
 ##   ## 
 ## Some default values  ## Some default values
 ##  ##
Line 99  print STDOUT "Starting comic fetch at $D Line 104  print STDOUT "Starting comic fetch at $D
   
 foreach my $comic ( sort keys %comics ) {  foreach my $comic ( sort keys %comics ) {
   
     print("Checking Comic $comic\n");
   
   ## Skip if this is Sunday and the comic is weekdays only    ## Skip if this is Sunday and the comic is weekdays only
   next if ( $comic =~ m/config/ );    next if ( $comic =~ m/config/ );
   if (($dates{'wday'} eq "Sunday") &&     if (($dates{'wday'} eq "Sunday") && 
Line 120  foreach my $comic ( sort keys %comics ) Line 127  foreach my $comic ( sort keys %comics )
     my $file = "$imageDir/$comic-$dates{'day2'}.$comics{$comic}{'ext'}";      my $file = "$imageDir/$comic-$dates{'day2'}.$comics{$comic}{'ext'}";
     my $size = 0;          my $size = 0;    
   
     my $cmd = "/usr/bin/identify -verbose $file|";      ## Resize downloaded images
     open(IMG, $cmd) || die ("Can't open: $!\n");      if($comics{$comic}{'mode'} != 3) {
     while(<IMG>) {              my $cmd = "/usr/bin/identify -verbose $file|";
         if ($_ =~ m/^\s+geometry:\s+(\d+)x\d+.*/i) {              open(IMG, $cmd) || die ("Can't open: $!\n");
             $size = $1 if ( $size == 0);              while(<IMG>) {
         }                  if ($_ =~ m/^\s+geometry:\s+(\d+)x\d+.*/i) {
     }                      $size = $1 if ( $size == 0);
     close(IMG);                  }
               }
               close(IMG);
         system( "/usr/bin/convert -resize 800 $file $file" )  
                 if ( $size > 800 )               system( "/usr/bin/convert -resize 800 $file $file" )
               if ( $size > 800 ) 
        }
 }  }
   
 ## &writeMainIndex ( \%dates );  ## &writeMainIndex ( \%dates );
Line 168  sub downloadComic ($$) { Line 177  sub downloadComic ($$) {
                         return directDownload ( \%comics, $comic, $date );                          return directDownload ( \%comics, $comic, $date );
                         last SWITCH;                          last SWITCH;
                 }                  }
                   if ( $comics->{$comic}{'mode'} eq 3 ) { 
                           return 0;
                           last SWITCH;
                   }
         }          }
                     
         return "ERROR: Unknown download method specified for $comics->{$comic}{'fullName'}.";          return "ERROR: Unknown download method specified for $comics->{$comic}{'fullName'}.";
Line 257  sub writeComic ($$) { Line 270  sub writeComic ($$) {
         my $indexFile = $indexDir . "/index-" . $date->{'year2'} .           my $indexFile = $indexDir . "/index-" . $date->{'year2'} . 
                         $date->{'mon2'} . $date->{'day2'} . "-" .                           $date->{'mon2'} . $date->{'day2'} . "-" . 
                         $sd . ".html";                          $sd . ".html";
     $comics->{$comic}{'fullName'} =~ s/&/&amp;/g;          $comics->{$comic}{'fullName'} =~ s/&/&amp;/g;
   
         my $content = <<EOF;          my $content = <<EOF;
   
 <!-- ********* Begin $comic ($comics->{$comic}{'fullName'}) ******* -->  <!-- ********* Begin $comic ($comics->{$comic}{'fullName'}) ******* -->
Line 265  sub writeComic ($$) { Line 279  sub writeComic ($$) {
     <td align="left">      <td align="left">
 <font color="blue"><b>$comics->{$comic}{'fullName'}</b></font> &nbsp; &nbsp;   <font color="blue"><b>$comics->{$comic}{'fullName'}</b></font> &nbsp; &nbsp; 
 <font size="-2">  <font size="-2">
         <a href="$comics->{$comic}{'url'}">          <a href="$comics->{$comic}{'url'}" target="_blank">
                 $comics->{$comic}{'url'}                  $comics->{$comic}{'url'}
         </a>          </a>
 </font><br/>  </font><br/>
   EOF
           if ( $comics->{$comic}{'mode'} == 3 ) {
                   print("Mode 3\n");
                   $content .= <<EOF;
   <img src="$comics->{$comic}{'ext'}" alt="$comics->{$comic}{'fullName'}" />
   EOF
           } else {
                   $content .= <<EOF;
 <img src="../images/$date->{'mon2'}$date->{'year2'}/$comic-$date->{'day2'}.$comics->{$comic}{'ext'}" alt="$comic-$date->{'day2'}" />  <img src="../images/$date->{'mon2'}$date->{'year2'}/$comic-$date->{'day2'}.$comics->{$comic}{'ext'}" alt="$comic-$date->{'day2'}" />
   EOF
           }
           $content .= <<EOF;
 <br/><br/>  <br/><br/>
 </td></tr>  </td></tr>
 <!-- ********* Finish $comic ($comics->{$comic}{'fullName'}) ******* -->  <!-- ********* Finish $comic ($comics->{$comic}{'fullName'}) ******* -->
Line 395  sub directDownload ($$) { Line 420  sub directDownload ($$) {
   
 #######################################################################  #######################################################################
 #######################################################################  #######################################################################
   sub linkOnly ($$) {
           my ( $comics, $comic, $date ) = @_;
   
           return 0;
   }
   #######################################################################
   #######################################################################
 sub indexDownload ($$) {  sub indexDownload ($$) {
         my ( $comics, $comic, $date ) = @_;          my ( $comics, $comic, $date ) = @_;
         my ( @lines, $comicLine, $mainURL );          my ( @lines, $comicLine, $mainURL );
Line 437  sub indexDownload ($$) { Line 469  sub indexDownload ($$) {
         ## Find the comic strip URL based on the specified regex in the search          ## Find the comic strip URL based on the specified regex in the search
         ##          ##
   
       print "Using search $comics->{$comic}{'search'}\n";
   
         foreach my $line (@lines) {          foreach my $line (@lines) {
                 if ( $line =~ m/$comics->{$comic}{'search'}/i ) {                  if ( $line =~ m/$comics->{$comic}{'search'}/i ) {
               print "Found match:\n";
                         $comicLine = $1; chomp $comicLine;                          $comicLine = $1; chomp $comicLine;
               print "+ $comicLine\n";
                 }                  }
     }      }
   
Line 450  sub indexDownload ($$) { Line 486  sub indexDownload ($$) {
         my $cDate   = $date->{'day2'};          my $cDate   = $date->{'day2'};
   
         if ( $comicLine ) {          if ( $comicLine ) {
           print "Downloading Comic\n";
                 if ( $comicLine =~ m/(gif|jpg|png)/i ) { $comics->{$comic}{'ext'} = $1; }                  if ( $comicLine =~ m/(gif|jpg|png)/i ) { $comics->{$comic}{'ext'} = $1; }
                 my $comicURL = ( $comicLine =~ m/http/ ) ? $comicLine : $mainURL . $comicLine;                  my $comicURL = ( $comicLine =~ m/http/ ) ? $comicLine : $mainURL . $comicLine;
           print "Final URL: $comicURL\n";
         # Strip &amp;          # Strip &amp;
         $comicURL =~ s/\&amp\;/&/g;          $comicURL =~ s/\&amp\;/&/g;
                 my $cmd = "wget --no-check-certificate --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'}";
Removed from v.1.30  
changed lines
  Added in v.1.31

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