correctly load multiple params for paths

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

diff --git a/lib/MojoFacets/Changes.pm b/lib/MojoFacets/Changes.pm
index 5e43b2e..ca22b4e 100644 (file)
--- a/lib/MojoFacets/Changes.pm
+++ b/lib/MojoFacets/Changes.pm
@@ -15,20 +15,35 @@ sub _changes_path {
        $self->app->home->rel_dir('data') . '/' . $path . '.changes';
 }
 
+sub _hash_eq {
+       my ( $a_ref, $b_ref ) = @_;
+
+       warn "# _hash_eq ",dump($a_ref,$b_ref);
+
+       local $Storable::canonical = 1;
+       return eval { Storable::freeze( $a_ref ) } eq eval { Storable::freeze( $b_ref ) };
+}
+
 sub index {
        my ( $self ) = @_;
        my $path = $self->param('path') || $self->session('path');
+       my $on_path = $self->param('on_path');
        my $commit = $self->param('commit');
+       my $apply = $self->param('apply');
        my ( $items, $unique2id );
-       if ( my $apply_on_path = $self->param('apply_on_path') ) {
-               $items = $MojoFacets::Data::loaded->{$apply_on_path}->{data}->{items};
-               die "no $apply_on_path" unless $items;
-               warn "using $items for $apply_on_path\n";
+       if ( $on_path ) {
+               $items = $MojoFacets::Data::loaded->{$on_path}->{data}->{items};
+               if ( ! $items ) {
+                       warn "$on_path not loaded";
+                       return $self->redirect_to('/data/index?path=' . $on_path);
+               }
+               warn "using ", $#$items + 1, " items from $on_path\n";
        }
        my $invalidate_columns;
        my $changes;
        my $stats;
        my $glob = $self->_changes_path . '/*';
+       my $status = 'unknown';
        foreach my $t ( sort { $a cmp $b } glob $glob ) {
                my $e = retrieve($t);
                $e->{old} = [ $e->{old} ] unless ref $e->{old} eq 'ARRAY';
@@ -46,34 +61,67 @@ sub index {
                                        $unique2id->{$pk}->{ $items->[$i]->{$pk}->[0] } = $i;
                                }
                        }
-                       my $status = 'missing';
+                       $status = 'missing';
                        if ( my $i = $unique2id->{$pk}->{$id} ) {
+                               if ( _hash_eq( $e->{old}, $items->[$i]->{$e->{column}} ) ) {
+                                       $status = 'found';
+                                       if ( $commit ) {
+                                               my $column = $e->{column} or die "no column";
+                                               $items->[$i]->{$column} = $e->{new};
+                                               warn "# commit $i $column ",dump( $e->{new} );
+                                               $invalidate_columns->{$column}++;
+                                       }
+                               } else {
+                                       $status = 'source-changed';
+                               }
+                       }
+               } elsif ( my $code = $e->{code} ) {
+                       if ( $commit ) {
+                               my $commit_changed;
+                               my $t = time();
+                               foreach my $i ( 0 .. $#$items ) {
+                                       MojoFacets::Data::__commit_path_code( $on_path, $i, $code, \$commit_changed );
+                               }
+                               $t = time() - $t;
+                               $self->stash( 'commit_changed', $commit_changed );
+                               warn "commit_changed in $t s ",dump( $e->{commit_changed}, $commit_changed );
+                               $e->{commit_changed_this} = $commit_changed;
+                               MojoFacets::Data::__invalidate_path_column( $on_path, $_ ) foreach keys %$commit_changed;
+                               MojoFacets::Data::__path_rebuild_stats( $on_path );
+                       }
+                       $status = 'code';
+                       if ( ( $apply || $commit ) && $e->{commit_changed} ) {
                                $status = 'found';
-                               if ( $commit ) {
-                                       my $column = $e->{column} or die "no column";
-                                       $items->[$i]->{$column} = $e->{new};
-                                       warn "# commit $i $column ",dump( $e->{new} );
-                                       $invalidate_columns->{$column}++;
+                               foreach my $c ( keys %{ $e->{commit_changed} } ) {
+                                       $status = 'missing' unless defined $MojoFacets::Data::loaded->{$path}->{stats}->{$c};
                                }
                        }
-                       $e->{_status} = $status;
-                       $stats->{$status}++;
                } else {
-                       warn "no unique in ", dump($e);
+                       $status = 'unknown';
                }
+
+               $e->{_status} = $status;
+               $stats->{$status}++;
+
                push @$changes, $e;
        }
 
+
        foreach my $name ( keys %$invalidate_columns ) {
-               MojoFacets::Data::__invalidate_path_column( $path, $name );
+               MojoFacets::Data::__invalidate_path_column( $on_path, $name );
        }
 
-       MojoFacets::Data::__path_modified( $path );
+       MojoFacets::Data::__path_modified( $on_path );
 
        my @loaded = MojoFacets::Data::__loaded_paths();
        warn "# loaded paths ",dump @loaded;
 
-       $self->render( changes => $changes, loaded => \@loaded, stats => $stats );
+       $self->render(
+               on_path => $on_path || $path,
+               changes => $changes,
+               loaded => \@loaded,
+               stats => $stats,
+       );
 }
 
 sub remove {
@@ -83,7 +131,7 @@ sub remove {
                unlink $self->_changes_path . '/' . $t;
        }
 
-       $self->redirect_to('/changes');
+       return $self->redirect_to('/changes');
 }
 
 1;