===================================================================
RCS file: /cvs/openbsd/OpenBSDTorrents/CurrentTorrents.pl,v
retrieving revision 1.19
retrieving revision 1.23
diff -u -r1.19 -r1.23
--- openbsd/OpenBSDTorrents/CurrentTorrents.pl	2005/06/01 18:52:14	1.19
+++ openbsd/OpenBSDTorrents/CurrentTorrents.pl	2007/10/01 21:17:23	1.23
@@ -1,11 +1,13 @@
 #!/usr/bin/perl -T
-#$Id: CurrentTorrents.pl,v 1.19 2005/06/01 17:52:14 andrew Exp $
+#$RedRiver: CurrentTorrents.pl,v 1.22 2006/07/24 18:03:53 andrew Exp $
 use strict;
 use warnings;
 use diagnostics;
 
 use Time::Local;
 use Fcntl ':flock';
+use File::Basename;
+#use YAML;
 
 use lib 'lib';
 use OpenBSDTorrents;
@@ -13,8 +15,6 @@
 
 %ENV = ();
 
-use YAML;
-
 #justme();
 
 my $Name_Filter = shift || '';
@@ -41,12 +41,17 @@
 		} else {
 			die "Invalid character in $_: $!";
 		}
-		my ($name, $year, $mon, $mday, $hour, $min) = 
-		   /^(.*)-(\d{4})-(\d{2})-(\d{2})-(\d{2})(\d{2})/;
+		my $epoch = 0;
+		my $name  = basename($_, '.torrent');
 
-		$mon--;
-		my $epoch = timegm(0,$min,$hour,$mday,$mon,$year);
+		if (my ($base, $year, $mon, $mday, $hour, $min) = 
+		   /^(.*)-(\d{4})-(\d{2})-(\d{2})-(\d{2})(\d{2})/) {
 
+			$mon--;
+ 			$epoch = timegm(0,$min,$hour,$mday,$mon,$year);
+			$name = $base;
+		}
+
 		#print "Adding $_\n";
 
 		$files{$ext}{$name}{$epoch} = {
@@ -54,16 +59,19 @@
 			dir       => $DIR,
 			path      => "$DIR/$_",
 			ext       => $ext,
-			year      => $year,
-			mon       => $mon,
-			mday      => $mday,
-			hour      => $hour,
-			min       => $min,
+			#year      => $year,
+			#mon       => $mon,
+			#mday      => $mday,
+			#hour      => $hour,
+			#min       => $min,
 			name      => $name,
 			epoch     => $epoch,
 		};
 
-		unless (exists $Possible_Torrents{$name}) {
+		if (
+			$name =~ m/\A $OBT->{BASENAME} /xms &&
+			! exists $Possible_Torrents{$name}
+		) {
 			print "Would remove $_\n";
 			push @delete, $files{$ext}{$name}{$epoch};
 		}
@@ -73,7 +81,7 @@
 
 foreach my $name (keys %{ $files{torrent} }) {
 	next unless $name =~ /^$Name_Filter/;
-	print "Checking $name\n";
+	#print "Checking $name\n";
 
 	foreach my $epoch ( sort { $b <=> $a } keys %{ $files{torrent}{$name} } ) {
 		#print "\t$epoch\n";
@@ -93,8 +101,8 @@
 			$t = BT::MetaInfo::Cached->new( 
 				$torrent, 
 				{ 
-					cache_root => 
-					$OBT->{DIR_HOME} . '/FileCache' 
+					cache_root => '/tmp/OBTFileCache'
+					#$OBT->{DIR_HOME} . '/FileCache' 
 				}
 			); 
 		};
@@ -145,6 +153,7 @@
 }
 
 #print Dump \%files, \%keep, \@delete;
+#exit;
 
 foreach (@delete) {
 	print "Deleting '$_->{path}'\n";
@@ -162,30 +171,30 @@
 }
 
 
-##print Dump \%keep;
-#foreach my $name (keys %keep) {
-#	foreach my $hash (keys %{ $keep{$name} }) {
-#		my $file = $keep{$name}{$hash}{file};
-#		my $dir  = $keep{$name}{$hash}{dir };
-#		if ($dir eq $OBT->{DIR_NEW_TORRENT}) {
-#			print "Moving $file to current torrents\n";
-#			rename("$dir/$file", $OBT->{DIR_TORRENT} . "/" . $file)
-#				or die "Couldn't rename '$file': $!";
-#
-#			my $name = $keep{$name}{$hash}{name};
-#			my $epoch = $keep{$name}{$hash}{epoch};
-#
-#			if (exists $files{txt}{$name}{$epoch}) { 
-#				my $m_file = $files{txt}{$name}{$epoch}{file};
-#				my $m_dir  = $files{txt}{$name}{$epoch}{dir };
-#				rename(
-#					"$m_dir/$m_file", 
-#					$OBT->{DIR_TORRENT} . "/" . $m_file
-#				) or die "Couldn't rename '$m_file': $!";
-#			}
-#		}
-#	}
-#}
+#print Dump \%keep;
+foreach my $name (keys %keep) {
+	foreach my $hash (keys %{ $keep{$name} }) {
+		my $file = $keep{$name}{$hash}{file};
+		my $dir  = $keep{$name}{$hash}{dir };
+		if ($dir eq $OBT->{DIR_NEW_TORRENT}) {
+			print "Moving $file to current torrents\n";
+			rename("$dir/$file", $OBT->{DIR_TORRENT} . "/" . $file)
+				or die "Couldn't rename '$file': $!";
+
+			my $name = $keep{$name}{$hash}{name};
+			my $epoch = $keep{$name}{$hash}{epoch};
+
+			if (exists $files{txt}{$name}{$epoch}) { 
+				my $m_file = $files{txt}{$name}{$epoch}{file};
+				my $m_dir  = $files{txt}{$name}{$epoch}{dir };
+				rename(
+					"$m_dir/$m_file", 
+					$OBT->{DIR_TORRENT} . "/" . $m_file
+				) or die "Couldn't rename '$m_file': $!";
+			}
+		}
+	}
+}
 
 sub Process_Dir
 {