Refactor Fey.pm module

[Fey] / lib / App / Fey.pm

diff --git a/lib/App/Fey.pm b/lib/App/Fey.pm
index 73dbb05e98f7a95ee47a75e23a138955740f27dc..c137002901e2aa6dfa7cb86b83695dbd94dbbc5f 100644 (file)
--- a/lib/App/Fey.pm
+++ b/lib/App/Fey.pm
@@ -8,45 +8,50 @@ our @EXPORT_OK = qw(fey);
 our $version = '0.01';
 
 sub new {
 our $version = '0.01';
 
 sub new {

-    my ($class, $args) = @_;
+    my ($class, $options) = @_;

     my $config = do ($ENV{XDG_CONFIG_HOME} // "$ENV{HOME}/.config") . '/fey/config.pl';
     my $config = do ($ENV{XDG_CONFIG_HOME} // "$ENV{HOME}/.config") . '/fey/config.pl';

-    my $placeholder = $args->{placeholder} // $config->{placeholder} // '//f';

 
     my $self = {
 
     my $self = {

-        contexts => $args->{contexts} // $config->{contexts} // { default => 1 },
-        placeholder => $placeholder,
-        mime_query => $args->{mime_query} // $config->{mime_query} // "file --brief --mime-type $placeholder",
-        targets => $args->{targets} // $config->{targets} // {}
+        mime_query => $options->{mime_query} // $config->{mime_query} // sub {
+            open my $mime_type, '-|', 'file', '--brief', '--mime-type', $_[0];
+            <$mime_type>;
+        },
+        contexts => $options->{contexts} // $config->{contexts} // { default => sub { 1 } },
+        targets => $options->{targets} // $config->{targets} // {}

     };
 
     bless $self, $class;
 }
 
 sub launch {
     };
 
     bless $self, $class;
 }
 
 sub launch {

-    my ($self, $file_or_uri) = @_;
+    my $self = shift;
+    my $options = ref $_[0] ? shift : {};

 
 

-    if ($file_or_uri =~ m|^file://(.+)|) {
-        $file_or_uri = $1;
-    }
+    die "No files or URIs specified.\n" unless @_;

 
 

-    my ($mime_or_uri, $targets);
-    if (-e $file_or_uri) {
-        $mime_or_uri = $self->{mime_query} =~ s/$self->{placeholder}/"$file_or_uri"/r;
-        $mime_or_uri = `$mime_or_uri`;
-    } else {
-        $mime_or_uri = $file_or_uri;
-    }
+    ARG: for my $file_or_uri (@_) {
+        if ($options->{fork} && !$options->{single}) {
+            my $pid = fork;
+            next ARG if ($pid);
+        }
+
+        $file_or_uri = $1 if ($file_or_uri =~ m|^file://(.+)|);
+        my $mime_or_uri = -e $file_or_uri ? $self->{mime_query}->($file_or_uri) : $file_or_uri;

 
 

-    for my $target (@{ $self->{targets} }) {
-        for my $pattern (@{ $target->{patterns} }) {
-            if ($mime_or_uri =~ /$pattern/) {
-                my $associations = $target->{associations};
-                for my $context (keys %{ $associations }) {
-                    if ($self->{contexts}->{$context}) {
-                        my $command = $associations->{$context};
-                        $command =~ s/$self->{placeholder}/"$file_or_uri"/;
-                        `$command`;
-                        return;
+        for my $target (@{ $self->{targets} }) {
+            for my $pattern (@{ $target->{patterns} }) {
+                if ($mime_or_uri =~ /$pattern/) {
+                    my $associations = $target->{associations};
+                    for my $context (keys %{ $associations }) {
+                        if ($self->{contexts}->{$context}->()) {
+                            if ($options->{single}) {
+                                $associations->{$context}->(@_);
+                                return;
+                            }
+                            $associations->{$context}->($file_or_uri);
+                            return if ($options->{fork});
+                            next ARG;
+                        }

                     }
                 }
             }
                     }
                 }
             }


@@ -55,5 +60,5 @@ sub launch {
 }
 
 sub fey {
 }
 
 sub fey {

-    App::Fey->new($_[1] // {})->launch($_[0] // die 'Error: No file or URI specified.');
+    App::Fey->new(ref $_[0] ? $_[0] : {})->launch(@_);

 }
 }