From: Ian Kelling Date: Wed, 15 Feb 2023 02:12:31 +0000 (-0500) Subject: mostly new music stuff X-Git-Url: https://iankelling.org/git/?p=distro-setup;a=commitdiff_plain;h=563cc41a1f3ddb95bedf595cc249f53aea6629c1 mostly new music stuff --- diff --git a/.bashrc b/.bashrc index a8ee067..ba355b4 100644 --- a/.bashrc +++ b/.bashrc @@ -29,7 +29,7 @@ HISTCONTROL=ignoredups # This works in addition to HISTCONTROL to do more flexible things # it could also do the same things as HISTCONTROL and thus replace it, # but meh. dunno why, but just " *" does glob expansion, so use [ ] to avoid it. -HISTIGNORE='pass *:[ ]*:otp *:oathtool *:histrm *' +HISTIGNORE='pass *:otp *:oathtool *:histrm *' diff --git a/.gitconfig b/.gitconfig index 6ee3a0f..8cfe86b 100644 --- a/.gitconfig +++ b/.gitconfig @@ -15,6 +15,9 @@ rl = reflog --format='%C(auto)%h %<|(17)%gd %C(blue)%ci%C(reset) %s' [core] excludesfile = ~/.gitignore_global +# https://stackoverflow.com/questions/59061816/git-forces-refresh-index-after-switching-between-windows-and-linux +# i'm hoping this stops refresh after btrfs sends, especially for brains +checkStat = minimal [credential] helper = cache diff --git a/beets-gen-playlists b/beets-gen-playlists index 085946c..ffad368 100755 --- a/beets-gen-playlists +++ b/beets-gen-playlists @@ -1,6 +1,7 @@ #!/bin/bash -# for generating playlist config yaml +# for generating playlist config yaml. +# plain playlists are added manually to the yaml. f=/usr/local/lib/err;test -r $f || { echo "error: $0 no $f" >&2;exit 1;}; . $f @@ -13,16 +14,21 @@ ignore_genres=( declare -A slow_genres_a slow_genres=( ambient - avantg + avant classical noise + sleep + mq + jazz ) + tags=( expl sad ) + for g in ${ignore_genres[@]}; do ignore_genres_a[$g]=t done @@ -35,11 +41,20 @@ beat_genres=() # generate genres based on what is in the db. genres=() + +# relatively upbeat genres to listen, eg while biking +upbeat_genres=() for g in $(beet ls -f '$genre' | sort -u); do if [[ ${ignore_genres_a[$g]} ]]; then continue; fi genres+=($g) if [[ ${slow_genres_a[$g]} ]]; then continue; fi beat_genres+=($g) + case $g in + chill) + continue + ;; + esac + upbeat_genres+=($g) done # generate regex for beat playlist @@ -54,6 +69,18 @@ for g in ${beat_genres[@]}; do fi done +# generate regex for upbeat playlist +beat_regex= +first=true +for g in ${upbeat_genres[@]}; do + if $first; then + first=false + upbeat_regex=$g + else + upbeat_regex+="|$g" + fi +done + for g in ${genres[@]}; do for r in {3..5}; do @@ -61,15 +88,15 @@ for g in ${genres[@]}; do pop|rap) cat </dev/null 2> >(grep -v '^convert: Skipping' ||:) - local l + local l query local -A paths + query="^genre:spoken-w ^genre:skit ^lesser_version:t ^rating:1" + # redirect is to avoid printing every file + beet convert -y $query >/dev/null 2> >(grep -v '^convert: Skipping' ||:) + + ## begin removal of files that are leftover from previous conversion, + # eg, previously rated > 1, now rated 1. while read -r l; do convertedpath="/i/converted${l#/i/m}" case $convertedpath in *.flac) convertedpath="${convertedpath%.flac}.mp3" ;; esac paths[$convertedpath]=t - done < <(beet ls -f '$path' ^genre:spoken-w ^genre:skit ^rating:1) + done < <(beet ls -f '$path' $query) while read -r l; do if [[ ! ${paths[$l]} ]]; then rm -v "$l" fi - done < <(find /i/converted -path /i/converted/beetsmartplaylists -prune -o \( -type f -print \)) + # note: the pruning is duplicative of filtering on name, but whatever. + done < <(find /i/converted -path /i/converted/beetsmartplaylists -prune -o \( -type f -print \) -name '*.mp3' -o -name '*.m4a') + ## end } # tag with beets. # usage: beetag QUERY -# it lists the query, reads an input char for tagging one by one +# it lists the query, reads an input char for tagging one by one. # 1-5 = set rating -# a-z+ = set genre/playlist. +# a-x 0 6-9 / . , = set genre/playlist. (available buttons: ` \ ) ] [ +# q = quit +# y = toggle to setting rare genres +# z = put the player in the foreground # enter = next song -# , = play song +# ' = toggle playing of songs, also replays current song if hit twice +# ; = go to previous song +# _ = delete file, remove from library +# -/+ = decrease / increase volume +# +# note, you may want to change the play command for doing rapid taging +# by immediately jumping forward into the song. this is set in the beets +# config yaml. beetag() { + local last_genre_i fstring tag id char new_item char_i genre tag remove doplay i j random + local do_rare_genres read_wait + local -a genres pl_tags buttons button_map ids tags rare_genres tmp_tags + local -A button_i + local -i volume + do_rare_genres=false + random=false + volume=70 + read_wait=2 + case $1 in + -r) + random=true + shift + ;; + esac if (( ! $# )); then echo beetag: error expected a query arg >&2 return 1 fi - local last_genre_i fstring tag id char new_item char_i genre tag remove - local -a genres pl_tags buttons button_map ids tags - local -A button_i + doplay=true genres=( + # gangsta rap / angry rap. something like g-rap would make beet queries for genre:rap include it + arp ambient avant blues classical + # slow instrumental. todo: reclassify some ambient into this. + chill country # like power glove dark-wave + # lyrical edm. todo: some pop needs reclassification to this + dance hardcore instrumental - jazz latin metal - musical # mq = mac quale. similar to the mr robot soundtracks. # slow, foreboding. usually electronic. mq - noise pop rap rock - skit - spoken-w + # like rain by brian crain. mostly slow broody piano + sleep techno world ) + # because we were destined to run out of single key buttons. + rare_genres=( + jazz + musical + noise + skit + spoken-w + ) pl_tags=( + ## cross-genre tags that dont really make a playlist expl + # songs i like but they get old fast due to feeling gimicky, or cringy after a while. + gimicky + # alternate version of a song we already have which isn't as good + lesser_version + # anything sad which i sometimes like or avoid. + sad + + ## playlists + # intimate, love love + # favorite songs pump up songs pump1 + # favorite rap pump up songs, allows more songs than pump1 pumprap + # heart rending, spine tickling rend + # for running run - sad ) last_genre_i=$(( ${#genres[@]} - 1 )) - buttons=( {a..z} 0 {6..9} ) + buttons=( {a..p} {r..w} 0 {6..9} , . / ) button_map=(${genres[@]} ${pl_tags[@]}) fstring= for tag in "${pl_tags[@]}"; do @@ -530,63 +583,180 @@ beetag() { button_i[${buttons[i]}]=$i done beet ls -f '%ifdef{rating,$rating }'"$fstring"', $genre $artist - $album - $title' "$@" - hr - mapfile -t ids < <(beet ls -f '$id' "$@") - for id in "${ids[@]}"; do + mapfile -t ids < <(beet ls -f '$id' "$@" | { if $random; then sort -R; else cat; fi; } ) + for (( j=0; j<${#ids[@]}; j++ )); do + hr + id=${ids[j]} lsout="$(beet ls -f '%ifdef{rating,$rating }'"$fstring"', $genre $id $artist - $album - $title' "id:$id")" tags=( ${lsout%%,*} ) printf "%s\n" "$lsout" for (( i=0; i<${#button_map[@]}; i++ )); do echo ${buttons[i]} ${button_map[i]} done + if $doplay; then + beet play --args=--volume=$volume "id:$id" & + fi while true; do - read -r -N 1 -s char + char= + if $doplay; then + ret=0 + read -r -N 1 -s -t $read_wait char || ret=$? + read_wait=2 + # Automatically skip to the next song if this one ends, unless + # we turn off the autoplay. + if (( ret == 142 )) || [[ ! $char ]]; then + if bg %% &>/dev/null; then + continue + else + break + fi + fi + else + read -r -N 1 -s char + fi if [[ $char == $'\n' ]]; then + kill %% ||: &>/dev/null break fi case $char in - ,) - beet play "id:$id" + ";") + kill %% ||: &>/dev/null + j=$(( j - 2 )) + break + ;; + "'") + if $doplay; then + doplay=false + else + doplay=true + kill %% ||: &>/dev/null + beet play --args=--volume=$volume "id:$id" & + fi continue ;; + _) + kill %% ||: &>/dev/null + m beet rm --delete --force "id:$id" + break + ;; [1-5]) beet modify -y "id:$id" rating=$char continue ;; + -) + volume=$(( volume - 5 )) + if (( volume < 0 )); then + volume=0 + fi + echo volume=$volume + continue + ;; + q) + kill %% ||: &>/dev/null + return + ;; + +) + volume+=5 + if (( volume > 130 )); then + volume=130 + fi + echo volume=$volume + continue + ;; + y) + if $do_rare_genres; then + do_rare_genres=false + button_map=(${genres[@]} ${pl_tags[@]}) + last_genre_i=$(( ${#rare_genres[@]} - 1 )) + else + do_rare_genres=true + button_map=(${rare_genres[@]} ${pl_tags[@]}) + last_genre_i=$(( ${#genres[@]} - 1 )) + fi + local -A button_i + for (( i=0; i<${#buttons[@]}; i++ )); do + button_i[${buttons[i]}]=$i + done + for (( i=0; i<${#button_map[@]}; i++ )); do + echo ${buttons[i]} ${button_map[i]} + done + continue + ;; + z) + # if we ctrl-z, it will put the whole function into sleep. so + # basically, we can't return from a foregrounded mpv like we + # would like to without some strange mechanism I can't think + # of. So, instead, detect ctrl-c and wait a while for prompt + # input. One idea would be to use a music player like mpd where + # we can send it messages. + if ! fg; then + sleep_wait=10 + fi + continue + ;; esac char_i=${button_i[$char]} new_item=${button_map[$char_i]} if [[ ! $char_i || ! $new_item ]]; then - echo "error: no mapping of input found, try again" + echo "error: no mapping of input: $char found, try again" continue fi if (( char_i <= last_genre_i )); then m beet modify -y "id:$id" genre=$new_item else remove=false + tmp_tags=() for tag in ${tags[@]}; do if [[ $new_item == "$tag" ]]; then remove=true - break + else + tmp_tags+=("$tag") fi done if $remove; then + tags=("${tags[@]}") m beet modify -y "id:$id" "$new_item!" else + tags+=("$new_item") m beet modify -y "id:$id" $new_item=t fi fi done done +} - # sadpop - # - # rending: - # two dollar guitar: speed - # black heard procession - # strong enough sheryl crow - # - # +# usage: FILE|ALBUM_DIR [GENRE] +beetadd() { + local import_path genre_arg single_track_arg + import_path="$1" + if [[ ! -e $import_path ]]; then + echo "beetadd error: path does not exist" + fi + if [[ $2 ]]; then + genre_arg="--set genre=$2" + fi + if [[ -f $import_path ]]; then + single_track_arg=-s + fi + beet import --set totag=t $single_track_arg $genre_arg "$import_path" + beetag totag:t + beet modify -y totag:t "totag!" +} + +# update navidrome music data after doing beets tagging +beet2nav() { + beetconvert + beetsmartplaylists + beetrating +} + +# pull in beets library locally +beetpull() { + if [[ ! -e /i ]]; then + s mkdir /i + s chown iank:iank /i + sshfs b8.nz:/i /i + fi } # escape regex. @@ -716,6 +886,54 @@ scr() { screen -RD "$@" } +# usage: first get an adb shell on the phone. +# +# just followed instructions in readme at +# https://github.com/Yuubi-san/ceb-tools +# tried to use ceb2txt but it failed because of schema +# slightly different than what it expected. +cheogram-get-logs() { + adb shell rm -r /storage/emulated/0/Download/Cheogram/Backup + read -p "do cheogram backup on phone, do not enable extra cheogram data. press any key when done" + cd /p/cheogram + rm -rf Backup b + adb pull /storage/emulated/0/Download/Cheogram/Backup + sqlite3 b /dev/null; then s chown root:www-data $f @@ -254,6 +259,12 @@ case $user in s chown nagios:www-data $f fi fi + f=/var/lib/bitcoind/settings.json + if [[ -e $f ]]; then + if getent passwd bitcoin &>/dev/null; then + s chown bitcoin:bitcoin $f + fi + fi ##### end special extra stuff ##### if ! $fast; then diff --git a/distro-begin b/distro-begin index 9780ed6..88a8b0e 100755 --- a/distro-begin +++ b/distro-begin @@ -637,6 +637,7 @@ case $HOSTNAME in kd) tu /etc/fstab <<'EOF' /dev/mapper/crypt_dev_ata-Samsung_SSD_870_QVO_8TB_S5VUNG0N900656V-part7 /d btrfs nofail,x-systemd.device-timeout=30s,x-systemd.mount-timeout=30s,noatime,compress=zstd,subvol=d 0 0 +/i /d/m none bind,compress=zstd 0 0 EOF if ! mountpoint /d &>/dev/null; then sudo mkdir -p /d diff --git a/distro-end b/distro-end index 6efe7bf..5092ce7 100755 --- a/distro-end +++ b/distro-end @@ -1791,7 +1791,6 @@ sudo sed -ri 's/([[:space:]]*)(\$reset)$/\1set +o noglob #$reset/' /usr/share/ba rm -fv /home/iank/.mpv/watch_later rm -rf /home/iank/.mpv - if [[ ! -e ~/.local/bin/pip ]]; then tmp=$(mktemp) wget -O$tmp https://bootstrap.pypa.io/get-pip.py @@ -1799,6 +1798,37 @@ if [[ ! -e ~/.local/bin/pip ]]; then hash -r fi +## begin beets +# soo, apt install beets fails due to wanting a pip package, +# we find out why it wants this through +# apt-cache depends --recurse --no-recommends --no-suggests --no-conflicts --no-breaks --no-replaces --no-enhances beets | less +# python-mediafile requires tox, which requires virtualenv, which requires pip. +# but, python-mediafile doesn't really require tox, it is specified in +# ./usr/lib/python3/dist-packages/mediafile-0.9.0.dist-info/METADATA +# as being required only for testing, but the debian package +# included it anyways, due to a mistake or bad tooling or something. +# I don't plan to use tox, so, according to https://serverfault.com/a/251091, +# we can create and install a dummy package by: +# +# "equivs-control , edit the file produced to provide the right +# dependency and have a nice name, then run equivs-build and +# finally dpkg -i the resulting .deb file" + +mkct +# edited from output of equivs-control tox +cat >tox <<'EOF' +Section: python +Priority: optional +Standards-Version: 3.9.2 +Package: tox +Description: tox-dummy +EOF +equivs-build tox +sudo dpkg -i tox_1.0_all.deb +rm -rf ./tox* +pi beets python3-discogs-client + + # notes about barrier # run barrier, do the gui config, # setup the 2 screens, using hostnames for the new screen. @@ -2112,7 +2142,8 @@ case $HOSTNAME in sudo install -m 0755 -o root -g root -t /usr/bin /a/opt/bitcoin-23.0/bin/* sgo bitcoind sudo usermod -a -G bitcoin iank - # todo, link in wallet. see + sudo ln -s /q/wallets /var/lib/bitcoind + # note, there exists # /a/bin/ds/disabled/bitcoin ;; esac diff --git a/i3-sway/common.conf b/i3-sway/common.conf index ac2c8c4..d648272 100644 --- a/i3-sway/common.conf +++ b/i3-sway/common.conf @@ -36,8 +36,8 @@ bindsym $mod+e fullscreen toggle bindsym $mod+r exec "/a/bin/ds/xl" # todo, in newer i3, make this toggle split tabbed bindsym $mod+t layout toggle split -bindsym $mod+Shift+t move workspace to output up -#bindsym $mod+Shift+t move workspace to output right +#bindsym $mod+Shift+t move workspace to output up +bindsym $mod+Shift+t move workspace to output right bindsym $mod+g layout tabbed # Use Mouse+$mod to drag floating windows to their wanted position diff --git a/mailclean b/mailclean index 4f0c55a..204b6c6 100755 --- a/mailclean +++ b/mailclean @@ -65,6 +65,6 @@ archive() { } cd /m/md -archive 400 ./!(*archive|Drafts|Sent|INBOX)/*(cur|new) ./l/!(*archive)/*(cur|new) +archive 800 ./!(*archive|Drafts|Sent|INBOX)/*(cur|new) ./l/!(*archive)/*(cur|new) archive 60 ./{sysadmin,rtcc,fsfcc,fsfmembers}/{cur,new} archive 14 ./Junk/{cur,new} diff --git a/nav2beet b/nav2beet new file mode 100755 index 0000000..b0ffcd5 --- /dev/null +++ b/nav2beet @@ -0,0 +1,164 @@ +#!/bin/bash + +f=/usr/local/lib/err;test -r $f || { echo "error: $0 no $f" >&2;exit 1;}; . $f + + +plist_only=false +dry_run=false +while (( $# )); do + case $1 in + plist) + plist_only=true + ;; + dry) + dry_run=true + ;; + esac +done + +m () +{ + printf "%s\n" "$*" >&2 + if $dry_run && [[ $1 == beet && $2 == modify ]]; then + echo "dry run: $*" + else + "$@" + fi +} + +tmpf=$(mktemp) + + +if ! $plist_only; then + echo begin star rating import from navidrome to beets + + declare -A navirating + tmpdir=$(mktemp -d) + cd $tmpdir + if [[ $HOSTNAME != kd ]]; then + ssh_prefix="ssh b8.nz" + ssh b8.nz ' +install -m 700 -d /tmp/nav2beet +for r in 1 2 3 4 5; do + sqlite3 /i/navidrome/navidrome.db ".output /tmp/nav2beet/$r" "select path from annotation inner join media_file on item_id = id where rating = $r;" +done +tar cz -C /tmp nav2beet +' | tar xz + cd nav2beet + else + for r in 1 2 3 4 5; do + sqlite3 /i/navidrome/navidrome.db ".output $r" "select path from annotation inner join media_file on item_id = id where rating = $r;" + done + fi + declare -A flacs + + # todo: consider if this is a problem: file removed/renamed in main + # collection, but not yet updated navidrome, we want to skip it not + # die. + + while read -r l; do + flacs[$l]=t + done < <($ssh_prefix find /i/m -type f -name '*.flac') + for r in 1 2 3 4 5; do + while read -r path; do + beetpath="/i/m${path#/i/converted}" + flac="${beetpath%.mp3}.flac" + if [[ ${flacs[$flac]} ]]; then + beetpath="$flac" + fi + navirating[$beetpath]=$r + done <$r + done + cd + rm -rf $tmpdir + declare -A beetrating + for r in 1 2 3 4 5; do + m beet ls -f '$path' rating:$r >$tmpf + while read -r path; do + beetrating[$path]=$r + done <$tmpf + done + + for path in "${!navirating[@]}"; do + r="${navirating[$path]}" + if [[ $r != "${beetrating[$path]}" ]]; then + # note: this assumes there are no cases like filea.mp3 filea.mp3.mp3, which would affect both files. + echo "$r != ${beetrating[$path]}, beet modify -y path:$path rating=$r" + beet modify -y "path:$path" "rating=$r" + fi + done + # end star rating import from navidrome to beets: +fi + +echo begin import navidrome playlists as flexible attribute with value t. +# These are only the playlists listed in the beets config.yaml +# "subsonicplaylist:" and then duplicated here: + + +plists=( + # these are useful tags + expl + gimicky + sad + # these are normal playlists + love + pump1 + pumprap + rend + run +) +# this puts the navidrome playlists into a smart attribute +# subsonic_playlist +m beet subsonicplaylist + +beet ls -f '$id $subsonic_playlist' subsonic_playlist::. | sed 's/;/ /g' >$tmpf + +# for debugging +#m head $tmpf + +navlists=() +while read -r id id_plists; do + navlists[id]="$id_plists" +done <$tmpf + +for plist in ${plists[@]}; do + echo "processing $plist" + for id in $(beet ls -f '$id' $plist:t ^genre:spoken-w ^genre:skit ^rating:1); do + found=false + newnavlist=() + for navlist in ${navlists[id]}; do + if [[ $navlist == "$plist" ]]; then + found=true + else + newnavlist+=($navlist) + fi + done + if $found; then + navlists[id]="${newnavlist[*]}" + else + # exists in beets, but not navidrome so we must have removed + # it from the playlist in navidrome. + m beet modify -y "id:$id" "$plist!" + fi + done +done +# The ones we didnt find and remove are ones we added +# in navidrome. +for id in ${!navlists[@]}; do + [[ ${navlists[id]} ]] || continue + m beet modify -y "id:$id" ${navlists[id]// /=t }=t +done + +# old way of doing it which sets everything. this doesnt +# account for removed tracks in navidrome, and it will +# be slower for handling many playlists. +# while read -r id plists; do +# plists="${plists#;}" +# m beet modify -y "id:$id" ${plists//;/=t } +# done < <(beet ls -f '$id $subsonic_playlist' subsonic_playlist::.) + +# if we remove a track from a playlist in navidrome, +# beet subsonicplaylist won't remove corresponding beet +# smart attribute, so clear them all here. + +m beet modify -y subsonic_playlist::. 'subsonic_playlist!' diff --git a/navidrome-playlist-export b/navidrome-playlist-export deleted file mode 100755 index c4c824c..0000000 --- a/navidrome-playlist-export +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -f=/usr/local/lib/err;test -r $f || { echo "error: $0 no $f" >&2;exit 1;}; . $f - - - -# begin star rating import from navidrome to beets: -declare -A navirating -for r in 1 2 3 4 5; do - while read -r path; do - beetpath="/i/m${path#/i/converted}" - navirating[$beetpath]=$r - done < <(sqlite3 /i/navidrome/navidrome.db "select path from annotation inner join media_file on item_id = id where rating = $r;") -done -declare -A beetrating -for r in 1 2 3 4 5; do - while read -r path; do - beetrating[$path]=$r - done < <(beet ls -f '$path' rating:$r) -done - -for path in "${!navirating[@]}"; do - r="${navirating[$path]}" - if [[ $r != "${beetrating[$path]}" ]]; then - # note: this assumes there are no cases like filea.mp3 filea.mp3.mp3, which would affect both files. - echo "$r != ${beetrating[$path]}, beet modify -y path:$path rating=$r" - beet modify -y "path:$path" "rating=$r" - fi -done -# end star rating import from navidrome to beets: - - -beet subsonicplaylist - -while read -r id plists; do - plists="${plists#;}" - e beet modify -y "id:$id" ${plists//;/=t } -done < <(beet ls -f '$id $subsonic_playlist' subsonic_playlist::.) diff --git a/subdir_files/.config/mpv/mpv.conf b/subdir_files/.config/mpv/mpv.conf index 027e52f..49d4960 100644 --- a/subdir_files/.config/mpv/mpv.conf +++ b/subdir_files/.config/mpv/mpv.conf @@ -19,4 +19,8 @@ shuffle # audio [a] +volume=75 player-operation-mode=cplayer + +# note, useful cli option: +# --script-opts=osc-visibility=always