X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/30068e6d43270e37b0f5c3620cb1ec43d54d1d61..e555fac76a951f1433487e5215966aee640b9407:/bin/disorder-notify

diff --git a/bin/disorder-notify b/bin/disorder-notify
index 757e12f..84c702f 100755
--- a/bin/disorder-notify
+++ b/bin/disorder-notify
@@ -3,16 +3,16 @@
 sub notify ($$) {
   my ($head, $body) = @_;
 
+  $body =~ s:\&:&:g;
+  $body =~ s:\<:&lt;:g;
+  $body =~ s:\>:&gt;:g;
   my $kid = fork;
   defined $kid or return;
   if (!$kid) {
     open STDOUT, ">", "/dev/null";
-    exec "gdbus", "call", "-e",
-      "-d", "org.freedesktop.Notifications",
-      "-o", "/org/freedesktop/Notifications",
-      "-m", "org.freedesktop.Notifications.Notify", "--",
-      "DisOrder", "0", "audio-volume-high",
-      $head, $body, "[]", "{}", "5000";
+    exec "notify-send",
+      "-c", "DisOrder", "-i", "audio-volume-high", "-t", "5000",
+      $head, $body;
   }
   waitpid $kid, 0;
 }
@@ -27,8 +27,13 @@ sub cmd (@) {
   else { return "??? multiple lines"; }
 }
 
-sub now_playing ($) {
+sub now_playing (;$) {
   my ($track) = @_;
+  if (!defined $track) {
+    my @r = cmd "playing";
+    if ($r[0] =~ /^track\s+(.*)$/) { $track = $1; }
+    else { return; }
+  }
   my %p;
   for my $p ("artist", "album", "title")
     { $p{$p} = cmd "part", $track, "display", $p; }
@@ -43,6 +48,8 @@ sub now_playing ($) {
 
 for (;;) {
   open my $log, "-|", "disorder", "log";
+  my $startp = 1;
+  my $stateinfo = undef;
   LINE: while (<$log>) {
     chomp;
     my @f = ();
@@ -71,18 +78,30 @@ for (;;) {
     push @f, $t if defined $t;
 
     my $what = $f[1];
-    if ($what eq "state") {
+    if ($what eq "volume" && $startp) {
+      $startp = 0;
+      notify "DisOrder state", "Connected: $startinfo";
+      now_playing;
+    } elsif ($what eq "state") {
       my $st = $f[2];
       my $msg;
+      my $np = 0;
       if ($st eq "disable_random") { $msg = "random play disabled"; }
       elsif ($st eq "enable_random") { $msg = "random play enabled"; }
       elsif ($st eq "disable_play") { $msg = "playing disabled"; }
       elsif ($st eq "enable_play") { $msg = "playing enabled"; }
       elsif ($st eq "pause") { $msg = "paused"; }
-      elsif ($st eq "resume") { $msg = "playing"; }
+      elsif ($st eq "resume") { $msg = "playing"; $np = 1; }
       else { next LINE; }
-      notify "DisOrder state", ucfirst $msg;
+      if (!$startp) {
+	notify "DisOrder state", ucfirst $msg;
+	now_playing if $np;
+      } else {
+	if (defined $startinfo) { $startinfo .= "; " . $msg; }
+	else { $startinfo = $msg; }
       }
+    } elsif ($what eq "scratched") {
+      notify "DisOrder state", "Scratched playing track";
     } elsif ($what eq "playing") {
       now_playing $f[2];
     }