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 Log::Any qw($log);
use Time::Duration qw(duration_exact);
use Time::Duration::Parse qw(parse_duration);
has $log_level :reader = 'warn';
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 $single :reader = 0;
- has $one_shot :reader = 0;
has $skip_db_update :reader = 0;
- has $dump_config :reader = 0;
method parse_command_line {
Getopt::Long::GetOptions(
'log-level=s' => \$log_level,
- '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,
- 'db-path=s' => \$db_path,
- 'db-user=s' => \$db_user,
- 'min-album-interval=s' => sub {
+ 'tql|target-queue-length=n' => sub {
+ $target_queue_length = parse_integer(pop);
+ },
+ '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 {
$value = $converter->($value) if $converter;
$$target_ref = $value;
+
+ $log->trace("Option $section.$option = $value");
}
method dump {
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 "password = " . ( $db_password // '' );
}
+ sub parse_integer($input) {
+ die "Invalid integer value '$input'" unless $input =~ /^\+?\d{1,18}$/;
+ return $input + 0;
+ }
+
method parse_config_file($path) {
+ $log->trace("Parsing configuration file $path");
+
use Config::INI::Reader;
my $ini = Config::INI::Reader->read_file($path);
handle_config_option( $ini => 'mpd-feeder' => log_level => \$log_level );
handle_config_option(
- $ini => queue => 'target-length' => \$target_queue_length );
+ $ini => queue => 'target-length' => \$target_queue_length,
+ \&parse_integer
+ );
handle_config_option(
$ini => queue => 'min-song-interval' => \$min_song_interval,
\&parse_duration
}
class Feeder {
+ has $cfg_file :reader;
has $opt :reader;
has $db;
has $db_generation;
+ 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 = Options->new;
- Log::Any::Adapter->set( Stderr => log_level => $opt->log_level );
+ $new_opt->parse_config_file($cfg_file) if $cfg_file;
- unless ($opt->dump_config) {
- my %conn = ( auto_connect => 1 );
- $conn{host} = $opt->mpd_host if $opt->mpd_host;
- $conn{port} = $opt->mpd_port if $opt->mpd_port;
+ $new_opt->parse_command_line;
- $mpd = Net::Async::MPD->new(%conn);
+ Log::Any::Adapter->set( Stderr => log_level => $new_opt->log_level );
- $self->connect_db;
- $self->update_db unless $self->opt->skip_db_update;
- }
+ $opt = $new_opt;
+ }
+
+ method connect_mpd {
+ return if $mpd;
+
+ my %conn = ( auto_connect => 1 );
+ $conn{host} = $opt->mpd_host if $opt->mpd_host;
+ $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 {
return if $db;
- $db =
- DBI->connect( "dbi:Pg:dbname=" . $opt->db_path,
+ $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 ".$opt->db_path);
+ $log->info( "Connected to database " . $opt->db_path );
$db_generation = $self->db_get_option('generation');
$log->debug("DB generation is $db_generation");
+ $self->update_db;
}
method db_get_option($name) {
)->execute( $item->{artist}, $item->{album} );
}
- method update_db() {
+ method update_db($force = undef) {
+ if (!$db_needs_update and !$force) {
+ $log->debug("Skipping DB update");
+ return;
+ }
+
$log->info('Updating song database');
- $mpd->send('listallinfo')->on_done(
- sub {
- try {
- my $rows = shift;
- $db->begin_work;
+ $self->connect_mpd;
+ $self->connect_db;
- $db_generation++;
+ my $rows = $mpd->send('listallinfo')->get;
+ try {
+ $db->begin_work;
- my $song_count;
+ $db_generation++;
- foreach my $entry (@$rows) {
- next unless exists $entry->{file};
- $self->db_store_song( $entry->{file},
- $entry->{Artist}, $entry->{Album} );
- $song_count++;
- }
+ my $song_count;
- $log->info("Updated data about $song_count songs");
+ foreach my $entry (@$rows) {
+ next unless exists $entry->{file};
+ $self->db_store_song( $entry->{file},
+ $entry->{AlbumArtist}, $entry->{Album} );
+ $song_count++;
+ }
- $self->db_remove_stale_entries;
+ $log->info("Updated data about $song_count songs");
- $self->db_set_option( generation => $db_generation );
+ $self->db_remove_stale_entries;
- $db->commit;
- }
- catch {
- my $err = $@;
+ $self->db_set_option( generation => $db_generation );
- $db_generation--;
+ $db->commit;
- $db->rollback;
+ $db_needs_update = 0;
+ }
+ catch {
+ my $err = $@;
- die $err;
- }
- }
- );
+ $db_generation--;
+
+ $db->rollback;
+
+ die $err;
+ }
}
method db_find_suitable_songs($num) {
+ $self->connect_db;
+ $self->update_db;
+
my @result;
my $sth = $db->prepare_cached(<<SQL);
SELECT s.path, s.artist, 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
$sth->execute(
- $self->opt->min_song_interval,
- $self->opt->min_artist_interval,
- $self->opt->min_album_interval,
+ $opt->min_song_interval,
+ $opt->min_artist_interval,
+ $opt->min_album_interval,
$num,
);
while ( my @row = $sth->fetchrow_array ) {
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;
$mpd->send('playlist')->on_done(
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 );
for (@paths) {
push @commands, [ add => "\"$_\"" ];
}
+ $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;
+ $db_needs_update = 1;
$self->prepare_to_wait_idle;
}
elsif ( $result->{changed} eq 'playlist' ) {
$self->prepare_to_wait_idle;
}
+
+ 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>'));
+ }
+ }
+ }
+
+ $db->disconnect;
+ undef $db;
+ }
+ }
}
my $feeder = Feeder->new();
-$feeder->opt->dump, exit if $feeder->opt->dump_config;
+if (@ARGV) {
+ my $cmd = shift @ARGV;
-$feeder->queue_songs(1), exit if $feeder->opt->single;
+ if ($cmd eq 'dump-config') {
+ die "dump-config command accepts no arguments\n" if @ARGV;
-# FIXME: handle blacklist manipulation
+ $feeder->opt->dump;
+ exit;
+ }
-$feeder->queue_songs;
+ 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;
+ }
-exit if $feeder->opt->one_shot;
+ 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;
+ }
-$feeder->mpd->on(
- database => sub {
- $feeder->update_db;
+ if ( $cmd eq 'add-unwanted-album' ) {
+ die "NOT IMPLEMENTED\n";
}
-);
-$feeder->mpd->on(
- playlist => sub {
- $feeder->queue_songs;
+ 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->mpd->idle(qw(database playlist));
-$feeder->mpd->get;
+ $feeder->queue_songs(1, sub { exit });
+ $feeder->mpd->loop->run;
+ }
+ else {
+ die "Unknown command '$cmd'";
+ }
+}
+
+for ( ;; ) {
+ $feeder->queue_songs( undef, sub { $feeder->run } );
+
+ $log->debug("Entering event loop. PID=$$");
+
+ my $result = $feeder->mpd->loop->run;
+ $log->trace( "Got loop result of " . ( $result // 'undef' ) );
+
+ if ('reload' eq $result) {
+ $log->notice("disconnecting");
+ $feeder->stop;
+
+ exec( "$0", '--config', $feeder->cfg_file, '--skip-db-update' );
+ }
+}
projects / mpd-feeder.git / blobdiff