=================================================================== RCS file: /cvs/openbsd/OpenBSDTorrents/ServerTorrents.pl,v retrieving revision 1.11 retrieving revision 1.26 diff -u -r1.11 -r1.26 --- openbsd/OpenBSDTorrents/ServerTorrents.pl 2005/05/02 21:26:04 1.11 +++ openbsd/OpenBSDTorrents/ServerTorrents.pl 2008/12/29 22:02:14 1.26 @@ -1,20 +1,20 @@ #!/usr/bin/perl -T -#$Id: ServerTorrents.pl,v 1.11 2005/05/02 20:26:04 andrew Exp $ +#$RedRiver: ServerTorrents.pl,v 1.25 2008/09/23 16:35:45 andrew Exp $ use strict; use warnings; use diagnostics; -use BT::OBTMetaInfo; use LWP::UserAgent; use Time::Local; +use File::Basename; +#use YAML; use lib 'lib'; use OpenBSDTorrents; +use BT::MetaInfo::Cached; %ENV = (); -#use YAML; - justme(); my @Sizes = ('', 'Ki', 'Mi', 'Gi', 'Ti'); @@ -32,18 +32,17 @@ 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; + $name =~ s#.*/##; + $server_torrents{$name}{$hash} = $disabled; } } } else { die $response->status_line; } - my %files; opendir DIR, $OBT->{DIR_TORRENT} or die "Couldn't opendir $OBT->{DIR_TORRENT}: $!"; foreach (readdir DIR) { @@ -54,56 +53,72 @@ 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 $time = "$year.$mon.$mday $hour:$min"; + my $name = basename($_, '.torrent'); - $mon--; + if (my ($base, $year, $mon, $mday, $hour, $min) = + /^(.*)-(\d{4})-(\d{2})-(\d{2})-(\d{2})(\d{2})/) { + $name = $base; + } - my $epoch = timegm(0,$min,$hour,$mday,$mon,$year); + my $t; + eval { + $t = BT::MetaInfo::Cached->new( + $OBT->{DIR_TORRENT} . '/' . $_, + { + cache_root => '/tmp/OBTFileCache' + #$OBT->{DIR_HOME} . '/FileCache' + } + ); + }; + if ($@) { + warn "Error reading torrent $_\n"; + next; + } + + 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; +#print Dump \%server_torrents; +#print Dump \%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 = unpack("H*", $files{$name}{$epoch}{'details'}->info_hash ); + #printf "LOCAL: [%s] [%s]\n", $hash, $torrent; + + $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} }) { + #printf "SERVER: [%s] [%s]\n", $hash, $torrent; + if ((! exists $torrents{$torrent}{$hash}) && + defined $server_torrents{$torrent}{$hash} && + $server_torrents{$torrent}{$hash} != 1 + ) { + Delete_Torrent($torrent, $hash); + } } } @@ -111,21 +126,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::OBTMetaInfo->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++; @@ -136,8 +158,11 @@ my $comment = $t->{comment}; $comment =~ s/\n.*$//s; - my ($filename) = $comment =~ /Files from (.+)/; + my $filename = + $comment =~ /($OBT->{BASENAME}.+)/ ? $1 + : $file; $filename =~ s#/# #g; + $filename =~ s/\.torrent\z//; $comment .= " [$size]"; $filename .= " [$time]"; @@ -148,7 +173,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 +189,33 @@ 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 "Removing $filename [$hash]\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) { + my ($result) = $response->content =~ /class="error"\>([^<]+)\status_line . " removing $filename [$hash]\n"; + } }