use slice name and get dir from group

diff --git a/lib/CloudStore/Store.pm b/lib/CloudStore/Store.pm
index 0c05987..83a13c2 100644 (file)
--- a/lib/CloudStore/Store.pm
+++ b/lib/CloudStore/Store.pm
@@ -2,6 +2,9 @@ package CloudStore::Store;
 use warnings;
 use strict;
 
+use lib 'lib';
+use CloudStore::API;
+
 use autodie;
 use JSON::XS;
 use File::Path qw(make_path);
@@ -14,13 +17,14 @@ use TokyoCabinet;
 use WarnColor;
 
 sub new {
-       my $class = shift;
+       my ($class,$group) = @_;
 
-       my $self = {@_};
+       my $self = {
+               api => CloudStore::API->new( $group ),
+       };
        bless $self, $class;
 
-       die "no dir" unless $self->{dir};
-       $self->{md5pool} = $self->{dir} . '/md5';
+       $self->{md5pool} = $self->{api}->{md5}->{dir};
 
        warn "# new ",dump $self if $ENV{DEBUG};
 

diff --git a/rsync-piper.pl b/rsync-piper.pl
index 2725d65..b82d339 100755 (executable)
--- a/rsync-piper.pl
+++ b/rsync-piper.pl
@@ -55,7 +55,7 @@ if ( $ENV{SQL} ) {
        exit 1;
 }
 
-my $store = CloudStore::Store->new( dir => $dir );
+my $store = CloudStore::Store->new( $slice );
 
 unlink $log_fifo if -f $log_fifo;
 mkfifo $log_fifo, 0700 unless -p $log_fifo;