--- trunk/sender.pl 2005/05/14 18:20:50 11 +++ trunk/sender.pl 2005/05/25 15:20:38 53 @@ -1,9 +1,9 @@ #!/usr/bin/perl -w use strict; -use Class::DBI::Loader::Pg; +use blib; +use Nos; use Getopt::Long; -use Data::Dumper; =head1 NAME @@ -11,73 +11,119 @@ =head1 SYNOPSYS + sender.pl --new=mylist sender.pl --add=mylist members.txt sender.pl --list[=mylist] - sender.pl --queue=mylist message.txt + sender.pl --queue[=mylist message.txt] sender.pl --send=mylist -=head2 All options +In C something like: -=over 20 + mylist: "| cd /path/to && ./sender.pl --inbox=mylist" -=item --debug +=head2 Command options -Turn on debugging output from C +=over 20 =cut -my ($list_opt,$debug) = (0,0); -my $add_opt; -my $queue_opt; +my $debug = 0; +my $verbose = 0; +my $opt; my $result = GetOptions( - "list:s" => \$list_opt, - "add=s" => \$add_opt, - "queue=s" => \$queue_opt, + "new=s" => \$opt->{'new'}, + "list:s" => \$opt->{'list'}, + "add=s" => \$opt->{'add'}, + "queue:s" => \$opt->{'queue'}, + "send:s" => \$opt->{'send'}, + "inbox=s" => \$opt->{'inbox'}, "debug" => \$debug, + "verbose" => \$verbose, + "from=s" => \$opt->{'from'}, + "driver=s" => \$opt->{'email_send_driver'}, + "sleep=i" => \$opt->{'sleep'}, ); - -my $loader = Class::DBI::Loader::Pg->new( - debug => $debug, - dsn => "dbi:Pg:dbname=notices", - user => "dpavlin", - password => "", - namespace => "Noticer", -# additional_classes => qw/Class::DBI::AbstractSearch/, -# additional_base_classes => qw/My::Stuff/, - relationships => 1, +my $nos = new Nos( + dsn => 'dbi:Pg:dbname=notices', + user => 'dpavlin', + passwd => '', + debug => $debug, + verbose => $verbose, ); +my $loader = $nos->{'loader'} || die "can't find loader?"; + my $lists = $loader->find_class('lists'); my $users = $loader->find_class('users'); my $user_list = $loader->find_class('user_list'); my $messages = $loader->find_class('messages'); my $queue = $loader->find_class('queue'); +my $sent = $loader->find_class('sent'); + +$queue->set_sql( list_queue => qq{ + SELECT messages.message, messages.date AS date, lists.name AS list + FROM queue + JOIN messages on message_id = messages.id + JOIN lists on list_id = lists.id +} ); + +my $list_name; + + +=item --new=list_name my-list@example.com + +Adds new list. You can also feed list name as first line to C. + +You can also add C<--from='Full name of list'> to specify full name (comment) +in outgoing e-mail. + +=cut + +if ($list_name = $opt->{'new'}) { + + my $email = shift @ARGV || <>; + chomp($email); + + die "need e-mail address for list (as argument or on STDIN)\n" unless ($email); + + my $id = $nos->new_list( + list => $list_name, + from => ($opt->{'from'} || ''), + email => $email, + ) || die "can't add list $list_name\n"; + + print "added list $list_name with ID $id\n"; + =item --list[=list_name] -List all available lists and users on them. Optional value is name of list -and it will produce users just on that list. +List all available lists and users on them. + +Optional value is name of list. With it, this option will produce just users +on that list. =cut -if (defined($list_opt)) { +} elsif (defined($list_name = $opt->{'list'})) { + my @lists; - if ($list_opt ne '') { - @lists = $lists->search( name=> $list_opt )->first || die "can't find list $list_opt"; + + if ($list_name ne '') { + @lists = $lists->search( name=> $list_name )->first || die "can't find list $list_name"; } else { @lists = $lists->retrieve_all; } foreach my $list (@lists) { - print $list->name,"\n"; - foreach my $user_on_list ($user_list->search(list_id => $list->id)) { - my $user = $users->retrieve( id => $user_on_list->user_id ); - print "\t",$user->full_name," <", $user->email, ">\n"; + print $list->name,": ",$list->from_addr," <",$list->email,">\n"; + foreach my $u ($nos->list_members( list => $list->name )) { + print "\t",$u->{'name'}, " <", $u->{'email'}, ">\n"; } } + =item --add=list_name Add users to list. Users are stored in file (which can be supplied as @@ -88,11 +134,9 @@ =cut -} elsif ($add_opt) { - #my $noticer = $loader->find_class('Noticer') || die "can't find my class!"; - my $list = $lists->find_or_create({ - name => $add_opt, - }) || die "can't add list $add_opt\n"; +} elsif ($list_name = $opt->{'add'}) { + + my $list = $nos->_get_list($list_name) || die "can't find list $list_name\n"; my $added = 0; @@ -100,63 +144,126 @@ chomp; next if (/^#/ || /^\s*$/); my ($email, $name) = split(/\s+/,$_, 2); - print "# $name <$email>\n"; - my $this_user = $users->find_or_create({ - email => $email, - full_name => $name, - }) || die "can't find or create member\n"; - my $user_on_list = $user_list->find_or_create({ - user_id => $this_user->id, - list_id => $list->id, - }) || die "can't add user to list"; - $added++; - } - - foreach my $c_name ($loader->tables) { - my $c = $loader->find_class($c_name)|| die "can't find $c_name"; - $c->dbi_commit(); + $added++ if ($nos->add_member_to_list( email => $email, name => $name, list => $list_name )); } print "list ",$list->name," has $added users\n"; -=item --queue=list_name + +=item --queue[=list_name] Queue message for later delivery. Message can be read from file (specified as argument) or read from C. +This option without optional parametar will display pending queue. If you +add C<--verbose> flag, it will display all messages in queue. + =cut -} elsif ($queue_opt) { - my $this_list = $lists->search( - name => $queue_opt, - )->first || die "can't find list $queue_opt"; +} elsif (defined($list_name = $opt->{'queue'})) { + + if ($list_name ne '') { + # add message to list queue + + my $message_text; + while(<>) { + $message_text .= $_; + } + + my $id = $nos->add_message_to_list( + list => $list_name, + message => $message_text, + ) || die "can't add message to list $list_name\n"; + + print "added message $id to list $list_name\n"; + + } else { + # list messages in queue + + foreach my $m ($queue->retrieve_all) { + next if ($m->all_sent && ! $verbose); + + my $l = $m->all_sent ? 'S' : 'Q'; + + my $date = $m->message_id->date; + $date =~ s/\..+$//; + my $msg = $m->message_id->message; + $msg =~ s/\s+/ /gs; + + $l .= sprintf(" %-15s %15s : ", $m->list_id->name, $date); + $l .= substr($msg, 0, 79 - length($l)); + + print "$l\n"; + } - my $message_text; - while(<>) { - $message_text .= $_; } - die "no message" unless ($message_text); - my $this_message = $messages->find_or_create({ - message => $message_text - }) || die "can't insert message"; +=item --send[=list_name] + +Send e-mails waiting in queue, or with optional argument, just send messages +for single list. + +Optional argument C<--driver=smtp> forces sending using SMTP server at +localhost (127.0.0.1). + +Optional argument C<--sleep=42> defines that sender will sleep 42 seconds +between sending e-mail. + +=cut + +} elsif (defined($list_name = $opt->{'send'})) { + + $nos->send_queued_messages( + list => $list_name, + driver => $opt->{'email_send_driver'}, + sleep => $opt->{'sleep'}, + ); + + +=item --inbox=list_name + +Feed incomming message back into notice sender. + +=cut + +} elsif ($list_name = $opt->{'inbox'}) { - $this_message->dbi_commit(); + my $message; + while(<>) { + $message .= $_; + } - $queue->find_or_create({ - message_id => $this_message->id, - list_id => $this_list->id, - }) || die "can't add message ",$this_message->id," to list ",$this_list->id, ": ",$this_list->name; + $nos->inbox_message( + list => $list_name, + message => $message, + ) || die "can't receive message for list $list_name"; - print "added message ",$this_message->id, " to list ",$this_list->name,"\n"; } else { - die "see perldoc $0 for help"; + die "see perldoc $0 for help\n"; } =back + + +=head2 Helper options + +=over 20 + +=item --debug + +Turn on debugging output from C + +=item --verbose + +Dump more info on screen. + +=back + + + =head1 AUTHOR Dobrica Pavlinusic