correct last test and don't output to STDOUT to make prove happy

[cloudstore.git] / lib / CloudStore / Store.pm

diff --git a/lib/CloudStore/Store.pm b/lib/CloudStore/Store.pm
index 5b6f693..4b91ee0 100644 (file)
--- a/lib/CloudStore/Store.pm
+++ b/lib/CloudStore/Store.pm
@@ -31,6 +31,8 @@ sub new {
        return $self;
 }
 
+sub api { $_[0]->{api} }
+
 sub mkbasedir {
        my $dir = shift;
        $dir =~ s{/[^/]+$}{}; # strip filename
@@ -124,6 +126,7 @@ sub modify_file {
 
                        $self->md5sum($data)->out( $from_dir . $from );
                        $self->md5sum($data)->put( $from_dir . $to => $md5 );
+                       $self->md5sum_close($data);
 
                        warn "$md5 moved to $from_dir $to";
                }
@@ -169,6 +172,9 @@ sub removed_file {
        }
 
        $self->md5sum($data)->out( $data->{file} );
+       $self->md5sum_close($data);
+
+       $self->api->append_meta('md5sum', $user, 'delete', $data->{file} );
 }
 
 sub make_dir {
@@ -248,7 +254,7 @@ sub init_pid_login {
 sub cleanup_pid {
        my ( $self, $pid ) = @_;
 
-       $self->md5sum_close;
+       $self->md5sum_close( $self->{pid}->{$pid} );
 
        delete $self->{pid}->{$pid};
        warn "removed $pid";
@@ -343,6 +349,9 @@ sub md5pool {
        }
 
        $self->md5sum($data)->put( $data->{file} => $md5 );
+       $self->md5sum_close($data);
+
+       $self->api->append_meta('md5sum', $data->{login}, $md5, $data->{file} );
 }
 
 my $empty_md5 = " " x 32;
@@ -351,18 +360,19 @@ sub dedup {
        my ( $self, $data, $path ) = @_;
 
        if ( $data->{file} =~ /^(.+\/)?md5sum$/ ) {
-               my $dir = $1;
+               my $dir = $1 || '';
                my $imported = 0;
                warn "IMPORT ", $data->{file}, "\n";
                open(my $md5sum, '<', $path);
                while(<$md5sum>) {
                        chomp;
                        my ( $md5, $file ) = split(/\s+/,$_,2);
-                       if ( ! -e "$self->{md5path}/$md5" ) {
+                       if ( ! -e "$self->{md5pool}/$md5" ) {
                                warn "MISSING $md5 $file\n";
                                next;
                        }
                        my $new = {
+                               login => $data->{login},
                                pid => $data->{pid},
                                file => "$dir$file",
                                md5 => $md5,
@@ -375,13 +385,12 @@ sub dedup {
                                $self->md5pool( $new );
                        }
                }
-               print "INFO imported $imported files from ",dump($data);
+               warn "INFO imported $imported files from ",dump($data);
 
                return; # don't put md5sum files into pool
        }
 
        if ( $data->{md5} ne $empty_md5 ) {
-               $self->md5sum($data)->put( $data->{file} => $data->{md5} );
                $self->md5pool( $data );
        } else {
                warn "empty md5", dump $data;