sort data files by mtime

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

diff --git a/lib/MojoFacets/Data.pm b/lib/MojoFacets/Data.pm
index 257e8a2..e1dc8ac 100644 (file)
--- a/lib/MojoFacets/Data.pm
+++ b/lib/MojoFacets/Data.pm
@@ -5,7 +5,11 @@ use warnings;
 
 use base 'Mojolicious::Controller';
 
-use Data::Dump qw(dump);
+#use Data::Dump qw(dump); # broken with Mojo::JSON, see https://rt.cpan.org/Public/Bug/Display.html?id=86592
+use Data::Dumper;
+use subs 'dump';
+sub dump { Dumper(@_) };
+
 use File::Slurp;
 use Encode;
 use locale;
@@ -13,7 +17,7 @@ use File::Find;
 use Storable;
 use Time::HiRes qw(time);
 use File::Path qw(mkpath);
-use Text::Unaccent;
+use Text::Unaccent::PurePerl;
 use Digest::MD5;
 use Statistics::Descriptive;
 
@@ -34,6 +38,8 @@ sub import_module {
 
 #      warn "# import_module $full_path\n";
 
+       return if $full_path =~ m/\.columns$/;
+
        foreach my $ext ( keys %{ $imports->{file} } ) {
                if ( -f $full_path && $full_path =~ m/$ext/i ) {
                        return $imports->{file}->{$ext};
@@ -55,7 +61,7 @@ our $filters;
 sub index {
        my $self = shift;
 
-       my $data_dir = $self->app->home->rel_dir('data');
+       my $data_dir = $self->app->home->rel_file('data');
        die "no data dir $data_dir" unless -d $data_dir;
 
        my @files;
@@ -63,11 +69,13 @@ sub index {
 
        find( sub {
                my $file = $File::Find::name;
-               if ( -f $file && $file =~ m/([^\/]+)\.changes\/(\d+\.\d+.+)/ ) {
+               if ( -f $file && $file =~ m/([^\/]+)\.changes\/(\d+[\.,]\d+.+)/ ) {
                        push @{ $changes->{$1} }, $2
                } elsif ( import_module( $file ) ) {
+                       my $mtime = (stat($file))[9]; # mtime
                        $file =~ s/$data_dir\/*//;
                        push @files, $file;
+                       $loaded->{$file}->{mtime} ||= $mtime;
                } else {
                        #warn "IGNORE: $file\n";
                }
@@ -92,7 +100,7 @@ sub index {
 
 sub _dump_path {
        my ( $self, $name ) = @_;
-       my $dir = $self->app->home->rel_dir('data');
+       my $dir = $self->app->home->rel_file('data');
        $name =~ s/^$dir//;
        $name =~ s/\/+/_/g;
        return '/tmp/mojo_facets.' . $name . '.storable';
@@ -259,7 +267,7 @@ sub _load_path {
 sub load {
        my $self = shift;
 
-       my @paths = $self->param('paths');
+       my @paths = @{ $self->every_param('paths') };
        warn "# paths ", dump @paths;
 
        foreach my $p ( keys %$loaded ) {
@@ -351,7 +359,7 @@ sub _checked {
 sub _permanent_path {
        my $self = shift;
        my $path = $self->_param_or_session('path');
-       $self->app->home->rel_dir('data') . '/' . join('.', $path, @_);
+       $self->app->home->rel_file('data') . '/' . join('.', $path, @_);
 }
 
 sub __unac {
@@ -377,7 +385,7 @@ sub _export_path {
                warn "no path in param or session";
                return;
        }
-       my $dir = $self->app->home->rel_dir('public') . "/export/$path";
+       my $dir = $self->app->home->rel_file('public') . "/export/$path";
        mkpath $dir unless -e $dir;
        my $name = __export_path_name( $path, @_ );
        my $full = $dir . '/' . $name;
@@ -453,7 +461,7 @@ sub columns {
 sub _param_array {
     my ($self,$name) = @_;
 
-       my @array = $self->param($name);
+       my @array = @{ $self->every_param($name) };
        my $path  = $self->session('path');
 
        if ( @array ) {
@@ -498,7 +506,7 @@ sub filter {
        my $self = shift;
 
        my $name = $self->param('filter_name') || die "name?";
-       my @vals = $self->param('filter_vals');
+       my @vals = @{ $self->every_param('filter_vals') };
 
        $self->_remove_filter( $name );
        if ( @vals ) {
@@ -809,7 +817,7 @@ sub items {
        $code =~ s{\n+$}{\n}s;
 
        # XXX convert @row->{foo} into @{$row->{foo}}
-       $code =~ s|\@(row->{[^}]+})|\@{\$$1}|gs;
+       $code =~ s|\@(row->\{[^}]+\})|\@{\$$1}|gs;
 
        my $commit = $self->param('commit');
        my $test = $self->param('test');
@@ -820,7 +828,7 @@ sub items {
        if ( $code && ( $test || $commit ) ) {
                # XXX find columns used in code snippet and show them to user
                my $order = 0;
-               foreach my $column ( $code =~ m/\$row->{([^}]+)}/g ) {
+               foreach my $column ( $code =~ m/\$row->\{([^}]+)\}/g ) {
                        if ( $column =~ s/^(['"])// ) {
                                $column =~ s/$1$//;
                        }
@@ -829,7 +837,7 @@ sub items {
                }
        }
 
-       my $code_path = $self->app->home->rel_dir('public') . "/code";
+       my $code_path = $self->app->home->rel_file('public') . "/code";
        if ( $commit ) {
 
                __path_modified( $path, 'commit' );
@@ -986,7 +994,7 @@ sub items {
                warn "# sorted_items ", $#$sorted_items + 1, " offset $offset limit $limit order $sort";
 
                my $depends_on;
-               my $tmp = $code; $tmp =~ s/\$row->{(['"]?)([\w\s]+)\1/$depends_on->{$2}++/gse;
+               my $tmp = $code; $tmp =~ s/\$row->\{(['"]?)([\w\s]+)\1/$depends_on->{$2}++/gse;
                warn "# depends_on ",dump $depends_on;
 
                my $test_added = Storable::dclone $test_changed;
@@ -1289,7 +1297,7 @@ sub save {
 sub export {
        my $self = shift;
 
-       my $dir = $self->app->home->rel_dir('public');
+       my $dir = $self->app->home->rel_file('public');
 
        if ( my $import = $self->param('import') ) {