From: Damyan Ivanov Date: Sun, 21 Nov 2021 08:32:22 +0000 (+0000) Subject: convert to unit-type class definition X-Git-Url: https://git.ktnx.net/?a=commitdiff_plain;h=c6856da18f274bf03ee7e8bb466bcba4db5eed79;p=mpd-feeder.git convert to unit-type class definition --- diff --git a/lib/App/MPD/Feeder/Command.pm b/lib/App/MPD/Feeder/Command.pm index d2c4130..468e57f 100644 --- a/lib/App/MPD/Feeder/Command.pm +++ b/lib/App/MPD/Feeder/Command.pm @@ -1,135 +1,132 @@ -package App::MPD::Feeder::Command; - -use strict; -use warnings; +use v5.28; use utf8; -use feature qw(fc say); - -use Log::Any qw($log); -use Object::Pad; - +use Object::Pad 0.57; class App::MPD::Feeder::Command -isa App::MPD::Feeder { - method run(@args) { - my $cmd = shift @args; - - if ( $cmd eq 'dump-config' ) { - die "dump-config command accepts no arguments\n" if @args; - - $self->opt->dump; - - return 0; - } - - if ( $cmd eq 'add-unwanted-artist' ) { - die "Missing command arguments\n" unless @args; - $self->set_db_needs_update(0); - for my $artist (@args) { - if ( $self->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"); - } - } + :isa(App::MPD::Feeder); - return 0; - } +use Log::Any qw($log); - if ( $cmd eq 'del-unwanted-artist' ) { - die "Missing command arguments\n" unless @args; - $self->set_db_needs_update(0); - for my $artist (@args) { - if ( $self->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"); - } - } +method run(@args) { + my $cmd = shift @args; - return 0; - } + if ( $cmd eq 'dump-config' ) { + die "dump-config command accepts no arguments\n" if @args; - if ( $cmd eq 'list-unwanted-artists' ) { - die "This command has no arguments\n" if @args; - $self->set_db_needs_update(0); - my $count = $self->db->walk_unwanted_artists( sub { say @_ } ); - say "Total unwanted artists: $count"; + $self->opt->dump; - return 0; - } + return 0; + } - if ( $cmd eq 'add-unwanted-album' ) { - die - "Syntax: mpd-feeder add-unwanted-album «album name» by «artist name»\n" - unless @args == 3 and $args[1] =~ /^by$/i; - $self->set_db_needs_update(0); - my ( $album, $artist ) = @args[ 0, 2 ]; - if ( $self->db->add_unwanted_album( $album, $artist ) ) { + if ( $cmd eq 'add-unwanted-artist' ) { + die "Missing command arguments\n" unless @args; + $self->set_db_needs_update(0); + for my $artist (@args) { + if ( $self->db->add_unwanted_artist($artist) ) { $log->info( - "Album «$album» by «$artist» added to the unwanted list\n" - ); + "Artist '$artist' added to the unwanted list\n"); } else { $log->warn( - "Album «$album» by «$artist» already in the unwanted list\n" - ); + "Artist '$artist' already in the unwanted list\n"); } - - return 0; } - if ( $cmd eq 'del-unwanted-album' ) { - die - "Syntax: mpd-feeder del-unwanted-album «album name» by «artist name»\n" - unless @args == 3 and $args[1] =~ /^by$/i; - $self->set_db_needs_update(0); - my ( $album, $artist ) = @args[ 0, 2 ]; - if ( $self->db->del_unwanted_album( $album, $artist ) ) { + return 0; + } + + if ( $cmd eq 'del-unwanted-artist' ) { + die "Missing command arguments\n" unless @args; + $self->set_db_needs_update(0); + for my $artist (@args) { + if ( $self->db->del_unwanted_artist($artist) ) { $log->info( - "Album «$album» by «$artist» deleted from the unwanted list\n" - ); + "Artist '$artist' deleted from the unwanted list\n"); } else { $log->warn( - "Album «$album» by «$artist» is not in the unwanted list\n" - ); + "Artist '$artist' is not in the unwanted list\n"); } - - return 0; } - if ( $cmd eq 'list-unwanted-albums' ) { - die "This command has no arguments\n" if @args; - $self->set_db_needs_update(0); - my $count = $self->db->walk_unwanted_albums( - sub ( $album, $artist ) { say "«$album» by «$artist»" } ); - say "Total unwanted albums: $count"; + return 0; + } - return 0; - } + if ( $cmd eq 'list-unwanted-artists' ) { + die "This command has no arguments\n" if @args; + $self->set_db_needs_update(0); + my $count = $self->db->walk_unwanted_artists( sub { say @_ } ); + say "Total unwanted artists: $count"; - if ( $cmd eq 'one-shot' ) { - die "one-shot command accepts no arguments\n" if @args; + return 0; + } - $self->queue_songs( undef, sub {$self->mpd->loop->stop} ); - $self->mpd->loop->run; - return 0; + if ( $cmd eq 'add-unwanted-album' ) { + die + "Syntax: mpd-feeder add-unwanted-album «album name» by «artist name»\n" + unless @args == 3 and $args[1] =~ /^by$/i; + $self->set_db_needs_update(0); + my ( $album, $artist ) = @args[ 0, 2 ]; + if ( $self->db->add_unwanted_album( $album, $artist ) ) { + $log->info( + "Album «$album» by «$artist» added to the unwanted list\n" + ); + } + else { + $log->warn( + "Album «$album» by «$artist» already in the unwanted list\n" + ); } - elsif ( $cmd eq 'single' ) { - die "single command accepts no arguments\n" if @args; - $self->queue_songs( 1, sub {$self->mpd->loop->stop} ); - $self->mpd->loop->run; - return 0; + return 0; + } + + if ( $cmd eq 'del-unwanted-album' ) { + die + "Syntax: mpd-feeder del-unwanted-album «album name» by «artist name»\n" + unless @args == 3 and $args[1] =~ /^by$/i; + $self->set_db_needs_update(0); + my ( $album, $artist ) = @args[ 0, 2 ]; + if ( $self->db->del_unwanted_album( $album, $artist ) ) { + $log->info( + "Album «$album» by «$artist» deleted from the unwanted list\n" + ); } else { - die "Unknown command '$cmd'"; + $log->warn( + "Album «$album» by «$artist» is not in the unwanted list\n" + ); } + + return 0; + } + + if ( $cmd eq 'list-unwanted-albums' ) { + die "This command has no arguments\n" if @args; + $self->set_db_needs_update(0); + my $count = $self->db->walk_unwanted_albums( + sub ( $album, $artist ) { say "«$album» by «$artist»" } ); + say "Total unwanted albums: $count"; + + return 0; + } + + if ( $cmd eq 'one-shot' ) { + die "one-shot command accepts no arguments\n" if @args; + + $self->queue_songs( undef, sub {$self->mpd->loop->stop} ); + $self->mpd->loop->run; + return 0; + } + elsif ( $cmd eq 'single' ) { + die "single command accepts no arguments\n" if @args; + + $self->queue_songs( 1, sub {$self->mpd->loop->stop} ); + $self->mpd->loop->run; + return 0; + } + else { + die "Unknown command '$cmd'"; } } + +1; diff --git a/lib/App/MPD/Feeder/DB.pm b/lib/App/MPD/Feeder/DB.pm index ace454c..466b492 100644 --- a/lib/App/MPD/Feeder/DB.pm +++ b/lib/App/MPD/Feeder/DB.pm @@ -1,365 +1,363 @@ -package App::MPD::Feeder::DB; - -use strict; -use warnings; +use v5.28; use utf8; +use Object::Pad; +class App::MPD::Feeder::DB; use Log::Any qw($log); -use Object::Pad; use Syntax::Keyword::Try; -class App::MPD::Feeder::DB { - has $opt :param; - has $db; - has $generation; +has $opt :param; +has $db; +has $generation; - method get_option($name) { - my $sth = $db->prepare_cached("select $name from options"); - $sth->execute; - my @result = $sth->fetchrow_array; - $sth->finish; - undef $sth; +method get_option($name) { + my $sth = $db->prepare_cached("select $name from options"); + $sth->execute; + my @result = $sth->fetchrow_array; + $sth->finish; + undef $sth; - return $result[0]; - } + return $result[0]; +} - method set_option( $name, $value ) { - my $sth = $db->prepare_cached("update options set $name = ?"); - $sth->execute($value); - } +method set_option( $name, $value ) { + my $sth = $db->prepare_cached("update options set $name = ?"); + $sth->execute($value); +} - method start_update { - $log->trace('starting DB update'); - $db->begin_work; - $db->do(<trace('starting DB update'); + $db->begin_work; + $db->do(<do('COPY tmp_songs(path, artist, album) FROM STDIN'); - $generation++; - } + $db->do('COPY tmp_songs(path, artist, album) FROM STDIN'); + $generation++; +} - method finish_update { - $log->trace('finishing DB update'); - $db->pg_putcopyend; - my $sth = $db->prepare_cached(<<'SQL'); +method finish_update { + $log->trace('finishing DB update'); + $db->pg_putcopyend; + my $sth = $db->prepare_cached(<<'SQL'); SELECT total_songs, total_artists, total_albums - , new_songs, new_artists, new_albums + , new_songs, new_artists, new_albums FROM update_song_data($1) SQL - $sth->execute($generation); - my @update_result = $sth->fetchrow_array(); - $sth->finish; - - $self->remove_stale_entries; + $sth->execute($generation); + my @update_result = $sth->fetchrow_array(); + $sth->finish; - $self->set_option(generation => $generation); - $db->commit; + $self->remove_stale_entries; - $log->trace('DB update finished'); + $self->set_option(generation => $generation); + $db->commit; - return @update_result; - } + $log->trace('DB update finished'); - method cancel_update { - $db->pg_putcopyend; - $generation--; - $db->rollback; - } + return @update_result; +} - method store_song($song, $artist, $album) { - return - unless length($song) - and length($artist) - and length($album); - - for ($song, $artist, $album) { - utf8::decode($_); - s/\\/\\\\/g; - s/\t/\\\t/g; - s/\n/\\\n/g; - } +method cancel_update { + $db->pg_putcopyend; + $generation--; + $db->rollback; +} - $db->pg_putcopydata(join("\t", $song, $artist, $album)."\n"); +method store_song($song, $artist, $album) { + return + unless length($song) + and length($artist) + and length($album); + + for ($song, $artist, $album) { + utf8::decode($_); + s/\\/\\\\/g; + s/\t/\\\t/g; + s/\n/\\\n/g; } - method remove_stale_entries { - my $sth = - $db->prepare_cached('DELETE FROM songs WHERE generation <> ?'); - $sth->execute($generation); - $log->debug( sprintf( "Deleted %d stale songs", $sth->rows ) ); + $db->pg_putcopydata(join("\t", $song, $artist, $album)."\n"); +} - $sth = $db->prepare_cached('DELETE FROM albums WHERE generation <> ?'); - $sth->execute($generation); - $log->debug( sprintf( "Deleted %d stale albums", $sth->rows ) ); +method remove_stale_entries { + my $sth = + $db->prepare_cached('DELETE FROM songs WHERE generation <> ?'); + $sth->execute($generation); + $log->debug( sprintf( "Deleted %d stale songs", $sth->rows ) ); - $sth = - $db->prepare_cached('DELETE FROM artists WHERE generation <> ?'); - $sth->execute($generation); - $log->debug( sprintf( "Deleted %d stale artists", $sth->rows ) ); - } + $sth = $db->prepare_cached('DELETE FROM albums WHERE generation <> ?'); + $sth->execute($generation); + $log->debug( sprintf( "Deleted %d stale albums", $sth->rows ) ); - method note_song_qeued($item) { - $db->prepare_cached( - 'UPDATE songs SET last_queued=current_timestamp WHERE path=?') - ->execute( $item->{song} ); - $db->prepare_cached( - 'UPDATE artists SET last_queued=CURRENT_TIMESTAMP WHERE artist=?') - ->execute( $item->{artist} ); - $db->prepare_cached( - 'UPDATE albums SET last_queued=CURRENT_TIMESTAMP WHERE artist=? AND album=?' - )->execute( $item->{artist}, $item->{album} ); - } + $sth = + $db->prepare_cached('DELETE FROM artists WHERE generation <> ?'); + $sth->execute($generation); + $log->debug( sprintf( "Deleted %d stale artists", $sth->rows ) ); +} - method find_suitable_songs($num) { - my @result; - my $sql = <prepare_cached( + 'UPDATE songs SET last_queued=current_timestamp WHERE path=?') + ->execute( $item->{song} ); + $db->prepare_cached( + 'UPDATE artists SET last_queued=CURRENT_TIMESTAMP WHERE artist=?') + ->execute( $item->{artist} ); + $db->prepare_cached( + 'UPDATE albums SET last_queued=CURRENT_TIMESTAMP WHERE artist=? AND album=?' + )->execute( $item->{artist}, $item->{album} ); +} + +method find_suitable_songs($num) { + my @result; + my $sql = <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; my $sth = $db->prepare_cached($sql); + pop @params; $sth->execute(@params); - while ( my @row = $sth->fetchrow_array ) { - push @result, - { song => $row[0], artist => $row[1], album => $row[2] }; - } - undef $sth; + my $count = ($sth->fetchrow_array)[0]; + $sth->finish; + + $sth = $db->prepare_cached('SELECT COUNT(*) FROM songs'); + $sth->execute; + my $total = ($sth->fetchrow_array)[0]; + $sth->finish; + $log->debug( + sprintf( + "Number of songs meeting the criteria: %d out of total %d (%5.2f%%)", + $count, $total, 100.0 * $count / $total + ) + ); - 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; - 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]; - $sth->finish; - $log->debug( - sprintf( - "Number of songs meeting the criteria: %d out of total %d (%5.2f%%)", - $count, $total, 100.0 * $count / $total - ) - ); - - $sql = <prepare_cached($sql); - $sth->execute($opt->min_song_interval); - $count = ($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 = <prepare_cached($sql); + $sth->execute($opt->min_song_interval); + $count = ($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 = <prepare_cached($sql); - $sth->execute($opt->min_artist_interval); - $count = ($sth->fetchrow_array)[0]; - $sth->finish; - - $sth = $db->prepare_cached('SELECT COUNT(*) FROM artists'); - $sth->execute; - $total = ($sth->fetchrow_array)[0]; - $sth->finish; - $log->debug( - sprintf( - "Number of artists not queued soon: %d out of total %d (%5.2f%%)", - $count, $total, 100.0 * $count / $total - ) - ); - - $sql = <prepare_cached($sql); + $sth->execute($opt->min_artist_interval); + $count = ($sth->fetchrow_array)[0]; + $sth->finish; + + $sth = $db->prepare_cached('SELECT COUNT(*) FROM artists'); + $sth->execute; + $total = ($sth->fetchrow_array)[0]; + $sth->finish; + $log->debug( + sprintf( + "Number of artists not queued soon: %d out of total %d (%5.2f%%)", + $count, $total, 100.0 * $count / $total + ) + ); + + $sql = <prepare_cached($sql); - $sth->execute($opt->min_album_interval); - $count = ($sth->fetchrow_array)[0]; - $sth->finish; - - $sth = $db->prepare_cached('SELECT COUNT(*) FROM albums'); - $sth->execute; - $total = ($sth->fetchrow_array)[0]; - $sth->finish; - $log->debug( - sprintf( - "Number of albums not queued soon: %d out of total %d (%5.2f%%)", - $count, $total, 100.0 * $count / $total - ) - ); - - undef $sth; - } + $sth = $db->prepare_cached($sql); + $sth->execute($opt->min_album_interval); + $count = ($sth->fetchrow_array)[0]; + $sth->finish; + + $sth = $db->prepare_cached('SELECT COUNT(*) FROM albums'); + $sth->execute; + $total = ($sth->fetchrow_array)[0]; + $sth->finish; + $log->debug( + sprintf( + "Number of albums not queued soon: %d out of total %d (%5.2f%%)", + $count, $total, 100.0 * $count / $total + ) + ); - return @result; + undef $sth; } - method add_unwanted_artist($artist) { - $self->connect; + return @result; +} + +method add_unwanted_artist($artist) { + $self->connect; - try { - $db->do( - <<'SQL', + try { + $db->do( + <<'SQL', INSERT INTO unwanted_artists(artist, generation) VALUES($1, $2) SQL - undef, $artist, $generation - ); - return 1; - } - catch { - my $err = $@; + undef, $artist, $generation + ); + return 1; + } + catch { + my $err = $@; - $log->debug("PostgreSQL error: $err"); - $log->debug( "SQLSTATE = " . $db->state ); - return 0 if $db->state eq '23505'; + $log->debug("PostgreSQL error: $err"); + $log->debug( "SQLSTATE = " . $db->state ); + return 0 if $db->state eq '23505'; - die $err; - } + die $err; } +} - method del_unwanted_artist($artist) { - $self->connect; +method del_unwanted_artist($artist) { + $self->connect; - return 1 == $db->do( - <<'SQL', + return 1 == $db->do( + <<'SQL', DELETE FROM unwanted_artists WHERE artist = $1 SQL - undef, $artist - ); - } - - method walk_unwanted_artists($callback) { - $self->connect; + undef, $artist + ); +} - my $count = 0; +method walk_unwanted_artists($callback) { + $self->connect; - my $sth = $db->prepare('SELECT artist FROM unwanted_artists ORDER BY 1'); - my $artist; - $sth->execute; - $sth->bind_columns(\$artist); - while ( $sth->fetchrow_arrayref ) { - $count++; - $callback->($artist); - } + my $count = 0; - return $count; + my $sth = $db->prepare('SELECT artist FROM unwanted_artists ORDER BY 1'); + my $artist; + $sth->execute; + $sth->bind_columns(\$artist); + while ( $sth->fetchrow_arrayref ) { + $count++; + $callback->($artist); } - method add_unwanted_album($album, $artist) { - $self->connect; + return $count; +} + +method add_unwanted_album($album, $artist) { + $self->connect; - try { - $db->do( - <<'SQL', + try { + $db->do( + <<'SQL', INSERT INTO unwanted_albums(album, artist, generation) VALUES($1, $2, $3) SQL - undef, $album, $artist, $generation - ); - return 1; - } - catch { - my $err = $@; + undef, $album, $artist, $generation + ); + return 1; + } + catch { + my $err = $@; - $log->debug("PostgreSQL error: $err"); - $log->debug( "SQLSTATE = " . $db->state ); - return 0 if $db->state eq '23505'; + $log->debug("PostgreSQL error: $err"); + $log->debug( "SQLSTATE = " . $db->state ); + return 0 if $db->state eq '23505'; - die $err; - } + die $err; } +} - method del_unwanted_album($album, $artist) { - $self->connect; +method del_unwanted_album($album, $artist) { + $self->connect; - return 1 == $db->do( - <<'SQL', + return 1 == $db->do( + <<'SQL', DELETE FROM unwanted_albums WHERE album = $1 AND artist = $2 SQL - undef, $album, $artist - ); - } - - method walk_unwanted_albums($callback) { - $self->connect; + undef, $album, $artist + ); +} - my $count = 0; +method walk_unwanted_albums($callback) { + $self->connect; - my $sth = $db->prepare('SELECT album, artist FROM unwanted_albums ORDER BY 2, 1'); - my ( $album, $artist ); - $sth->execute; - $sth->bind_columns( \$album, \$artist ); - while ( $sth->fetchrow_arrayref ) { - $count++; - $callback->($album, $artist); - } + my $count = 0; - return $count; + my $sth = $db->prepare('SELECT album, artist FROM unwanted_albums ORDER BY 2, 1'); + my ( $album, $artist ); + $sth->execute; + $sth->bind_columns( \$album, \$artist ); + while ( $sth->fetchrow_arrayref ) { + $count++; + $callback->($album, $artist); } - method connect { - return if $db; + return $count; +} - $db = DBI->connect( "dbi:Pg:dbname=" . $opt->db_path, - $opt->db_user, $opt->db_password, - { RaiseError => 1, PrintError => 0, AutoCommit => 1 } ); +method connect { + return if $db; - $log->info( "Connected to database " . $opt->db_path ); - $generation = $self->get_option('generation'); - $log->debug("DB generation is $generation"); - } + $db = DBI->connect( "dbi:Pg:dbname=" . $opt->db_path, + $opt->db_user, $opt->db_password, + { RaiseError => 1, PrintError => 0, AutoCommit => 1 } ); - method disconnect { - return unless $db; + $log->info( "Connected to database " . $opt->db_path ); + $generation = $self->get_option('generation'); + $log->debug("DB generation is $generation"); +} + +method disconnect { + return unless $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//'')); - } + 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//'')); } } - - $db->disconnect; - undef $db; } + + $db->disconnect; + undef $db; } + +1; diff --git a/lib/App/MPD/Feeder/Options.pm b/lib/App/MPD/Feeder/Options.pm index 21bd646..eff87be 100644 --- a/lib/App/MPD/Feeder/Options.pm +++ b/lib/App/MPD/Feeder/Options.pm @@ -1,121 +1,119 @@ -package App::MPD::Feeder::Options; - -use strict; -use warnings; +use v5.28; use utf8; -use feature 'say'; use Object::Pad; +class App::MPD::Feeder::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}; -class App::MPD::Feeder::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 - } + $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 +} + +1;