register extension in import modules and load automatically

diff --git a/lib/MojoFacets/Data.pm b/lib/MojoFacets/Data.pm
index 03c1668..257e8a2 100644 (file)
--- a/lib/MojoFacets/Data.pm
+++ b/lib/MojoFacets/Data.pm
@@ -17,12 +17,37 @@ use Text::Unaccent;
 use Digest::MD5;
 use Statistics::Descriptive;
 
-use MojoFacets::Import::File;
-use MojoFacets::Import::HTMLTable;
-use MojoFacets::Import::CSV;
-use MojoFacets::Import::CouchDB;
-use MojoFacets::Import::SQL;
-use MojoFacets::Import::Pairs;
+our $imports;
+foreach my $module ( glob('lib/MojoFacets/Import/*.pm') ) {
+       $module =~ s{lib/(\w+)/(\w+)/(.*)\.pm}{$1::$2::$3};
+       eval "use $module";
+       die "$module: $!" if $!;
+       my ( $ext, $priority ) = $module->ext;
+       $imports->{$priority || 'file'}->{$ext} = $module;
+       warn "# import $ext $module\n";
+}
+
+warn "# import loaded ",dump( $imports );
+
+sub import_module {
+       my $full_path = shift;
+
+#      warn "# import_module $full_path\n";
+
+       foreach my $ext ( keys %{ $imports->{file} } ) {
+               if ( -f $full_path && $full_path =~ m/$ext/i ) {
+                       return $imports->{file}->{$ext};
+                       last;
+               }
+       }
+
+       foreach my $ext ( keys %{ $imports->{directory} } ) {
+               if ( -f $full_path && $full_path =~ m/$ext/i ) {
+                       return $imports->{directory}->{$ext};
+                       last;
+               }
+       }
+}
 
 our $loaded;
 our $filters;
