$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');
$self->connect_mpd;
$self->connect_db;
- $mpd->send('listallinfo')->on_done(
- sub {
- try {
- my $rows = shift;
- $db->begin_work;
+ my $rows = $mpd->send('listallinfo')->get;
+ try {
+ $db->begin_work;
- $db_generation++;
+ $db_generation++;
- my $song_count;
+ my $song_count;
- foreach my $entry (@$rows) {
- next unless exists $entry->{file};
- $self->db_store_song( $entry->{file},
- $entry->{Artist}, $entry->{Album} );
- $song_count++;
- }
+ foreach my $entry (@$rows) {
+ next unless exists $entry->{file};
+ $self->db_store_song( $entry->{file},
+ $entry->{Artist}, $entry->{Album} );
+ $song_count++;
+ }
- $log->info("Updated data about $song_count songs");
+ $log->info("Updated data about $song_count songs");
- $self->db_remove_stale_entries;
+ $self->db_remove_stale_entries;
- $self->db_set_option( generation => $db_generation );
+ $self->db_set_option( generation => $db_generation );
- $db->commit;
- }
- catch {
- my $err = $@;
+ $db->commit;
- $db_generation--;
+ $db_needs_update = 0;
+ }
+ catch {
+ my $err = $@;
- $db->rollback;
+ $db_generation--;
- die $err;
- }
- }
- );
+ $db->rollback;
+
+ die $err;
+ }
}
method db_find_suitable_songs($num) {
$self->connect_db;
+ $self->update_db;
my @result;
my $sth = $db->prepare_cached(<<SQL);
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
}
$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(1);
+ $db_needs_update = 1;
$self->prepare_to_wait_idle;
}
elsif ( $result->{changed} eq 'playlist' ) {
}
}
-
$feeder->queue_songs( undef, sub { $feeder->run } );
$feeder->mpd->loop->run;