=================================================================== RCS file: /cvs/openbsd/OpenBSDTorrents/CurrentTorrents.pl,v retrieving revision 1.8 retrieving revision 1.23 diff -u -r1.8 -r1.23 --- openbsd/OpenBSDTorrents/CurrentTorrents.pl 2005/03/31 01:14:58 1.8 +++ openbsd/OpenBSDTorrents/CurrentTorrents.pl 2007/10/01 21:17:23 1.23 @@ -1,106 +1,218 @@ #!/usr/bin/perl -T -#$Id: CurrentTorrents.pl,v 1.8 2005/03/31 01:14:58 andrew Exp $ +#$RedRiver: CurrentTorrents.pl,v 1.22 2006/07/24 18:03:53 andrew Exp $ use strict; use warnings; use diagnostics; -use BT::MetaInfo; use Time::Local; +use Fcntl ':flock'; +use File::Basename; +#use YAML; -use lib '/usr/local/bin/OpenBSDTorrents/lib'; +use lib 'lib'; use OpenBSDTorrents; +use BT::MetaInfo::Cached; %ENV = (); -#use YAML; +#justme(); -justme(); +my $Name_Filter = shift || ''; +if ($Name_Filter =~ /^(\w*)$/) { + $Name_Filter = $1; +} else { + die "Invalid filter: $Name_Filter"; +} +my %Possible_Torrents; +Process_Dir($OBT->{DIR_FTP}); + my %files; -opendir DIR, $TorrentDir or die "Couldn't opendir $TorrentDir: $!"; -foreach (readdir DIR) { - if (/^([^\/]+)$/) { - $_ = $1; - } else { - die "Invalid character in $_: $!"; - } - next unless /\.torrent$/; - my ($name, $year, $mon, $mday, $hour, $min) = - /^(.*)-(\d{4})-(\d{2})-(\d{2})-(\d{2})(\d{2})/; +my %keep; +my @delete; +foreach my $DIR ($OBT->{DIR_NEW_TORRENT}, $OBT->{DIR_TORRENT}) { + opendir DIR, $DIR + or die "Couldn't opendir $DIR: $!"; + foreach (readdir DIR) { + next unless my ($ext) = /\.(torrent|$OBT->{META_EXT})$/; - $mon--; - my $epoch = timegm(0,$min,$hour,$mday,$mon,$year); + if (/^([^\/]+)$/) { + $_ = $1; + } else { + die "Invalid character in $_: $!"; + } + my $epoch = 0; + my $name = basename($_, '.torrent'); - #print "Adding $_\n"; + if (my ($base, $year, $mon, $mday, $hour, $min) = + /^(.*)-(\d{4})-(\d{2})-(\d{2})-(\d{2})(\d{2})/) { - $files{$name}{$epoch} = { - file => $_, - year => $year, - mon => $mon, - mday => $mday, - hour => $hour, - min => $min, - epoch => $epoch, - }; + $mon--; + $epoch = timegm(0,$min,$hour,$mday,$mon,$year); + $name = $base; + } + #print "Adding $_\n"; + + $files{$ext}{$name}{$epoch} = { + file => $_, + dir => $DIR, + path => "$DIR/$_", + ext => $ext, + #year => $year, + #mon => $mon, + #mday => $mday, + #hour => $hour, + #min => $min, + name => $name, + epoch => $epoch, + }; + + if ( + $name =~ m/\A $OBT->{BASENAME} /xms && + ! exists $Possible_Torrents{$name} + ) { + print "Would remove $_\n"; + push @delete, $files{$ext}{$name}{$epoch}; + } + } + closedir DIR; } -closedir DIR; -my %keep; -my @delete; -foreach my $name (keys %files) { - #print "$name\n"; +foreach my $name (keys %{ $files{torrent} }) { + next unless $name =~ /^$Name_Filter/; + #print "Checking $name\n"; - foreach my $epoch ( sort { $b <=> $a } keys %{ $files{$name} } ) { + foreach my $epoch ( sort { $b <=> $a } keys %{ $files{torrent}{$name} } ) { #print "\t$epoch\n"; - my $torrent = $files{$name}{$epoch}{file}; + my $torrent = $files{torrent}{$name}{$epoch}{path}; + if ( + keys %{ $files{torrent}{$name} } == 1 && + $files{torrent}{$name}{$epoch}{dir} + eq $OBT->{DIR_TORRENT} + ) { + #print "Skipping torrent for $name there is only one.\n"; + next; + } + my $t; - eval { $t = BT::MetaInfo->new("$TorrentDir/$torrent"); }; + eval { + $t = BT::MetaInfo::Cached->new( + $torrent, + { + cache_root => '/tmp/OBTFileCache' + #$OBT->{DIR_HOME} . '/FileCache' + } + ); + }; + if ($@) { warn "Error reading torrent $torrent\n"; next; } - $files{$name}{$epoch}{comment} = $t->{comment}; + $files{torrent}{$name}{$epoch}{comment} = $t->{comment}; my ($path) = $t->{comment} =~ /Files from ([^\n]+)\n/s; - unless (-d "$BaseDir/$path") { - #print "Deleting $files{$name}{$epoch}{file} the path doesn't exist.\n"; - push @delete, $files{$name}{$epoch}{file}; - } - - if (keys %{ $files{$name} } == 1) { - #print "Skipping torrent for $name there is only one.\n"; + unless (-d $OBT->{DIR_FTP} . "/$path") { + #print "Deleting $files{torrent}{$name}{$epoch}{file} the path doesn't exist.\n"; + push @delete, $files{torrent}{$name}{$epoch}; + delete $files{torrent}{$name}{$epoch}; next; } my $hash = $t->info_hash; $hash = unpack("H*", $hash); - $files{$name}{$epoch}{info_hash} = $hash; - undef $t; + $files{torrent}{$name}{$epoch}{info_hash} = $hash; + + if (exists $keep{$name}) { if (exists $keep{$name}{$hash}) { push @delete, $keep{$name}{$hash}; + delete $files{torrent}{ + $keep{$name}{$hash}{name} + }{ + $keep{$name}{$hash}{epoch} + }; $keep{$name}{$hash} = - $files{$name}{$epoch}{file}; + $files{torrent}{$name}{$epoch}; } else { - push @delete, $files{$name}{$epoch}{file}; + push @delete, $files{torrent}{$name}{$epoch}; + delete $files{torrent}{$name}{$epoch}; } } else { $keep{$name}{$hash} = - $files{$name}{$epoch}{file}; + $files{torrent}{$name}{$epoch}; } } } #print Dump \%files, \%keep, \@delete; +#exit; foreach (@delete) { - print "Deleting '$_'\n"; - unlink "$TorrentDir/$_" or die "Couldn't unlink $_"; + print "Deleting '$_->{path}'\n"; + unlink $_->{path} or die "Couldn't unlink $_->{path}"; } + +foreach my $name (keys %{ $files{$OBT->{META_EXT} } }) { + foreach my $epoch (keys %{ $files{ $OBT->{META_EXT} }{$name} }) { + unless ( exists $files{torrent}{$name}{$epoch} ) { + my $path = $files{$OBT->{META_EXT}}{$name}{$epoch}{path}; + print "Unlinking '$path'\n"; + unlink $path or die "couldn't unlink '$path': $!"; + } + } +} + + +#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 +{ + my $basedir = shift; + + my ($dirs, $files) = Get_Files_and_Dirs($basedir); + if (@$files) { + my $dir = $basedir; + $dir =~ s/^$OBT->{DIR_FTP}\///; + my $torrent = Name_Torrent($dir); + $torrent =~ s/-.*$//; + $Possible_Torrents{$torrent} = 1; + } + + foreach my $subdir (@$dirs) { + next if $subdir eq '.'; + next if $subdir eq '..'; + Process_Dir("$basedir/$subdir") + } +} +