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 {
+ 'min-album-interval=s' => sub {
$min_album_interval = parse_duration(pop);
},
'min-sing-interval=s' => sub {
has $opt :reader;
has $db;
has $db_generation;
+ has $db_needs_update = 1;
has $mpd :reader;
use constant DEFAULT_CONFIG_FILE => '/etc/mpd-feeder/mpd-feeder.conf';
$opt->parse_command_line;
+ $db_needs_update = 0 if $opt->skip_db_update;
+
Log::Any::Adapter->set( Stderr => log_level => $opt->log_level );
+ }
- 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;
+ method connect_mpd {
+ return if $mpd;
- $mpd = Net::Async::MPD->new(%conn);
+ my %conn = ( auto_connect => 1 );
+ $conn{host} = $opt->mpd_host if $opt->mpd_host;
+ $conn{port} = $opt->mpd_port if $opt->mpd_port;
- $self->connect_db;
- $self->update_db unless $self->opt->skip_db_update;
- }
+ $mpd = Net::Async::MPD->new(%conn);
}
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->{Artist}, $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 ) {
method queue_songs($num = undef, $callback = undef) {
if (!defined $num) {
+ $self->connect_mpd;
$mpd->send('playlist')->on_done(
sub {
my $present = scalar @{ $_[0] };
for (@paths) {
push @commands, [ add => "\"$_\"" ];
}
+ $self->connect_mpd;
my $f = $mpd->send( \@commands );
- warn "here";
$f->on_fail( sub { die @_ } );
$f->on_done(
sub {
$callback->(@_) if $callback;
}
);
-
- warn "here";
}
method prepare_to_wait_idle {
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' ) {
my $feeder = Feeder->new();
-$feeder->opt->dump, exit if $feeder->opt->dump_config;
-
-$feeder->queue_songs(1), exit if $feeder->opt->single;
-
-# FIXME: handle blacklist manipulation
+sub usage {
+ die "Usage: mpd-feeder [option...] [command]\n";
+}
-$feeder->queue_songs;
+if (@ARGV) {
+ usage if @ARGV > 1;
-exit if $feeder->opt->one_shot;
+ my $cmd = shift @ARGV;
-$feeder->mpd->on(
- database => sub {
- $feeder->update_db;
+ if ($cmd eq 'dump-config') {
+ $feeder->opt->dump;
+ exit;
}
-);
+# FIXME: handle blacklist manipulation
-$feeder->mpd->on(
- playlist => sub {
- $feeder->queue_songs;
+ if ( $cmd eq 'one-shot' ) {
+ $feeder->queue_songs(undef, sub { exit });
+ $feeder->mpd->loop->run;
+ }
+ elsif ( $cmd eq 'single' ) {
+ $feeder->queue_songs(1, sub { exit });
+ $feeder->mpd->loop->run;
}
-);
+ else {
+ die "Unknown command '$cmd'";
+ }
+}
+
+$feeder->queue_songs( undef, sub { $feeder->run } );
-$feeder->mpd->idle(qw(database playlist));
-$feeder->mpd->get;
+$feeder->mpd->loop->run;