--- trunk/sender.pl 2005/05/14 14:26:21 10 +++ trunk/sender.pl 2005/05/15 22:12:31 23 @@ -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 @@ -13,52 +13,64 @@ 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 +=head2 Command options =over 20 -=item --debug - -Turn on debugging output from C - =cut -my ($list_opt,$debug) = (0,0); +my $debug = 0; +my $verbose = 0; +my $list_opt; my $add_opt; my $queue_opt; +my $send_opt; +my $email_opt; my $result = GetOptions( "list:s" => \$list_opt, "add=s" => \$add_opt, - "queue=s" => \$queue_opt, + "queue:s" => \$queue_opt, + "send:s" => \$send_opt, "debug" => \$debug, + "verbose" => \$verbose, + "email=s" => \$email_opt, ); - -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 $message_list = $loader->find_class('message_list'); +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 +} ); + =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 @@ -71,7 +83,7 @@ } foreach my $list (@lists) { - print $list->name,"\n"; + print $list->name," <",$list->email,">\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"; @@ -86,70 +98,105 @@ email@example.com Optional full name of person dpavlin@rot13.org Dobrica Pavlinusic +You may use C<--email> parametar at any time to set From: e-mail address for list. +B. + =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"; + if ($email_opt && $list->email ne $email_opt) { + $list->email($email_opt); + $list->update; + $list->dbi_commit; + } + my $added = 0; while(<>) { 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 => $add_opt )); } 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($queue_opt)) { + + if ($queue_opt ne '') { + # add message to list queue + + my $this_list = $lists->search( + name => $queue_opt, + )->first || die "can't find list $queue_opt"; + + 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"; + + $this_message->dbi_commit() || die "can't add 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; + + $queue->dbi_commit || die "can't add message to list ",$this_list->name; + + print "added message ",$this_message->id, " to list ",$this_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(" %-10s %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); +=item --send[=list_name] - my $this_message = $messages->find_or_create({ - message => $message_text - }) || die "can't insert message"; +Send e-mails waiting in queue, or with optional argument, just send messages +for single list. - $this_message->dbi_commit(); +=cut - $message_list->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; +} elsif (defined($send_opt)) { - print "added message ",$this_message->id, " to list ",$this_list->name,"\n"; + $nos->send_queued_messages($send_opt); } else { die "see perldoc $0 for help"; @@ -157,6 +204,28 @@ =back + + +=head2 Helper options + +=over 20 + +=item --debug + +Turn on debugging output from C + +=item --verbose + +Dump more info on screen. + +=item --email + +Used to specify e-mail address where needed. + +=back + + + =head1 AUTHOR Dobrica Pavlinusic