fix with nested brackets in a format

1 files changed, 5 insertions, 3 deletions

diff --git a/format.py b/format.py
index 12a00fd..f08d1d1 100644
--- a/format.py
+++ b/format.py
@@ -70,7 +70,7 @@ def match_bracket(string, start):
 	balance=1
 	start+=1
 	while balance>0:
-		if start>len(string):
+		if start<=0:
 			raise Exception("No matching bracket found")
 		l=string.find("(", start)
 		r=string.find(")", start)
@@ -78,10 +78,11 @@ def match_bracket(string, start):
 		if l<0:
 			if r>0:	balance-=1
 			else:	return -1
+			start=r+1
 		else:
 			if l<r:	balance+=1
-			elif r<l:	balance-=1
-		start=min(l,r)+1
+			elif l>r:	balance-=1
+			start=min(l,r)+1
 	
 	if balance==0:
 		return r+1
@@ -100,6 +101,7 @@ def params(song, overwrite={}, ensure={"title":"", "artist":""\
 		params[param]=overwrite[param]
 	return params
 
+#f=compile("$if($date, ($date) )")
 #f=compile("a$if($title,$title)b$if($artist,$artist)c")
 #print f({'state':'playing', 'title':'martha', 'artist':'waits'})
 #f=compile("$artist $if($title, titeltje:$artist, $artist $title!) $album")