move mail event loop to Feeder

diff --git a/bin/mpd-feeder b/bin/mpd-feeder
index 53c826578840f3900e08e14472539117a4ba6073..79d0b1b858926841cbad61586a35231bfb4017f3 100755 (executable)
--- a/bin/mpd-feeder
+++ b/bin/mpd-feeder
@@ -70,20 +70,4 @@ if (@ARGV) {
     }
 }
 
-$feeder->connect_db;
-
-for ( ;; ) {
-    $feeder->queue_songs( undef, sub { $feeder->run } );
-
-    $log->debug("Entering event loop. PID=$$");
-
-    my $result = $feeder->mpd->loop->run;
-    $log->trace( "Got loop result of " . ( $result // 'undef' ) );
-
-    if ('reload' eq $result) {
-        $log->notice("disconnecting");
-        $feeder->stop;
-
-        exec( "$0", '--config', $feeder->cfg_file, '--skip-db-update' );
-    }
-}
+$feeder->run_loop;

diff --git a/lib/App/MPD/Feeder.pm b/lib/App/MPD/Feeder.pm
index dbdcafb39494df4a0f2ae796faa57415b3c0d764..4285e7077549ce294e26b6c7b6d75babef7f9da3 100644 (file)
--- a/lib/App/MPD/Feeder.pm
+++ b/lib/App/MPD/Feeder.pm
@@ -482,5 +482,25 @@ SQL
             undef $db;
         }
     }
+
+    method run_loop {
+        $self->connect_db;
+
+        for ( ;; ) {
+            $self->queue_songs( undef, sub { $self->run } );
+
+            $log->debug("Entering event loop. PID=$$");
+
+            my $result = $mpd->loop->run;
+            $log->trace( "Got loop result of " . ( $result // 'undef' ) );
+
+            if ( 'reload' eq $result ) {
+                $log->notice("disconnecting");
+                $self->stop;
+
+                exec( "$0", '--config', $self->cfg_file, '--skip-db-update' );
+            }
+        }
+    }
 }