From c7bc2cb7c28c2542e549c76195eb9a9d9cbb8e96 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 5 Apr 2020 11:46:38 +0200
Subject: l radio: kill skipped tracks

---
 lass/2configs/radio.nix | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'lass/2configs/radio.nix')

diff --git a/lass/2configs/radio.nix b/lass/2configs/radio.nix
index b24d7af3e..639caa178 100644
--- a/lass/2configs/radio.nix
+++ b/lass/2configs/radio.nix
@@ -9,13 +9,25 @@ let
   admin-password = import <secrets/icecast-admin-pw>;
   source-password = import <secrets/icecast-source-pw>;
 
+  music_dir = "/home/radio/music";
+
   add_random = pkgs.writeDashBin "add_random" ''
     ${pkgs.mpc_cli}/bin/mpc add "$(${pkgs.mpc_cli}/bin/mpc ls the_playlist/music | grep '\.ogg$' | shuf -n1)"
   '';
 
   skip_track = pkgs.writeDashBin "skip_track" ''
     ${add_random}/bin/add_random
-    echo skipping: "$(${print_current}/bin/print_current)"
+    current_track=$(${pkgs.mpc_cli}/bin/mpc current -f %file%)
+    track_infos=$(${print_current}/bin/print_current)
+    skip_count=$(${pkgs.attr}/bin/getfattr -n user.skip_count --only-values "$current_track" || echo 0)
+    if [ "$skip_count" -gt 2 ]; then
+      mv "$music_dir"/"$current_track" "$music_dir"/.graveyard/
+      echo killing: "$track_infos"
+    else
+      skip_count=$((skip_count+1))
+      ${pkgs.attr}/bin/setfattr -n user.skip_count -v "$skip_count" "$music_dir"/"$current_track"
+      echo skipping: "$track_infos" skip_count: "$skip_count"
+    fi
     ${pkgs.mpc_cli}/bin/mpc -q next
   '';
 
@@ -57,7 +69,7 @@ in {
   services.mpd = {
     enable = true;
     group = "radio";
-    musicDirectory = "/home/radio/music";
+    musicDirectory = "${music_dir}";
     extraConfig = ''
       log_level "default"
       auto_update "yes"
-- 
cgit v1.2.3


From e6b18f0f178fa47ddb46952de6d103e2904d519a Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 5 Apr 2020 12:24:12 +0200
Subject: l radio skip_track: set music_dir

---
 lass/2configs/radio.nix | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'lass/2configs/radio.nix')

diff --git a/lass/2configs/radio.nix b/lass/2configs/radio.nix
index 639caa178..c89dc91e5 100644
--- a/lass/2configs/radio.nix
+++ b/lass/2configs/radio.nix
@@ -16,7 +16,10 @@ let
   '';
 
   skip_track = pkgs.writeDashBin "skip_track" ''
+    set -eu
+
     ${add_random}/bin/add_random
+    music_dir=${escapeShellArg music_dir}
     current_track=$(${pkgs.mpc_cli}/bin/mpc current -f %file%)
     track_infos=$(${print_current}/bin/print_current)
     skip_count=$(${pkgs.attr}/bin/getfattr -n user.skip_count --only-values "$current_track" || echo 0)
-- 
cgit v1.2.3


From 0a9aa4bc575364ec7a4d477ea98325a8282fde56 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 8 Apr 2020 11:13:54 +0200
Subject: l radio: prefix commands with the_playlist:

---
 lass/2configs/radio.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'lass/2configs/radio.nix')

diff --git a/lass/2configs/radio.nix b/lass/2configs/radio.nix
index c89dc91e5..1a5aadeba 100644
--- a/lass/2configs/radio.nix
+++ b/lass/2configs/radio.nix
@@ -22,7 +22,7 @@ let
     music_dir=${escapeShellArg music_dir}
     current_track=$(${pkgs.mpc_cli}/bin/mpc current -f %file%)
     track_infos=$(${print_current}/bin/print_current)
-    skip_count=$(${pkgs.attr}/bin/getfattr -n user.skip_count --only-values "$current_track" || echo 0)
+    skip_count=$(${pkgs.attr}/bin/getfattr -n user.skip_count --only-values "$music_dir"/"$current_track" || echo 0)
     if [ "$skip_count" -gt 2 ]; then
       mv "$music_dir"/"$current_track" "$music_dir"/.graveyard/
       echo killing: "$track_infos"
@@ -193,11 +193,15 @@ in {
     };
   };
 
+  # allow reaktor2 to modify files
+  systemd.services."reaktor2-the_playlist".serviceConfig.DynamicUser = mkForce false;
+
   krebs.reaktor2.the_playlist = {
     hostname = "irc.freenode.org";
     port = "6697";
     useTLS = true;
     nick = "the_playlist";
+    username = "radio";
     plugins = [
       {
         plugin = "register";
@@ -214,8 +218,8 @@ in {
           workdir = config.krebs.reaktor2.the_playlist.stateDir;
           hooks.PRIVMSG = [
             {
-              #activate = "match";
-              pattern = "^\\s*([0-9A-Za-z._][0-9A-Za-z._-]*)(?:\\s+(.*\\S))?\\s*$";
+              activate = "match";
+              pattern = "^(?:.*\\s)?\\s*the_playlist:\\s*([0-9A-Za-z._][0-9A-Za-z._-]*)(?:\\s+(.*\\S))?\\s*$";
               command = 1;
               arguments = [2];
               commands = {
-- 
cgit v1.2.3


From 0578d851885e59b317d653982b7b74f10739b9f3 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 8 Apr 2020 12:33:08 +0200
Subject: syncthing: use upstream module

---
 lass/2configs/radio.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lass/2configs/radio.nix')

diff --git a/lass/2configs/radio.nix b/lass/2configs/radio.nix
index 1a5aadeba..74b15a0ab 100644
--- a/lass/2configs/radio.nix
+++ b/lass/2configs/radio.nix
@@ -277,9 +277,9 @@ in {
       alias ${html};
     '';
   };
-  krebs.syncthing.folders."the_playlist" = {
+  services.syncthing.declarative.folders."the_playlist" = {
     path = "/home/radio/music/the_playlist";
-    peers = [ "mors" "phone" "prism" "xerxes" ];
+    devices = [ "mors" "phone" "prism" "xerxes" ];
   };
   krebs.permown."/home/radio/music/the_playlist" = {
     owner = "radio";
-- 
cgit v1.2.3

[cgit] Unable to lock slot /tmp/cgit/fc100000.lock: No such file or directory (2)