===================================================================
RCS file: /cvs/openbsd/OpenBSDTorrents/ServerTorrents.pl,v
retrieving revision 1.3
retrieving revision 1.17
diff -u -r1.3 -r1.17
--- openbsd/OpenBSDTorrents/ServerTorrents.pl	2005/03/24 19:49:51	1.3
+++ openbsd/OpenBSDTorrents/ServerTorrents.pl	2005/05/20 18:18:13	1.17
@@ -1,32 +1,26 @@
 #!/usr/bin/perl -T
-#$Id: ServerTorrents.pl,v 1.3 2005/03/24 19:49:51 andrew Exp $
+#$Id: ServerTorrents.pl,v 1.17 2005/05/20 17:18:13 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;
+justme();
 
-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';
-
-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) {
@@ -51,27 +45,40 @@
 
 
 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 $epoch = timegm(0,$min,$hour,$mday,$mon,$year);
+	my $t;
+        eval {
+		$t = BT::MetaInfo::Cached->new(
+			$_,
+			{
+				cache_root =>
+				$OBT->{DIR_HOME} . '/FileCache'
+			}
+		);
+	};
 
+	if ($@) {
+		warn "Error reading torrent $_\n";
+		return undef;
+	}
+
+	my $epoch = $t->creation_date;
+
 	$files{$name}{$epoch} = {
 		file      => $_,
-		year      => $year,
-		mon       => $mon,
-		mday      => $mday,
-		hour      => $hour,
-		min       => $min,
+		details   => $t,
+		name      => $name,
 		epoch     => $epoch,
 	};
 
@@ -86,14 +93,14 @@
 		#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($files{$name}{$epoch});
 		}
 		next;
 	}
@@ -108,24 +115,25 @@
 	}
 }
 
+$ua->get($OBT->{URL_SANITY});
 
 sub Upload_Torrent
 {
-	my $file = shift;
-	my $time = shift;
+	my $torrent = shift;
+	my $t = $torrent->{'details'};
 
+	my $file = $torrent->{'file'};
 	print "Uploading $file\n";
 
-	my $t;
-	eval { $t = BT::MetaInfo->new("$TorrentDir/$file"); };
-	if ($@) {
-		warn "Error reading torrent $file\n";
-		return undef;
-	}
-
 	my $size = $t->total_size;
+	my ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday) =
+		gmtime($t->creation_date);
+	$year += 1900;
+	$mon++;
+	my $time = sprintf "%04d.%02d.%02d %02d:%02d", 
+		$year, $mon, $mday,  $hour, $min;
 
-	my $i;
+	my $i = 0;
 	while ($size > 1024) {
 		$size /= 1024;
 		$i++;
@@ -142,10 +150,10 @@
 	$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,
@@ -155,7 +163,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;