cleanup dump_path usage

[MojoFacets.git] / lib / MojoFacets / Data.pm

diff --git a/lib/MojoFacets/Data.pm b/lib/MojoFacets/Data.pm
index 41134cb..a515b82 100644 (file)
--- a/lib/MojoFacets/Data.pm
+++ b/lib/MojoFacets/Data.pm
@@ -37,30 +37,39 @@ sub index {
        my $size;
        $size->{$_} = -s "$path/$_" foreach @files;
 
+       if ( my $save_path = $self->session('save_path') ) {
+               $self->session( 'save_path' => 0 )
+               if ! defined $loaded->{$save_path};
+       }
+
        $self->render(
                files => [ @files ],
                size => $size,
                loaded => $loaded,
                filters => $filters,
+               dump_path => { map { $_ => $self->_dump_path($_) } @files },
        );
 }
 
-sub _save {
-       my ( $self, $path ) = @_;
-
-       my $name = $path;
+sub _dump_path {
+       my ( $self, $name ) = @_;
        my $dir = $self->app->home->rel_dir('data');
        $name =~ s/^$dir//;
        $name =~ s/\/+/_/g;
-       my $dump_path = '/tmp/mojo_facets.' . $name . '.storable';
+       return '/tmp/mojo_facets.' . $name . '.storable';
+}
 
+sub _save {
+       my ( $self, $path ) = @_;
+
+       my $dump_path = $self->_dump_path( $path );
        warn "save loaded to $dump_path";
        my $info = $loaded->{$path};
        store $info, $dump_path;
 
        # sync timestamp
-       my $mtime = $loaded->{$path}->{mtime};
-       utime $mtime, $mtime, $dump_path;
+       #my $mtime = $loaded->{$path}->{mtime};
+       #utime $mtime, $mtime, $dump_path;
 
        warn $dump_path, ' ', -s $dump_path, " bytes\n";
        return $dump_path;
@@ -72,10 +81,17 @@ sub _load_path {
        my $full_path = $self->app->home->rel_file( 'data/' . $path );
        die "$full_path $!" unless -r $full_path;
 
+       my $dump_path = $self->_dump_path( $path );
+
        if ( defined $loaded->{$path}->{data} ) {
                my $mtime = (stat($full_path))[9];
                return if $loaded->{$path}->{mtime} == $mtime;
                warn "reload $full_path, modified ", time() - $mtime, " seconds ago\n";
+       } elsif ( -e $dump_path ) {
+               warn "dump_path $dump_path ", -s $dump_path, " bytes loading...\n";
+               my $info = retrieve $dump_path;
+               $loaded->{ $path } = $info;
+               return;
        }
 
        # we could use Mojo::JSON here, but it's too slow
@@ -217,8 +233,10 @@ sub _loaded {
        my $path = $self->session('path');
        $self->redirect_to('/data/index') unless $path;
        if ( ! defined $loaded->{$path}->{$name} ) {
-               warn "$path $name doesn't exist in loaded ",dump( $loaded );
-               $self->redirect_to('/data/index');
+               warn "$path $name isn't loaded\n";
+               $self->_load_path( $path );
+               $self->redirect_to('/data/index')
+                       unless defined $loaded->{$path}->{$name};
        }
        return $loaded->{$path}->{$name};
 }
@@ -670,7 +688,9 @@ sub edit {
        my $name = $self->param('name') || die "no name";
        my $status = 200; # 200 = OK, 201 = Created
 
-       if ( defined $loaded->{$path}->{data}->{items}->[$i]->{$name} ) {
+       my $data = $self->_loaded('data');
+
+       if ( defined $loaded->{$path}->{data}->{items}->[$i] ) {
                $content =~ s/^\s+//s;
                $content =~ s/\s+$//s;
                my $v;
@@ -682,7 +702,9 @@ sub edit {
 
                my $old = dump $loaded->{$path}->{data}->{items}->[$i]->{$name};
                my $new = dump $v;
-               if ( $old ne $new ) {
+               if ( $old ne $new
+                       && ! ( $old eq 'undef' && length($content) == 0 ) # new value empty, previous undef
+               ) {
                        warn "# update $path $i $old -> $new\n";
                        $loaded->{$path}->{data}->{items}->[$i]->{$name} = $v;
 
@@ -706,9 +728,10 @@ sub edit {
        } else {
                $content = "$path $i $name doesn't exist\n";
                $status = 404;
-               warn "# $content\n";
        }
 
+       warn "# edit $status $content";
+
        $self->render(
                status => $status,
                content => $content,