From f1ec4c566878127cb35a1e597d2300a86fb3d38c Mon Sep 17 00:00:00 2001 From: William McBrine Date: Fri, 15 Jun 2012 22:49:43 -0400 Subject: [PATCH] The regexes for some music playlist types didn't necessarily stop grouping at the first quote. Reported by "HoustonG". --- plugins/music/music.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/music/music.py b/plugins/music/music.py index 192b6ae..15aa0d1 100644 --- a/plugins/music/music.py +++ b/plugins/music/music.py @@ -36,9 +36,9 @@ TAGNAMES = {'artist': ['\xa9ART', 'Author'], 'genre': ['\xa9gen', u'WM/Genre']} # Search strings for different playlist types -asxfile = re.compile('ref +href *= *"(.+)"', re.IGNORECASE).search -wplfile = re.compile('media +src *= *"(.+)"', re.IGNORECASE).search -b4sfile = re.compile('Playstring="file:(.+)"').search +asxfile = re.compile('ref +href *= *"([^"]*)"', re.IGNORECASE).search +wplfile = re.compile('media +src *= *"([^"]*)"', re.IGNORECASE).search +b4sfile = re.compile('Playstring="file:([^"]*)"').search plsfile = re.compile('[Ff]ile(\d+)=(.+)').match plstitle = re.compile('[Tt]itle(\d+)=(.+)').match plslength = re.compile('[Ll]ength(\d+)=(\d+)').match -- 2.11.4.GIT