don't die on md5sum without filename

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

diff --git a/lib/CloudStore/Store.pm b/lib/CloudStore/Store.pm
index 2791ed0..1956a73 100644 (file)
--- a/lib/CloudStore/Store.pm
+++ b/lib/CloudStore/Store.pm
@@ -3,7 +3,7 @@ use warnings;
 use strict;
 
 use lib 'lib';
-use base 'CloudStore::MD5sum';
+use base qw(CloudStore::MD5sum);
 use CloudStore::API;
 
 use autodie;
@@ -155,7 +155,9 @@ sub new_file {
 sub removed_file {
        my ( $self, $data ) = @_;
 
-       my $md5 = $self->md5sum($data)->get( $data->{file} );
+=for removed
+       my $path = $self->blob_path( $data );
+       my $md5 = $self->md5_get( $path );
        return unless $md5; # directories don't have md5sums
        my $path = $self->{md5pool} . '/' . $md5;
        my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,
@@ -171,10 +173,9 @@ sub removed_file {
                warn "# chown $id $gid $path";
        }
 
-       $self->md5sum($data)->out( $data->{file} );
-       $self->md5sum_close($data);
-
        $self->api->append_meta('md5sum', $user, 'delete', $data->{file} );
+=cut
+
 }
 
 sub make_dir {
@@ -254,8 +255,6 @@ sub init_pid_login {
 sub cleanup_pid {
        my ( $self, $pid ) = @_;
 
-       $self->md5sum_close( $self->{pid}->{$pid} );
-
        delete $self->{pid}->{$pid};
        warn "removed $pid";
 }
@@ -269,7 +268,7 @@ sub rsync_log {
                my $pid = $1;
                $self->cleanup_pid( $pid );
        } else {
-               warn "## rsync_log $data";
+               warn "## rsync_log $data" if $ENV{DEBUG};
        }
 }
 
@@ -278,7 +277,7 @@ sub blob_path {
        my $blob = $self->{pid}->{ $data->{pid} }->{dir};
        if ( ! $blob ) {
                warn "ERROR: $data->{pid} not found, possible restart?";
-               $self->init_pid_login( $self->{pid}, $data->{login} );
+               $self->init_pid_login( $data->{pid}, $data->{login} );
                $blob = $self->{pid}->{ $data->{pid} }->{dir} || die "no dir for ", dump( $self->{pid}->{ $data->{pid} } );
        }
        $blob .= '/' . ( defined $path ? $path : $data->{file} );
@@ -304,8 +303,10 @@ sub rsync_transfer {
                } else {
                        die "unknown type $type ", dump $data;
                }
+               $self->api->refresh_file_list( $data->{login} );
        } elsif ( $data->{itemize} =~ m/\*deleting/ ) {
                $self->removed_file($data);
+               $self->api->refresh_file_list( $data->{login} );
        } else {
                warn "IGNORED ",dump($data) if $ENV{DEBUG};
        }
@@ -358,8 +359,7 @@ sub md5pool {
                warn "dedup +++ $md5 $path";
        }
 
-       $self->md5sum($data)->put( $data->{file} => $md5 );
-       $self->md5sum_close($data);
+       $self->md5_set( $path => $md5 );
 
        $self->api->append_meta('md5sum', $data->{login}, $md5, $data->{file} );
 }
@@ -377,6 +377,10 @@ sub dedup {
                while(<$md5sum>) {
                        chomp;
                        my ( $md5, $file ) = split(/\s+/,$_,2);
+                       if ( ! $file ) {
+                               warn "IGNORE $md5 without file\n";
+                               next;
+                       }
                        if ( ! -e "$self->{md5pool}/$md5" ) {
                                warn "MISSING $md5 $file\n";
                                next;