X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=brc2;h=1add8230a8766562b053460b415ce2915afd5018;hb=5cb8fc0c2a8a3f9ffa3cb4d376075c1217eb6d8c;hp=a8a2de76a3a7ee83dd071229b23a7a3292ebef8f;hpb=63e3670ab59869f5f74904edbe64daa943fad15f;p=distro-setup diff --git a/brc2 b/brc2 index a8a2de7..1add823 100644 --- a/brc2 +++ b/brc2 @@ -290,7 +290,10 @@ 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)" @@ -349,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 @@ -392,16 +395,27 @@ astudio() { # becomes # https://brains.fsf.org/wiki/sysadmin/interns/2022/nick_shrader/intro_blog_post iki() { - local url path + local url path input if [[ $1 ]]; then - path="$*" + input="$*" else - read -r -p "enter path" path + read -r -p "enter path or url" input fi - url=$(readlink -f "$path") - url="https://brains.fsf.org/wiki/${url#*brains/}" - url="${url%.mdwn}" - echo "$url" + case $input in + http*) + path="/f/brains/${input##https://brains.fsf.org/wiki/}" + if [[ $path == */ ]]; then + path=${path%/}.mdwn + fi + j printf "%s\n" "$path" + ;; + *) + url=$(readlink -f "$input") + url="https://brains.fsf.org/wiki/${url#*brains/}" + url="${url%.mdwn}/" + j echo "$url" + ;; + esac } @@ -525,7 +539,15 @@ EOF # beet playlist. use beetag with a playlist name bpl() { - eval beetag -r "$@" "${bpla[${@: -1}]}" + local playlist playlist_regex + playlist="${*: -1}" + playlist_regex='[a-z0-9_]' + if [[ ! $playlist =~ $playlist_regex ]]; then + echo "bpl: error unexpected chars in playlist: $playlist" + return 1 + fi + # all but last arg as options + eval beetag -r "${*:1:$# - 1}" "${bpla[$playlist]}" } complete -W "${!bpla[*]}" bpl @@ -538,31 +560,101 @@ beetmq() { sed 's/^format_item:.*/format_item: ignore_this/' ~/.config/beets/config.yaml >$tmpf beet -c $tmpf modify -y "$@" > >(grep -vFx -e 'ignore_this' -e 'Modifying 1 items.' ||:) rm "$tmpf" - scrolled+=1 + 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<${#button_map[@]}; i++)); do - if (( i % 3 == 2 )); then - printf "%s %s\n" ${buttons[i]} ${button_map[i]} + for (( i=0; i/<- skip + + +y other genres z fg player ' = toggle play 1-5 rate +; previous _ = delete up/down skip mpv vol,pause,seek EOF hr scrolled=10 fi } +# Must be called from beetag for variables to be setup +beetag-nostatus() { + if (( $# )); then + scrolled=$(( scrolled + $1 )) + fi + if $erasable_line; then + # https://stackoverflow.com/a/71286261 + printf '\033[1A\033[K' + fi + erasable_line=false +} +# meant to be called from beetag +beetag-status() { + if $erasable_line; then + # https://stackoverflow.com/a/71286261 + printf '\033[1A\033[K' + fi + erasable_line=true +} + +# meant to be called from beetag +mpvrpc() { + if jobs -p | grep -q . &>/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 [-r] [-s] QUERY # it lists the query, reads an input char for tagging one by one. @@ -582,18 +674,23 @@ EOF # 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 help line lsout tmp ls_line - local escape_char escaped_input expected_input skip_input_regex - local -a pl_tags buttons button_map ids tags rare_genres tmp_tags initial_ls ls_lines + 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 i j volume scrolled id_count line_int skip_start pre_j_count head_count - + 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 + new_random=false case $1 in -r) random=true @@ -603,6 +700,10 @@ beetag() { random=false shift ;; + -x) + new_random=true + shift + ;; esac if (( ! $# )); then echo beetag: error expected a query arg >&2 @@ -616,17 +717,9 @@ beetag() { volume=70 read_wait=2 doplay=true - # because we were destined to run out of single key buttons. - rare_genres=( - jazz - musical - noise - skit - spoken-w - ) last_genre_i=$(( ${#common_genres[@]} - 1 )) - buttons=( {a..p} {r..w} 0 {6..9} , . / ) + buttons=( {a..p} {r..w} {6..8} , . / - "=") button_map=(${common_genres[@]} ${pl_tags[@]}) fstring= for tag in "${pl_tags[@]}"; do @@ -637,37 +730,122 @@ beetag() { button_i[${buttons[i]}]=$i done - # TODO: use shuf --random-source=FILE to save the random sort order - # for reusing later, so we can pickup where we left off in a playlist. + # 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 - mapfile -t initial_ls < <(beet ls -f '$id %ifdef{rating,$rating }'"$fstring"'$genre | $artist - $album - $title $length' "$@" | { if $random; then sort -R; else cat; fi; } ) - j=0 - # i only care to see the head of the list. - head_count=$(( LINES - 14 )) + 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 - id="${line%% *}" + 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") - ls_line="${line#* }" - ls_line="$ls_line $id" + right_pad="${line_no_path%% |*}" + ls_line="$(printf %-11s "$right_pad")${line_no_path#"$right_pad"}" ls_lines+=("$ls_line") - if (( j < head_count )); then + 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 - j=$(( j+1 )) done - id_count=${#ids[@]} - for (( j=0; j < id_count; j++ )); do + 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]} + path="${paths[$j]}" lsout="${ls_lines[j]}" tags=( ${lsout%%,*} ) beetag-help printf "██ %s\n" "$lsout" - scrolled+=1 + beetag-nostatus 1 if $doplay; then # https://stackoverflow.com/a/7687716 # note: duplicated down below - { beet play "--args=--volume=$volume" "id:$id" 2>&1 & } 2>/dev/null + # + # 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= @@ -678,7 +856,8 @@ beetag() { # 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 @@ -689,13 +868,10 @@ beetag() { fi beetag-help if [[ $char == $'\n' ]]; then - # https://stackoverflow.com/a/5722874 - kill %%; wait %% 2>/dev/null ||: break fi case $char in ";") - kill %%; wait %% 2>/dev/null ||: j=$(( j - 2 )) break ;; @@ -705,44 +881,43 @@ beetag() { doplay=false else doplay=true - kill %%; wait %% 2>/dev/null ||: - { beet play "--args=--volume=$volume" "id:$id" 2>&1 & } 2>/dev/null + mpvrpc '{ "command": ["loadfile", "'"$path"'"] }' + erasable_line=false fi - scrolled+=1 + beetag-nostatus 1 continue ;; _) - kill %%; wait %% 2>/dev/null ||: m beet rm --delete --force "id:$id" - scrolled+=4 # guessing. dont want to test atm + beetag-nostatus 4 # guessing. dont want to test atm break ;; [1-5]) beetmq "id:$id" rating=$char continue ;; - -) + 9) volume=$(( volume - 5 )) if (( volume < 0 )); then volume=0 fi - echo volume=$volume - scrolled+=1 - continue - ;; - q) - kill %%; wait %% 2>/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 - scrolled+=1 continue ;; + q) + kill-bg-quiet + return + ;; y) if $do_rare_genres; then do_rare_genres=false @@ -763,7 +938,7 @@ beetag() { continue ;; z) - scrolled+=3 + 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 @@ -775,34 +950,35 @@ beetag() { 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]+$" - skip_back=false case $escaped_input in - '[D') - # skip backward - if (( j == 0 )); then - echo "no earlier songs" - continue - fi - skip_back=true - { - line_int=0 - for (( i=j-1; i >= 0; i-- )); do - echo "$line_int | ${ls_lines[i]}" - line_int+=1 - done - } | less -F - scrolled+=$j - ;; - '[C') - # skip forward, but show the last few songs anyways. + # up char: show all the songs, use less + '[A') skip_start=0 - if (( j - 3 > skip_start )); then - skip_start=$(( j - 3 )) + 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 @@ -814,7 +990,45 @@ beetag() { line_int+=1 done } | less -F - scrolled+=$(( id_count - skip_start - 1 )) + ;; + # 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 @@ -822,19 +1036,20 @@ beetag() { 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 - if $skip_back; then - j=$(( j - skip_input - 2 )) - else - pre_j_count=$(( j - skip_start )) - j=$(( j + skip_input - pre_j_count )) - if (( skip_input < pre_j_count )); then - j=$(( j - 1 )) - fi + pre_j_count=$(( j - skip_start )) + j=$(( j + skip_input - pre_j_count )) + if (( skip_input < pre_j_count )); then + j=$(( j - 1 )) fi - kill %%; wait %% 2>/dev/null ||: - break fi + break fi ;; esac @@ -865,6 +1080,14 @@ beetag() { 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 } @@ -900,6 +1123,8 @@ beet2nav() { # pull in beets library locally beetpull() { + local sshfs_host + sshfs_host=b8.nz if [[ $HOSTNAME == kd ]]; then return 0 fi @@ -908,7 +1133,7 @@ beetpull() { s chown iank:iank /i fi if ! mountpoint /i &>/dev/null; then - m sshfs b8.nz:/i /i + m sshfs $sshfs_host:/i /i fi } @@ -1073,14 +1298,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 + #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 /b/data/daystart + else + cat /b/data/daystart + fi +} #### begin bitcoin related things btc() { @@ -1777,7 +2021,65 @@ tl() { t s w } -arbttlog() { 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}' ; } +focus() { + /p/c/proc/focus/linux-amd64/focus & + watcharb5 + kill %% +} + + +watcharb5() { + local char ret + killall arbtt-capture ||: + rm -f ~/.arbtt/capture.log + arbtt-capture --sample-rate=10 & + clear + while true; do + arb5 + ret=0 + # i first thought to sleep and capture ctrl-c, but it seems we can't + # capture control-c, unless maybe we implement the commands in a + # separate script or maybe add err-cleanup to err. Anyways, this + # method is superior because any single char exits. + read -rsN1 -t 5 char || ret=$? + if (( ret == 142 )) || [[ ! $char ]]; then + # debug + #e ret=$ret char=$char + : + else + killall arbtt-capture ||: + return 0 + fi + clear + done + +} + +arb5() { + local i l sec + i=0 + if [[ ! -e ~/.arbtt/capture.log ]]; then + sleep 5 + fi + # https://stackoverflow.com/questions/56486272/how-to-concat-multiple-fields-to-same-line-with-jq + arbtt-dump -l 30 -t json | jq -r '.[] | [ ( .inactive / 1000 | floor ) , ( .windows[] | select (.active == true) |.title) ] | @tsv' \ + | tac | while read -r sec l; do + if (( i % 6 == 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 @@ -2288,9 +2590,17 @@ otp() { oathtool --totp -b "$*" | xclip -selection clipboard } j() { - "$@" |& pee "xclip -r -selection clipboard" + "$@" |& pee "xclip -r -selection clipboard" cat } +# x copy +xc() { + xclip -r -selection clipboard +} +# echo copy +ec() { + pee "xclip -r -selection clipboard" cat +} pakaraoke() { # from http://askubuntu.com/questions/456021/remove-vocals-from-mp3-and-get-only-instrumentals @@ -2874,6 +3184,17 @@ fixu() { fi } +# unmute +um() { + pactl set-sink-mute @DEFAULT_SINK@ false + rm -f /tmp/ianknap +} +nap() { + pactl set-sink-mute @DEFAULT_SINK@ true + touch /tmp/ianknap +} + + # systemctl is-enabled / status / cat says nothing, instead theres # some obscure symlink. paths copied from man systemd.unit. # possibly also usefull, but incomplete, doesnt show units not loaded in memory: @@ -2974,6 +3295,25 @@ vspicy() { # usage: VIRSH_DOMAIN wian() { cat-new-files /m/4e/INBOX/new } +wakehours() { + local sec + if (( $# != 1 )) ; then + echo wakehours: error: expected 1 arg, got $# >&2 + return 1 + fi + sec=$(( EPOCHSECONDS - $( date +%s -d $1am ) )) + printf "%d:%02d\n" $(( sec / 60 / 60)) $(( (sec / 60) % 60 )) +} + +calvis() { # calendar visualize + install -m 600 /dev/null /tmp/calendar-bytes + while read l; do + for char in $l; do + printf "\x$(printf "%x" $char)" >>/tmp/calendar-bytes + done + done < <(grep -v '[#-]' /p/calendar-data) + /p/c/proc/calendar/linux-amd64/calendar +} wtr() { curl wttr.in/boston; }