--- trunk/sender.pl	2005/05/14 10:44:53	3
+++ trunk/sender.pl	2005/05/15 22:30:54	24
@@ -1,70 +1,220 @@
 #!/usr/bin/perl -w
 
 use strict;
-use Class::DBI::Loader::Pg;
+use blib;
+use Nos;
 use Getopt::Long;
-use Data::Dumper;
 
-my ($list_opt,$debug) = (0,0);
+=head1 NAME
+
+sender.pl - command line notify sender utility
+
+=head1 SYNOPSYS
+
+ sender.pl --add=mylist members.txt
+ sender.pl --list[=mylist]
+ sender.pl --queue[=mylist message.txt]
+ sender.pl --send=mylist
+
+=head2 Command options
+
+=over 20
+
+=cut
+
+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"	=> \$list_opt,
+	"list:s" => \$list_opt,
 	"add=s" => \$add_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 $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. With it, this option will produce just users
+on that list.
+
+=cut
+
+if (defined($list_opt)) {
+	my @lists;
+	if ($list_opt ne '') {
+		@lists = $lists->search( name=> $list_opt )->first || die "can't find list $list_opt";
+	} else {
+		@lists = $lists->retrieve_all;
+	}
 
-if ($list_opt) {
-	foreach my $list ($lists->retrieve_all) {
-		print $list->name,"\n";
+	foreach my $list (@lists) {
+		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";
 		}
 	}
+
+=item --add=list_name
+
+Add users to list. Users are stored in file (which can be supplied as
+argument) or read from C<STDIN>. List should be in following format:
+
+ 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<This seems somewhat cludgy, and it will probably change in future>.
+
+=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++ if ($nos->add_member_to_list( email => $email, name => $name, list => $add_opt ));
 	}
 
-	foreach my $c_name ($loader->tables) {
-		my $c = $loader->find_class($c_name)|| die "can't find $c_name";
-		$c->dbi_commit();
+	print "list ",$list->name," has $added users\n";
+
+=item --queue[=list_name]
+
+Queue message for later delivery. Message can be read from file (specified as
+argument) or read from C<STDIN>.
+
+This option without optional parametar will display pending queue. If you
+add C<--verbose> flag, it will display all messages in queue.
+
+=cut
+
+} elsif (defined($queue_opt)) {
+
+	if ($queue_opt ne '') {
+		# add message to list queue
+
+		my $message_text;
+		while(<>) {
+			$message_text .= $_;
+		}
+
+		my $id = $nos->add_message_to_queue(
+			list => $queue_opt,
+			message => $message_text,
+		);
+
+		print "added message $id to list $queue_opt\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";
+		}
+
 	}
 
+=item --send[=list_name]
+
+Send e-mails waiting in queue, or with optional argument, just send messages
+for single list.
+
+=cut
+
+} elsif (defined($send_opt)) {
+
+	$nos->send_queued_messages($send_opt);
+
 } else  {
-	die "$0 --list --add=name_of_list --debug\n";
+	die "see perldoc $0 for help";
 }
 
+=back
+
+
+
+=head2 Helper options
+
+=over 20
+
+=item --debug
+
+Turn on debugging output from C<Class::DBI>
+
+=item --verbose
+
+Dump more info on screen.
+
+=item --email
+
+Used to specify e-mail address where needed.
+
+=back
+
+
+
+=head1 AUTHOR
+
+Dobrica Pavlinusic <dpavlin@rot13.org>
+
+=cut