X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=bin%2Fmpd-feeder;h=7c796c71f4f1e5e65eba5a66dd774eb5f3fb6add;hb=ed5a6f39c03b74319f55d0e1ff33e85c74766a52;hp=ddc4a923a9f9fda295010c9fc6aba97ca72b2599;hpb=7482f3eff8cd5c2c567265b576daae9c794fc2af;p=mpd-feeder.git

diff --git a/bin/mpd-feeder b/bin/mpd-feeder
index ddc4a92..7c796c7 100755
--- 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,
@@ -124,10 +126,13 @@ class Feeder {
     has $opt :reader;
     has $db;
     has $db_generation;
-    has $mpd;
+    has $mpd :reader;
 
 use constant DEFAULT_CONFIG_FILE => '/etc/mpd-feeder/mpd-feeder.conf';
 
+use DBD::Pg;
+use DBI;
+use Net::Async::MPD;
     ADJUST {
         $opt = Options->new;
 
@@ -152,7 +157,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;
         }
     }
 
@@ -276,23 +281,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 ) {