--- comics/fetch.pl.new 2017/12/05 13:37:40 1.22 +++ comics/fetch.pl.new 2018/01/26 13:05:27 1.23 @@ -2,6 +2,15 @@ ############################################################################### # $Log: fetch.pl.new,v $ +# Revision 1.23 2018/01/26 13:05:27 nick +# Added a new config option to remove all newline from the resulting index.html +# file. This allows for easier parsing for certain comics. I then updated +# the URLs to search for and enabled the newline removal for a handful +# of uComics. +# +# I believe I've also properly fixed the Comic Config version displayed on +# the webpage itself. +# # Revision 1.22 2017/12/05 13:37:40 nick # Added the CVS config version to the outpuit. # @@ -39,7 +48,7 @@ use Date::Calc qw/Date_to_Text_Long Toda ## ## Some default values ## -my $ver = '$Id: fetch.pl.new,v 1.22 2017/12/05 13:37:40 nick Exp $'; +my $ver = '$Id: fetch.pl.new,v 1.23 2018/01/26 13:05:27 nick Exp $'; my $comicFile = "comics.conf"; my $comicConfigVer = "Unknown"; my %comics = &readComicConfig ( $comicFile ); @@ -150,7 +159,8 @@ sub readComicConfig ($$) { open FILEN, "<$comicFile"; while () { - if ($_ =~ m/^#.* \$Id: fetch.pl.new,v 1.22 2017/12/05 13:37:40 nick Exp $/) { + #if ($_ =~ m/^#.* \$Id: fetch.pl.new,v 1.23 2018/01/26 13:05:27 nick Exp $/) { + if ($_ =~ m/^#.* \$Id: fetch.pl.new,v 1.23 2018/01/26 13:05:27 nick Exp $$/) { $comicConfigVer = $1; } if ( ( $_ !~ m/^#/ ) && ( $_ =~ m/,.*,/) ){ @@ -166,6 +176,7 @@ sub readComicConfig ($$) { $comicConfig{$res[0]}{'ext'} = $res[5]; $comicConfig{$res[0]}{'sunday'} = sprintf("%d", $res[6] || 1); $comicConfig{$res[0]}{'sunday_only'} = sprintf("%d", $res[7] || 0); + $comicConfig{$res[0]}{'remove_newlines'} = sprintf("%d", $res[8] || 0); $comicConfig{$res[0]}{'error'} = 0; } elsif ( $_ =~ m/(.*)\s+=\s+(.*)/ ) { @@ -342,7 +353,11 @@ sub indexDownload ($$) { return "ERROR: Can't open index file for " . $comics->{$comic}{'fullName'} . " (" . $comics->{$comic}{'url'} . ")"; } - @lines = ; + while () { + my $line = $_; + $line =~ s/\R|\ \ +|\t//g if ( $comics->{$comic}{'remove_newliens'} ); + push @lines, $line; + } close (FILEN); unlink ("$comicIndex");