X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=brc2;h=676c5973a760a2c7936cd24c901336a8f09b2727;hb=b186607514fbcf10bd5664ccb759a6e873f048c7;hp=9dda87b0930740b7896e601fd780e452b887dcfc;hpb=563cc41a1f3ddb95bedf595cc249f53aea6629c1;p=distro-setup diff --git a/brc2 b/brc2 index 9dda87b..676c597 100644 --- a/brc2 +++ b/brc2 @@ -42,6 +42,7 @@ export WCDHOME=/a case $EUID in 0) + # shellcheck disable=SC2034 # used in brc SL_SSH_ARGS="-F $HOME/.ssh/confighome" ;; esac @@ -58,9 +59,14 @@ source /a/bin/bash_unpublished/source-semi-priv source /a/bin/bash_unpublished/source-state source /a/bin/log-quiet/logq-function -if [[ -s /a/opt/alacritty/extra/completions/alacritty.bash ]]; then - source /a/opt/alacritty/extra/completions/alacritty.bash -fi + +# not used +# if [[ -s /a/opt/alacritty/extra/completions/alacritty.bash ]]; then +# source /a/opt/alacritty/extra/completions/alacritty.bash +# fi + + +source /a/bin/ds/beet-data # * functions @@ -73,7 +79,7 @@ multimic() { m pactl unload-module module-null-sink m pactl unload-module module-remap-source - sources=($(pacmd list-sources | sed -rn 's/.*name: <([^>]+).*/\1/p')) + IFS=" " read -r -a sources <<<"$(pacmd list-sources | sed -rn 's/.*name: <([^>]+).*/\1/p')" if (( ! $# )); then i=0 @@ -177,7 +183,8 @@ rm-docker-iptables() { # usage mkschroot [-] distro codename packages # - means no piping in of sources.list mkschroot() { - local force=false + local sources force repo n distro + force=false while [[ $1 == -* ]]; do case $1 in -f) force=true; shift ;; @@ -283,10 +290,13 @@ tback() { # s sshfs bu@$host:/bu/home/md /bu/mnt -o reconnect,ServerAliveInterval=20,ServerAliveCountMax=30 -o allow_other eqgo() { - enn -M $(exiqgrep -i -r.\*) + local -a array tmpstr + tmpstr=$(exiqgrep -i -r.\*) + mapfile -t array <<<"$tmpstr" + enn -M "${array[@]}" } eqgo1() { - enn -M $(exipick -i -r.\*|h1) + enn -M "$(exipick -i -r.\*|h1)" } @@ -342,7 +352,7 @@ alerts() { ralerts() { # remote alerts local ret shell # this list is duplicated in check-remote-mailqs - for h in bk je li frodo kwwg x3wg x2wg kdwg sywg; do + for h in bk je li frodo x3wg kdwg sywg; do echo $h: shell="ssh $h" if [[ $HOSTNAME == "${h%wg}" ]]; then @@ -377,10 +387,13 @@ astudio() { # googling android emulator libGL error: failed to load driver: r600 # lead to http://stackoverflow.com/a/36625175/14456 export ANDROID_EMULATOR_USE_SYSTEM_LIBS=1 - /a/opt/android-studio/bin/studio.sh "$@" &r; + /a/opt/android-studio/bin/studio.sh "$@" & r } - +# convert brains path to url +# /f/brains/sysadmin/interns/2022/nick_shrader/intro_blog_post.mdwn +# becomes +# https://brains.fsf.org/wiki/sysadmin/interns/2022/nick_shrader/intro_blog_post iki() { local url path if [[ $1 ]]; then @@ -392,9 +405,6 @@ iki() { url="https://brains.fsf.org/wiki/${url#*brains/}" url="${url%.mdwn}" echo "$url" - # /f/brains/sysadmin/interns/2022/nick_shrader/intro_blog_post.mdwn - # becomes - # https://brains.fsf.org/wiki/sysadmin/interns/2022/nick_shrader/intro_blog_post } @@ -415,47 +425,71 @@ beetsmartplaylists() { rmdir /tmp/ianbeetstmp } -# Export beets ratings into navidrome -beetrating() { - local tmp tmpfile myuser userid rating path cpath sqlpath +# internal function for beetrating, in case we need to ssh +beetrating-stdin() { + local tmp rating path cpath sqlpath userid # plucked this from the db. im the only user. userid=23cc2eb9-e35e-4811-a0f0-d5f0dd6eb634 - tmpfile=$(mktemp) - beet ls -f '$rating $path' ^genre:spoken-w ^genre:skit rating:2..5 >$tmpfile while read -r rating path; do - tmp="/i/converted${path#/i/m}" - cpath="${tmp%.*}.mp3" # converted path + cpath="/i/converted${path#/i/m}" # converted path + case $cpath in + *.flac) + cpath="${cpath%.*}.mp3" + ;; + esac + if [[ ! -e $cpath ]]; then + echo "beetraing: error: this should not happen, path does not exist: $cpath" + return 1 + fi sqlpath="${cpath//\'/\'\'}" old_rating=$(sqlite3 /i/navidrome/navidrome.db "select rating from annotation inner join media_file on item_id = id where path = '$sqlpath' and item_type = 'media_file';") if [[ $old_rating ]]; then - if [[ $old_rating != $rating ]]; then + if [[ $old_rating != "$rating" ]]; then + echo "setting rating $old_rating -> $rating $cpath" # https://stackoverflow.com/a/50317320 - m sqlite3 /i/navidrome/navidrome.db " + # we got a timeout error once. arbitrarily chose 15 seconds. + sqlite3 /i/navidrome/navidrome.db ".timeout 15000" " update annotation set rating = $rating where item_id in ( select media_file.id from annotation inner join media_file on annotation.item_id = media_file.id where media_file.path = '$sqlpath' and annotation.item_type = 'media_file' );" fi else + echo "setting rating $rating $cpath" # /a/opt/navidrome/persistence/sql_annotations.go v0.48.0 # https://www.sqlite.org/lang_insert.html - m sqlite3 /i/navidrome/navidrome.db "insert into annotation select '$(uuidgen)', '$userid', id, 'media_file', 0, NULL, $rating, 0, NULL from media_file where path = '$sqlpath';" + sqlite3 /i/navidrome/navidrome.db ".timeout 15000" "insert into annotation select '$(uuidgen)', '$userid', id, 'media_file', 0, NULL, $rating, 0, NULL from media_file where path = '$sqlpath';" fi - #sqlite3 /i/navidrome/navidrome.db "select path from annotation inner join media_file on item_id = id where rating = $r;" - done <$tmpfile + done +} + +# Export beets ratings into navidrome +beetrating() { + local ssh_prefix + if [[ $HOSTNAME != kd ]]; then + ssh_prefix="ssh b8.nz" + fi + # shellcheck disable=SC2016 # obvious reason + beet ls -f '$rating $path' $nav_convert_query | $ssh_prefix beetrating-stdin } # Do transcoding and hardlinking of audio files for navidrome. -# +beetconvert() { + local tmpf + tmpf="$(mktemp)" + # a bunch of effort to ignore output we dont care about... + sed 's/^format_item:.*/format_item: ignore_this/' ~/.config/beets/config.yaml >$tmpf + beet -c $tmpf convert -y $nav_convert_query > >(grep -vFx 'ignore_this' ||:) 2> >(grep -v '^convert: Skipping' ||:) + rm "$tmpf" +} # This deletes files in the converted directory which should no longer # be there due to a rename of the unconverted file. -beetconvert() { - local l query +beetconvert-rm-extras() { + local l tmpf 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' ||:) - + tmpf="$(mktemp)" + # shellcheck disable=SC2016 # obvious reason + beet ls -f '$path' $nav_convert_query >"$tmpf" ## begin removal of files that are leftover from previous conversion, # eg, previously rated > 1, now rated 1. while read -r l; do @@ -464,116 +498,218 @@ beetconvert() { *.flac) convertedpath="${convertedpath%.flac}.mp3" ;; esac paths[$convertedpath]=t - done < <(beet ls -f '$path' $query) + done <"$tmpf" + + find /i/converted -path /i/converted/beetsmartplaylists -prune -o \( -type f -print \) -name '*.mp3' -o -name '*.m4a' >"$tmpf" while read -r l; do if [[ ! ${paths[$l]} ]]; then rm -v "$l" fi # 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 + done <"$tmpf" + rm "$tmpf" +} + +beets-gen-playlists() { + local i str + local -a query_array query_str + for i in "${!bpla[@]}"; do + query_str=() + eval "query_array=(${bpla[$i]})" + for str in "${query_array[@]}"; do + query_str+=("\"$str\"") + done + cat <$tmpf + beet -c $tmpf modify -y "$@" > >(grep -vFx -e 'ignore_this' -e 'Modifying 1 items.' ||:) + rm "$tmpf" + beetag-nostatus 1 +} + +kill-bg-quiet() { + # https://stackoverflow.com/a/5722874 + kill %% 2>/dev/null ||:; wait %% 2>/dev/null ||: +} + +# debug variables +dv() { + for arg; do + printf "%s=%s " "$arg" "${!arg}" + done + echo +} + +# Must be called from beetag for variables to be setup +beetag-help() { + local -i i j col_total row col button_total row_total remainder_cols remainder_term + col_total=4 + button_total=${#button_map[@]} + row_total=$(( button_total / col_total )) + remainder_cols=$(( button_total % col_total )) + # for debugging + #dv button_total row_total remainder_cols + beetag-nostatus + # - 3 is just a constant that helps things work in practice. + if [[ $LINES ]] && (( LINES - 3 < scrolled )); then + hr + for (( i=0; i/dev/null; then + printf "%s\n" "$*" | socat - /tmp/mpvsock >/dev/null ||: + fi +} +# meant to be called from beetag +# o for get output +mpvrpco() { + # note: testing for background jobs will output nothing if we are in a pipeline + printf "%s\n" "$*" | socat - /tmp/mpvsock ||: +} + +# meant to be called from beetag +mpvrpc-percent-pos() { + mpvrpco '{ "command": ["get_property", "percent-pos"] }' | jq .data | sed 's/\..*/%/' 2>/dev/null ||: } # tag with beets. -# usage: beetag QUERY +# usage: beetag [-r] [-s] QUERY # it lists the query, reads an input char for tagging one by one. -# 1-5 = set rating -# 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 -# ' = 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. +# +# (available buttons: ` \ ) ] [ and non-printing chars, see +# https://stackoverflow.com/questions/10679188/casing-arrow-keys-in-bash +# +# +# note: after foregrounding the player, must quit it to get back. can't ctrl-c. +# +# keys I dont need help to remember: +# 1-5 rate +# q quit +# ret next 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 last_genre_i fstring tag id char new_item char_i genre tag remove doplay i j random path + local do_rare_genres read_wait help line lsout tmp ls_line skip_lookback + local escape_char escaped_input expected_input skip_input_regex right_pad erasable_line seek_sec + local pl_state_path pl_state_dir pl_state_file tmpstr + local new_random pl_seed_path seed_num seed_file fmt first_play + local -a pl_tags buttons button_map ids tags tmp_tags initial_ls ls_lines paths local -A button_i - local -i volume - do_rare_genres=false + local -i i j volume scrolled id_count line_int skip_start pre_j_count head_count skip_lookback + local -i overflow_lines overflow + + first_play=true + erasable_line=false + escape_char=$(printf "\u1b") + scrolled=999 # more than any $LINES + ### begin arg processing ### random=false - volume=70 - read_wait=2 + new_random=false case $1 in -r) random=true shift ;; + -s) + random=false + shift + ;; + -x) + new_random=true + shift + ;; esac if (( ! $# )); then echo beetag: error expected a query arg >&2 return 1 fi + ### end arg processing ### + + beetpull + + do_rare_genres=false + volume=70 + read_wait=2 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 - latin - metal - # mq = mac quale. similar to the mr robot soundtracks. - # slow, foreboding. usually electronic. - mq - pop - rap - rock - # 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 - ) - last_genre_i=$(( ${#genres[@]} - 1 )) - buttons=( {a..p} {r..w} 0 {6..9} , . / ) - button_map=(${genres[@]} ${pl_tags[@]}) + + last_genre_i=$(( ${#common_genres[@]} - 1 )) + buttons=( {a..p} {r..w} {6..8} , . / - "=") + button_map=(${common_genres[@]} ${pl_tags[@]}) fstring= for tag in "${pl_tags[@]}"; do fstring+="%ifdef{$tag,$tag }" @@ -582,96 +718,204 @@ beetag() { for (( i=0; i<${#buttons[@]}; i++ )); do button_i[${buttons[i]}]=$i done - beet ls -f '%ifdef{rating,$rating }'"$fstring"', $genre $artist - $album - $title' "$@" - mapfile -t ids < <(beet ls -f '$id' "$@" | { if $random; then sort -R; else cat; fi; } ) - for (( j=0; j<${#ids[@]}; j++ )); do - hr + + # note: this structure of files is rather haphazard. + seed_num=1 # later we might want a few + seed_file=seed$seed_num + if $random; then + pl_state_file=$seed_num + else + pl_state_file=sorted + fi + pl_state_dir=/i/info/pl-state + if [[ $playlist ]]; then + pl_state_dir=$pl_state_dir/nopl + else + pl_state_dir=$pl_state_dir/$playlist + fi + pl_state_path=$pl_state_dir/$pl_state_file + pl_seed_path=$pl_state_dir/$seed_file + + + if $new_random || [[ ! -r $pl_seed_path ]]; then + mkdir -p $pl_state_dir + { base64 < /dev/urandom | head -c 200 ||:; echo; } > $pl_seed_path + fi + + + + # PijokVipiotOzeph is just a random string for a delimiter + fmt='%ifdef{rating,$rating }'"$fstring"'$genre | $title - $artist - $album $length $id PijokVipiotOzeph $path' + # shellcheck disable=SC2016 # obvious reason + tmpstr=$(beet ls -f "$fmt" "$@" | { if $random; then sort -R --random-source=$pl_seed_path; else cat; fi; } ) + mapfile -t initial_ls <<<"$tmpstr" + id_count=${#initial_ls[@]} + for line in "${initial_ls[@]}"; do + path="${line#*PijokVipiotOzeph }" + # https://github.com/koalaman/shellcheck/issues/2171 + # shellcheck disable=SC2190 # bug in shellcheck, looking at paths from an earlier function + paths+=("$path") + line_no_path="${line% PijokVipiotOzeph*}" + id="${line_no_path##* }" + ids+=("$id") + right_pad="${line_no_path%% |*}" + ls_line="$(printf %-11s "$right_pad")${line_no_path#"$right_pad"}" + ls_lines+=("$ls_line") + i=$(( i+1 )) + done + + + + + j=0 + if [[ $playlist ]]; then + if [[ -r $pl_state_path ]]; then + j=$(cat $pl_state_path) + fi + fi + + # i only care to see a smallish portion of the list when starting. + head_count=$(( LINES - 20 )) + head_start=$(( j - head_count / 2 )) + if (( head_start < 0 )); then + head_start=0 + fi + for (( i=head_start; i < head_count && i < id_count; i++ )); do + ls_line="${ls_lines[$i]}" + if (( i == j )); then + echo "* $ls_line" + else + echo "$ls_line" + fi + done + if $doplay; then + #{ mpv --profile=a --volume=$volume --idle 2>&1 & } 2>/dev/null + mpv --profile=a --volume=$volume --idle & + # if we dont sleep, can expect an error like this: + # socat[1103381] E connect(5, AF=1 "/tmp/mpvsock", 14): Connection refused + sleep .1 + fi + + while true; do id=${ids[j]} - lsout="$(beet ls -f '%ifdef{rating,$rating }'"$fstring"', $genre $id $artist - $album - $title' "id:$id")" + path="${paths[$j]}" + lsout="${ls_lines[j]}" tags=( ${lsout%%,*} ) - printf "%s\n" "$lsout" - for (( i=0; i<${#button_map[@]}; i++ )); do - echo ${buttons[i]} ${button_map[i]} - done + beetag-help + printf "██ %s\n" "$lsout" + beetag-nostatus 1 if $doplay; then - beet play --args=--volume=$volume "id:$id" & + # https://stackoverflow.com/a/7687716 + # note: duplicated down below + # + # notes on old method of invoking mpv each time: + # https://superuser.com/questions/305933/preventing-bash-from-displaying-done-when-a-background-command-finishes-execut + # we can't disown or run in a subshell or set +m because all that + # disabled job control from working properly in ways we want. + # todo: figure out some kind of answer to this. I think the solution + # is that we are waiting in 2 second intervals and checking if the + # background job exists. Instead, we should make mpv just idle + # when it is done with a song and then send it a command to play a new track. + #{ mpv --profile=a --volume=$volume "$path" 2>&1 & } 2>/dev/null + # old + #{ beet play "--args=--volume=$volume" "id:$id" 2>&1 & } 2>/dev/null + + # on slow systems, we may need to wait like .3 seconds before mpv + # is ready. so impatiently check until it is ready + if $first_play; then + first_play=false + for (( i=0; i<20; i++ )); do + if [[ $(mpvrpco '{ "command": ["get_property", "idle-active"] }' 2>/dev/null | jq .data) == true ]]; then + mpvrpc '{ "command": ["loadfile", "'"$path"'"] }' 2>/dev/null + break + fi + sleep .1 + done + else + mpvrpc '{ "command": ["loadfile", "'"$path"'"] }' + fi + erasable_line=false fi while true; do char= if $doplay; then ret=0 - read -r -N 1 -s -t $read_wait char || ret=$? + read -rsN1 -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 + if jobs -p | grep -q . &>/dev/null && \ + [[ $(mpvrpco '{ "command": ["get_property", "idle-active"] }' | jq .data) == false ]]; then continue else break fi fi else - read -r -N 1 -s char + read -rsN1 char fi + beetag-help if [[ $char == $'\n' ]]; then - kill %% ||: &>/dev/null break fi case $char in ";") - kill %% ||: &>/dev/null j=$(( j - 2 )) break ;; "'") if $doplay; then + echo "play toggled off" doplay=false else doplay=true - kill %% ||: &>/dev/null - beet play --args=--volume=$volume "id:$id" & + mpvrpc '{ "command": ["loadfile", "'"$path"'"] }' + erasable_line=false fi + beetag-nostatus 1 continue ;; _) - kill %% ||: &>/dev/null m beet rm --delete --force "id:$id" + beetag-nostatus 4 # guessing. dont want to test atm break ;; [1-5]) - beet modify -y "id:$id" rating=$char + beetmq "id:$id" rating=$char continue ;; - -) + 9) volume=$(( volume - 5 )) if (( volume < 0 )); then volume=0 fi - echo volume=$volume - continue - ;; - q) - kill %% ||: &>/dev/null - return - ;; - +) + ;;& + 0) volume+=5 if (( volume > 130 )); then volume=130 fi + ;;& + 0|9) + mpvrpc '{ "command": ["set_property", "volume", '$volume'] }' + beetag-status echo volume=$volume continue ;; + q) + kill-bg-quiet + return + ;; y) if $do_rare_genres; then do_rare_genres=false - button_map=(${genres[@]} ${pl_tags[@]}) + button_map=(${common_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 )) + last_genre_i=$(( ${#rare_genres[@]} - 1 )) fi local -A button_i for (( i=0; i<${#buttons[@]}; i++ )); do @@ -683,6 +927,7 @@ beetag() { continue ;; z) + beetag-nostatus 3 # 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 @@ -690,10 +935,112 @@ beetag() { # input. One idea would be to use a music player like mpd where # we can send it messages. if ! fg; then - sleep_wait=10 + read_wait=10 + fi + continue + ;; + + # + " ") + # output time if we aren't already paused + if [[ $(mpvrpco '{ "command": ["get_property", "pause"] }' | jq .data) == false ]]; then + # minutes/seconds + #date -d @"$(mpvrpco '{ "command": ["get_property", "playback-time"] }' | jq .data)" +%M:%S ||: + beetag-status + mpvrpc-percent-pos fi + # originally found this solution, which worked fine. + #kill -STOP %% &>/dev/null + # + mpvrpc '{ "command": ["cycle", "pause"] }' continue ;; + "$escape_char") + expected_input=true + read -rsn2 escaped_input + skip_input_regex="^[0-9]+$" + case $escaped_input in + # up char: show all the songs, use less + '[A') + skip_start=0 + skip_lookback=5 + if (( j - skip_lookback > skip_start )); then + skip_start=$(( j - skip_lookback )) + fi + beetag-nostatus $(( id_count - skip_start - 1 )) + { + line_int=0 + for (( i=skip_start; i < id_count; i++ )); do + if (( i == j )); then + echo " * ${ls_lines[i]}" + continue + fi + echo "$line_int | ${ls_lines[i]}" + line_int+=1 + done + } | less -F + ;; + # down char + '[B') + # skip forward, but show the last few songs anyways. + skip_start=0 + skip_lookback=3 + if (( j - skip_lookback > skip_start )); then + skip_start=$(( j - skip_lookback )) + fi + beetag-nostatus $(( id_count - skip_start - 1 )) + + line_int=0 + overflow_lines=$LINES + for (( i=skip_start; i < overflow_lines - 1 && i < id_count; i++ )); do + ls_line="${ls_lines[i]}" + overflow=$(( ${#ls_line} / ( COLUMNS - 1 ) )) + overflow_lines=$(( overflow_lines - overflow )) + if (( i == j )); then + echo " * $ls_line" + continue + fi + echo "$line_int | $ls_line" + line_int+=1 + done + ;; + # left key + '[D') + seek_sec=-8 + ;;& + # right key + '[C') + seek_sec=8 + ;;& + '[C'|'[D') + beetag-status + mpvrpc-percent-pos + erasable_line=true + mpvrpc '{ "command": ["seek", "'$seek_sec'"] }' + continue + ;; + *) + expected_input=false + ;; + esac + if $expected_input; then + read -r skip_input + case $skip_input in + q) + kill-bg-quiet + return + ;; + esac + if [[ $skip_input =~ $skip_input_regex ]]; then + pre_j_count=$(( j - skip_start )) + j=$(( j + skip_input - pre_j_count )) + if (( skip_input < pre_j_count )); then + j=$(( j - 1 )) + fi + fi + break + fi + ;; esac char_i=${button_i[$char]} new_item=${button_map[$char_i]} @@ -702,7 +1049,7 @@ beetag() { continue fi if (( char_i <= last_genre_i )); then - m beet modify -y "id:$id" genre=$new_item + m beetmq "id:$id" genre=$new_item else remove=false tmp_tags=() @@ -715,13 +1062,21 @@ beetag() { done if $remove; then tags=("${tags[@]}") - m beet modify -y "id:$id" "$new_item!" + m beetmq "id:$id" "$new_item!" else tags+=("$new_item") - m beet modify -y "id:$id" $new_item=t + m beetmq "id:$id" $new_item=t fi fi done + if (( j < id_count - 1 )); then + j+=1 + else + j=0 + fi + if [[ $playlist ]]; then + echo $j >$pl_state_path + fi done } @@ -745,18 +1100,45 @@ beetadd() { # update navidrome music data after doing beets tagging beet2nav() { - beetconvert - beetsmartplaylists - beetrating + m beetpull + m beetconvert + m beetrating + # this function would naturally just be part of beetconvert, + # but we want beetrating to happen sooner so that our ssh auth dialog + # happens earlier. Currently 17 seconds for that. + m beetconvert-rm-extras + m beetsmartplaylists } # pull in beets library locally beetpull() { + if [[ $HOSTNAME == kd ]]; then + return 0 + fi if [[ ! -e /i ]]; then s mkdir /i s chown iank:iank /i - sshfs b8.nz:/i /i fi + if ! mountpoint /i &>/dev/null; then + m sshfs b8.nz:/i /i + fi +} + +# remove all playlists in navidrome, for when I make big +# playlist name changes and just want to scrap everything. +nav-rm-plists() { + local tmpf id + tmpf=$(mktemp) + if [[ $HOSTNAME != kd ]]; then + echo "error: run on kd" + return 1 + fi + sqlite3 /i/navidrome/navidrome.db "select id from playlist" >$tmpf + while read -r id; do + + curl --http1.1 --user "iank:$navidrome_pw" "https://b8.nz/rest/deletePlaylist.view?u=iank&s=sb219dvv7egnoe4i47k75cli0m&t=1c8f5575cd0fdf03deb971187c9c88b1&v=1.2.0&c=DSub&id=$id" + done <$tmpf + rm $tmpf } # escape regex. @@ -775,28 +1157,37 @@ er() { # "artist:" it is used as the artist instead of each artist in QUERY. # beegenre() { - local artist artregex genre term singleartist - local -a artists genres terms + local count artist artregex genre singleartist tmpf tmpf2 + local -a artists genres singleartist=false case $1 in artist:*) singleartist=true - artist="$term" + artist="$1" + shift ;; esac + tmpf=$(mktemp) + tmpf2=$(mktemp) if $singleartist; then - read count genre < <(beet ls -f '$genre' "$artist" "${@/#/^}" | sort | uniq -c | sort -n | tail -n1) ||: + # shellcheck disable=SC2016 # obvious reason + beet ls -f '$genre' "$artist" "${@/#/^}" | sort | uniq -c | sort -n | tail -n1 >$tmpf + read -r count genre <$tmpf ||: beet modify "$artist" "$@" genre=$genre else + # shellcheck disable=SC2016 # obvious reason + beet ls -f '$artist' "$@" | sort -u >$tmpf while read -r artist; do artregex=$(er "$artist") - read count genre < <(beet ls -f '$genre' "artist::^$artregex$" "${@/#/^}" | sort | uniq -c | sort -n | tail -n1) || continue + # shellcheck disable=SC2016 # obvious reason + beet ls -f '$genre' "artist::^$artregex$" "${@/#/^}" | sort | uniq -c | sort -n | tail -n1 >$tmpf2 + read -r count genre <$tmpf2 || continue if [[ $count ]]; then artists+=("$artregex") genres+=("$genre") - echo "beet modify -y $@ \"artist::^$artist$\" genre=$genre # $count" + echo "beet modify -y $* \"artist::^$artist$\" genre=$genre # $count" fi - done < <(beet ls -f '$artist' "$@" | sort -u) + done <$tmpf read -r -N 1 -s -p "Y/n " char case $char in [Yy$'\n']) @@ -806,6 +1197,7 @@ beegenre() { ;; esac fi + rm $tmpf } # note, to check for glue records @@ -893,14 +1285,16 @@ scr() { # 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" + #adb shell rm -r /storage/emulated/0/Download/Cheogram/Backup + read -r -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 ||: # this avoids any err-catch - (( $ret == 0 )) || return $ret + (( ret == 0 )) || return $ret } # service run, and watch the output @@ -1133,7 +1535,7 @@ dnsecgen() { local zone=$1 dnssec-keygen -a RSASHA256 -b 2048 $zone dnssec-keygen -f KSK -a RSASHA256 -b 4096 $zone - for f in K$zone.*.key; do + for f in K"$zone".*.key; do # eg Kb8.nz.+008+47995.key tag=47995 # in dnsimple, you add the long string from this. # in gandi, you add the long string from the .key file, @@ -1144,7 +1546,7 @@ dnsecgen() { # For b8.nz, we let bind read the keys and sign, and # right now they have root ownership, so let them # get group read. - chmod g+r *.private + chmod g+r ./*.private } dsign() { # create .signed file @@ -1157,13 +1559,18 @@ dsign() { done } +# set day start for use in other programs. +# expected to do be in a format like 830, or 800 or 1300. +ds() { + echo $1 >/b/data/daystart +} #### begin bitcoin related things btc() { local f=/etc/bitcoin/bitcoin.conf # importprivkey will timeout if using the default of 15 mins. # upped it to 1 hour. - bitcoin-cli -rpcclienttimeout=60000 -$(s grep rpcuser= $f) -$(s grep rpcpassword= $f) "$@" + bitcoin-cli -rpcclienttimeout=60000 -"$(s grep rpcuser= $f)" -"$(s grep rpcpassword= $f)" "$@" } btcusd() { # $1 btc in usd local price @@ -1222,7 +1629,7 @@ chrome() { else cd / cmd="schroot -c bullseye chromium" - CHROMIUM_FLAGS='--enable-remote-extensions' $cmd &r + CHROMIUM_FLAGS='--enable-remote-extensions' $cmd & r fi } @@ -1430,10 +1837,13 @@ fdup() { } firefox-default-profile() { - key=Default value=1 section=$1 + local key value section + key=Default + value=1 + section=$1 file=/p/c/subdir_files/.mozilla/firefox/profiles.ini sed -ri "/^ *$key/d" "$file" - sed -ri "/ *\[$section\]/,/^ *\[[^]]+\]/{/^\s*$key[[:space:]=]/d};/ *\[$section\]/a $key=$value" "$file" + sed -ri "/ *\[$section\]/,/^ *\[[^]]+\]/{/^\s*${key}[[:space:]=]/d};/ *\[$section\]/a $key=$value" "$file" } fdhome() { #firefox default home profile firefox-default-profile Profile0 @@ -1481,11 +1891,13 @@ fsdiff () { fi } fsdiff-test() { + local tmpd x # expected output, with different tmp dirs # /tmp/tmp.HDPbwMqdC9/c/d ./c/d # /a/tmp/tmp.qLDkYxBYPM-missing # ./b - cd $(mktemp -d) + tmpd="$(mktemp -d)" + cd "$tmpd" echo ok > a echo nok > b mkdir c @@ -1496,6 +1908,7 @@ fsdiff-test() { echo different > $x/c/d echo ok > $x/a fsdiff $x + rm -r "$x" "$tmpd" } rename-test() { # test whether missing files were renamed, generally for use with fsdiff @@ -1558,7 +1971,7 @@ hstatus() { # do git status on published repos. c /a/bin/githtml for x in *; do - cd $(readlink -f $x)/.. + cd "$(readlink -f $x)"/.. status=$(i status -s) || pwd if [[ $status ]]; then hr @@ -1571,7 +1984,7 @@ hstatus() { # work log wlog() { - local day now i days_back + local day i days_back days_back=${1:-16} for (( i=0; i= 2 )); then + echo == $(( i / 6 + 1 )) == + fi + if (( sec > 10 )); then + printf "%3d %s\n" $sec "$l" + else + printf " %s\n" "$l" + fi + i=$(( i + 1 )) + done +} + +arbttlog() { + # from the log, show only the currently active window, and the number of + # seconds of input inactivity. + arbtt-dump "$@" | grep -v '( )\|Current Desktop' | sed -rn '/^[^ ]/{N;s/^(.{21})([0-9]*)[0-9]{3}m.*\(\*/\1\2/;s/^(.{21})[0-9]*.*\(\*/\1/;s/\n//;p}' ; } idea() { - /a/opt/idea-IC-163.7743.44/bin/idea.sh "$@" &r + /a/opt/idea-IC-163.7743.44/bin/idea.sh "$@" & r } +ilogs-local() { + cd /var/lib/znc/moddata/log/iank/freenode/ + hr + for x in "#$1/"*; do + base=${x##*/} + files=() + for f in $@; do + tmp=\#$f/$base + if [[ -e $tmp ]]; then + files+=(\#$f/$base) + fi + done + sed \"s/^./${base%log}/\" ${files[@]}|sort -n + hr + done +} ilogs() { - ssh root@iankelling.org "cd /var/lib/znc/moddata/log/iank/freenode/ && hr && for x in \#$1/*; do base=\${x##*/}; files=(); for f in $@; do tmp=\#\$f/\$base; if [[ -e \$tmp ]]; then files+=(\#\$f/\$base); fi; done; sed \"s/^./\${base%log}/\" \${files[@]}|sort -n; hr; done" + sl root@iankelling.org ilogs-local "$@" } + +ilog-local() { + local d chan + chan="$1" + d=/var/lib/znc/moddata/log/iank/ + for n in freenode libera; do + cd $d$n/"$chan" && hr + for x in *; do + echo $x; sed "s/^./${x%log}/" $x; hr; + done + done +} ilog() { - chan=${1:-#fsfsys} + local chan + chan="${1:-#fsfsys}" # use * instead of -r since that does sorted order - ssh root@iankelling.org "for n in freenode libera; do cd /var/lib/znc/moddata/log/iank/\$n/$chan && hr && for x in *; do echo \$x; sed \"s/^./\${x%log}/\" \$x; hr; done; done" | less +G + sl root@iankelling.org ilog-local "$chan" | less +G } o() { @@ -1633,11 +2135,19 @@ jrf() { journalctl -n 200 -f "$@" ; } ccomp journalctl jtail jr jrf -kff() { # keyboardio firmware flash. you must hold down the tilde key - pushd /a/opt/Model01-Firmware - # if we didn't want this yes hack, then remove "shell read" from - # /a/opt/Kaleidoscope/etc/makefiles/sketch.mk - yes $'\n' | VERBOSE=1 make flash +## old version for model01. i need to get that firmware working again. +# kff() { # keyboardio firmware flash. you must hold down the tilde key +# pushd /a/opt/Model01-Firmware +# # if we didn't want this yes hack, then remove "shell read" from +# # /a/opt/Kaleidoscope/etc/makefiles/sketch.mk +# yes $'\n' | VERBOSE=1 make flash +# popd +# } + + +kff() { + pushd /a/opt/Kaleidoscope/examples/Devices/Keyboardio/Model100 + make flash popd } @@ -1662,11 +2172,12 @@ wghole() { host=$1 ipsuf=$2 mkdir -p /p/c/machine_specific/$host/filesystem/etc/wireguard - cd /p/c/machine_specific/$host/filesystem/etc/wireguard - umask_orig=$(umask) - umask 0077 - wg genkey | tee hole-priv.key | wg pubkey > hole-pub.key - cat >wghole.conf < hole-pub.key + cat >wghole.conf </dev/null + ) } @@ -1948,15 +2459,21 @@ myirc() { if [[ ! $1 ]]; then set -- fsf-office fi - local d1 d2 + local -a d d=( /var/lib/znc/moddata/log/iank/{freenode,libera} ) # use * instead of -r since that does sorted order - ssh root@iankelling.org "for f in ${d[@]}; do cd \$f/#$1; grep '\= 2 )); then + echo "error: iank: unexpected multiple files" + return 1 + fi + fname="${fnames[0]}" src=/a/opt/roms/$fname if [[ ! -f $src ]]; then echo debvm: not found $src, download from eg: https://cloud.debian.org/images/cloud/buster/latest/ @@ -2271,7 +2793,7 @@ To: alerts@iankelling.org Subject: $* EOF else - read sub + read -r sub { cat < /dev/null 2>&1 & + (sleep "$(calc "$* * 60")" && mpv --no-config --volume 50 /a/bin/data/alarm.mp3) > /dev/null 2>&1 & } trg() { transmission-remote-gtk & r; } @@ -2561,7 +3084,7 @@ spamnn() { m sudo nsenter -t $spamdpid -n -m sudo -u Debian-exim spamassassin "$@" } unboundbash() { - m sudo nsenter -t $(systemctl status unbound| sed -n '/^ *Main PID:/s/[^0-9]//gp') -n -m sudo -u $USER -i bash + m sudo nsenter -t "$(systemctl status unbound| sed -n '/^ *Main PID:/s/[^0-9]//gp')" -n -m sudo -u $USER -i bash } nmtc() { @@ -2595,7 +3118,7 @@ mailnncheck() { vpncmd() { - m sudo -E env "PATH=$PATH" nsenter -t $(pgrep -f "/usr/sbin/openvpn .* --config /etc/openvpn/.*client.conf") -n "$@" + m sudo -E env "PATH=$PATH" nsenter -t "$(pgrep -f "/usr/sbin/openvpn .* --config /etc/openvpn/.*client.conf")" -n "$@" } vpni() { @@ -2702,7 +3225,7 @@ sysd-deps() { fixvpndns() { local link istls - read _ link _ istls < <(resolvectl dnsovertls tunfsf) + read -r _ link _ istls < <(resolvectl dnsovertls tunfsf) case $istls in yes|no) : ;; *) echo fixvpndns error: unexpected istls value: $istls >&2; return 1 ;; @@ -2729,13 +3252,32 @@ vpnc() { vspicy() { # usage: VIRSH_DOMAIN # connect to vms made with virt-install - spicy -p $(sudo virsh dumpxml "$1"|grep "