X-Git-Url: https://code.th-h.de/?p=usenet%2Fyapfaq.git;a=blobdiff_plain;f=yapfaq.pl;h=5b7160a27a92835946865b73fba1aba41c791530;hp=eb9993778a5c082d0fb259e3a551566ade3606f7;hb=dbca4ad8a165e3d51fe4caed45f9a3ee04bf5db0;hpb=4251e5451cacbbd682ec65b4057e4dc5733aca06 diff --git a/yapfaq.pl b/yapfaq.pl index eb99937..5b7160a 100644 --- a/yapfaq.pl +++ b/yapfaq.pl @@ -12,7 +12,7 @@ # It can be redistributed and/or modified under the same terms under # which Perl itself is published. -my $Version = "0.6-unreleased"; +my $Version = "0.6.2"; my $NNTPServer = "localhost"; my $NNTPUser = ""; @@ -52,6 +52,7 @@ my @PGPorderheaders = ('from', 'newsgroups', 'subject', 'control', use strict; use Net::NNTP; +use Net::Domain qw(hostfqdn); use Date::Calc qw(Add_Delta_YM Add_Delta_Days Delta_Days Today); use Fcntl ':flock'; # import LOCK_* constants use Getopt::Std; @@ -73,7 +74,7 @@ foreach (@Config) { my ($NPY,$NPM,$NPD); #NP: Next posting-date my $SupersedeMID; - my ($ActName,$File,$PFreq) =($$_{'name'},$$_{'file'},$$_{'posting-frequency'}); + my ($ActName,$File,$PFreq,$Expire) =($$_{'name'},$$_{'file'},$$_{'posting-frequency'},$$_{'expires'}); my ($From,$Subject,$NG,$Fup2)=($$_{'from'},$$_{'subject'},$$_{'ngs'},$$_{'fup2'}); my ($MIDF,$ReplyTo,$ExtHea)=($$_{'mid-format'},$$_{'reply-to'},$$_{'extraheader'}); my ($Supersede) =($$_{'supersede'}); @@ -95,17 +96,13 @@ foreach (@Config) { $SupersedeMID = "" unless $Supersede; - if ($PFreq =~ /(\d+)\s*([dw])/) { # Is counted in days or weeks: Use Add_Delta_Days. - ($NPY,$NPM,$NPD) = Add_Delta_Days($LPY, $LPM, $LPD, (($2 eq "w")?$1 * 7: $1 * 1)); - } elsif ($PFreq =~ /(\d+)\s*([my])/) { #Is counted in months or years: Use Add_Delta_YM - ($NPY,$NPM,$NPD) = Add_Delta_YM($LPY, $LPM, $LPD, (($2 eq "m")?(0,$1):($1,0))); - } - + ($NPY,$NPM,$NPD) = calcdelta ($LPY,$LPM,$LPD,$PFreq); + if (Delta_Days($NPY,$NPM,$NPD,$TDY,$TDM,$TDD) >= 0 or ($Options{'p'})) { if($Options{'d'}) { print "$ActName: Would be posted now (but running in simulation mode [$0 -d]).\n" if $Options{'v'}; } else { - postfaq(\$ActName,\$File,\$From,\$Subject,\$NG,\$Fup2,\$MIDF,\$ExtHea,\$Sender,\$TDY,\$TDM,\$TDD,\$ReplyTo,\$SupersedeMID); + postfaq(\$ActName,\$File,\$From,\$Subject,\$NG,\$Fup2,\$MIDF,\$ExtHea,\$Sender,\$TDY,\$TDM,\$TDD,\$ReplyTo,\$SupersedeMID,\$Expire); } } elsif($Options{'v'}) { print "$ActName: Nothing to do.\n"; @@ -122,9 +119,7 @@ sub readconfig{ my ($File, $Config, $Faq) = @_; my ($LastEntry, $Error, $i) = ('','',0); - if($Options{'v'}) { - print "Reading configuration.\n"; - } + print "Reading configuration.\n" if($Options{'v'}); open FH, "<$$File" or die "$0: E: Can't open $$File: $!"; while () { @@ -143,41 +138,71 @@ sub readconfig{ #Check saved values: for $i (0..$i){ next if (defined($$Faq) && defined($$Config[$i]{'name'}) && $$Config[$i]{'name'} ne $$Faq ); - unless($$Config[$i]{'from'} =~ /\S+\@(\S+\.)?\S{2,}\.\S{2,}/) { - $Error .= "E: The From-header for your project \"$$Config[$i]{'name'}\" seems to be incorrect.\n" + unless(defined($$Config[$i]{'name'}) && $$Config[$i]{'name'} =~ /^\S+$/) { + $Error .= "E: The name of your project \"$$Config[$i]{'name'}\" is not defined or contains whitespaces.\n" + } + unless(defined($$Config[$i]{'file'}) && -f $$Config[$i]{'file'}) { + $Error .= "E: The file to post for your project \"$$Config[$i]{'name'}\" is not defined or does not exist.\n" } - unless($$Config[$i]{'ngs'} =~ /^\S+$/) { - $Error .= "E: The Newsgroups-header for your project \"$$Config[$i]{'name'}\" contains whitespaces.\n" + unless(defined($$Config[$i]{'from'}) && $$Config[$i]{'from'} =~ /\S+\@(\S+\.)?\S{2,}\.\S{2,}/) { + $Error .= "E: The From header for your project \"$$Config[$i]{'name'}\" seems to be incorrect.\n" + } + unless(defined($$Config[$i]{'ngs'}) && $$Config[$i]{'ngs'} =~ /^\S+$/) { + $Error .= "E: The Newsgroups header for your project \"$$Config[$i]{'name'}\" is not defined or contains whitespaces.\n" + } + unless(defined($$Config[$i]{'subject'})) { + $Error .= "E: The Subject header for your project \"$$Config[$i]{'name'}\" is not defined.\n" } unless(!$$Config[$i]{'fup2'} || $$Config[$i]{'fup2'} =~ /^\S+$/) { - $Error .= "E: The Followup-To-header for your project \"$$Config[$i]{'name'}\" contains whitespaces.\n" + $Error .= "E: The Followup-To header for your project \"$$Config[$i]{'name'}\" contains whitespaces.\n" } - unless($$Config[$i]{'posting-frequency'} =~ /^\s*\d+\s*[dwmy]\s*$/) { + unless(defined($$Config[$i]{'posting-frequency'}) && $$Config[$i]{'posting-frequency'} =~ /^\s*\d+\s*[dwmy]\s*$/) { $Error .= "E: The Posting-frequency for your project \"$$Config[$i]{'name'}\" is invalid.\n" } - $Error .= "-" x 25 . "\n" if $Error; + unless(!$$Config[$i]{'expires'} || $$Config[$i]{'expires'} =~ /^\s*\d+\s*[dwmy]\s*$/) { + warn "$0: W: The Expires for your project \"$$Config[$i]{'name'}\" is invalid - set to 3 month.\n"; + } + unless(defined($$Config[$i]{'mid-format'}) && $$Config[$i]{'mid-format'} =~ /^<\S+\@\S{2,}\.\S{2,}>$/) { + warn "$0: W: The Expires for your project \"$$Config[$i]{'name'}\" seems to be invalid - set to default.\n"; + } } + $Error .= "-" x 25 . 'program terminated' . "-" x 25 . "\n" if $Error; die $Error if $Error; } +################################# calcdelta ################################# +# Takes a date (year, month and day) and a time period (1d, 1w, 1m, 1y, ...) +# and adds the latter to the former + +sub calcdelta { + my ($Year, $Month, $Day, $Period) = @_; + my ($NYear, $NMonth, $NDay); + + if ($Period =~ /(\d+)\s*([dw])/) { # Is counted in days or weeks: Use Add_Delta_Days. + ($NYear, $NMonth, $NDay) = Add_Delta_Days($Year, $Month, $Day, (($2 eq "w")?$1 * 7: $1 * 1)); + } elsif ($Period =~ /(\d+)\s*([my])/) { #Is counted in months or years: Use Add_Delta_YM + ($NYear, $NMonth, $NDay) = Add_Delta_YM($Year, $Month, $Day, (($2 eq "m")?(0,$1):($1,0))); + } + return ($NYear, $NMonth, $NDay); +} + ################################## postfaq ################################## # Takes a filename and many other vars. # # It reads the data-file $File and then posts the article. sub postfaq { - my ($ActName,$File,$From,$Subject,$NG,$Fup2,$MIDF,$ExtraHeaders,$Sender,$TDY,$TDM,$TDD,$ReplyTo,$Supersedes) = @_; + my ($ActName,$File,$From,$Subject,$NG,$Fup2,$MIDF,$ExtraHeaders,$Sender,$TDY,$TDM,$TDD,$ReplyTo,$Supersedes,$Expire) = @_; my (@Header,@Body,$MID,$InRealBody,$LastModified); - if($Options{'v'}) { - print "$$ActName: Preparing to post.\n"; - } + print "$$ActName: Preparing to post.\n" if($Options{'v'}); #Prepare MID: $$TDM = ($$TDM < 10 && $$TDM !~ /^0/) ? "0" . $$TDM : $$TDM; $$TDD = ($$TDD < 10 && $$TDD !~ /^0/) ? "0" . $$TDD : $$TDD; $MID = $$MIDF; + $MID = '<%n-%d.%m.%y@'.hostfqdn.'>' if !defined($MID); $MID =~ s/\%n/$$ActName/g; $MID =~ s/\%d/$$TDD/g; $MID =~ s/\%m/$$TDM/g; @@ -207,13 +232,15 @@ sub postfaq { my $wday = ("Sun","Mon","Tue","Wed","Thu","Fri","Sat")[$time[6]]; my $year = (1900 + $time[5]); my $tz = $time[8] ? " +0200" : " +0100"; - - my ($expY,$expM,$expD) = Add_Delta_YM($year, $month, $day, 0, 3); + + $$Expire = '3m' if !$$Expire; # set default if unset: 3 month + + my ($expY,$expM,$expD) = calcdelta ($year,$month,$day,$$Expire); my $expmonthN = ("Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec")[$expM-1]; my $date = "$day $monthN $year " . $hh . ":" . $mm . ":" . $ss . $tz; my $expdate = "$expD $expmonthN $expY $hh:$mm:$ss$tz"; - + #Replace %LM by the content of the news.answer-pseudo-header Last-modified: if ($LastModified) { $$Subject =~ s/\%LM/$LastModified/; @@ -245,14 +272,13 @@ sub postfaq { my @Article = ($UsePGP)?@{signpgp(\@Header, \@Body)}:(@Header, "\n", @Body); - if($Options{'v'}) { - print "$$ActName: Posting article ...\n"; - } + print "$$ActName: Posting article ...\n" if($Options{'v'}); post(\@Article); - if($Options{'v'}) { - print "$$ActName: Save status information.\n"; - } + # Test mode? + return if($Options{'t'}); + + print "$$ActName: Save status information.\n" if($Options{'v'}); open (FH, ">$$File.cfg") or die "$0: E: Can't open $$File.cfg: $!"; print FH "##;; Lastpost: $day.$month.$year\n"; @@ -460,3 +486,329 @@ sub signpgp { my @pgpmessage = (@pgphead, "\n", @pgpbody); return \@pgpmessage; } + +__END__ + +################################ Documentation ################################# + +=head1 NAME + +yapfaq - Post Usenet FAQs I<(yet another postfaq)> + +=head1 SYNOPSIS + +B [B<-hvpd>] [B<-t> I | CONSOLE] [B<-f> I] + +=head1 REQUIREMENTS + +=over 2 + +=item - + +Perl 5.8 or later + +=item - + +Net::NNTP + +=item - + +Date::Calc + +=item - + +Getopt::Std + +=back + +Furthermore you need access to a news server to actually post FAQs. + +=head1 DESCRIPTION + +B posts (one or more) FAQs to Usenet with a certain posting +frequency (every n days, weeks, months or years), adding all necessary +headers as defined in its config file (by default F). + +=head2 Configuration + +F consists of one or more blocks, separated by C<=====> on +a single line, each containing the configuration for one FAQ as a set +of definitions in the form of I. + +=over 4 + +=item B = I + +A name referring to your FAQ, also used for generation of a Message-ID. + +This value must be set. + +=item B = I + +A file containing the message body of your FAQ and all pseudo headers +(subheaders in the news.answers style). + +This value must be set. + +=item B = I