switch to lastfm-query

2 files changed, 12 insertions, 10 deletions

diff --git a/bin/pick_music b/bin/pick_music
index e667960..fe65dbc 100755
--- a/bin/pick_music
+++ b/bin/pick_music
@@ -1,4 +1,6 @@
 #!/bin/bash
+set -eu
+set -o pipefail
 
-lastfm_export --user doyster --dsn dbi:SQLite:${HOME}/.tracks.sqlite
-sqlite3 ${HOME}/.tracks.sqlite "SELECT artist FROM yearly_tracks WHERE artist NOT IN (SELECT DISTINCT(artist) FROM weekly_tracks) GROUP BY artist ORDER BY count(artist) * (strftime('%s') - max(timestamp)) DESC LIMIT $([ -z "$1" ] && echo 20 || echo $1)"
+lastfm-query sync doyster
+lastfm-query recommend "${1:-20}"
diff --git a/bin/rand_music b/bin/rand_music
index c726bf2..ecf6666 100755
--- a/bin/rand_music
+++ b/bin/rand_music
@@ -1,13 +1,13 @@
 #!/bin/bash
+set -eu
+set -o pipefail
 
-local db
-if [[ $1 == '--old' ]]; then
-    db=old_tracks
+if [[ "${1:-}" == '--old' ]]; then
+    extra_args="--exclude yearly --include all"
     shift
 else
-    db=yearly_tracks
+    extra_args=
 fi
-lastfm_export --user doyster --dsn dbi:SQLite:${HOME}/.tracks.sqlite
-for i in $(seq 1 $([ -z "$1" ] && echo 20 || echo $1)); do
-    echo "select distinct(artist) from $db where artist not in (select distinct(artist) from weekly_tracks);" | sqlite3 ~/.tracks.sqlite | rand_line | sed "s/'/''/" | sed "s/.*/select artist, album from $db where artist = '&' group by artist, album;/" | sqlite3 ~/.tracks.sqlite | rand_line | sed 's/|/ - /'
-done
+
+lastfm-query sync doyster
+lastfm-query recommend --random --album $extra_args "${1:-20}"