extract _save_change and use for code commits

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

diff --git a/lib/MojoFacets/Data.pm b/lib/MojoFacets/Data.pm
index 7344f89..65e2082 100644 (file)
--- a/lib/MojoFacets/Data.pm
+++ b/lib/MojoFacets/Data.pm
@@ -317,6 +317,22 @@ sub _permanent_path {
        $self->app->home->rel_dir('data') . '/' . join('.', $path, @_);
 }
 
+sub __unac {
+       my $n = shift;
+       $n = unac_string($n);
+       $n =~ s/\W+/_/g;
+       return $n;
+}
+
+sub _column_from_unac {
+       my ($self,$name) = @_;
+
+       my $stats = $self->_loaded('stats');
+       my $cols_norm = { map { __unac( $_ ) => $_ } keys %$stats };
+
+       $cols_norm->{$name} || die "can't find column $name in ", dump($cols_norm);
+}
+
 sub _export_path {
        my $self = shift;
        my $path = $self->_param_or_session('path');
@@ -326,7 +342,10 @@ sub _export_path {
        }
        my $dir = $self->app->home->rel_dir('public') . "/export/$path";
        mkpath $dir unless -e $dir;
-       $dir . '/' . unac_string( join('.', @_) );
+       my $name = join('.', map { __unac($_) } @_ );
+       my $full = $dir . '/' . $name;
+       $full =~ s/\/+$// if -d $full; # strip trailing slash for dirs
+       return $full;
 }
 
 sub columns {
@@ -465,15 +484,12 @@ sub _filter_on_data {
 sub _current_filters {
        my $self = shift;
        my $current_filters;
-       my $columns = $self->_loaded('header');
-       if ( my $sc = $self->session('columns') ) {
-               $columns = $sc;
-       }
+       my $stats = $self->_loaded('stats');
 
        $current_filters->{ $_ } = $filters->{ $_ }
-               foreach ( grep { defined $filters->{ $_ } } @$columns )
+               foreach ( grep { defined $filters->{ $_ } } keys %$stats )
        ;
-       warn "# _current_filters ",dump($columns);
+       warn "# _current_filters ",dump( keys %$current_filters );
        return $current_filters;
 }
 
@@ -650,8 +666,18 @@ sub items {
                        } else {
                                write_file(  $path, { binmode => ':utf8' }, $code );
                                warn "code $path ", -s $path, " bytes saved\n";
+
+                               $self->_save_change({
+                                       path => $path,
+                                       time => $self->param('time') || time(),
+                                       user => $self->param('user') || $ENV{'LOGNAME'},
+                                       code => $code,
+                               });
+
                        }
                }
+
+               # remove console
                $code = '';
                if ( $out ) {
                        my $commit_dataset = join('.'
@@ -746,11 +772,16 @@ sub items {
                foreach my $f ( 0 .. $#$filtered ) {
                        print $fh join("\t", map {
                                my $i = $data->{items}->[ $filtered->[$f] ];
-                               if ( ref $i->{$_} eq 'ARRAY' ) {
-                                       join(',', @{ $i->{$_} });
+                               my $v = '\N';
+                               if ( ! defined $i->{$_} ) {
+                                       # nop
+                               } elsif ( ref $i->{$_} eq 'ARRAY' ) {
+                                       $v =join(',', @{ $i->{$_} });
+                                       $v = '\N' if length($v) == 0;
                                } else {
-                                       dump $i->{$_};
+                                       $v = dump $i->{$_};
                                }
+                               $v;
                        } @columns),"\n";
                }
                close($fh);
@@ -938,6 +969,17 @@ sub __path_modified {
        warn "# __path_modified $path $value\n";
 }
 
+sub _save_change {
+       my ($self,$change) = @_;
+
+       my $change_path = $self->_permanent_path( 'changes' );
+       mkdir $change_path unless -d $change_path;
+       $change_path .= '/' . $change->{time};
+       store $change, $change_path;
+       utime $change->{time}, $change->{time}, $change_path;
+       warn "_save_change $change_path ", dump($change);
+}
+
 sub edit {
        my $self = shift;
        my $new_content = $self->param('new_content');
@@ -966,7 +1008,7 @@ sub edit {
                if ( $old ne $new
                        && ! ( $old eq 'undef' && length($new_content) == 0 ) # new value empty, previous undef
                ) {
-                       my $change = {
+                       $self->_save_change({
                                path => $path,
                                column => $name,
                                pos => $i,
@@ -979,13 +1021,7 @@ sub edit {
                                        grep { defined $loaded->{$path}->{stats}->{$_}->{unique} }
                                        keys %{ $loaded->{$path}->{stats} }
                                },
-                       };
-                       my $change_path = $self->_permanent_path( 'changes' );
-                       mkdir $change_path unless -d $change_path;
-                       $change_path .= '/' . $change->{time};
-                       store $change, $change_path;
-                       utime $change->{time}, $change->{time}, $change_path;
-                       warn "# $change_path ", dump($change);
+                       });
 
                        warn "# change $path $i $old -> $new\n";
                        $loaded->{$path}->{data}->{items}->[$i]->{$name} = $v;
@@ -1028,12 +1064,16 @@ sub save {
 sub export {
        my $self = shift;
 
+       my $dir = $self->app->home->rel_dir('public');
+
        if ( my $import = $self->param('import') ) {
 
                if ( $import =~ m{/filter\.(.+?)\..+} ) {
-                       my $name = $1;
+                       my $name = $self->_column_from_unac( $1 );
+
                        my @vals = map { chomp; $_ }
-                               read_file $self->app->home->rel_dir('public') . "/export/$import", binmode => ':utf8';
+                               read_file "$dir/export/$import", binmode => ':utf8';
+
                        $self->_remove_filter( $name );
                        $self->_filter_on_data( $name, @vals );
                        $self->session( 'offset' => 0 );
@@ -1043,7 +1083,16 @@ sub export {
                }
        }
 
-       my @files = grep { ! /\.png$/ } glob( $self->_export_path . '*' );
+       if ( my $remove = $self->param('remove') ) {
+               my $path = "$dir/export/$remove";
+               unlink $path if -e $path;
+               $path .= '.png';
+               unlink $path if -e $path;
+       }
+
+       my $path = $self->_export_path || $self->redirect_to('/data/index');
+
+       my @files = grep { ! /\.png$/ } glob "$path/*";
        my $mtime = { map { $_ => (stat($_))[9] } @files };
        @files = sort { $mtime->{$b} <=> $mtime->{$a} } @files;
        $self->render( export => [ @files ] );