@@ -35,17 +60,12 @@ sub index {
 
        my @files;
        my $changes;
+
        find( sub {
                my $file = $File::Find::name;
-               if ( -f $file && $file =~ m/\.(js(on)?|txt)$/ ) {
-                       $file =~ s/$data_dir\/*//;
-                       push @files, $file;
-               } elsif ( -f $file && $file =~ m/([^\/]+)\.changes\/(\d+\.\d+.+)/ ) {
+               if ( -f $file && $file =~ m/([^\/]+)\.changes\/(\d+\.\d+.+)/ ) {
                        push @{ $changes->{$1} }, $2
-               } elsif ( -d $file && $file =~ m/\.html$/ ) {
-                       $file =~ s/$data_dir\/*//;
-                       push @files, $file;
-               } elsif ( -f $file && $file =~ m/\.(csv|storable|couchdb|sql|pairs)$/i ) {
+               } elsif ( import_module( $file ) ) {
                        $file =~ s/$data_dir\/*//;
                        push @files, $file;
                } else {
@@ -197,39 +217,8 @@ sub _load_path {
        }
 
        my $data;
-       if ( -f $full_path ) {
-               if ( $full_path =~ m/.storable$/ ) { # check storable first to catch files copied from /tmp/
-                       $data->{generated}++;
-                       warn "open $full_path ", -s $full_path, " bytes";
-                       open(my $pipe, "<", $full_path) || die $!;
-                       while ( my $o = eval { Storable::fd_retrieve $pipe } ) {
-                               if ( exists $o->{item} ) {
-                                       # stream of storable objects
-                                       push @{ $data->{items} }, $o->{item};
-                               } elsif ( exists $o->{data}->{items} ) {
-                                       # /tmp/mojofacets.*.storable
-                                       $data->{items} = $o->{data}->{items};
-                                       $data->{header} = $o->{header};
-                                       delete $data->{generated};
-                               } else {
-                                       warn "SKIP ",dump($o);
-                               }
-                       }
-                       close($pipe);
-                       warn "loaded ", $#{ $data->{items} } + 1, " items from $full_path\n";
-               } elsif ( $full_path =~ m/.csv/i ) {
-                       $data = MojoFacets::Import::CSV->new( full_path => $full_path )->data;
-               } elsif ( $full_path =~ m/.sql/i ) {
-                       $data = MojoFacets::Import::SQL->new( full_path => $full_path )->data;
-               } elsif ( $full_path =~ m/.couchdb/i ) {
-                       $data = MojoFacets::Import::CouchDB->new( full_path => $full_path )->data;
-               } elsif ( $full_path =~ m/.pairs/i ) {
-                       $data = MojoFacets::Import::Pairs->new( full_path => $full_path )->data;
-               } else {
-                       $data = MojoFacets::Import::File->new( full_path => $full_path, path => $path )->data;
-               }
-       } elsif ( -d $full_path && $full_path =~ m/.html/ ) {
-               $data = MojoFacets::Import::HTMLTable->new( dir => $full_path )->data;
+       if ( my $module = import_module( $full_path ) ) {
+               $data = $module->new( full_path => $full_path )->data;
        } else {
                die "can't load $full_path";
        }
@@ -281,7 +270,7 @@ sub load {
 
        $self->_load_path( $_ ) foreach @paths;
 
-       my $path = $self->param('path') || $self->session('path') || @paths[0] || $self->redirect_to('/data/index');
+       my $path = $self->param('path') || $self->session('path') || $paths[0] || $self->redirect_to('/data/index');
 
        warn "# path $path\n";
        $self->_load_path( $path );

diff --git a/lib/MojoFacets/Import/CSV.pm b/lib/MojoFacets/Import/CSV.pm
index 89c4ab3..d571144 100644 (file)
--- a/lib/MojoFacets/Import/CSV.pm
+++ b/lib/MojoFacets/Import/CSV.pm
@@ -10,6 +10,8 @@ use Data::Dump qw(dump);
 
 __PACKAGE__->attr('full_path');
 
+sub ext { '.csv' };
+
 sub data {
        my $self = shift;
 

diff --git a/lib/MojoFacets/Import/CouchDB.pm b/lib/MojoFacets/Import/CouchDB.pm
index bb1e16b..ccb2167 100644 (file)
--- a/lib/MojoFacets/Import/CouchDB.pm
+++ b/lib/MojoFacets/Import/CouchDB.pm
@@ -13,6 +13,8 @@ use Mojo::UserAgent;
 __PACKAGE__->attr('path');
 __PACKAGE__->attr('full_path');
 
+sub ext { '.couchdb' };
+
 sub flatten {
        my ($flat,$data,$prefix) = @_;
        if ( ref $data eq '' ) {

diff --git a/lib/MojoFacets/Import/File.pm b/lib/MojoFacets/Import/File.pm
index dac817b..503be1d 100644 (file)
--- a/lib/MojoFacets/Import/File.pm
+++ b/lib/MojoFacets/Import/File.pm
@@ -13,6 +13,8 @@ use JSON;
 __PACKAGE__->attr('path');
 __PACKAGE__->attr('full_path');
 
+sub ext { '\.(js(on)?|txt)$' }
+
 sub data {
        my $self = shift;
 
@@ -23,7 +25,7 @@ sub data {
        my $data = read_file $self->full_path;
        warn "# data snippet: ", substr($data,0,200);
        my @header;
-       if ( $path =~ m/\.js/ ) {
+       if ( $path =~ m/\.js(on)?/ ) {
                Encode::_utf8_on($data);
                $data = from_json $data;
        } elsif ( $path =~ m/\.txt/ ) {

diff --git a/lib/MojoFacets/Import/HTMLTable.pm b/lib/MojoFacets/Import/HTMLTable.pm
index 25c6406..a662707 100644 (file)
--- a/lib/MojoFacets/Import/HTMLTable.pm
+++ b/lib/MojoFacets/Import/HTMLTable.pm
@@ -9,7 +9,9 @@ use HTML::TableExtract;
 use File::Slurp;
 use Data::Dump qw(dump);
 
-__PACKAGE__->attr('dir');
+__PACKAGE__->attr('full_path');
+
+sub ext { '\.html$' => 'directory' }
 
 sub __normalize_header {
        map {
@@ -27,7 +29,7 @@ sub data {
        my $stats;
        my @header;
 
-       foreach my $file ( glob $self->dir . '/*.html' ) {
+       foreach my $file ( glob $self->full_path . '/*.html' ) {
                warn "# file $file\n";
                my $te = HTML::TableExtract->new(
                        keep_headers => 1,

diff --git a/lib/MojoFacets/Import/Pairs.pm b/lib/MojoFacets/Import/Pairs.pm
index 5bef5a1..9b4003a 100644 (file)
--- a/lib/MojoFacets/Import/Pairs.pm
+++ b/lib/MojoFacets/Import/Pairs.pm
@@ -9,6 +9,8 @@ use Data::Dump qw(dump);
 
 __PACKAGE__->attr('full_path');
 
+sub ext { '.pairs' }
+
 sub data {
        my $self = shift;
 

diff --git a/lib/MojoFacets/Import/SQL.pm b/lib/MojoFacets/Import/SQL.pm
index ba11845..ff40bf3 100644 (file)
--- a/lib/MojoFacets/Import/SQL.pm
+++ b/lib/MojoFacets/Import/SQL.pm
@@ -12,6 +12,8 @@ use Encode;
 
 __PACKAGE__->attr('full_path');
 
+sub ext { '.sql' }
+
 sub data {
        my $self = shift;
 

diff --git a/t/MojoFacets-Import-Pairs.t b/t/MojoFacets-Import-Pairs.t
index 332ff5c..aca5809 100755 (executable)
--- a/t/MojoFacets-Import-Pairs.t
+++ b/t/MojoFacets-Import-Pairs.t
@@ -13,7 +13,7 @@ use_ok('MojoFacets::Import::Pairs');
 my $path = $ARGV[0] || (glob 'data/lsblk/*.pairs')[0];
 diag "using $path";
 
-ok( my $o = MojoFacets::Import::Pairs->new( path => $path ), 'new' );
+ok( my $o = MojoFacets::Import::Pairs->new( full_path => $path ), 'new' );
 
 ok( my $data = $o->data, 'data' );
 diag dump($data);

diff --git a/t/basic.t b/t/basic.t
index 7116bdf..be67871 100644 (file)
--- a/t/basic.t
+++ b/t/basic.t
@@ -6,9 +6,11 @@ use warnings;
 use Test::More tests => 5;
 use Test::Mojo;
 
+use lib 'lib';
+
 use_ok('MojoFacets');
 
 # Test
-my $t = Test::Mojo->new(app => 'MojoFacets');
-$t->get_ok('/')->status_is(200)->content_type_is('text/html')
+my $t = Test::Mojo->new('MojoFacets');
+$t->get_ok('/')->status_is(200)->content_type_is('text/html;charset=UTF-8')
   ->content_like(qr/Mojo/i);

diff --git a/t/mojofacets.t b/t/mojofacets.t
new file mode 100755 (executable)
index 0000000..1b893fe
--- /dev/null
+++ b/t/mojofacets.t
@@ -0,0 +1,16 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+use Test::More tests => 2;
+use Data::Dump qw(dump);
+
+use lib 'lib';
+
+use_ok('MojoFacets');
+
+ok( my $o = MojoFacets->new, 'new' );
+
+#ok( my $permanent = $o->_permanent_path('test'), '_permanent_path' );
+#diag $permanent;