use v5.32;
+use App::MPD::Feeder::Options;
use Getopt::Long ();
use Log::Any qw($log);
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 $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' => 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 {
- $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;
-
- $log->trace("Option $section.$option = $value");
- }
-
- method dump {
- say "[mpd-feeder]";
- say "log_level = $log_level";
- say "";
- say "[mpd]";
- say "host = " . ( $mpd_host // '' );
- say "port = " . ( $mpd_port // '' );
- 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 // '' );
- }
-
- 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 => 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,
- \&parse_integer
- );
- 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;
}
method configure {
- my $new_opt = Options->new;
+ my $new_opt = App::MPD::Feeder::Options->new;
$new_opt->parse_config_file($cfg_file) if $cfg_file;
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->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)
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;
}
}
}
+$feeder->connect_db;
+
for ( ;; ) {
$feeder->queue_songs( undef, sub { $feeder->run } );
projects / mpd-feeder.git / blobdiff