Merge branch 'master' of /tank/andrew/code/scripts

diff --git a/i3blocks-music.pl b/i3blocks-music.pl
index 62e3a16ec0d46333dba4a1eeb822a96e15e53607..b24f6b1625792421d7c7d551f1d199ed6b79645a 100755 (executable)
--- a/i3blocks-music.pl
+++ b/i3blocks-music.pl
@@ -19,7 +19,7 @@ if (not m/Playing/) {
   print("<span color='#586e75'>");
 }
 else {
- print("<span>");
+ print("<span>♪ ");
 }
 
 # Obtain & format metadata from playerctl
@@ -28,12 +28,12 @@ push(@metadata, $artist) if $artist;
 
 my $title = qx(playerctl $player_arg metadata title);
 $title =~ s/(\s|\s\()[Ff]([et]at[. ].*|t.*)//;
-$title =~ s/(\s\(.+\) *|\s-\s.+)//;
-$title =~ s/&/&amp;/;
+$title =~ s/((\s(\(|\[).+(\)|\]).*)|(\s-\s.+))//;
 push(@metadata, $title) if $title;
 
 for (@metadata){
-  s/\n//;
+  s/\n//;   # remove newlines
+  s/&/&amp;/;   # fix ampersand rendering for i3bar
 }
 
 # Print stuff