X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=bin%2Fmpd-feeder;h=3ba943234f6900e1ab32abb342edfa7e7a2931fb;hb=cd886cc2a585da2c0affca6205038d3075a3ec65;hp=401e696d19700dc9836b1f7bcff49e689f8d2219;hpb=e69cd83287a8a78d386e1019bea45a78a22a3cd2;p=mpd-feeder.git

diff --git a/bin/mpd-feeder b/bin/mpd-feeder
index 401e696..3ba9432 100755
--- a/bin/mpd-feeder
+++ b/bin/mpd-feeder
@@ -266,6 +266,8 @@ SQL
             $self->db_set_option( generation => $db_generation );
 
             $db->commit;
+
+            $db_needs_update = 0;
         }
         catch {
             my $err = $@;
@@ -280,6 +282,7 @@ SQL
 
     method db_find_suitable_songs($num) {
         $self->connect_db;
+        $self->update_db;
 
         my @result;
         my $sth = $db->prepare_cached(<<SQL);
@@ -359,7 +362,6 @@ SQL
         }
         $self->connect_mpd;
         my $f = $mpd->send( \@commands );
-        warn "here";
         $f->on_fail( sub { die @_ } );
         $f->on_done(
             sub {
@@ -368,8 +370,6 @@ SQL
                 $callback->(@_) if $callback;
             }
         );
-
-        warn "here";
     }
 
     method prepare_to_wait_idle {
@@ -378,10 +378,9 @@ SQL
             sub {
                 warn $_ for @_;
                 my $result = shift;
-                use JSON; warn to_json($result);
 
                 if ( $result->{changed} eq 'database' ) {
-                    $self->update_db(1);
+                    $db_needs_update = 1;
                     $self->prepare_to_wait_idle;
                 }
                 elsif ( $result->{changed} eq 'playlist' ) {
@@ -439,7 +438,6 @@ if (@ARGV) {
     }
 }
 
-
 $feeder->queue_songs( undef, sub { $feeder->run } );
 
 $feeder->mpd->loop->run;