--- trunk/sender.pl	2005/05/14 20:54:40	13
+++ trunk/sender.pl	2005/05/15 14:20:08	14
@@ -5,6 +5,7 @@
 use Getopt::Long;
 use Mail::CheckUser qw(check_email);
 use Email::Valid;
+use Email::Send;
 
 =head1 NAME
 
@@ -14,7 +15,7 @@
 
  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
@@ -31,11 +32,13 @@
 my $list_opt;
 my $add_opt;
 my $queue_opt;
+my $send_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,
 );
 
@@ -57,10 +60,20 @@
 my $messages = $loader->find_class('messages');
 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
-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
 
@@ -125,37 +138,77 @@
 
 	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<STDIN>.
 
+This options without optional parametars it will display current 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) {
+			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]
 
-	my $this_message = $messages->find_or_create({
-		message => $message_text
-	}) || die "can't insert message";
+Send e-mail waiting in queue for all lists, or with optional argument for
+just single list.
+
+=cut
+
+} elsif (defined($send_opt)) {
 
-	$this_message->dbi_commit();
 
-	$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;
+	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 "see perldoc $0 for help";