openlp-core team mailing list archive

["M. Bernis" <mbernis@xxxxxxxx>]

M. Bernis has proposed merging lp:~mbernis/openlp/chordpro_format into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~mbernis/openlp/chordpro_format/+merge/271233

add regular expression filter to remove chords on direct, but keep them for remote app.

I don't have a jenkins account for ci, but all tests passed at home.
-- 
Your team OpenLP Core is requested to review the proposed merge of lp:~mbernis/openlp/chordpro_format into lp:openlp.

=== modified file 'openlp/core/lib/serviceitem.py'
--- openlp/core/lib/serviceitem.py	2015-09-08 19:13:59 +0000
+++ openlp/core/lib/serviceitem.py	2015-09-16 05:38:29 +0000
@@ -30,6 +30,7 @@
 import os
 import uuid
 import ntpath
+import re
 
 from PyQt4 import QtGui
 
@@ -259,9 +260,11 @@
                     pages = self.renderer.format_slide(slide['raw_slide'], self)
                     previous_pages[verse_tag] = (slide['raw_slide'], pages)
                 for page in pages:
-                    page = page.replace('<br>', '{br}')
+                    # regular expression remove chords from song text. raw_slide is added for remote app using chords.
+                    page = re.compile('\[[^\]]+\]').sub('', page).replace('<br>', '{br}')
                     html_data = expand_tags(html.escape(page.rstrip()))
                     self._display_frames.append({
+                        'raw': slide['raw_slide'],
                         'title': clean_tags(page),
                         'text': clean_tags(page.rstrip()),
                         'html': html_data.replace('&amp;nbsp;', '&nbsp;'),