=================================================================== RCS file: /cvs/openbsd/OpenBSDTorrents/CurrentTorrents.pl,v retrieving revision 1.19 retrieving revision 1.22 diff -u -r1.19 -r1.22 --- openbsd/OpenBSDTorrents/CurrentTorrents.pl 2005/06/01 18:52:14 1.19 +++ openbsd/OpenBSDTorrents/CurrentTorrents.pl 2006/07/24 19:03:53 1.22 @@ -1,5 +1,5 @@ #!/usr/bin/perl -T -#$Id: CurrentTorrents.pl,v 1.19 2005/06/01 17:52:14 andrew Exp $ +#$RedRiver: CurrentTorrents.pl,v 1.21 2006/05/15 18:47:04 andrew Exp $ use strict; use warnings; use diagnostics; @@ -73,7 +73,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 +93,8 @@ $t = BT::MetaInfo::Cached->new( $torrent, { - cache_root => - $OBT->{DIR_HOME} . '/FileCache' + cache_root => '/tmp/OBTFileCache' + #$OBT->{DIR_HOME} . '/FileCache' } ); }; @@ -162,30 +162,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 {