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 e0f1926..4b91ee0 100644 (file)
--- a/lib/CloudStore/Store.pm
+++ b/lib/CloudStore/Store.pm
@@ -31,13 +31,7 @@ sub new {
        return $self;
 }
 
-sub user_set {
-       my ( $self,$data ) = @_;
-}
-
-sub user_get {
-       my ( $self,$data ) = @_;
-}
+sub api { $_[0]->{api} }
 
 sub mkbasedir {
        my $dir = shift;
@@ -48,6 +42,8 @@ sub mkbasedir {
 sub modify_file {
        my ( $self,$data ) = @_;
 
+=for removed
+
        if ( $data->{file} =~ m{^(.*/)?.sync/send/([^/]+)$} ) {
                my $from_dir = $1;
                warn "SEND $2 from $from_dir\n";
@@ -130,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";
                }
@@ -137,6 +134,13 @@ sub modify_file {
                return 0; # skip dedup
        }
 
+=cut
+
+       if ( $data->{file} =~ m{^(.*/)?.sync/} ) {
+               # ignore .sync/ files from client
+               return 0;
+       }
+
        #return $file->{size} > 4096 ? 1 : 0; # FIXME
        return 1; # dedup
 }
@@ -147,6 +151,7 @@ sub new_file {
 #      $self->file_set($data);
 }
 
+# client doesn't issue --delete
 sub removed_file {
        my ( $self, $data ) = @_;
 
@@ -167,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 {
@@ -179,6 +187,8 @@ sub new_link {
 
        warn "# new_link ",dump $data;
 
+=for removed
+
        if ( $data->{file} =~ m{^(.*/?)\.send/([^/]+)/(.+)$} ) {
                my ( $dir, $to, $name ) = ( $1, $2, $3 );
                my $path = $self->blob_path($data);
@@ -227,6 +237,9 @@ sub new_link {
                        warn "ERROR: can't SEND To:$to Name:$name Link:$link_to";
                }
        }
+
+=cut
+
 }
 
 sub init_pid_login {
@@ -241,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";
@@ -316,13 +329,15 @@ sub md5pool {
                my ($pool_uid,$pool_size) = (stat($pool_md5))[4,7];
                my $user = $self->{api}->user_info( $data->{login} );
 
-               if ( $pool_uid != $self->{api}->{md5}->{uid} ) {
-                       chown $self->{api}->{md5}->{uid}, $self->{api}->{md5}->{gid}, $pool_md5;
-                       chmod oct("0444"), $pool_md5;
-                       my $steal_user = $self->{api}->user_info( $pool_uid );
-                       $self->append( $steal_user, 'dedup-steal', $pool_size, $pool_uid, $data->{file} );
+               if ( $pool_uid != $user->{uid} ) {
+                       if ( $pool_uid != $self->{api}->{md5}->{uid} ) {
+                               chown $self->{api}->{md5}->{uid}, $self->{api}->{md5}->{gid}, $pool_md5;
+                               chmod oct("0444"), $pool_md5;
+                               my $steal_user = $self->{api}->user_info( $pool_uid );
+                               $self->append( $steal_user, 'dedup-steal', $pool_size, $pool_uid, $data->{file} );
+                       }
+                       $self->append( $user, 'dedup', $pool_size, $pool_uid, $data->{file} );
                }
-               $self->append( $user, 'dedup', $pool_size, $pool_uid, $data->{file} );
 
                my $dedup = $path . '.dedup';
                rename $path, $dedup;
@@ -334,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;
@@ -342,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,
@@ -366,11 +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;