--- trunk/sender.pl	2005/05/15 17:01:19	18
+++ trunk/sender.pl	2005/05/17 21:37:06	38
@@ -1,10 +1,9 @@
 #!/usr/bin/perl -w
 
 use strict;
-use Class::DBI::Loader::Pg;
+use blib;
+use Nos;
 use Getopt::Long;
-use Email::Valid;
-use Email::Send;
 
 =head1 NAME
 
@@ -12,11 +11,16 @@
 
 =head1 SYNOPSYS
 
+ sender.pl --new=mylist
  sender.pl --add=mylist members.txt
  sender.pl --list[=mylist]
  sender.pl --queue[=mylist message.txt]
  sender.pl --send=mylist
 
+In C</etc/aliases> something like:
+
+ mylist: "| /path/to/sender.pl --inbox=mylist"
+
 =head2 Command options
 
 =over 20
@@ -25,34 +29,29 @@
 
 my $debug = 0;
 my $verbose = 0;
-my $list_opt;
-my $add_opt;
-my $queue_opt;
-my $send_opt;
-my $email_opt;
+my $opt;
 
 my $result = GetOptions(
-	"list:s" => \$list_opt,
-	"add=s" => \$add_opt,
-	"queue:s" => \$queue_opt,
-	"send:s" => \$send_opt,
+	"new=s" => \$opt->{'new'},
+	"list:s" => \$opt->{'list'},
+	"add=s" => \$opt->{'add'},
+	"queue:s" => \$opt->{'queue'},
+	"send:s" => \$opt->{'send'},
+	"inbox=s" => \$opt->{'inbox'},
 	"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');
@@ -67,6 +66,29 @@
 	JOIN lists on list_id = lists.id
 } );
 
+my $list_name;
+
+
+=item --new=list_name my-list@example.com
+
+Adds new list. You can also feed list name as first line to C<STDIN>.
+
+=cut
+
+if ($list_name = $opt->{'new'}) {
+
+	my $email = shift @ARGV || <>;
+	chomp($email);
+
+	die "need e-mail address for list (as argument or on STDIN)\n" unless ($email);
+
+	my $id = $nos->new_list(
+		list => $list_name,
+		email => $email,
+	) || die "can't add list $list_name\n";
+
+	print "added list $list_name with ID $id\n";
+
 
 =item --list[=list_name]
 
@@ -77,10 +99,12 @@
 
 =cut
 
-if (defined($list_opt)) {
+} elsif (defined($list_name = $opt->{'list'})) {
+
 	my @lists;
-	if ($list_opt ne '') {
-		@lists = $lists->search( name=> $list_opt )->first || die "can't find list $list_opt";
+
+	if ($list_name ne '') {
+		@lists = $lists->search( name=> $list_name )->first || die "can't find list $list_name";
 	} else {
 		@lists = $lists->retrieve_all;
 	}
@@ -93,6 +117,7 @@
 		}
 	}
 
+
 =item --add=list_name
 
 Add users to list. Users are stored in file (which can be supplied as
@@ -101,21 +126,13 @@
  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!";
+} elsif ($list_name = $opt->{'add'}) {
+
 	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;
-	}
+		name => $list_name,
+	}) || die "can't add list $list_name\n";
 
 	my $added = 0;
 
@@ -123,30 +140,12 @@
 		chomp;
 		next if (/^#/ || /^\s*$/);
 		my ($email, $name) = split(/\s+/,$_, 2);
-		$name ||= '';
-		if (! Email::Valid->address($email)) {
-			print "SKIPPING $name <$email>\n";
-			next;
-		}
-		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 => $list_name ));
 	}
 
 	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
@@ -157,36 +156,22 @@
 
 =cut
 
-} elsif (defined($queue_opt)) {
+} elsif (defined($list_name = $opt->{'queue'})) {
 
-	if ($queue_opt ne '') {
+	if ($list_name 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";
+		my $id = $nos->add_message_to_list(
+			list => $list_name,
+			message => $message_text,
+		) || die "can't add message to list $list_name\n";
 
-		$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";
+		print "added message $id to list $list_name\n";
 
 	} else {
 		# list messages in queue	
@@ -201,7 +186,7 @@
 			my $msg = $m->message_id->message;
 			$msg =~ s/\s+/ /gs;
 
-			$l .= sprintf(" %-10s %15s : ", $m->list_id->name, $date);
+			$l .= sprintf(" %-15s %15s : ", $m->list_id->name, $date);
 			$l .= substr($msg, 0, 79 - length($l));
 
 			print "$l\n";
@@ -209,6 +194,7 @@
 
 	}
 
+
 =item --send[=list_name]
 
 Send e-mails waiting in queue, or with optional argument, just send messages
@@ -216,50 +202,32 @@
 
 =cut
 
-} elsif (defined($send_opt)) {
+} elsif (defined($list_name = $opt->{'send'})) {
 
-	my $my_q;
-	if ($send_opt ne '') {
-		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;
-	}
+	$nos->send_queued_messages($list_name);
 
-	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;
+=item --inbox=list_name
 
-		foreach my $u ($user_list->search(list_id => $m->list_id)) {
+Feed incomming message back into notice sender.
 
-			my $hdr = "To: ".$u->user_id->full_name." <". $u->user_id->email. ">\n";
-
-			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";
-
-				# 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;
+=cut
+
+} elsif ($list_name = $opt->{'inbox'}) {
+
+	my $message;
+	while(<>) {
+		$message .= $_;
 	}
 
+	$nos->inbox_message(
+		list => $list_name,
+		message => $message,
+	) || die "can't receive message for list $list_name";
+
+
 } else  {
-	die "see perldoc $0 for help";
+	die "see perldoc $0 for help\n";
 }
 
 =back
@@ -278,10 +246,6 @@
 
 Dump more info on screen.
 
-=item --email
-
-Used to specify e-mail address where needed.
-
 =back