--- trunk/sender.pl	2005/05/15 14:20:08	14
+++ trunk/sender.pl	2005/05/15 17:04:18	19
@@ -3,7 +3,6 @@
 use strict;
 use Class::DBI::Loader::Pg;
 use Getopt::Long;
-use Mail::CheckUser qw(check_email);
 use Email::Valid;
 use Email::Send;
 
@@ -18,21 +17,19 @@
  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<Class::DBI>
-
 =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:s" => \$list_opt,
@@ -40,6 +37,8 @@
 	"queue:s" => \$queue_opt,
 	"send:s" => \$send_opt,
 	"debug"	=> \$debug,
+	"verbose" => \$verbose,
+	"email=s" => \$email_opt,
 );
 
 
@@ -59,9 +58,10 @@
 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 message_date, lists.name AS list
+	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
@@ -86,7 +86,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";
@@ -101,6 +101,9 @@
  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) {
@@ -108,6 +111,11 @@
 	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;
 
@@ -115,6 +123,7 @@
 		chomp;
 		next if (/^#/ || /^\s*$/);
 		my ($email, $name) = split(/\s+/,$_, 2);
+		$name ||= '';
 		if (! Email::Valid->address($email)) {
 			print "SKIPPING $name <$email>\n";
 			next;
@@ -143,7 +152,8 @@
 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.
+This option without optional parametar will display pending queue. If you
+add C<--verbose> flag, it will display all messages in queue.
 
 =cut
 
@@ -182,9 +192,18 @@
 		# 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;
+			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";
 		}
 
@@ -192,22 +211,52 @@
 
 =item --send[=list_name]
 
-Send e-mail waiting in queue for all lists, or with optional argument for
-just single list.
+Send e-mails waiting in queue, or with optional argument, just send messages
+for single list.
 
 =cut
 
 } elsif (defined($send_opt)) {
 
-
-	die "send option not yet implemented";
-
-	my @q;
+	my $my_q;
 	if ($send_opt ne '') {
-#		@q => $queue->search( name => 'foo' );
+		my $l_id = $lists->search_like( name => $send_opt )->first ||
+			die "can't find list $send_opt";
+		$my_q = $queue->search_like( list_id => $l_id ) ||
+			die "can't find list $send_opt";
+	} else {
+		$my_q = $queue->retrieve_all;
 	}
-	foreach my $q (@q) {
-		
+
+	while (my $m = $my_q->next) {
+		next if ($m->all_sent);
+
+		print "sending message ",$m->message_id," enqueued on ",$m->date," to list ",$m->list_id->name,"\n";
+		my $msg = $m->message_id->message;
+
+		foreach my $u ($user_list->search(list_id => $m->list_id)) {
+
+			if ($sent->search( message_id => $m->message_id, user_id => $u->user_id )) {
+				print "SKIP ",$u->user_id->email," message allready sent\n";
+			} else {
+				print "\t",$u->user_id->email,"\n";
+
+				my $hdr = "From: " . $u->list_id->name . " <" . $u->list_id->email . ">\n" .
+					"To: " . $u->user_id->full_name . " <". $u->user_id->email. ">\n";
+
+				# FIXME do real sending :-)
+				send IO => "$hdr\n$msg";
+
+				$sent->create({
+					message_id => $m->message_id,
+					user_id => $u->user_id,
+				});
+				$sent->dbi_commit;
+			}
+		}
+		$m->all_sent(1);
+		$m->update;
+		$m->dbi_commit;
 	}
 
 } else  {
@@ -216,6 +265,28 @@
 
 =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>