Refactor Fey.pm module

[Fey] / lib / App / Fey.pm

diff --git a/lib/App/Fey.pm b/lib/App/Fey.pm
index 4400e488f18086fbfe88cfaea3280b5a400b3525..c137002901e2aa6dfa7cb86b83695dbd94dbbc5f 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,18 +25,18 @@ sub new {
 
 sub launch {
     my $self = shift;
 
 sub launch {
     my $self = shift;

+    my $options = ref $_[0] ? shift : {};
+
+    die "No files or URIs specified.\n" unless @_;

 
     ARG: for my $file_or_uri (@_) {
 
     ARG: for my $file_or_uri (@_) {

-        if ($file_or_uri =~ m|^file://(.+)|) {
-            $file_or_uri = $1;
+        if ($options->{fork} && !$options->{single}) {
+            my $pid = fork;
+            next ARG if ($pid);

         }
 
         }
 

-        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;
-        }
+        $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} }) {
 
         for my $target (@{ $self->{targets} }) {
             for my $pattern (@{ $target->{patterns} }) {


@@ -41,7 +44,12 @@ sub launch {
                     my $associations = $target->{associations};
                     for my $context (keys %{ $associations }) {
                         if ($self->{contexts}->{$context}->()) {
                     my $associations = $target->{associations};
                     for my $context (keys %{ $associations }) {
                         if ($self->{contexts}->{$context}->()) {

+                            if ($options->{single}) {
+                                $associations->{$context}->(@_);
+                                return;
+                            }

                             $associations->{$context}->($file_or_uri);
                             $associations->{$context}->($file_or_uri);

+                            return if ($options->{fork});

                             next ARG;
                         }
                     }
                             next ARG;
                         }
                     }


@@ -52,5 +60,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(@_);

 }
 }