use v5.32;
+use App::MPD::Feeder::Options;
use Getopt::Long ();
use Log::Any qw($log);
-use Log::Any::Adapter Stderr => log_level => 'trace';
+use Log::Any::Adapter Stderr => log_level => 'error';
use Object::Pad;
use Syntax::Keyword::Try;
-class Options {
- use Time::Duration qw(duration_exact);
- use Time::Duration::Parse qw(parse_duration);
- has $log_level :reader = 'warn';
- has $target_queue_length :reader = 10;
- has $mpd_host :reader = undef;
- has $mpd_port :reader = undef;
- has $db_path :reader = 'mpd-feeder';
- has $db_user :reader = undef;
- has $db_password :reader = undef;
- has $min_album_interval :reader = parse_duration('5h');
- has $min_song_interval :reader = parse_duration('13d');
- has $min_artist_interval :reader = parse_duration('1h 15m');
- has $skip_db_update :reader = 0;
-
- method parse_command_line {
- Getopt::Long::GetOptions(
- 'log-level=s' => \$log_level,
- 'skip-db-update!' => \$skip_db_update,
- 'tql|target-queue-length=n' => \$target_queue_length,
- 'mpd-host=s' => \$mpd_host,
- 'mpd-port=s' => \$mpd_port,
- 'db-path=s' => \$db_path,
- 'db-user=s' => \$db_user,
- 'min-album-interval=s' => sub {
- $min_album_interval = parse_duration(pop);
- },
- 'min-sing-interval=s' => sub {
- $min_song_interval = parse_duration(pop);
- },
- 'min-artist-interval=s' => sub {
- $min_artist_interval = parse_duration(pop);
- },
- ) or exit 1;
- }
-
- sub handle_config_option( $ini, $section, $option, $target_ref,
- $converter = undef )
- {
- return undef unless exists $ini->{$section}{$option};
-
- my $value = $ini->{$section}{$option};
-
- $value = $converter->($value) if $converter;
-
- $$target_ref = $value;
- }
-
- method dump {
- say "[mpd-feeder]";
- say "log_level = $log_level";
- say "";
- say "[mpd]";
- say "host = " . ( $mpd_host // '' );
- say "port = " . ( $mpd_port // '' );
- say "target-queue-length = $target_queue_length";
- say "";
- say "[queue]";
- say "target-length = $target_queue_length";
- say "min-song-interval = " . duration_exact($min_song_interval);
- say "min-album-interval = " . duration_exact($min_album_interval);
- say "min-artist-interval = " . duration_exact($min_artist_interval);
- say "";
- say "[db]";
- say "path = " . ( $db_path // '' );
- say "user = " . ( $db_user // '' );
- say "password = " . ( $db_password // '' );
- }
-
- method parse_config_file($path) {
- use Config::INI::Reader;
- my $ini = Config::INI::Reader->read_file($path);
-
- handle_config_option( $ini => mpd => host => \$mpd_host );
- handle_config_option( $ini => mpd => port => \$mpd_port );
-
- handle_config_option( $ini => 'mpd-feeder' => log_level => \$log_level );
-
- handle_config_option(
- $ini => queue => 'target-length' => \$target_queue_length );
- handle_config_option(
- $ini => queue => 'min-song-interval' => \$min_song_interval,
- \&parse_duration
- );
- handle_config_option(
- $ini => queue => 'min-album-interval' => \$min_album_interval,
- \&parse_duration
- );
- handle_config_option(
- $ini => queue => 'min-artist-interval' => \$min_artist_interval,
- \&parse_duration
- );
-
- handle_config_option( $ini => db => path => \$db_path );
- handle_config_option( $ini => db => user => \$db_user );
- handle_config_option( $ini => db => password => \$db_password );
-
- # FIXME: complain about unknown sections/parameters
- }
-}
-
class Feeder {
+ has $cfg_file :reader;
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';
use DBD::Pg;
use DBI;
use Log::Any qw($log);
+use IO::Async::Signal;
use Net::Async::MPD;
ADJUST {
- $opt = Options->new;
+ Getopt::Long::Configure('pass_through');
+ Getopt::Long::GetOptions('cfg|config=s' => \$cfg_file);
+ Getopt::Long::Configure('no_pass_through');
- {
- my $cfg_file;
- Getopt::Long::Configure('pass_through');
- Getopt::Long::GetOptions('cfg|config=s' => \$cfg_file);
- Getopt::Long::Configure('no_pass_through');
+ $cfg_file //= DEFAULT_CONFIG_FILE if -e DEFAULT_CONFIG_FILE;
- $cfg_file //= DEFAULT_CONFIG_FILE if -e DEFAULT_CONFIG_FILE;
+ $self->configure;
- $opt->parse_config_file($cfg_file) if $cfg_file;
- }
+ $db_needs_update = 0 if $opt->skip_db_update;
+ }
- $opt->parse_command_line;
+ method configure {
+ my $new_opt = App::MPD::Feeder::Options->new;
- $db_needs_update = 0 if $opt->skip_db_update;
+ $new_opt->parse_config_file($cfg_file) if $cfg_file;
+
+ $new_opt->parse_command_line;
- Log::Any::Adapter->set( Stderr => log_level => $opt->log_level );
+ Log::Any::Adapter->set( Stderr => log_level => $new_opt->log_level );
+
+ $opt = $new_opt;
}
method connect_mpd {
$conn{port} = $opt->mpd_port if $opt->mpd_port;
$mpd = Net::Async::MPD->new(%conn);
+
+ $mpd->loop->add(
+ IO::Async::Signal->new(
+ name => 'HUP',
+ on_receipt => sub {
+ $log->debug("SIGHUP received. Stopping loop");
+ $mpd->loop->stop('reload');
+ },
+ )
+ );
+
+ $mpd->loop->add(
+ IO::Async::Signal->new(
+ name => 'USR1',
+ on_receipt => sub {
+ $log->debug("SIGUSR1 received. Dumping configuration to STDERR");
+ my $old = select \*STDERR;
+ try {
+ $opt->dump;
+ }
+ finally {
+ select $old;
+ }
+ },
+ )
+ );
}
method connect_db {
$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');
my $sth = $db->prepare_cached("select $name from options");
$sth->execute;
my @result = $sth->fetchrow_array;
+ $sth->finish;
+ undef $sth;
return $result[0];
}
foreach my $entry (@$rows) {
next unless exists $entry->{file};
$self->db_store_song( $entry->{file},
- $entry->{Artist}, $entry->{Album} );
+ $entry->{AlbumArtist} // $entry->{Artist},
+ $entry->{Album} );
$song_count++;
}
$self->db_set_option( generation => $db_generation );
$db->commit;
+
+ $db_needs_update = 0;
}
catch {
my $err = $@;
method db_find_suitable_songs($num) {
$self->connect_db;
+ $self->update_db;
my @result;
- my $sth = $db->prepare_cached(<<SQL);
+ my $sql = <<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
+JOIN albums al ON al.album=s.album AND al.artist=s.artist
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
- $sth->execute(
- $opt->min_song_interval,
- $opt->min_artist_interval,
- $opt->min_album_interval,
- $num,
+ my @params = (
+ $opt->min_song_interval, $opt->min_artist_interval,
+ $opt->min_album_interval, $num,
);
+ my $sth = $db->prepare_cached($sql);
+ $sth->execute(@params);
while ( my @row = $sth->fetchrow_array ) {
push @result,
{ song => $row[0], artist => $row[1], album => $row[2] };
}
+ undef $sth;
+
+ if (scalar(@result) == $num and $log->is_debug) {
+ $sql =~ s/^SELECT .+$/SELECT COUNT(DISTINCT s.path)/m;
+ $sql =~ s/^ORDER BY .+$//m;
+ $sql =~ s/^LIMIT .+$//m;
+ $log->debug($sql);
+ my $sth = $db->prepare_cached($sql);
+ pop @params;
+ $sth->execute(@params);
+ my $count = ($sth->fetchrow_array)[0];
+ $sth->finish;
+
+ $sth = $db->prepare_cached('SELECT COUNT(*) FROM songs');
+ $sth->execute;
+ my $total = ($sth->fetchrow_array)[0];
+ $log->debug(
+ sprintf(
+ "Number of songs meeting the criteria: %d out of total %d (%5.2f%%)",
+ $count, $total, 100.0 * $count / $total
+ )
+ );
+ $sth->finish;
+
+ $sql = <<SQL;
+SELECT COUNT(*)
+FROM songs s
+WHERE (s.last_queued IS NULL OR s.last_queued < CURRENT_TIMESTAMP - (? || ' seconds')::interval)
+UNION
+SELECT COUNT(*)
+FROM songs
+SQL
+ $sth = $db->prepare_cached($sql);
+ $sth->execute($opt->min_song_interval);
+ $count = ($sth->fetchrow_array)[0];
+ $total = ($sth->fetchrow_array)[0];
+ $sth->finish;
+
+ $log->debug(
+ sprintf(
+ "Number of songs not queued soon: %d out of total %d (%5.2f%%)",
+ $count, $total, 100.0 * $count / $total
+ )
+ );
+ $sth->finish;
+
+ $sql = <<SQL;
+SELECT COUNT(*)
+FROM artists ar
+WHERE (ar.last_queued IS NULL OR ar.last_queued < CURRENT_TIMESTAMP - (? || ' seconds')::interval)
+UNION
+SELECT COUNT(*)
+FROM artists
+SQL
+ $sth = $db->prepare_cached($sql);
+ $sth->execute($opt->min_artist_interval);
+ $count = ($sth->fetchrow_array)[0];
+ $total = ($sth->fetchrow_array)[0];
+ $log->debug(
+ sprintf(
+ "Number of artists not queued soon: %d out of total %d (%5.2f%%)",
+ $count, $total, 100.0 * $count / $total
+ )
+ );
+ $sth->finish;
+
+ $sql = <<SQL;
+SELECT COUNT(*)
+FROM albums al
+WHERE (al.last_queued IS NULL OR al.last_queued < CURRENT_TIMESTAMP - (? || ' seconds')::interval)
+UNION
+SELECT COUNT(*)
+FROM albums
+SQL
+ $sth = $db->prepare_cached($sql);
+ $sth->execute($opt->min_album_interval);
+ $count = ($sth->fetchrow_array)[0];
+ $total = ($sth->fetchrow_array)[0];
+ $log->debug(
+ sprintf(
+ "Number of albums not queued soon: %d out of total %d (%5.2f%%)",
+ $count, $total, 100.0 * $count / $total
+ )
+ );
+ $sth->finish;
+
+ undef $sth;
+ }
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;
sub {
my $present = scalar @{ $_[0] };
- $log->notice("Playlist contains $present songs");
+ $log->notice( "Playlist contains $present songs. Wanted: "
+ . $opt->target_queue_length );
if ( $present < $opt->target_queue_length ) {
$self->queue_songs(
$opt->target_queue_length - $present, $callback );
}
$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' ) {
$self->prepare_to_wait_idle;
}
-}
-my $feeder = Feeder->new();
+ method stop {
+ undef $mpd;
+
+ if ($db) {
+ if ($db->{ActiveKids}) {
+ $log->warn("$db->{ActiveKids} active DB statements");
+ for my $st ( @{ $db->{ChildHandles} } ) {
+ next unless $st->{Active};
+ while(my($k,$v) = each %$st) {
+ $log->debug("$k = ".($v//'<NULL>'));
+ }
+ }
+ }
-sub usage {
- die "Usage: mpd-feeder [option...] [command]\n";
+ $db->disconnect;
+ undef $db;
+ }
+ }
}
-if (@ARGV) {
- usage if @ARGV > 1;
+my $feeder = Feeder->new();
+if (@ARGV) {
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;
}
}
}
+$feeder->connect_db;
+
+for ( ;; ) {
+ $feeder->queue_songs( undef, sub { $feeder->run } );
+
+ $log->debug("Entering event loop. PID=$$");
-$feeder->queue_songs( undef, sub { $feeder->run } );
+ my $result = $feeder->mpd->loop->run;
+ $log->trace( "Got loop result of " . ( $result // 'undef' ) );
-$feeder->mpd->loop->run;
+ if ('reload' eq $result) {
+ $log->notice("disconnecting");
+ $feeder->stop;
+
+ exec( "$0", '--config', $feeder->cfg_file, '--skip-db-update' );
+ }
+}
projects / mpd-feeder.git / blobdiff