X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit%2FConfig-Any.git;a=blobdiff_plain;f=lib%2FConfig%2FAny.pm;h=1f172bc6c546deafc3f7aa92fe7489952ba4eb8f;hp=708936aa14a106c16666d96f22232158ef6040bf;hb=c84f1613b60ec2bd2df1a88e6618f36246c24c4b;hpb=a918b0b8b7952db918dfabb8dc72bf34832d43d0 diff --git a/lib/Config/Any.pm b/lib/Config/Any.pm index 708936a..1f172bc 100644 --- a/lib/Config/Any.pm +++ b/lib/Config/Any.pm @@ -133,19 +133,21 @@ sub _load { my ( $class, $args ) = @_; croak "_load requires a arrayref of file paths" unless $args->{ files }; - if( !defined $args->{ use_ext } ) { - warn "use_ext argument was not explicitly set, as of 0.09, this is true by default"; + my $force = defined $args->{ force_plugins }; + if ( !$force and !defined $args->{ use_ext } ) { + warn + "use_ext argument was not explicitly set, as of 0.09, this is true by default"; $args->{ use_ext } = 1; } # figure out what plugins we're using - my $force = defined $args->{ force_plugins }; - my @plugins = $force ? @{ $args->{ force_plugins } } : $class->plugins; + my @plugins = grep { $_->is_supported } + ( $force ? @{ $args->{ force_plugins } } : $class->plugins ); # map extensions if we have to - my( %extension_lut, $extension_re ); + my ( %extension_lut, $extension_re ); my $use_ext_lut = !$force && $args->{ use_ext }; - if( $use_ext_lut ) { + if ( $use_ext_lut ) { for my $plugin ( @plugins ) { $extension_lut{ $_ } = $plugin for $plugin->extensions; } @@ -164,19 +166,21 @@ sub _load { my @results; for my $filename ( @{ $args->{ files } } ) { + # don't even bother if it's not there next unless -f $filename; my @try_plugins = @plugins; - if( $use_ext_lut ) { + if ( $use_ext_lut ) { $filename =~ m{\.($extension_re)\z}; next unless $1; @try_plugins = $extension_lut{ $1 }; } for my $loader ( @try_plugins ) { - my @configs = eval { $loader->load( $filename, $loader_args{ $loader } ); }; + my @configs + = eval { $loader->load( $filename, $loader_args{ $loader } ); }; # fatal error if we used extension matching croak "Error parsing file: $filename" if $@ and $use_ext_lut; @@ -187,7 +191,8 @@ sub _load { $args->{ filter }->( $_ ) for @configs; } - push @results, { $filename => @configs == 1 ? $configs[ 0 ] : \@configs }; + push @results, + { $filename => @configs == 1 ? $configs[ 0 ] : \@configs }; last; } }