summaryrefslogtreecommitdiffstats
path: root/scripts/spotify.pl
diff options
context:
space:
mode:
authorDavid Leadbeater2014-10-13 15:13:06 +0100
committerDavid Leadbeater2014-10-13 15:13:06 +0100
commitc4488751a63333d5cc07e91d41bdd314e1943301 (patch)
tree7e28eda8366a591e41274c58619f595a835ef977 /scripts/spotify.pl
parent6f2d27c884e39c14042a3e933ea55d37edca8458 (diff)
parent579995c9f012eba2207a4bf5bc53e0c1ec576007 (diff)
downloadscripts.irssi.org-c4488751a63333d5cc07e91d41bdd314e1943301.tar.bz2
Merge pull request #55 from op/http-url-fix
Actually work with HTTP links
Diffstat (limited to 'scripts/spotify.pl')
-rw-r--r--scripts/spotify.pl11
1 files changed, 8 insertions, 3 deletions
diff --git a/scripts/spotify.pl b/scripts/spotify.pl
index 92f82e4..607b44a 100644
--- a/scripts/spotify.pl
+++ b/scripts/spotify.pl
@@ -18,7 +18,7 @@
use strict;
use vars qw($VERSION %IRSSI);
-$VERSION = '1.0';
+$VERSION = '1.1';
%IRSSI = (
authors => 'Örjan Persson',
contact => 'o@42mm.org',
@@ -413,10 +413,15 @@ sub spotify_lookup {
my $writer = shift;
my ($uri, $manual) = @{$_[0]};
+ # Remove any leading whitespace and trailing whitespace and dots
$uri =~ s/^\s+//g;
$uri =~ s/[\s\.]+$//g;
- my $u = URI->new($uri);
- my @parts = split /[\/:]/, URI->new($uri)->path;
+
+ # Unify how we look at the path, removing leading / to match how path looks
+ # for URIs with : where the path never starts with a :.
+ my $u = URI->new($uri)->path;
+ $u =~ s/^\///;
+ my @parts = split /[\/:]/, $u;
my $path;
my $auth;