X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=brc2;h=9dda87b0930740b7896e601fd780e452b887dcfc;hb=563cc41a1f3ddb95bedf595cc249f53aea6629c1;hp=7e57ec94117f4b70dc76e50a6a3ebd2736a4cfa6;hpb=9c77c557e60d21caceeef1e78e35b35ed968fca9;p=distro-setup diff --git a/brc2 b/brc2 index 7e57ec9..9dda87b 100644 --- a/brc2 +++ b/brc2 @@ -447,79 +447,132 @@ update annotation set rating = $rating # Do transcoding and hardlinking of audio files for navidrome. # -# Deletes files in the converted directory which should no longer +# This deletes files in the converted directory which should no longer # be there due to a rename of the unconverted file. beetconvert() { - # directs to avoid printing every file - beet convert -y ^genre:spoken-w ^genre:skit ^rating:1 >/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