debug--

[mpd-feeder.git] / bin / mpd-feeder

diff --git a/bin/mpd-feeder b/bin/mpd-feeder
index 401e696d19700dc9836b1f7bcff49e689f8d2219..a5454424ae16200d4cd6331cae816fbf5f25d92e 100755 (executable)
--- a/bin/mpd-feeder
+++ b/bin/mpd-feeder
@@ -113,7 +113,7 @@ class Feeder {
     has $opt :reader;
     has $db;
     has $db_generation;
-    has $db_needs_update = 1;
+    has $db_needs_update :writer = 1;
     has $mpd :reader;
 
 use constant DEFAULT_CONFIG_FILE => '/etc/mpd-feeder/mpd-feeder.conf';
@@ -159,7 +159,7 @@ use Net::Async::MPD;
 
         $db = DBI->connect( "dbi:Pg:dbname=" . $opt->db_path,
             $opt->db_user, $opt->db_password,
-            { RaiseError => 1, AutoCommit => 1 } );
+            { RaiseError => 1, PrintError => 0, AutoCommit => 1 } );
 
         $log->info( "Connected to database " . $opt->db_path );
         $db_generation = $self->db_get_option('generation');
@@ -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);
@@ -290,8 +293,8 @@ JOIN albums al ON al.album=s.album
 WHERE (s.last_queued IS NULL OR s.last_queued < CURRENT_TIMESTAMP - (? || ' seconds')::interval)
   AND (ar.last_queued IS NULL OR ar.last_queued < CURRENT_TIMESTAMP - (? || ' seconds')::interval)
   AND (al.last_queued IS NULL OR al.last_queued < CURRENT_TIMESTAMP - (? || ' seconds')::interval)
-  AND NOT EXISTS (SELECT 1 FROM blacklisted_artists bar WHERE bar.artist = s.artist)
-  AND NOT EXISTS (SELECT 1 FROM blacklisted_albums  bal WHERE bal.album  = s.album)
+  AND NOT EXISTS (SELECT 1 FROM unwanted_artists uar WHERE uar.artist = s.artist)
+  AND NOT EXISTS (SELECT 1 FROM unwanted_albums  ual WHERE ual.album  = s.album)
 ORDER BY random()
 LIMIT ?
 SQL
@@ -309,6 +312,42 @@ SQL
         return @result;
     }
 
+    method db_add_unwanted_artist($artist) {
+        $self->connect_db;
+
+        try {
+            $db->do(
+                <<'SQL',
+INSERT INTO unwanted_artists(artist, generation)
+VALUES($1, $2)
+SQL
+                undef, $artist, $db_generation
+            );
+            return 1;
+        }
+        catch {
+            my $err = $@;
+
+            $log->debug("PostgreSQL error: $err");
+            $log->debug( "SQLSTATE = " . $db->state );
+            return 0 if $db->state eq '23505';
+
+            die $err;
+        }
+    }
+
+    method db_del_unwanted_artist($artist) {
+        $self->connect_db;
+
+        return 1 == $db->do(
+            <<'SQL',
+DELETE FROM unwanted_artists
+WHERE artist = $1
+SQL
+            undef, $artist
+        );
+    }
+
     method queue_songs($num = undef, $callback = undef) {
         if (!defined $num) {
             $self->connect_mpd;
@@ -359,29 +398,23 @@ SQL
         }
         $self->connect_mpd;
         my $f = $mpd->send( \@commands );
-        warn "here";
         $f->on_fail( sub { die @_ } );
         $f->on_done(
             sub {
-                warn $_ for @_;
                 $self->db_note_song_qeued($_) for @list;
                 $callback->(@_) if $callback;
             }
         );
-
-        warn "here";
     }
 
     method prepare_to_wait_idle {
         $log->trace('declaring idle mode');
         $mpd->send('idle database playlist')->on_done(
             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' ) {
@@ -411,26 +444,57 @@ SQL
 
 my $feeder = Feeder->new();
 
-sub usage {
-    die "Usage: mpd-feeder [option...] [command]\n";
-}
-
 if (@ARGV) {
-    usage if @ARGV > 1;
-
     my $cmd = shift @ARGV;
 
     if ($cmd eq 'dump-config') {
+        die "dump-config command accepts no arguments\n" if @ARGV;
+
         $feeder->opt->dump;
         exit;
     }
-# FIXME: handle blacklist manipulation
+
+    if ( $cmd eq 'add-unwanted-artist' ) {
+        die "Missing command arguments\n" unless @ARGV;
+        $feeder->set_db_needs_update(0);
+        for my $artist (@ARGV) {
+            if ( $feeder->db_add_unwanted_artist($artist) ) {
+                $log->info("Artist '$artist' added to the unwanted list\n");
+            }
+            else {
+                $log->warn("Artist '$artist' already in the unwanted list\n");
+            }
+        }
+        exit;
+    }
+
+    if ( $cmd eq 'del-unwanted-artist' ) {
+        die "Missing command arguments\n" unless @ARGV;
+        $feeder->set_db_needs_update(0);
+        for my $artist (@ARGV) {
+            if ( $feeder->db_del_unwanted_artist($artist) ) {
+                $log->info("Artist '$artist' deleted from the unwanted list\n");
+            }
+            else {
+                $log->warn("Artist '$artist' is not in the unwanted list\n");
+            }
+        }
+        exit;
+    }
+
+    if ( $cmd eq 'add-unwanted-album' ) {
+        die "NOT IMPLEMENTED\n";
+    }
 
     if ( $cmd eq 'one-shot' ) {
+        die "one-shot command accepts no arguments\n" if @ARGV;
+
         $feeder->queue_songs(undef, sub { exit });
         $feeder->mpd->loop->run;
     }
     elsif ( $cmd eq 'single' ) {
+        die "single command accepts no arguments\n" if @ARGV;
+
         $feeder->queue_songs(1, sub { exit });
         $feeder->mpd->loop->run;
     }
@@ -439,7 +503,6 @@ if (@ARGV) {
     }
 }
 
-
 $feeder->queue_songs( undef, sub { $feeder->run } );
 
 $feeder->mpd->loop->run;