added --skip-db-update option

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

diff --git a/bin/mpd-feeder b/bin/mpd-feeder
index 95227e9c6dbfd2934a9372d838fafe638233ce55..d2768c68fa11e3833083c1f81df7e9768192dcd2 100755 (executable)
--- a/bin/mpd-feeder
+++ b/bin/mpd-feeder
@@ -21,6 +21,7 @@ class Options {
     has $verbose             :reader = 0;
     has $single              :reader = 0;
     has $one_shot            :reader = 0;
+    has $skip_db_update      :reader = 0;
     has $dump_config         :reader = 0;
 
     method verb($message) {
@@ -38,6 +39,7 @@ class Options {
             'dump-config!'              => \$dump_config,
             's|single!'                 => \$single,
             'one-shot!'                 => \$one_shot,
+            'skip-db-update!'           => \$skip_db_update,
             'tql|target-queue-length=n' => \$target_queue_length,
             'mpd-host=s'                => \$mpd_host,
             'mpd-port=s'                => \$mpd_port,
@@ -152,7 +154,7 @@ use constant DEFAULT_CONFIG_FILE => '/etc/mpd-feeder/mpd-feeder.conf';
             );
 
             $self->connect_db;
-            $self->update_db;
+            $self->update_db unless $self->opt->skip_db_update;
         }
     }
 
@@ -186,7 +188,7 @@ use constant DEFAULT_CONFIG_FILE => '/etc/mpd-feeder/mpd-feeder.conf';
         $db->prepare_cached(
             <<'SQL')->execute( $song, $artist, $album, $db_generation );
 INSERT INTO songs(path, artist, album, generation)
-VALUES($1, $2, $3, $3)
+VALUES($1, $2, $3, $4)
 ON CONFLICT ON CONSTRAINT songs_pkey DO
 UPDATE SET artist = $2
          , album = $3
@@ -276,23 +278,23 @@ SQL
 
     method db_find_suitable_songs($num) {
         my @result;
-        my $sth = $self->db->prepare_cached(<<SQL);
+        my $sth = $db->prepare_cached(<<SQL);
 SELECT s.path, s.artist, s.album
 FROM songs s
 JOIN artists ar ON ar.artist=s.artist
 JOIN albums al ON al.album=s.album
-WHERE (s.last_queued IS NULL OR s.last_queued < CURRENT_TIMESTAMP - CAST(? AS float))
-  AND (ar.last_queued IS NULL OR ar.last_queued < CURRENT_TIMESTAMP - CAST(? AS float))
-  AND (al.last_queued IS NULL OR al.last_queued < CURRENT_TIMESTAMP - CAST(? AS float))
+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)
 ORDER BY random()
 LIMIT ?
 SQL
         $sth->execute(
-            $self->opt->min_song_interval / 3600.0 / 24.0,
-            $self->opt->min_artist_interval / 3600.0 / 24.0,
-            $self->opt->min_album_interval / 3600.0 / 24.0,
+            $self->opt->min_song_interval,
+            $self->opt->min_artist_interval,
+            $self->opt->min_album_interval,
             $num,
         );
         while ( my @row = $sth->fetchrow_array ) {