Refactor Fey.pm module

[Fey] / lib / App / Fey.pm

diff --git a/lib/App/Fey.pm b/lib/App/Fey.pm
index 4400e488f18086fbfe88cfaea3280b5a400b3525..c0778ab2ede342c99b79f96f124388ab303f3310 100644 (file)
--- a/lib/App/Fey.pm
+++ b/lib/App/Fey.pm
@@ -8,13 +8,16 @@ 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 $self = {
     my $config = do ($ENV{XDG_CONFIG_HOME} // "$ENV{HOME}/.config") . '/fey/config.pl';
 
     my $self = {

-        mime_query => $args->{mime_query} // $config->{mime_query} // sub { `file --brief --mime-type "$_[0]"` },
-        contexts => $args->{contexts} // $config->{contexts} // { default => sub { 1 } },
-        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;
     };
 
     bless $self, $class;


@@ -22,28 +25,64 @@ sub new {
 
 sub launch {
     my $self = shift;
 
 sub launch {
     my $self = shift;

+    my $options = ref $_[0] ? shift : {};

 
 

-    ARG: for my $file_or_uri (@_) {
-        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}->($file_or_uri)
-        } else {
-            $mime_or_uri = $file_or_uri;
+    if ($options->{single}) {
+        $self->_launch_single($options, @_);
+    } else {
+        $self->_launch($options, @_);
+    }
+}
+
+sub _launch {
+    my $self = shift;
+    my $options = shift;
+
+    if ($options->{fork}) {
+        for my $file_or_uri (@_) {
+            my $pid = fork;
+            next if $pid;
+
+            my $handler = $self->_get_handler($file_or_uri);
+            $handler->($file_or_uri) if $handler;
+            return;

         }
         }

+    } else {
+        for my $file_or_uri (@_) {
+            my $handler = $self->_get_handler($file_or_uri);
+            $handler->($file_or_uri) if $handler;
+        }
+    }
+}
+
+sub _launch_single {
+    my $self = shift;
+    my $options = shift;
+
+    if ($options->{fork}) {
+        my $pid = fork;
+        return if $pid;
+    }
+
+    my $handler = $self->_get_handler($_[0]);
+    $handler->(@_) if $handler;
+}
+
+sub _get_handler {
+    my $self = shift;
+    
+    my $file_or_uri = $_[0] =~ m|^file://(.+)| ? $1 : $_[0];
+    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}->()) {
-                            $associations->{$context}->($file_or_uri);
-                            next ARG;
-                        }
+    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}->()) {
+                        return $associations->{$context};

                     }
                 }
             }
                     }
                 }
             }


@@ -52,5 +91,5 @@ sub launch {
 }
 
 sub fey {
 }
 
 sub fey {

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

 }
 }