Compare commits

..

2 Commits

Author SHA1 Message Date
Storm Dragon 0d618a76e7 Keep sound paths independent from API data 2026-06-19 11:22:56 -04:00
Storm Dragon 8c4dcd1f87 Harden sound notification playback 2026-06-19 01:49:00 -04:00
+41 -6
View File
@@ -13,6 +13,9 @@
# notifytype=soundpack # Enable sound notifications
# notifies=default,mention,dm,me,follow,boost,favourite
my $soundDataDir = ($ENV{'XDG_DATA_HOME'} || "$ENV{'HOME'}/.local/share") .
"/ttyverse";
sub notifier_soundpack {
my $class = shift;
my $text = shift;
@@ -47,24 +50,56 @@ sub notifier_soundpack {
return 1;
}
# Build sound file path using XDG data directory
my $data_dir = "$ENV{'HOME'}/.local/share/ttyverse";
my $sound_file = "$data_dir/sounds/$sound_pack/" . lc($class) . ".ogg";
unless ($sound_pack =~ /^[A-Za-z0-9_.-]+$/ && $class =~ /^[A-Za-z0-9_.-]+$/) {
print $stdout "-- Warning: Invalid sound pack or notification class\n";
return 1;
}
my $sound_file = "$soundDataDir/sounds/$sound_pack/" . lc($class) . ".ogg";
if (!-f $sound_file) {
# Only warn once per session per class
my $warn_key = "warned_missing_sound_$class";
if (!$store->{$warn_key}) {
print $stdout "-- Warning: Sound file '$class.ogg' not found in pack '$sound_pack'\n";
print $stdout "-- Place sound files in $data_dir/sounds/$sound_pack/\n";
print $stdout "-- Place sound files in $soundDataDir/sounds/$sound_pack/\n";
$store->{$warn_key} = 1;
}
return 1;
}
# Play the sound in background (suppress output)
require Text::ParseWords;
my @soundCommand = Text::ParseWords::shellwords($sound_command);
unless (scalar(@soundCommand)) {
print $stdout "-- Warning: Sound command is empty\n";
return 1;
}
# Double-fork so playback cannot block the client and does not leave a
# child process waiting to be reaped. List-form exec avoids shell parsing.
print $stdout "-- DEBUG: Playing sound: $sound_command \"$sound_file\"\n" if ($verbose);
system("$sound_command \"$sound_file\" >/dev/null 2>&1 &");
my $playerPid = fork();
unless (defined($playerPid)) {
print $stdout "-- Warning: Could not start sound player: $!\n";
return 1;
}
if (!$playerPid) {
# Prevent TTYverse's END handler from shutting down the main client
# when either detached playback process exits.
$in_backticks = 1;
my $playbackPid = fork();
exit 1 unless (defined($playbackPid));
exit 0 if ($playbackPid);
unless ($verbose) {
open(STDOUT, '>', '/dev/null');
}
if (!exec { $soundCommand[0] } @soundCommand, $sound_file) {
print STDERR "TTYverse could not execute sound player '$soundCommand[0]': $!\n";
exit 127;
}
}
waitpid($playerPid, 0);
return 1;
}