===================================================================
RCS file: /cvs/openbsd/OpenBSDTorrents/ServerTorrents.pl,v
retrieving revision 1.1
retrieving revision 1.14
diff -u -r1.1 -r1.14
--- openbsd/OpenBSDTorrents/ServerTorrents.pl	2005/03/24 00:22:09	1.1
+++ openbsd/OpenBSDTorrents/ServerTorrents.pl	2005/05/05 21:33:42	1.14
@@ -1,30 +1,26 @@
 #!/usr/bin/perl -T
-#$Id: ServerTorrents.pl,v 1.1 2005/03/24 00:22:09 andrew Exp $
+#$Id: ServerTorrents.pl,v 1.14 2005/05/05 20:33:42 andrew Exp $
 use strict;
 use warnings;
 use diagnostics;
 
-use BT::MetaInfo;
 use LWP::UserAgent;
 use Time::Local;
 
 use lib 'lib';
 use OpenBSDTorrents;
+use BT::MetaInfo::Cached;
 
 %ENV = ();
 
-use YAML;
+#use YAML;
 
-my $url_torrents = 'http://openbsd.somedomain.net/dumptorrents.php';
-my $url_upload   = 'http://openbsd.somedomain.net/newtorrents.php';
-my $url_delete   = 'http://openbsd.somedomain.net/deltorrents.php';
+justme();
 
-my $user = 'torrentup';
-my $pass = 'ssapword';
-
+my @Sizes = ('', 'Ki', 'Mi', 'Gi', 'Ti');
 my $ua = LWP::UserAgent->new;
 
-my $response = $ua->get($url_torrents);
+my $response = $ua->get($OBT->{URL_TORRENTS});
 
 my %server_torrents;
 if ($response->is_success) {
@@ -49,18 +45,22 @@
 
 
 my %files;
-opendir DIR, $TorrentDir or die "Couldn't opendir $TorrentDir: $!";
+opendir DIR, $OBT->{DIR_TORRENT} or die "Couldn't opendir $OBT->{DIR_TORRENT}: $!";
 foreach (readdir DIR) {
+	chomp;
 	if (/^([^\/]+)$/) {
 		$_ = $1;
 	} else {
 		die "Invalid character in $_: $!";
 	}
 	next unless /\.torrent$/;
-	chomp;
 	my ($name, $year, $mon, $mday, $hour, $min) = 
 	   /^(.*)-(\d{4})-(\d{2})-(\d{2})-(\d{2})(\d{2})/;
 
+	my $time = "$year.$mon.$mday $hour:$min";
+
+	$mon--;
+
 	my $epoch = timegm(0,$min,$hour,$mday,$mon,$year);
 
 	$files{$name}{$epoch} = {
@@ -70,6 +70,7 @@
 		mday      => $mday,
 		hour      => $hour,
 		min       => $min,
+		time      => $time,
 		epoch     => $epoch,
 	};
 
@@ -84,25 +85,29 @@
 		#print "\t$epoch\n";
 		my $torrent = $files{$name}{$epoch}{file};
 		unless (exists $server_torrents{$torrent} ) {
-			my $time = 
-				$files{$name}{$epoch}{year} . '-' . 
-				$files{$name}{$epoch}{mon}  . '-' . 
-				$files{$name}{$epoch}{mday} . ' ' .
-				$files{$name}{$epoch}{hour} . ':' .
-				$files{$name}{$epoch}{min}  . ':00';
+			#my $time = 
+			#	$files{$name}{$epoch}{year} . '-' . 
+			#	$files{$name}{$epoch}{mon}  . '-' . 
+			#	$files{$name}{$epoch}{mday} . ' ' .
+			#	$files{$name}{$epoch}{hour} . ':' .
+			#	$files{$name}{$epoch}{min}  . ':00';
 				
-			Upload_Torrent($torrent, $time);
+			Upload_Torrent($torrent, $files{$name}{$epoch}{time});
 		}
 		next;
 	}
 }
 
 foreach my $file (keys %server_torrents) {
-	unless (exists $files{$file}) {
+	my ($name, $year, $mon, $mday, $hour, $min) = 
+	   $file =~
+	   /^(.*)-(\d{4})-(\d{2})-(\d{2})-(\d{2})(\d{2})/;
+	unless (exists $files{$name}) {
 		Delete_Torrent($file);
 	}
 }
 
+$ua->get($OBT->{URL_SANITY});
 
 sub Upload_Torrent
 {
@@ -112,24 +117,35 @@
 	print "Uploading $file\n";
 
 	my $t;
-	eval { $t = BT::MetaInfo->new("$TorrentDir/$file"); };
+	eval { $t = BT::MetaInfo::Cached->new("$OBT->{DIR_TORRENT}/$file"); };
 	if ($@) {
 		warn "Error reading torrent $file\n";
 		return undef;
 	}
 
+	my $size = $t->total_size;
+
+	my $i = 0;
+	while ($size > 1024) {
+		$size /= 1024;
+		$i++;
+	}
+	$size = sprintf('%.2f', $size);
+	$size .= $Sizes[$i] . 'B';
+	
 	my $comment = $t->{comment};
 	$comment =~ s/\n.*$//s;
-
-	my ($filename) = $comment =~ /Files from ([^<]+)/;
+	
+	my ($filename) = $comment =~ /Files from (.+)/;
 	$filename =~ s#/# #g;
 	
-	$filename .= ' (' . $time . ')';
+	$comment  .= " [$size]";
+	$filename .= " [$time]";
 
-	my $response = $ua->post($url_upload, {
-		username => $user,
-		password => $pass,
-		torrent  => [ "$TorrentDir/$file" ],
+	my $response = $ua->post($OBT->{URL_UPLOAD}, {
+		username => $OBT->{UPLOAD_USER},
+		password => $OBT->{UPLOAD_PASS},
+		torrent  => [ $OBT->{DIR_TORRENT} . "/$file" ],
 		url      => "/torrents/$file",
 		filename => $filename,
 		filedate => $time,
@@ -139,7 +155,7 @@
 	}, Content_Type => 'form-data');
 
 	if ($response->is_success) {
-		print "Uploaded  $file\n";
+		print STDERR "Uploaded  $file\n";
 		#print $response->content;
 	} else {
     		die $response->status_line;