===================================================================
RCS file: /cvs/openbsd/OpenBSDTorrents/ServerTorrents.pl,v
retrieving revision 1.10
retrieving revision 1.20
diff -u -r1.10 -r1.20
--- openbsd/OpenBSDTorrents/ServerTorrents.pl	2005/04/07 00:05:28	1.10
+++ openbsd/OpenBSDTorrents/ServerTorrents.pl	2005/06/03 02:32:40	1.20
@@ -1,15 +1,15 @@
 #!/usr/bin/perl -T
-#$Id: ServerTorrents.pl,v 1.10 2005/04/06 23:05:28 andrew Exp $
+#$Id: ServerTorrents.pl,v 1.20 2005/06/03 01:32:40 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 = ();
 
@@ -32,11 +32,11 @@
             s/^\s+//;
             s/\s+$//;
             next unless $_;
-            my ($name, $hash) = split /\t/;
+            my ($name, $hash, $disabled) = split /\t/;
             next if $name eq 'File';
 
             $name =~ s#^/torrents/##;
-            $server_torrents{$name} = $hash;
+            $server_torrents{$name}{$hash} = $disabled;
         }
     }
 } else {
@@ -57,53 +57,64 @@
 	my ($name, $year, $mon, $mday, $hour, $min) = 
 	   /^(.*)-(\d{4})-(\d{2})-(\d{2})-(\d{2})(\d{2})/;
 
-	my $time = "$year.$mon.$mday $hour:$min";
+	my $t;
+        eval {
+		$t = BT::MetaInfo::Cached->new(
+			$OBT->{DIR_TORRENT} . '/' . $_,
+			{
+				cache_root =>
+				$OBT->{DIR_HOME} . '/FileCache'
+			}
+		);
+	};
 
-	$mon--;
+	if ($@) {
+		warn "Error reading torrent $_\n";
+		next;
+	}
 
-	my $epoch = timegm(0,$min,$hour,$mday,$mon,$year);
+	my $epoch = $t->creation_date;
 
 	$files{$name}{$epoch} = {
 		file      => $_,
-		year      => $year,
-		mon       => $mon,
-		mday      => $mday,
-		hour      => $hour,
-		min       => $min,
-		time      => $time,
+		details   => $t,
+		name      => $name,
 		epoch     => $epoch,
 	};
 
 }
 closedir DIR;
 
-#print Dump \%server_torrents, \%files;
+#use Data::Dumper;
+#print Dumper \%server_torrents;#, \%files;
+#exit;
 
-foreach my $name (keys %files) {
+my %torrents;
+FILE: foreach my $name (keys %files) {
 	#print "$name\n";
 	foreach my $epoch ( sort { $b <=> $a } keys %{ $files{$name} } ) {
 		#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';
-				
-			Upload_Torrent($torrent, $files{$name}{$epoch}{time});
+
+		my $hash = $files{$name}{$epoch}{'details'}->info_hash;
+		$hash = unpack("H*", $hash);
+
+		$torrents{$torrent}{$hash} = $files{$name}{$epoch};
+
+		unless (exists $server_torrents{$torrent}{$hash}) {
+			Upload_Torrent($files{$name}{$epoch});
 		}
-		next;
 	}
 }
 
-foreach my $file (keys %server_torrents) {
-	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);
+foreach my $torrent (keys %server_torrents) {
+	foreach my $hash (keys %{ $server_torrents{$torrent} }) {
+		unless (
+			exists $torrents{$torrent}{$hash} ||
+			$server_torrents{$torrent}{$hash} == 1
+		) {
+			Delete_Torrent($torrent, $hash);
+		}
 	}
 }
 
@@ -111,21 +122,28 @@
 
 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("$OBT->{DIR_TORRENT}/$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;
+	($sec, $min, $hour, $mday, $mon, $year, $wday, $yday) =
+		localtime($t->creation_date);
+	$year += 1900;
+	$mon++;
+	my $sql_time = sprintf "%04d-%02d-%02d %02d:%02d", 
+		$year, $mon, $mday,  $hour, $min;
+
+	my $i = 0;
 	while ($size > 1024) {
 		$size /= 1024;
 		$i++;
@@ -148,7 +166,7 @@
 		torrent  => [ $OBT->{DIR_TORRENT} . "/$file" ],
 		url      => "/torrents/$file",
 		filename => $filename,
-		filedate => $time,
+		filedate => $sql_time,
 		info     => $comment,
 		hash     => '',
 		autoset  => 'enabled', # -> checked="checked"
@@ -164,6 +182,27 @@
 
 sub Delete_Torrent
 {
-	my $file = shift;
-	print "Will delete $file soon enough\n";
+	my $filename = shift;
+	my $hash = shift;
+	die "No hash passed!" unless $hash;
+
+	print "Disabling $filename\n";
+
+	my $response = $ua->post($OBT->{'URL_DELETE'}, {
+		username => $OBT->{UPLOAD_USER},
+		password => $OBT->{UPLOAD_PASS},
+		filename => $filename,
+		hash     => $hash,
+	}, Content_Type => 'form-data');
+
+	if ($response->is_success) {
+		#print $response->content;
+		if ($response->content =~ /Torrent was removed successfully/) {
+			print STDERR "Disabled $filename\n";
+		} else {
+			print STDERR "An error occoured removing $filename\n";
+		}
+	} else {
+    		die $response->status_line;
+	}
 }