projects
/
usenet
/
yapfaq.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add option '-s': pipe article to script.
[usenet/yapfaq.git]
/
yapfaq.pl
diff --git
a/yapfaq.pl
b/yapfaq.pl
index
084c77e
..
c36be30
100644
(file)
--- a/
yapfaq.pl
+++ b/
yapfaq.pl
@@
-58,22
+58,31
@@
use Fcntl ':flock'; # import LOCK_* constants
use Getopt::Std;
my ($TDY, $TDM, $TDD) = Today(); #TD: Today's date
use Getopt::Std;
my ($TDY, $TDM, $TDD) = Today(); #TD: Today's date
+# read commandline options
my %Options;
my %Options;
-getopts('Vhvpdt:f:', \%Options);
+getopts('Vhvpdt:f:s:', \%Options);
+# -V: print version / copyright information
if ($Options{'V'}) {
print "$0 v $Version\nCopyright (c) 2003 Marc Brockschmidt <marc\@marcbrockschmidt.de>\nCopyright (c) 2010 Thomas Hochstein <thh\@inter.net>\n";
print "This program is free software; you may redistribute it and/or modify it under the same terms as Perl itself.\n";
exit(0);
}
if ($Options{'V'}) {
print "$0 v $Version\nCopyright (c) 2003 Marc Brockschmidt <marc\@marcbrockschmidt.de>\nCopyright (c) 2010 Thomas Hochstein <thh\@inter.net>\n";
print "This program is free software; you may redistribute it and/or modify it under the same terms as Perl itself.\n";
exit(0);
}
+# -h: feed myself to perldoc
if ($Options{'h'}) {
exec ('perldoc', $0);
exit(0);
};
if ($Options{'h'}) {
exec ('perldoc', $0);
exit(0);
};
+# -f: set $Faq
my ($Faq) = $Options{'f'} if ($Options{'f'});
my ($Faq) = $Options{'f'} if ($Options{'f'});
+# read configuration (configured FAQs)
my @Config;
readconfig (\$ConfigFile, \@Config, \$Faq);
my @Config;
readconfig (\$ConfigFile, \@Config, \$Faq);
+# for each FAQ:
+# - parse configuration
+# - read status data
+# - if FAQ is due: call postfaq()
foreach (@Config) {
my ($LPD,$LPM,$LPY) = (01, 01, 0001); #LP: Last posting-date
my ($NPY,$NPM,$NPD); #NP: Next posting-date
foreach (@Config) {
my ($LPD,$LPM,$LPY) = (01, 01, 0001); #LP: Last posting-date
my ($NPY,$NPM,$NPD); #NP: Next posting-date
@@
-84,8
+93,10
@@
foreach (@Config) {
my ($MIDF,$ReplyTo,$ExtHea)=($$_{'mid-format'},$$_{'reply-to'},$$_{'extraheader'});
my ($Supersede) =($$_{'supersede'});
my ($MIDF,$ReplyTo,$ExtHea)=($$_{'mid-format'},$$_{'reply-to'},$$_{'extraheader'});
my ($Supersede) =($$_{'supersede'});
+ # -f: loop if not FAQ to post
next if (defined($Faq) && $ActName ne $Faq);
next if (defined($Faq) && $ActName ne $Faq);
+ # read status data
if (open (FH, "<$File.cfg")) {
while(<FH>){
if (/##;; Lastpost:\s*(\d{1,2})\.(\d{1,2})\.(\d{2}(\d{2})?)/){
if (open (FH, "<$File.cfg")) {
while(<FH>){
if (/##;; Lastpost:\s*(\d{1,2})\.(\d{1,2})\.(\d{2}(\d{2})?)/){
@@
-103,6
+114,7
@@
foreach (@Config) {
($NPY,$NPM,$NPD) = calcdelta ($LPY,$LPM,$LPD,$PFreq);
($NPY,$NPM,$NPD) = calcdelta ($LPY,$LPM,$LPD,$PFreq);
+ # if FAQ is due: get it out
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'};
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'};
@@
-213,7
+225,6
@@
sub postfaq {
$MID =~ s/\%m/$$TDM/g;
$MID =~ s/\%y/$$TDY/g;
$MID =~ s/\%m/$$TDM/g;
$MID =~ s/\%y/$$TDY/g;
-
#Now get the body:
open (FH, "<$$File");
while (<FH>){
#Now get the body:
open (FH, "<$$File");
while (<FH>){
@@
-275,14
+286,17
@@
sub postfaq {
push @Header, "$_\n" for (split /\n/, $$ExtraHeaders);
}
push @Header, "$_\n" for (split /\n/, $$ExtraHeaders);
}
+ # sign article if $UsePGP is true
my @Article = ($UsePGP)?@{signpgp(\@Header, \@Body)}:(@Header, "\n", @Body);
my @Article = ($UsePGP)?@{signpgp(\@Header, \@Body)}:(@Header, "\n", @Body);
+ # post article
print "$$ActName: Posting article ...\n" if($Options{'v'});
post(\@Article);
# Test mode?
return if($Options{'t'});
print "$$ActName: Posting article ...\n" if($Options{'v'});
post(\@Article);
# Test mode?
return if($Options{'t'});
+ # otherwise: update status data
print "$$ActName: Save status information.\n" if($Options{'v'});
open (FH, ">$$File.cfg") or die "$0: E: Can't open $$File.cfg: $!";
print "$$ActName: Save status information.\n" if($Options{'v'});
open (FH, ">$$File.cfg") or die "$0: E: Can't open $$File.cfg: $!";
@@
-301,12
+315,20
@@
sub post {
# Test mode?
if(defined($Options{'t'}) and $Options{'t'} =~ /console/i) {
# Test mode?
if(defined($Options{'t'}) and $Options{'t'} =~ /console/i) {
- print "
\n
-----BEGIN--------------------------------------------------\n";
+ print "-----BEGIN--------------------------------------------------\n";
print @$ArticleR;
print @$ArticleR;
- print "
\n
------END---------------------------------------------------\n";
+ print "------END---------------------------------------------------\n";
return;
}
return;
}
+ # pipe to script?
+ if(defined($Options{'s'})) {
+ open (POST, "| $Options{'s'}") or die "$0: E: Cannot fork $Options{'s'}: $!\n";
+ print POST @$ArticleR;
+ close POST;
+ return;
+ }
+
my $NewsConnection = Net::NNTP->new($NNTPServer, Reader => 1)
or die "$0: E: Can't connect to news server '$NNTPServer'!\n";
my $NewsConnection = Net::NNTP->new($NNTPServer, Reader => 1)
or die "$0: E: Can't connect to news server '$NNTPServer'!\n";
@@
-315,6
+337,7
@@
sub post {
$NewsConnection->datasend (@$ArticleR);
$NewsConnection->dataend();
$NewsConnection->datasend (@$ArticleR);
$NewsConnection->dataend();
+ # Posting failed? Save to ERROR.dat
if (!$NewsConnection->ok()) {
open FH, ">>ERROR.dat";
print FH "\nPosting failed! Saving to ERROR.dat. Response from news server:\n";
if (!$NewsConnection->ok()) {
open FH, ">>ERROR.dat";
print FH "\nPosting failed! Saving to ERROR.dat. Response from news server:\n";
@@
-502,7
+525,7
@@
yapfaq - Post Usenet FAQs I<(yet another postfaq)>
=head1 SYNOPSIS
=head1 SYNOPSIS
-B<yapfaq> [B<-hvpd>] [B<-t> I<newsgroups> | CONSOLE] [B<-f> I<project name>]
+B<yapfaq> [B<-hvpd>] [B<-t> I<newsgroups> | CONSOLE] [B<-f> I<project name>]
[B<-s> I<program>]
=head1 REQUIREMENTS
=head1 REQUIREMENTS
@@
-745,6
+768,12
@@
will be posted unconditionally. That may not be what you want to
achieve, so you can limit the operation of B<yapfaq> to the named FAQ
only.
achieve, so you can limit the operation of B<yapfaq> to the named FAQ
only.
+=item B<-s> I<program> (pipe to script)
+
+Instead of posting the article(s) to Usenet pipe them to the external
+I<program> on STDIN (which may post the article(s) then). A return
+value of 0 will be considered success.
+
=back
=head1 EXAMPLES
=back
=head1 EXAMPLES
This page took
0.012505 seconds
and
4
git commands to generate.