--- trunk/sender.pl	2005/05/14 12:31:27	6
+++ trunk/sender.pl	2005/05/15 14:20:08	14
@@ -3,22 +3,42 @@
 use strict;
 use Class::DBI::Loader::Pg;
 use Getopt::Long;
-use Data::Dumper;
+use Mail::CheckUser qw(check_email);
+use Email::Valid;
+use Email::Send;
 
 =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 All options
+
+=over 20
+
+=item --debug
+
+Turn on debugging output from C<Class::DBI>
+
 =cut
 
-my ($list_opt,$debug) = (0,0);
+my $debug = 0;
+my $list_opt;
 my $add_opt;
 my $queue_opt;
+my $send_opt;
 
 my $result = GetOptions(
-	"list"	=> \$list_opt,
+	"list:s" => \$list_opt,
 	"add=s" => \$add_opt,
-	"queue=s" => \$queue_opt,
+	"queue:s" => \$queue_opt,
+	"send:s" => \$send_opt,
 	"debug"	=> \$debug,
 );
 
@@ -38,16 +58,51 @@
 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');
+
+$queue->set_sql( list_queue => qq{
+	SELECT messages.message, messages.date AS message_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 ($list_opt) {
-	foreach my $list ($lists->retrieve_all) {
+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;
+	}
+
+	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";
 		}
 	}
+
+=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
+
+=cut
+
 } elsif ($add_opt) {
 	#my $noticer = $loader->find_class('Noticer') || die "can't find my class!";
 	my $list = $lists->find_or_create({
@@ -60,6 +115,10 @@
 		chomp;
 		next if (/^#/ || /^\s*$/);
 		my ($email, $name) = split(/\s+/,$_, 2);
+		if (! Email::Valid->address($email)) {
+			print "SKIPPING $name <$email>\n";
+			next;
+		}
 		print "# $name <$email>\n";
 		my $this_user = $users->find_or_create({
 			email => $email,
@@ -79,37 +138,87 @@
 
 	print "list ",$list->name," has $added users\n";
 
-} elsif ($queue_opt) {
-	my $this_list = $lists->search(
-		name => $queue_opt,
-	)->first || die "can't find list $queue_opt";
+=item --queue[=list_name]
+
+Queue message for later delivery. Message can be read from file (specified as
+argument) or read from C<STDIN>.
+
+This options without optional parametars it will display current queue.
+
+=cut
+
+} 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) {
+			my $l = sprintf("%-10s %15s : ", $m->list_id->name, $m->message_id->date);
+			$l .= substr($m->message_id->message, 0, 79 - length($l));
+			$l =~ s/[\n\r]/ /gs;
+			print "$l\n";
+		}
 
-	my $message_text;
-	while(<>) {
-		$message_text .= $_;
 	}
 
-	die "no message" unless ($message_text);
+=item --send[=list_name]
+
+Send e-mail waiting in queue for all lists, or with optional argument for
+just single list.
 
-	my $this_message = $messages->find_or_create({
-		message => $message_text
-	}) || die "can't insert message";
+=cut
+
+} elsif (defined($send_opt)) {
 
-	$this_message->dbi_commit();
 
-	$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;
+	die "send option not yet implemented";
 
-	print "added message ",$this_message->id, " to list ",$this_list->name,"\n";
+	my @q;
+	if ($send_opt ne '') {
+#		@q => $queue->search( name => 'foo' );
+	}
+	foreach my $q (@q) {
+		
+	}
 
 } else  {
-	die $0.'
-	--list				show all lists and users
-	--add=name_of_list < users.txt	add users (email@example.com full name)
-	--queue=name_of_list < message	queue message for sending to list
-	--debug
-';
+	die "see perldoc $0 for help";
 }
 
+=back
+
+=head1 AUTHOR
+
+Dobrica Pavlinusic <dpavlin@rot13.org>
+
+=cut
+