From be9e6f6da868e6ef68291be954f63eb30b216c5e Mon Sep 17 00:00:00 2001 From: yves Date: Sat, 8 Jun 2013 21:34:39 +0200 Subject: splitted --- rtttl.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/rtttl.py b/rtttl.py index b0dcc05..7157fce 100644 --- a/rtttl.py +++ b/rtttl.py @@ -12,8 +12,8 @@ import time BAUDRATE = 9600 PAUSE = .001 -_rtttl_re = re.compile('([0-9]+)?([a-hp]#?)(\.?)([0-9]?)(?:(?:,[ \n]*|$))') -_rtttl_prefix_re = re.compile('d=([0-9]+),o=([1-5]),b=([0-9]+)') +_rtttl_re = re.compile('^\s*([0-9]+)?([a-hp]#?)(\.?)([0-9]?)\s*$') +_rtttl_prefix_re = re.compile('d=([0-9]+),\s?o=([1-5]),\s?b=([0-9]+)') freqs = { 'a': 440.000, @@ -41,7 +41,15 @@ def parse(s): octave = int(o) timefactor = int(b)/60 - for m in _rtttl_re.finditer(music): + # for m in _rtttl_re.finditer(music): + for tone in music.split(","): + + m = _rtttl_re.match(tone) + + if not m: + print("Didn't match:",music) + continue + l, t, ld, o = m.groups() if l: -- cgit v1.2.3-1-g7c22 From 8946d88bdacaf45331b9814370fb060effbd0b26 Mon Sep 17 00:00:00 2001 From: Marian Sigler Date: Sat, 8 Jun 2013 22:00:07 +0200 Subject: remove whitespace --- rtttl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rtttl.py b/rtttl.py index 7157fce..c741974 100644 --- a/rtttl.py +++ b/rtttl.py @@ -49,7 +49,7 @@ def parse(s): if not m: print("Didn't match:",music) continue - + l, t, ld, o = m.groups() if l: -- cgit v1.2.3-1-g7c22