===================================================================
RCS file: /cvs/openbsd/OpenBSDTorrents/ServerTorrents.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- openbsd/OpenBSDTorrents/ServerTorrents.pl	2005/05/20 18:51:51	1.18
+++ openbsd/OpenBSDTorrents/ServerTorrents.pl	2005/05/21 01:48:03	1.19
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -T
-#$Id: ServerTorrents.pl,v 1.18 2005/05/20 17:51:51 andrew Exp $
+#$Id: ServerTorrents.pl,v 1.19 2005/05/21 00:48:03 andrew Exp $
 use strict;
 use warnings;
 use diagnostics;
@@ -60,7 +60,7 @@
 	my $t;
         eval {
 		$t = BT::MetaInfo::Cached->new(
-			$_,
+			$OBT->{DIR_TORRENT} . '/' . $_,
 			{
 				cache_root =>
 				$OBT->{DIR_HOME} . '/FileCache'
@@ -70,7 +70,7 @@
 
 	if ($@) {
 		warn "Error reading torrent $_\n";
-		return undef;
+		next;
 	}
 
 	my $epoch = $t->creation_date;
@@ -92,17 +92,16 @@
 	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($files{$name}{$epoch});
-		}
-		next;
+
+		my $hash = $files{$name}{$epoch}{'details'}->info_hash;
+		$hash = unpack("H*", $hash);
+
+		next if (
+			exists $server_torrents{$torrent} &&
+			$server_torrents{$torrent} eq $hash
+		);
+
+		Upload_Torrent($files{$name}{$epoch});
 	}
 }
 
@@ -133,6 +132,13 @@
 	my $time = sprintf "%04d.%02d.%02d %02d:%02d", 
 		$year, $mon, $mday,  $hour, $min;
 
+	($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;
@@ -156,7 +162,7 @@
 		torrent  => [ $OBT->{DIR_TORRENT} . "/$file" ],
 		url      => "/torrents/$file",
 		filename => $filename,
-		filedate => $t->creation_date,
+		filedate => $sql_time,
 		info     => $comment,
 		hash     => '',
 		autoset  => 'enabled', # -> checked="checked"