diff options
| author | lassulus <lassulus@lassul.us> | 2022-12-12 15:15:36 +0100 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2022-12-12 15:15:36 +0100 |
| commit | d26c371b14d4b082871f85a0a8675b493a2d73dd (patch) | |
| tree | 3f094c54137be5d6103a8c4991fbc9f0c92af0e6 | |
| parent | 610cd8774903f8a9110f6ebe678de78ec82e9fe1 (diff) | |
l radio: better irc output, eat blanks, wishes
| -rw-r--r-- | lass/2configs/radio/default.nix | 21 | ||||
| -rw-r--r-- | lass/2configs/radio/radio.liq | 1 |
2 files changed, 18 insertions, 4 deletions
diff --git a/lass/2configs/radio/default.nix b/lass/2configs/radio/default.nix index 2803200f..0f599ea1 100644 --- a/lass/2configs/radio/default.nix +++ b/lass/2configs/radio/default.nix @@ -9,7 +9,6 @@ let set -eu # TODO come up with new rating, without moving files - # music_dir=${lib.escapeShellArg music_dir} # current_track=$(${pkgs.curl}/bin/curl -fSs http://localhost:8002/current | ${pkgs.jq}/bin/jq -r .filename) # track_infos=$(${print_current}/bin/print_current) # skip_count=$(${pkgs.attr}/bin/getfattr -n user.skip_count --only-values "$current_track" || echo 0) @@ -22,13 +21,13 @@ let # mv "$current_track" "$music_dir"/the_playlist/.graveyard/ # echo killing: "$track_infos" # fi - ${pkgs.curl}/bin/curl -X POST http://localhost:8002/skip + ${pkgs.curl}/bin/curl -fSs -X POST http://localhost:8002/skip | + ${pkgs.jq}/bin/jq -r '.filename' ''; good_track = pkgs.writeBashBin "good_track" '' set -eu - music_dir=${lib.escapeShellArg music_dir} current_track=$(${pkgs.curl}/bin/curl -fSs http://localhost:8002/current | ${pkgs.jq}/bin/jq -r .filename) track_infos=$(${print_current}/bin/print_current) # TODO come up with new rating, without moving files @@ -41,7 +40,15 @@ let ''; print_current = pkgs.writeDashBin "print_current" '' - ${pkgs.curl}/bin/curl -fSs http://localhost:8002/current | ${pkgs.jq}/bin/jq -r '"\(.filename): \(.purl)"' + file=$(${pkgs.curl}/bin/curl -fSs http://localhost:8002/current | + ${pkgs.jq}/bin/jq -r '.filename' | + ${pkgs.gnused}/bin/sed 's,^${music_dir},,' + ) + link=$(${pkgs.curl}/bin/curl http://localhost:8002/current | + ${pkgs.jq}/bin/jq -r '.filename' | + ${pkgs.gnused}/bin/sed 's@.*\(.\{11\}\)\.ogg@https://youtu.be/\1@' + ) + echo "$file": "$link" ''; set_irc_topic = pkgs.writeDash "set_irc_topic" '' @@ -181,6 +188,12 @@ in { like.filename = "${good_track}/bin/good_track"; current.filename = "${print_current}/bin/print_current"; + wish.filename = pkgs.writeDash "wish" '' + echo "youtube-dl:$1" | ${pkgs.curl}/bin/curl -fSs http://localhost:8002/wish -d @- > /dev/null + ''; + wishlist.filename = pkgs.writeDash "wishlist" '' + ${pkgs.curl}/bin/curl -fSs http://localhost:8002/wish | ${pkgs.jq}/bin/jq -r '.[]' + ''; suggest.filename = pkgs.writeDash "suggest" '' echo "$@" >> playlist_suggest ''; diff --git a/lass/2configs/radio/radio.liq b/lass/2configs/radio/radio.liq index e90197c1..70d31604 100644 --- a/lass/2configs/radio/radio.liq +++ b/lass/2configs/radio/radio.liq @@ -30,6 +30,7 @@ port = string.to_int(env["RADIO_PORT"], default = 8000) all_music = playlist(env["MUSIC"], check_next = filter_graveyard) wishlist = request.queue() tracks = fallback(track_sensitive = true, [wishlist, all_music]) +tracks = blank.eat(tracks) last_metadata = ref([]) def on_metadata(m) = |