From b5075ccddf261b6dc97eddd724a420006b21b40e Mon Sep 17 00:00:00 2001 From: M2j Date: Sun, 12 Dec 2010 00:54:07 +0100 Subject: [PATCH 01/27] Bible web import from Bibleserver.com - first version --- .../plugins/bibles/forms/bibleimportform.py | 31 ++++++- .../plugins/bibles/forms/bibleimportwizard.py | 3 + openlp/plugins/bibles/lib/http.py | 85 ++++++++++++++++++- 3 files changed, 115 insertions(+), 4 deletions(-) diff --git a/openlp/plugins/bibles/forms/bibleimportform.py b/openlp/plugins/bibles/forms/bibleimportform.py index 70a06fc0c..9bacd7fae 100644 --- a/openlp/plugins/bibles/forms/bibleimportform.py +++ b/openlp/plugins/bibles/forms/bibleimportform.py @@ -43,10 +43,12 @@ class WebDownload(object): Unknown = -1 Crosswalk = 0 BibleGateway = 1 + Bibleserver = 2 Names = { 0: u'Crosswalk', - 1: u'BibleGateway' + 1: u'BibleGateway', + 2: u'Bibleserver' } @classmethod @@ -230,8 +232,7 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard): The index of the combo box. """ self.bibleComboBox.clear() - bibles = [unicode(translate('BiblesPlugin.ImportWizardForm', bible)) for - bible in self.web_bible_list[index].keys()] + bibles = self.web_bible_list[index].keys() bibles.sort() for bible in bibles: self.bibleComboBox.addItem(bible) @@ -383,6 +384,27 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard): if books_file: books_file.close() + # Load and store Bibleserver Bibles. + filepath = AppLocation.get_directory(AppLocation.PluginsDir) + filepath = os.path.join(filepath, u'bibles', u'resources') + books_file = None + try: + self.web_bible_list[WebDownload.Bibleserver] = {} + books_file = open( + os.path.join(filepath, u'bibleserver.csv'), 'rb') + dialect = csv.Sniffer().sniff(books_file.read(1024)) + books_file.seek(0) + books_reader = csv.reader(books_file, dialect) + for line in books_reader: + ver = unicode(line[0], u'utf-8') + name = unicode(line[1], u'utf-8') + self.web_bible_list[WebDownload.Bibleserver][ver] = name.strip() + except IOError, UnicodeError: + log.exception(u'Bibelserver resources could not be imported') + finally: + if books_file: + books_file.close() + def getFileName(self, title, editbox): filename = QtGui.QFileDialog.getOpenFileName(self, title, SettingsManager.get_last_dir(self.bibleplugin.settingsSection, 1)) @@ -455,6 +477,9 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard): elif download_location == WebDownload.BibleGateway: bible = \ self.web_bible_list[WebDownload.BibleGateway][bible_version] + elif download_location == WebDownload.Bibleserver: + bible = \ + self.web_bible_list[WebDownload.Bibleserver][bible_version] importer = self.manager.import_bible( BibleFormat.WebDownload, name=license_version, diff --git a/openlp/plugins/bibles/forms/bibleimportwizard.py b/openlp/plugins/bibles/forms/bibleimportwizard.py index 4f6e0f624..fbbba22bf 100644 --- a/openlp/plugins/bibles/forms/bibleimportwizard.py +++ b/openlp/plugins/bibles/forms/bibleimportwizard.py @@ -208,6 +208,7 @@ class Ui_BibleImportWizard(object): self.locationComboBox.setObjectName(u'LocationComboBox') self.locationComboBox.addItem(u'') self.locationComboBox.addItem(u'') + self.locationComboBox.addItem(u'') self.downloadOptionsLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.locationComboBox) self.bibleLabel = QtGui.QLabel(self.downloadOptionsTab) @@ -383,6 +384,8 @@ class Ui_BibleImportWizard(object): translate('BiblesPlugin.ImportWizardForm', 'Crosswalk')) self.locationComboBox.setItemText(1, translate('BiblesPlugin.ImportWizardForm', 'BibleGateway')) + self.locationComboBox.setItemText(2, + translate('BiblesPlugin.ImportWizardForm', 'Bibleserver')) self.bibleLabel.setText( translate('BiblesPlugin.ImportWizardForm', 'Bible:')) self.webDownloadTabWidget.setTabText( diff --git a/openlp/plugins/bibles/lib/http.py b/openlp/plugins/bibles/lib/http.py index dade3ad44..9ee445431 100644 --- a/openlp/plugins/bibles/lib/http.py +++ b/openlp/plugins/bibles/lib/http.py @@ -240,6 +240,87 @@ class BGExtract(object): return SearchResults(bookname, chapter, verse_list) +class BSExtract(object): + """ + Extract verses from Bibleserver.com + """ + def __init__(self,proxyurl=None): + log.debug(u'init %s', proxyurl) + self.proxyurl = proxyurl + + def get_bible_chapter(self, version, bookname, chapter): + """ + Access and decode bibles via http://m.Bibleserver.com + + ``version`` + The version of the bible like NIV for New International Version + + ``bookname`` + Text name of in english e.g. 'gen' for Genesis + + ``chapter`` + Chapter number + """ + print(bookname) + log.debug(u'get_bible_chapter %s,%s,%s', version, bookname, chapter) + bookindex = self._get_book_index(bookname) + if chapter < 10: + chapter_string = u'00' + unicode(chapter) + elif chapter < 100: + chapter_string = u'0' + unicode(chapter) + else: + chapter_string = unicode(chapter) + chapter_url = u'http://m.bibleserver.com/text/%s/%s%s000' % \ + (version, bookindex, chapter_string) + log.debug(u'URL: %s', chapter_url) + page = None + try: + page = urllib2.urlopen(chapter_url) + Receiver.send_message(u'openlp_process_events') + except urllib2.URLError: + log.exception(u'The web bible page could not be downloaded.') + finally: + if not page: + return None + soup = None + try: + soup = BeautifulSoup(page) + except HTMLParseError: + log.exception(u'BeautifulSoup could not parse the bible page.') + finally: + if not soup: + return None + Receiver.send_message(u'openlp_process_events') + content = soup.find(u'div', u'content').find(u'div').findAll(u'div') + verse_number = re.compile(r'v\d{5}(\d{3}) verse') + verses = {} + for verse in content: + Receiver.send_message(u'openlp_process_events') + versenumber = int(verse_number.sub(r'\1', verse[u'class'])) + verses[versenumber] = verse.contents[1].rstrip(u'\n') + return SearchResults(bookname, chapter, verses) + def _get_book_index(self, bookname): + print bookname + bookmap = {u'Gen': u'01', u'Exod': u'02', u'Lev': u'03', + u'Num': u'04', u'Deut': u'05', u'Josh': u'06', u'Judg': u'07', + u'Ruth': u'08', u'1Sam': u'09', u'2Sam': u'10', u'1Kgs': u'11', + u'2Kgs': u'12', u'1Chr': u'13', u'2Chr': u'14', u'Ezra': u'15', + u'Neh': u'16', u'Esth': u'17', u'Job': u'18', u'Ps': u'19', + u'Prov': u'20', u'Eccl': u'21', u'Song': u'22', u'Isa': u'23', + u'Jer': u'24', u'Lam': u'25', u'Ezek': u'26', u'Dan': u'27', + u'Hos': u'28', u'Joel': u'29', u'Amos': u'30', u'Obad': u'31', + u'Jonah': u'32', u'Mic': u'33', u'Nah': u'34', u'Hab': u'35', + u'Zeph': u'36', u'Hag': u'37', u'Zech': u'38', u'Mal': u'39', + u'Matt': u'40', u'Mark': u'41', u'Luke': u'42', u'John': u'43', + u'Acts': u'44', u'Rom': u'45', u'1Cor': u'46', u'2Cor': u'47', + u'Gal': u'48', u'Eph': u'49', u'Phil': u'50', u'Col': u'51', + u'1Thess':u'52', u'2Thess':u'53', u'1Tim': u'54', u'2Tim': u'55', + u'Titus': u'56', u'Phlm': u'57', u'Heb': u'58', u'Jas': u'59', + u'1Pet': u'60', u'2Pet': u'61', u'1John': u'62', u'2John':u'63', + u'3John': u'64', u'Jude': u'65', u'Rev': u'66'} + return bookmap[bookname] + + class CWExtract(object): """ Extract verses from CrossWalk/BibleStudyTools @@ -426,8 +507,10 @@ class HTTPBible(BibleDB): log.debug(u'source = %s', self.download_source) if self.download_source.lower() == u'crosswalk': ev = CWExtract(self.proxy_server) - else: + elif self.download_source.lower() == u'biblegateway': ev = BGExtract(self.proxy_server) + elif self.download_source.lower() == u'bibleserver': + ev = BSExtract(self.proxy_server) return ev.get_bible_chapter(self.download_name, book, chapter) def get_books(self): From fda30854492fb7a7ce886e3fd04a45c696dd03d6 Mon Sep 17 00:00:00 2001 From: M2j Date: Sun, 12 Dec 2010 01:03:51 +0100 Subject: [PATCH 02/27] resource added --- .../plugins/bibles/resources/bibleserver.csv | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 openlp/plugins/bibles/resources/bibleserver.csv diff --git a/openlp/plugins/bibles/resources/bibleserver.csv b/openlp/plugins/bibles/resources/bibleserver.csv new file mode 100644 index 000000000..cc0a843ce --- /dev/null +++ b/openlp/plugins/bibles/resources/bibleserver.csv @@ -0,0 +1,39 @@ +عربي, ARA +Bible, překlad 21. století, B21 +Bible du Semeur, BDS +Българската Библия, BLG +Český ekumenický překlad, CEP +Hrvatski, CRO +Священное Писание, CRS +Version La Biblia al Dia, CST +中文和合本（简体）, CUVS +Bibelen på hverdagsdansk, DK +Rev. Elberfelder, ELB +Einheitsübersetzung, EU +Gute Nachricht Bibel, GNB +Hoffnung für alle, HFA +Hungarian, HUN +Het Boek, HTB +La Parola è Vita, ITA +IBS-fordítás (Új Károli), KAR +King James Version, KJV +Luther 1984, LUT +Septuaginta, LXX +Neue Genfer Übersetzung, NGÜ +New Int. Readers Version, NIRV +New International Version, NIV +Neues Leben, NL +En Levende Bok, NOR +Nádej pre kazdého, NPK +Noua traducere în limba românã, NTR +Nueva Versión Internacional, NVI +Hebrew OT, OT +Słowo Życia, POL +O Livro, PRT +Новый перевод на русский язык, RUS +Slovo na cestu, SNC +Schlachter 2000, SLT +En Levande Bok, SVL +Today's New International Version, TNIV +Türkçe, TR +Vulgata, VUL From 6e834900e680d151b27387aa31794f9336924af6 Mon Sep 17 00:00:00 2001 From: M2j Date: Mon, 13 Dec 2010 20:06:07 +0100 Subject: [PATCH 03/27] rewritten bible reference parser with more features and localisation capabilities (first, untested version) --- openlp/plugins/bibles/lib/__init__.py | 108 ++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/openlp/plugins/bibles/lib/__init__.py b/openlp/plugins/bibles/lib/__init__.py index a6fc03045..a1845c0b9 100644 --- a/openlp/plugins/bibles/lib/__init__.py +++ b/openlp/plugins/bibles/lib/__init__.py @@ -32,6 +32,114 @@ import re log = logging.getLogger(__name__) +BIBLE_SEPARATORS = {u'sep_v': r'\s*,\s*', u'sep_r': r'\s*-\s*', u'sep_l': r'\.'} + +BIBLE_RANGE_REGEX = str(r'(?:(?P[0-9]+)%(sep_v)s)?' + r'(?P[0-9]+)(?:%(sep_r)s(?:(?:(?P[0-9]+)%(sep_v)s)?' + r'(?P[0-9]+))?)?' % BIBLE_SEPARATORS) + +BIBLE_RANGE = re.compile(r'^\s*' + BIBLE_RANGE_REGEX + r'\s*$', re.UNICODE) + +BIBLE_REFERENCE_NG = re.compile(str(r'^\s*?(?P[\d]*[^\d]+)\s*?' + r'(?P(?:' + BIBLE_RANGE_REGEX + r'(?:%(sep_l)s|(?=\s*\n)))+)\s*$') % + BIBLE_SEPARATORS, re.UNICODE) + +def parse_reference_ng(reference): + """ + This is the next generation über-awesome function that takes a person's + typed in string and converts it to a reference list, a list of references to + be queried from the Bible database files. + + The ``BIBLE_RANGE`` regular expression produces match groups for verse range + declarations: + + 1. ``(?:(?P[0-9]+)%(sep_v)s)?' + It starts with a optional chapter reference ``from_chapter`` followed by + a verse separator. + 2. ``(?P[0-9]+)`` + The verse reference ``from_verse`` is manditory + ``(?:%(sep_r)s(?:`` ... ``)?)?`` + A range declaration is optional. It starts with a range seperator and + contains a optional chapter and verse declaration + 3. ``(?:(?P[0-9]+)%(sep_v)s)?`` + The ``to_chapter`` reference with seperator is equivalent to group 1. + 4. ``(?P[0-9]+)?)?`` + The ``to_verse`` reference is equivalent to group 2. + + The ``BIBLE_REFERENCE`` regular expression produces matched groups for the + whole reference string: + + 1. ``\s*?(?P[\d]*[^\d]+)\s*?`` + The ``book`` group starts with the first non-whitespace character. There + are optional leading digits followed by non-digits. The group ends + before the whitspace in front of the next digit. + 2. ``(?P(?:`` + BIBLE_RANGE_REGEX + + ``(?:%(sep_l)s|(?=\s*\\n)))+)\s*$`` + The sechon group contains all ``ranges``. This can be multiple + declarations of a BIBLE_RANGE separated by a list separator. + + ``BIBLE_SEPARATORS`` is a dict which defines the separator formats. It might + be used to localize the bible references. + + The reference list is a list of tuples, with each tuple structured like + this:: + + (book, chapter, from_verse, to_verse) + + ``reference`` + The bible reference to parse. + + Returns None or a reference list. + """ + + log.debug('parse_reference("%s")', reference) + if u'' in reference: + return + ref_list = [] + match = BIBLE_REFERENCE_NG.match(reference) + if match: + log.debug(u'Matched reference %s' % reference) + book = match.group(u'book') + ranges = match.group(u'ranges').split(r'\s*\.\s*') + chapter = 0 + for this_range in ranges: + range_match = BIBLE_RANGE.match(this_range) + from_chapter = int(u'0' + range_match.group('from_chapter')) + from_verse = int(u'0' + range_match.group('from_verse')) + to_chapter = int(u'0' + range_match.group('to_chapter')) + to_verse = int(u'0' + range_match.group('to_verse')) + # First reference has to be a chapter + if not unified_ref_list: + if not from_chapter: + from_chapter = from_verse + from_verse = 1 + # Fill missing chapter references with the last chapter + if from_chapter: + chapter = from_chapter + else: + from_chapter = chapter + if not from_verse: + from_verse = 1 + if to_chapter: + if to_chapter > from_chapter: + ref_list.append((book, from_chapter, from_verse, -1)) + for i in range(from_chapter + 1, to_chapter -1): + ref_list.append((book, i, 1, -1)) + ref_list.append((book, to_chapter, 1, to_verse)) + else: + if to_verse < from_verse: + to_verse = from_verse + ref_list.append((book, from_chapter, from_verse, to_verse)) + else: + if to_verse < from_verse: + to_verse = from_verse + ref_list.append((book, from_chapter, from_verse, to_verse)) + else: + log.debug(u'Invalid reference: %s' % reference) + return None + return ref_list + + BIBLE_REFERENCE = re.compile( r'^([\w ]+?) *([0-9]+)' # Initial book and chapter r'(?: *[:|v|V] *([0-9]+))?' # Verse for first chapter From d848dedb792145b0b9fb1496965fd4ac35da6548 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Tue, 14 Dec 2010 20:22:01 +0000 Subject: [PATCH 04/27] Fix custom edit bug Fixes: https://launchpad.net/bugs/690335 --- openlp/plugins/custom/forms/editcustomform.py | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/openlp/plugins/custom/forms/editcustomform.py b/openlp/plugins/custom/forms/editcustomform.py index c5281574b..01749b040 100644 --- a/openlp/plugins/custom/forms/editcustomform.py +++ b/openlp/plugins/custom/forms/editcustomform.py @@ -224,27 +224,27 @@ class EditCustomForm(QtGui.QDialog, Ui_CustomEditDialog): ``edit_all`` Indicates if all slides or only one slide has been edited. """ - if len(slides) == 1: - self.slideListView.currentItem().setText(slides[0]) +# if len(slides) == 1: +# self.slideListView.currentItem().setText(unicode(slides[0])) +# else: + if edit_all: + self.slideListView.clear() + for slide in slides: + self.slideListView.addItem(slide) else: - if edit_all: - self.slideListView.clear() - for slide in slides: - self.slideListView.addItem(slide) - else: - old_slides = [] - old_row = self.slideListView.currentRow() - # Create a list with all (old/unedited) slides. - old_slides = [self.slideListView.item(row).text() for row in \ - range(0, self.slideListView.count())] - self.slideListView.clear() - old_slides.pop(old_row) - # Insert all slides to make the old_slides list complete. - for slide in slides: - old_slides.insert(old_row, slide) - for slide in old_slides: - self.slideListView.addItem(slide) - self.slideListView.repaint() + old_slides = [] + old_row = self.slideListView.currentRow() + # Create a list with all (old/unedited) slides. + old_slides = [self.slideListView.item(row).text() for row in \ + range(0, self.slideListView.count())] + self.slideListView.clear() + old_slides.pop(old_row) + # Insert all slides to make the old_slides list complete. + for slide in slides: + old_slides.insert(old_row, slide) + for slide in old_slides: + self.slideListView.addItem(slide) + self.slideListView.repaint() def onDeleteButtonPressed(self): self.slideListView.takeItem(self.slideListView.currentRow()) From b9a97dd6511cb46d2e39ff3e9e0b39ab21324969 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Tue, 14 Dec 2010 20:22:57 +0000 Subject: [PATCH 05/27] Remove comments --- openlp/plugins/custom/forms/editcustomform.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/openlp/plugins/custom/forms/editcustomform.py b/openlp/plugins/custom/forms/editcustomform.py index 01749b040..359cc9eae 100644 --- a/openlp/plugins/custom/forms/editcustomform.py +++ b/openlp/plugins/custom/forms/editcustomform.py @@ -224,9 +224,6 @@ class EditCustomForm(QtGui.QDialog, Ui_CustomEditDialog): ``edit_all`` Indicates if all slides or only one slide has been edited. """ -# if len(slides) == 1: -# self.slideListView.currentItem().setText(unicode(slides[0])) -# else: if edit_all: self.slideListView.clear() for slide in slides: From 0e1383c35d2d7fbcdade859141c8d8a1bad5180a Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Wed, 15 Dec 2010 20:22:25 +0100 Subject: [PATCH 06/27] clean ups --- openlp/core/ui/filerenamedialog.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/openlp/core/ui/filerenamedialog.py b/openlp/core/ui/filerenamedialog.py index 02eefe7ed..4b1cf9411 100644 --- a/openlp/core/ui/filerenamedialog.py +++ b/openlp/core/ui/filerenamedialog.py @@ -30,23 +30,23 @@ from openlp.core.lib import translate class Ui_FileRenameDialog(object): def setupUi(self, FileRenameDialog): - FileRenameDialog.setObjectName("FileRenameDialog") + FileRenameDialog.setObjectName(u'FileRenameDialog') FileRenameDialog.resize(400, 87) self.buttonBox = QtGui.QDialogButtonBox(FileRenameDialog) self.buttonBox.setGeometry(QtCore.QRect(210, 50, 171, 25)) self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel | QtGui.QDialogButtonBox.Ok) - self.buttonBox.setObjectName("buttonBox") + self.buttonBox.setObjectName(u'buttonBox') self.widget = QtGui.QWidget(FileRenameDialog) self.widget.setGeometry(QtCore.QRect(10, 10, 381, 35)) - self.widget.setObjectName("widget") + self.widget.setObjectName(u'widget') self.horizontalLayout = QtGui.QHBoxLayout(self.widget) - self.horizontalLayout.setObjectName("horizontalLayout") + self.horizontalLayout.setObjectName(u'horizontalLayout') self.FileRenameLabel = QtGui.QLabel(self.widget) - self.FileRenameLabel.setObjectName("FileRenameLabel") + self.FileRenameLabel.setObjectName(u'FileRenameLabel') self.horizontalLayout.addWidget(self.FileRenameLabel) self.FileNameEdit = QtGui.QLineEdit(self.widget) - self.FileNameEdit.setObjectName("FileNameEdit") + self.FileNameEdit.setObjectName(u'FileNameEdit') self.horizontalLayout.addWidget(self.FileNameEdit) self.retranslateUi(FileRenameDialog) @@ -57,4 +57,3 @@ class Ui_FileRenameDialog(object): 'File Rename')) self.FileRenameLabel.setText(translate('OpenLP.FileRenameForm', 'New File Name:')) - From 4e9d6370b3bf2d6e0bd7683e974b0ae15763a087 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Thu, 16 Dec 2010 17:08:10 +0100 Subject: [PATCH 07/27] clean up --- openlp/core/ui/filerenamedialog.py | 14 +++++++------- openlp/core/ui/thememanager.py | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/openlp/core/ui/filerenamedialog.py b/openlp/core/ui/filerenamedialog.py index 4b1cf9411..600027940 100644 --- a/openlp/core/ui/filerenamedialog.py +++ b/openlp/core/ui/filerenamedialog.py @@ -42,12 +42,12 @@ class Ui_FileRenameDialog(object): self.widget.setObjectName(u'widget') self.horizontalLayout = QtGui.QHBoxLayout(self.widget) self.horizontalLayout.setObjectName(u'horizontalLayout') - self.FileRenameLabel = QtGui.QLabel(self.widget) - self.FileRenameLabel.setObjectName(u'FileRenameLabel') - self.horizontalLayout.addWidget(self.FileRenameLabel) - self.FileNameEdit = QtGui.QLineEdit(self.widget) - self.FileNameEdit.setObjectName(u'FileNameEdit') - self.horizontalLayout.addWidget(self.FileNameEdit) + self.fileRenameLabel = QtGui.QLabel(self.widget) + self.fileRenameLabel.setObjectName(u'fileRenameLabel') + self.horizontalLayout.addWidget(self.fileRenameLabel) + self.fileNameEdit = QtGui.QLineEdit(self.widget) + self.fileNameEdit.setObjectName(u'fileNameEdit') + self.horizontalLayout.addWidget(self.fileNameEdit) self.retranslateUi(FileRenameDialog) QtCore.QMetaObject.connectSlotsByName(FileRenameDialog) @@ -55,5 +55,5 @@ class Ui_FileRenameDialog(object): def retranslateUi(self, FileRenameDialog): FileRenameDialog.setWindowTitle(translate('OpenLP.FileRenameForm', 'File Rename')) - self.FileRenameLabel.setText(translate('OpenLP.FileRenameForm', + self.fileRenameLabel.setText(translate('OpenLP.FileRenameForm', 'New File Name:')) diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py index b6e8c3d7a..0b0d8281d 100644 --- a/openlp/core/ui/thememanager.py +++ b/openlp/core/ui/thememanager.py @@ -225,10 +225,10 @@ class ThemeManager(QtGui.QWidget): """ item = self.themeListWidget.currentItem() oldThemeName = unicode(item.data(QtCore.Qt.UserRole).toString()) - self.fileRenameForm.FileNameEdit.setText(oldThemeName) + self.fileRenameForm.fileNameEdit.setText(oldThemeName) self.saveThemeName = u'' if self.fileRenameForm.exec_(): - newThemeName = unicode(self.fileRenameForm.FileNameEdit.text()) + newThemeName = unicode(self.fileRenameForm.fileNameEdit.text()) oldThemeData = self.getThemeData(oldThemeName) self.deleteTheme(oldThemeName) self.cloneThemeData(oldThemeData, newThemeName) @@ -239,10 +239,10 @@ class ThemeManager(QtGui.QWidget): """ item = self.themeListWidget.currentItem() oldThemeName = unicode(item.data(QtCore.Qt.UserRole).toString()) - self.fileRenameForm.FileNameEdit.setText(oldThemeName) + self.fileRenameForm.fileNameEdit.setText(oldThemeName) self.saveThemeName = u'' if self.fileRenameForm.exec_(): - newThemeName = unicode(self.fileRenameForm.FileNameEdit.text()) + newThemeName = unicode(self.fileRenameForm.fileNameEdit.text()) themeData = self.getThemeData(oldThemeName) self.cloneThemeData(themeData, newThemeName) self.loadThemes() From ff9887039180f3e8e9f4b3b385d990389fd98b44 Mon Sep 17 00:00:00 2001 From: M2j Date: Thu, 16 Dec 2010 18:11:02 +0100 Subject: [PATCH 08/27] - bible imports broken by variable renaming - removed tab indentation --- openlp/core/ui/exceptionform.py | 2 +- openlp/plugins/bibles/lib/http.py | 2 +- openlp/plugins/bibles/lib/osis.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openlp/core/ui/exceptionform.py b/openlp/core/ui/exceptionform.py index 7ccf3fc4c..cc66f21d7 100644 --- a/openlp/core/ui/exceptionform.py +++ b/openlp/core/ui/exceptionform.py @@ -138,6 +138,6 @@ class ExceptionForm(QtGui.QDialog, Ui_ExceptionDialog): if re.search(r'[/\\]openlp[/\\]', line): source = re.sub(r'.*[/\\]openlp[/\\](.*)".*', r'\1', line) if u':' in line: - exception = line.split(u'\n')[-1].split(u':')[0] + exception = line.split(u'\n')[-1].split(u':')[0] subject = u'Bug report: %s in %s' % (exception, source) mailto(address=u'bugs@openlp.org', subject=subject, body=body % content) diff --git a/openlp/plugins/bibles/lib/http.py b/openlp/plugins/bibles/lib/http.py index dade3ad44..099cb1706 100644 --- a/openlp/plugins/bibles/lib/http.py +++ b/openlp/plugins/bibles/lib/http.py @@ -350,7 +350,7 @@ class HTTPBible(BibleDB): Run the import. This method overrides the parent class method. Returns ``True`` on success, ``False`` on failure. """ - self.wizard.ImportProgressBar.setMaximum(2) + self.wizard.importProgressBar.setMaximum(2) self.wizard.incrementProgressBar('Registering bible...') self.create_meta(u'download source', self.download_source) self.create_meta(u'download name', self.download_name) diff --git a/openlp/plugins/bibles/lib/osis.py b/openlp/plugins/bibles/lib/osis.py index 53a6f152c..f39a4ab0f 100644 --- a/openlp/plugins/bibles/lib/osis.py +++ b/openlp/plugins/bibles/lib/osis.py @@ -134,9 +134,9 @@ class OSISBible(BibleDB): testament) if last_chapter == 0: if book == u'Gen': - self.wizard.ImportProgressBar.setMaximum(1188) + self.wizard.importProgressBar.setMaximum(1188) else: - self.wizard.ImportProgressBar.setMaximum(260) + self.wizard.importProgressBar.setMaximum(260) if last_chapter != chapter: if last_chapter != 0: self.session.commit() From 95f30dfb6da75c582c509cfe6c75d617da2c4dc2 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Thu, 16 Dec 2010 18:56:08 +0100 Subject: [PATCH 09/27] fixed bug #690774 --- openlp/plugins/songs/lib/mediaitem.py | 33 +++++++++++++++------------ 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py index dc8310e9d..224063c47 100644 --- a/openlp/plugins/songs/lib/mediaitem.py +++ b/openlp/plugins/songs/lib/mediaitem.py @@ -44,6 +44,7 @@ class SongListView(BaseListWithDnD): self.PluginName = u'Songs' BaseListWithDnD.__init__(self, parent) + class SongMediaItem(MediaManagerItem): """ This is the custom media manager item for Songs. @@ -392,7 +393,7 @@ class SongMediaItem(MediaManagerItem): author_audit.append(unicode(author.display_name)) raw_footer.append(song.title) raw_footer.append(author_list) - raw_footer.append(song.copyright ) + raw_footer.append(song.copyright) raw_footer.append(unicode( translate('SongsPlugin.MediaItem', 'CCLI License: ') + QtCore.QSettings().value(u'general/ccli number', @@ -417,26 +418,30 @@ class SongMediaItem(MediaManagerItem): item.data_string[u'title'].split(u'@')[0].lower() , Song.search_title.asc()) author_list = item.data_string[u'authors'].split(u', ') + # The service item always has an author (at least it has u'' + # as author). However, songs saved in the database do not + # have to have an author. + if u'' in author_list: + author_list.remove(u'') editId = 0 uuid = item._uuid + add_song = True if search_results: for song in search_results: - count = 0 + same_author = True for author in song.authors: - if author.display_name in author_list: - count += 1 - # All Authors the same - if count == len(author_list): + if author.display_name not in author_list: + same_author = False + # All Authors the same, so we can stop here and the song + # does not have to be saved. + if same_author: editId = song.id - else: - # Authors different - if self.addSongFromService: - editId = self.openLyrics. \ - xml_to_song(item.xml_version) - else: - # Title does not match + add_song = False + break + if add_song: + # Authors different if self.addSongFromService: - editId = self.openLyrics.xml_to_song(item.xml_version) + editId = self.openLyrics. xml_to_song(item.xml_version) # Update service with correct song id if editId != 0: Receiver.send_message(u'service_item_update', From e6bc3b930348d6c6a9140b86f155a2d7ae8d1023 Mon Sep 17 00:00:00 2001 From: M2j Date: Thu, 16 Dec 2010 19:20:46 +0100 Subject: [PATCH 10/27] song search strings: handle unicode and reindex also search_lyric --- openlp/plugins/songs/forms/editsongform.py | 3 ++- openlp/plugins/songs/lib/songimport.py | 2 +- openlp/plugins/songs/songsplugin.py | 12 ++++++++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py index b7f4a3f0b..58488a6e9 100644 --- a/openlp/plugins/songs/forms/editsongform.py +++ b/openlp/plugins/songs/forms/editsongform.py @@ -108,6 +108,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): self.TopicsListView.setSortingEnabled(False) self.TopicsListView.setAlternatingRowColors(True) self.findVerseSplit = re.compile(u'---\[\]---\n', re.UNICODE) + self.whitespace = re.compile(r'\W+', re.UNICODE) def initialise(self): self.VerseEditButton.setEnabled(False) @@ -738,7 +739,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): verseId = unicode(item.data(QtCore.Qt.UserRole).toString()) bits = verseId.split(u':') sxml.add_verse_to_lyrics(bits[0], bits[1], unicode(item.text())) - text = text + re.sub(r'\W+', u' ', + text = text + whitespace.sub(u' ', unicode(self.VerseListWidget.item(i, 0).text())) + u' ' if (bits[1] > u'1') and (bits[0][0] not in multiple): multiple.append(bits[0][0]) diff --git a/openlp/plugins/songs/lib/songimport.py b/openlp/plugins/songs/lib/songimport.py index ea36d55b5..f305b90c7 100644 --- a/openlp/plugins/songs/lib/songimport.py +++ b/openlp/plugins/songs/lib/songimport.py @@ -247,7 +247,7 @@ class SongImport(QtCore.QObject): """ Extracts alphanumeric words for searchable fields """ - return re.sub(r'\W+', u' ', text) + return re.sub(r'\W+', u' ', text, re.UNICODE) def finish(self): """ diff --git a/openlp/plugins/songs/songsplugin.py b/openlp/plugins/songs/songsplugin.py index 32336c507..b55b05988 100644 --- a/openlp/plugins/songs/songsplugin.py +++ b/openlp/plugins/songs/songsplugin.py @@ -31,7 +31,7 @@ from PyQt4 import QtCore, QtGui from openlp.core.lib import Plugin, StringContent, build_icon, translate from openlp.core.lib.db import Manager -from openlp.plugins.songs.lib import SongMediaItem, SongsTab +from openlp.plugins.songs.lib import SongMediaItem, SongsTab, SongXMLParser from openlp.plugins.songs.lib.db import init_schema, Song from openlp.plugins.songs.lib.importer import SongFormat @@ -150,9 +150,13 @@ class SongsPlugin(Plugin): song.title = u'' if song.alternate_title is None: song.alternate_title = u'' - song.search_title = self.whitespace.sub(u' ', \ - song.title.lower()) + u' ' + \ - self.whitespace.sub(u' ', song.alternate_title.lower()) + song.search_title = self.whitespace.sub(u' ', song.title.lower() + \ + u' ' + song.alternate_title.lower()) + lyrics = u'' + verses = SongXMLParser(song.lyrics).get_verses() + for verse in verses: + lyrics = lyrics + self.whitespace.sub(u' ', verse[1]) + u' ' + song.search_lyrics = lyrics.lower() progressDialog.setValue(counter) self.manager.save_objects(songs) counter += 1 From fe452bc588b3764f72f4320167dd022c13c5fbc6 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Thu, 16 Dec 2010 20:12:34 +0100 Subject: [PATCH 11/27] removed mistakes --- openlp/plugins/songs/lib/mediaitem.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py index 224063c47..884cf4a8b 100644 --- a/openlp/plugins/songs/lib/mediaitem.py +++ b/openlp/plugins/songs/lib/mediaitem.py @@ -418,9 +418,9 @@ class SongMediaItem(MediaManagerItem): item.data_string[u'title'].split(u'@')[0].lower() , Song.search_title.asc()) author_list = item.data_string[u'authors'].split(u', ') - # The service item always has an author (at least it has u'' - # as author). However, songs saved in the database do not - # have to have an author. + # The service item always has an author (at least it has u'' as + # author). However, songs saved in the database do not have to have + # an author. if u'' in author_list: author_list.remove(u'') editId = 0 @@ -428,20 +428,20 @@ class SongMediaItem(MediaManagerItem): add_song = True if search_results: for song in search_results: - same_author = True + same_authors = True for author in song.authors: if author.display_name not in author_list: - same_author = False + same_authors = False # All Authors the same, so we can stop here and the song # does not have to be saved. - if same_author: + if same_authors: editId = song.id add_song = False break if add_song: # Authors different if self.addSongFromService: - editId = self.openLyrics. xml_to_song(item.xml_version) + editId = self.openLyrics.xml_to_song(item.xml_version) # Update service with correct song id if editId != 0: Receiver.send_message(u'service_item_update', From f119a4afa59413664199f2b6dae3f1ec8631fe7f Mon Sep 17 00:00:00 2001 From: M2j Date: Thu, 16 Dec 2010 21:00:01 +0100 Subject: [PATCH 12/27] further work on parse_reference and other things --- .../plugins/bibles/forms/bibleimportform.py | 9 +- .../plugins/bibles/forms/bibleimportwizard.py | 10 + openlp/plugins/bibles/lib/__init__.py | 276 ++++++------------ openlp/plugins/bibles/lib/http.py | 10 +- openlp/plugins/bibles/lib/manager.py | 21 +- openlp/plugins/bibles/lib/mediaitem.py | 8 +- openlp/plugins/bibles/lib/openlp1.py | 1 + openlp/plugins/bibles/lib/osis.py | 4 +- .../plugins/bibles/resources/biblegateway.csv | 8 +- .../plugins/bibles/resources/bibleserver.csv | 6 +- 10 files changed, 155 insertions(+), 198 deletions(-) mode change 100755 => 100644 openlp/plugins/bibles/lib/openlp1.py diff --git a/openlp/plugins/bibles/forms/bibleimportform.py b/openlp/plugins/bibles/forms/bibleimportform.py index 9bacd7fae..326a9a629 100644 --- a/openlp/plugins/bibles/forms/bibleimportform.py +++ b/openlp/plugins/bibles/forms/bibleimportform.py @@ -79,6 +79,12 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard): QtGui.QWizard.__init__(self, parent) self.setupUi(self) self.registerFields() + if not BibleFormat.get_availability(BibleFormat.OpenLP1): + self.openlp1Page.setVisible(False) + self.openlp1LocationLabel.setVisible(False) + self.openlp1LocationEdit.setVisible(False) + self.openlp1FileButton.setVisible(False) + self.openlp1DisabledLabel.setVisible(True) self.finishButton = self.button(QtGui.QWizard.FinishButton) self.cancelButton = self.button(QtGui.QWizard.CancelButton) self.manager = manager @@ -104,9 +110,6 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard): QtCore.QObject.connect(self.openlp1FileButton, QtCore.SIGNAL(u'clicked()'), self.onOpenlp1FileButtonClicked) - QtCore.QObject.connect(self.cancelButton, - QtCore.SIGNAL(u'clicked(bool)'), - self.onCancelButtonClicked) QtCore.QObject.connect(self, QtCore.SIGNAL(u'currentIdChanged(int)'), self.onCurrentIdChanged) diff --git a/openlp/plugins/bibles/forms/bibleimportwizard.py b/openlp/plugins/bibles/forms/bibleimportwizard.py index fbbba22bf..a0b2b99b9 100644 --- a/openlp/plugins/bibles/forms/bibleimportwizard.py +++ b/openlp/plugins/bibles/forms/bibleimportwizard.py @@ -280,6 +280,11 @@ class Ui_BibleImportWizard(object): self.openlp1LocationLayout.addWidget(self.openlp1FileButton) self.openlp1Layout.setLayout(1, QtGui.QFormLayout.FieldRole, self.openlp1LocationLayout) + self.openlp1DisabledLabel = QtGui.QLabel(self.openlp1Page) + self.openlp1DisabledLabel.setObjectName(u'openlp1DisabledLabel') + self.openlp1DisabledLabel.setVisible(False) + self.openlp1DisabledLabel.setWordWrap(True) + self.openlp1Layout.addWidget(self.openlp1DisabledLabel) self.formatWidget.addWidget(self.openlp1Page) self.selectPageLayout.addWidget(self.formatWidget) bibleImportWizard.addPage(self.selectPage) @@ -420,3 +425,8 @@ class Ui_BibleImportWizard(object): self.importProgressLabel.setText( translate('BiblesPlugin.ImportWizardForm', 'Ready.')) self.importProgressBar.setFormat(u'%p%') + self.openlp1DisabledLabel.setText( + translate('BiblesPlugin.ImportWizardForm', 'The openlp.org 1.x ' + 'importer has been disabled due to a missing Python module. If ' + 'you want to use this importer, you will need to install the ' + '"python-sqlite" module.')) diff --git a/openlp/plugins/bibles/lib/__init__.py b/openlp/plugins/bibles/lib/__init__.py index a1845c0b9..253c6cfbc 100644 --- a/openlp/plugins/bibles/lib/__init__.py +++ b/openlp/plugins/bibles/lib/__init__.py @@ -32,24 +32,56 @@ import re log = logging.getLogger(__name__) -BIBLE_SEPARATORS = {u'sep_v': r'\s*,\s*', u'sep_r': r'\s*-\s*', u'sep_l': r'\.'} +# English: +BIBLE_SEPARATORS = {u'sep_v': r'\s*:\s*', u'sep_r': r'\s*-\s*', u'sep_l': r','} +# German: +#BIBLE_SEPARATORS = {u'sep_v': r'\s*,\s*', u'sep_r': r'\s*-\s*', u'sep_l': r'\.'} +# RegEx for a verse span: (:)?(-(:)??)? BIBLE_RANGE_REGEX = str(r'(?:(?P[0-9]+)%(sep_v)s)?' - r'(?P[0-9]+)(?:%(sep_r)s(?:(?:(?P[0-9]+)%(sep_v)s)?' - r'(?P[0-9]+))?)?' % BIBLE_SEPARATORS) + r'(?P[0-9]+)(?P%(sep_r)s(?:(?:(?P[0-9]+)' + r'%(sep_v)s)?(?P[0-9]+))?)?' % BIBLE_SEPARATORS) BIBLE_RANGE = re.compile(r'^\s*' + BIBLE_RANGE_REGEX + r'\s*$', re.UNICODE) -BIBLE_REFERENCE_NG = re.compile(str(r'^\s*?(?P[\d]*[^\d]+)\s*?' - r'(?P(?:' + BIBLE_RANGE_REGEX + r'(?:%(sep_l)s|(?=\s*\n)))+)\s*$') % +BIBLE_RANGE_SPLIT = re.compile(BIBLE_SEPARATORS[u'sep_l']) + +# RegEx for a reference ((,|(?=$)))+ +BIBLE_REFERENCE = re.compile(str(r'^\s*(?!\s)(?P[\d]*[^\d]+)(?(?:' + BIBLE_RANGE_REGEX + r'(?:%(sep_l)s|(?=\s*$)))+)\s*$') % BIBLE_SEPARATORS, re.UNICODE) -def parse_reference_ng(reference): +def parse_reference(reference): """ This is the next generation über-awesome function that takes a person's typed in string and converts it to a reference list, a list of references to be queried from the Bible database files. +##### + This is a user manual like description, how the references are working. + + - Each reference starts with the book name. A chapter name is manditory. + ``John 3`` refers to Gospel of John chapter 3 + - A reference range can be given after a range seperator. + ``John 3-5`` refers to John chapters 3 to 5 + - Single verses can be addressed after a verse seperator + ``John 3:16`` refers to John chapter 3 verse 16 + ``John 3:16-4:3`` refers to John chapter 3 verse 16 to chapter 4 verse 3 + - After a verse reference all further single values are treat as verse in + the last selected chapter. + ``John 3:16-18`` refers to John chapter 3 verses 16 to 18 + - After a list separator it is possible to refer to additional verses. They + are build analog to the first ones. This way it is possible to define each + number of verse references. It is not possible to refer to verses in + additional books. + ``John 3:16,18`` refers to John chapter 3 verses 16 and 18 + ``John 3:16-18,20`` refers to John chapter 3 verses 16 to 18 to 20 + ``John 3:16-18,4:1`` refers to John chapter 3 verses 16 to 18 and + chapter 3 verse 1 + - If there is a range separator without further verse declaration the last + refered chapter is addressed until the end. +##### + The ``BIBLE_RANGE`` regular expression produces match groups for verse range declarations: @@ -58,23 +90,23 @@ def parse_reference_ng(reference): a verse separator. 2. ``(?P[0-9]+)`` The verse reference ``from_verse`` is manditory - ``(?:%(sep_r)s(?:`` ... ``)?)?`` - A range declaration is optional. It starts with a range seperator and - contains a optional chapter and verse declaration - 3. ``(?:(?P[0-9]+)%(sep_v)s)?`` + 3. ``(?P%(sep_r)s(?:`` ... ``)?)?`` + A ``range_to`` declaration is optional. It starts with a range seperator + and contains a optional chapter and verse declaration + 4. ``(?:(?P[0-9]+)%(sep_v)s)?`` The ``to_chapter`` reference with seperator is equivalent to group 1. - 4. ``(?P[0-9]+)?)?`` + 5. ``(?P[0-9]+)?)?`` The ``to_verse`` reference is equivalent to group 2. The ``BIBLE_REFERENCE`` regular expression produces matched groups for the whole reference string: - 1. ``\s*?(?P[\d]*[^\d]+)\s*?`` + 1. ``^\s*(?!\s)(?P[\d]*[^\d]+)(?(?:`` + BIBLE_RANGE_REGEX + - ``(?:%(sep_l)s|(?=\s*\\n)))+)\s*$`` + ``(?:%(sep_l)s|(?=\s*$)))+)\s*$`` The sechon group contains all ``ranges``. This can be multiple declarations of a BIBLE_RANGE separated by a list separator. @@ -93,181 +125,67 @@ def parse_reference_ng(reference): """ log.debug('parse_reference("%s")', reference) - if u'' in reference: - return - ref_list = [] - match = BIBLE_REFERENCE_NG.match(reference) - if match: - log.debug(u'Matched reference %s' % reference) - book = match.group(u'book') - ranges = match.group(u'ranges').split(r'\s*\.\s*') - chapter = 0 - for this_range in ranges: - range_match = BIBLE_RANGE.match(this_range) - from_chapter = int(u'0' + range_match.group('from_chapter')) - from_verse = int(u'0' + range_match.group('from_verse')) - to_chapter = int(u'0' + range_match.group('to_chapter')) - to_verse = int(u'0' + range_match.group('to_verse')) - # First reference has to be a chapter - if not unified_ref_list: - if not from_chapter: - from_chapter = from_verse - from_verse = 1 - # Fill missing chapter references with the last chapter - if from_chapter: - chapter = from_chapter - else: - from_chapter = chapter - if not from_verse: - from_verse = 1 - if to_chapter: - if to_chapter > from_chapter: - ref_list.append((book, from_chapter, from_verse, -1)) - for i in range(from_chapter + 1, to_chapter -1): - ref_list.append((book, i, 1, -1)) - ref_list.append((book, to_chapter, 1, to_verse)) - else: - if to_verse < from_verse: - to_verse = from_verse - ref_list.append((book, from_chapter, from_verse, to_verse)) - else: - if to_verse < from_verse: - to_verse = from_verse - ref_list.append((book, from_chapter, from_verse, to_verse)) - else: - log.debug(u'Invalid reference: %s' % reference) - return None - return ref_list - - -BIBLE_REFERENCE = re.compile( - r'^([\w ]+?) *([0-9]+)' # Initial book and chapter - r'(?: *[:|v|V] *([0-9]+))?' # Verse for first chapter - r'(?: *- *([0-9]+|end$))?' # Range for verses or chapters - r'(?:(?:,([0-9]+))?' # Second chapter - r' *[,|:|v|V] *([0-9]+|end$)' # More range for verses or chapters - r'(?: *- *([0-9]+|end$))?)?$', # End of second verse range - re.UNICODE) - -def check_end(match_group): - """ - Check if a regular expression match group contains the text u'end' or - should be converted to an int. - - ``match_group`` - The match group to check. - """ - if match_group == u'end': - return -1 - else: - return int(match_group) - -def parse_reference(reference): - """ - This is the über-awesome function that takes a person's typed in string - and converts it to a reference list, a list of references to be queried - from the Bible database files. - - The ``BIBLE_REFERENCE`` constant regular expression produces the following - match groups: - - 0. (match string) - This is a special group consisting of the whole string that matched. - 1. ``[\w ]+`` - The book the reference is from. - 2. ``[0-9]+`` - The first (or only) chapter in the reference. - 3. ``None`` or ``[0-9]+`` - ``None``, or the only verse, or the first verse in a verse range or, - the start verse in a chapter range. - 4. ``None`` or ``[0-9]+`` or ``end`` - ``None``, or the end verse of the first verse range, or the end chapter - of a chapter range. - 5. ``None`` or ``[0-9]+`` - ``None``, or the second chapter in multiple (non-ranged) chapters. - 6. ``None`` or ``[0-9]+`` or ``end`` - ``None``, the start of the second verse range. or the end of a chapter - range. - 7. ``None`` or ``[0-9]+`` or ``end`` - ``None``, or the end of the second verse range. - - The reference list is a list of tuples, with each tuple structured like - this:: - - (book, chapter, start_verse, end_verse) - - ``reference`` - The bible reference to parse. - - Returns None or a reference list. - """ - reference = reference.strip() - log.debug('parse_reference("%s")', reference) - unified_ref_list = [] match = BIBLE_REFERENCE.match(reference) if match: log.debug(u'Matched reference %s' % reference) - book = match.group(1) - chapter = int(match.group(2)) - if match.group(7): - # Two verse ranges - vr1_start = int(match.group(3)) - vr1_end = int(match.group(4)) - unified_ref_list.append((book, chapter, vr1_start, vr1_end)) - vr2_start = int(match.group(6)) - vr2_end = check_end(match.group(7)) - if match.group(5): - # One verse range per chapter - chapter2 = int(match.group(5)) - unified_ref_list.append((book, chapter2, vr2_start, vr2_end)) + book = match.group(u'book') + ranges = BIBLE_RANGE_SPLIT.split(match.group(u'ranges')) + ref_list = [] + chapter = 0 + for this_range in ranges: + range_match = BIBLE_RANGE.match(this_range) + from_chapter = range_match.group('from_chapter') + from_verse = range_match.group('from_verse') + has_range = range_match.group('range_to') + to_chapter = range_match.group('to_chapter') + to_verse = range_match.group('to_verse') + if from_chapter: + from_chapter = int(from_chapter) + if from_verse: + from_verse = int(from_verse) + if to_chapter: + to_chapter = int(to_chapter) + if to_verse: + to_verse = int(to_verse) + # Fill chapters with reasonable values. + if from_chapter: + chapter = from_chapter + elif chapter: + from_chapter = chapter else: - unified_ref_list.append((book, chapter, vr2_start, vr2_end)) - elif match.group(6): - # Chapter range with verses - if match.group(3): - vr1_start = int(match.group(3)) - else: - vr1_start = 1 - if match.group(2) == match.group(4): - vr1_end = int(match.group(6)) - unified_ref_list.append((book, chapter, vr1_start, vr1_end)) - else: - vr1_end = -1 - unified_ref_list.append((book, chapter, vr1_start, vr1_end)) - vr2_end = check_end(match.group(6)) - if int(match.group(4)) > chapter: - for i in range(chapter + 1, int(match.group(4)) + 1): - if i == int(match.group(4)): - unified_ref_list.append((book, i, 1, vr2_end)) - else: - unified_ref_list.append((book, i, 1, -1)) - elif match.group(4): - # Chapter range or chapter and verse range - if match.group(3): - vr1_start = int(match.group(3)) - vr1_end = check_end(match.group(4)) - if vr1_end == -1 or vr1_end > vr1_start: - unified_ref_list.append((book, chapter, vr1_start, vr1_end)) + from_chapter = from_verse + from_verse = None + if to_chapter: + if to_chapter < from_chapter: + continue else: - log.debug(u'Ambiguous reference: %s' % reference) - return None - elif match.group(4) != u'end': - for i in range(chapter, int(match.group(4)) + 1): - unified_ref_list.append((book, i, 1, -1)) + chapter = to_chapter + elif to_verse: + if chapter: + to_chapter = chapter + else: + to_chapter = to_verse + # Append references to the list + if has_range: + if not from_verse: + from_verse = 1 + if not to_verse: + to_verse = -1 + if to_chapter > from_chapter: + ref_list.append((book, from_chapter, from_verse, -1)) + for i in range(int(from_chapter) + 1, int(to_chapter) - 1): + ref_list.append((book, i, 1, -1)) + ref_list.append((book, to_chapter, 1, to_verse)) + elif to_verse >= from_verse: + ref_list.append((book, from_chapter, from_verse, to_verse)) + elif from_verse: + ref_list.append((book, from_chapter, from_verse, from_verse)) else: - log.debug(u'Unsupported reference: %s' % reference) - return None - elif match.group(3): - # Single chapter and verse - verse = int(match.group(3)) - unified_ref_list.append((book, chapter, verse, verse)) - else: - # Single chapter - unified_ref_list.append((book, chapter, -1, -1)) + ref_list.append((book, from_chapter, 1, -1)) + return ref_list else: log.debug(u'Invalid reference: %s' % reference) return None - return unified_ref_list class SearchResults(object): diff --git a/openlp/plugins/bibles/lib/http.py b/openlp/plugins/bibles/lib/http.py index 9ee445431..8f36d33c5 100644 --- a/openlp/plugins/bibles/lib/http.py +++ b/openlp/plugins/bibles/lib/http.py @@ -261,8 +261,8 @@ class BSExtract(object): ``chapter`` Chapter number """ - print(bookname) log.debug(u'get_bible_chapter %s,%s,%s', version, bookname, chapter) + ''' bookindex = self._get_book_index(bookname) if chapter < 10: chapter_string = u'00' + unicode(chapter) @@ -272,6 +272,10 @@ class BSExtract(object): chapter_string = unicode(chapter) chapter_url = u'http://m.bibleserver.com/text/%s/%s%s000' % \ (version, bookindex, chapter_string) + ''' + chapter_url = u'http://m.bibleserver.com/#/%s/%s%s' % \ + (version, bookname, chapter) + log.debug(u'URL: %s', chapter_url) page = None try: @@ -299,6 +303,7 @@ class BSExtract(object): versenumber = int(verse_number.sub(r'\1', verse[u'class'])) verses[versenumber] = verse.contents[1].rstrip(u'\n') return SearchResults(bookname, chapter, verses) + ''' def _get_book_index(self, bookname): print bookname bookmap = {u'Gen': u'01', u'Exod': u'02', u'Lev': u'03', @@ -319,6 +324,7 @@ class BSExtract(object): u'1Pet': u'60', u'2Pet': u'61', u'1John': u'62', u'2John':u'63', u'3John': u'64', u'Jude': u'65', u'Rev': u'66'} return bookmap[bookname] + ''' class CWExtract(object): @@ -431,7 +437,7 @@ class HTTPBible(BibleDB): Run the import. This method overrides the parent class method. Returns ``True`` on success, ``False`` on failure. """ - self.wizard.ImportProgressBar.setMaximum(2) + self.wizard.importProgressBar.setMaximum(2) self.wizard.incrementProgressBar('Registering bible...') self.create_meta(u'download source', self.download_source) self.create_meta(u'download name', self.download_name) diff --git a/openlp/plugins/bibles/lib/manager.py b/openlp/plugins/bibles/lib/manager.py index 794c9c5f7..39d8b644c 100644 --- a/openlp/plugins/bibles/lib/manager.py +++ b/openlp/plugins/bibles/lib/manager.py @@ -35,9 +35,14 @@ from openlp.plugins.bibles.lib.db import BibleDB, BibleMeta from csvbible import CSVBible from http import HTTPBible -from openlp1 import OpenLP1Bible from opensong import OpenSongBible from osis import OSISBible +# Imports that might fail. +try: + from openlp1 import OpenLP1Bible + has_openlp1 = True +except ImportError: + has_openlp1 = False log = logging.getLogger(__name__) @@ -57,6 +62,7 @@ class BibleFormat(object): plus a few helper functions to facilitate generic handling of Bible types for importing. """ + _format_availability = {} Unknown = -1 OSIS = 0 CSV = 1 @@ -98,6 +104,14 @@ class BibleFormat(object): BibleFormat.OpenLP1 ] + @staticmethod + def set_availability(format, available): + BibleFormat._format_availability[format] = available + + @staticmethod + def get_availability(format): + return BibleFormat._format_availability.get(format, True) + class BibleManager(object): """ @@ -339,3 +353,8 @@ class BibleManager(object): """ for bible in self.db_cache: self.db_cache[bible].finalise() + +BibleFormat.set_availability(BibleFormat.OpenLP1, has_openlp1) + +__all__ = [u'BibleFormat'] + diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index 949035c0b..717fa03b7 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -750,21 +750,21 @@ class BibleMediaItem(MediaManagerItem): second_copyright, second_permissions) if footer not in raw_footer: raw_footer.append(footer) - bible_text = u'%s %s\n\n%s %s' % (verse_text, text, verse_text, + bible_text = u'%s\u00a0%s\n\n%s\u00a0%s' % (verse_text, text, verse_text, second_text) raw_slides.append(bible_text) bible_text = u'' # If we are 'Verse Per Slide' then create a new slide. elif self.parent.settings_tab.layout_style == 0: - bible_text = u'%s %s' % (verse_text, text) + bible_text = u'%s\u00a0%s' % (verse_text, text) raw_slides.append(bible_text) bible_text = u'' # If we are 'Verse Per Line' then force a new line. elif self.parent.settings_tab.layout_style == 1: - bible_text = u'%s %s %s\n' % (bible_text, verse_text, text) + bible_text = u'%s %s\u00a0%s\n' % (bible_text, verse_text, text) # We have to be 'Continuous'. else: - bible_text = u'%s %s %s\n' % (bible_text, verse_text, text) + bible_text = u'%s %s\u00a0%s\n' % (bible_text, verse_text, text) if first_item: start_item = item first_item = False diff --git a/openlp/plugins/bibles/lib/openlp1.py b/openlp/plugins/bibles/lib/openlp1.py old mode 100755 new mode 100644 index 7f8a8d17e..ba9476fca --- a/openlp/plugins/bibles/lib/openlp1.py +++ b/openlp/plugins/bibles/lib/openlp1.py @@ -62,6 +62,7 @@ class OpenLP1Bible(BibleDB): # Create all books. cursor.execute(u'SELECT id, testament_id, name, abbreviation FROM book') books = cursor.fetchall() + self.wizard.importProgressBar.setMaximum(len(books) + 1) for book in books: if self.stop_import_flag: connection.close() diff --git a/openlp/plugins/bibles/lib/osis.py b/openlp/plugins/bibles/lib/osis.py index 53a6f152c..f39a4ab0f 100644 --- a/openlp/plugins/bibles/lib/osis.py +++ b/openlp/plugins/bibles/lib/osis.py @@ -134,9 +134,9 @@ class OSISBible(BibleDB): testament) if last_chapter == 0: if book == u'Gen': - self.wizard.ImportProgressBar.setMaximum(1188) + self.wizard.importProgressBar.setMaximum(1188) else: - self.wizard.ImportProgressBar.setMaximum(260) + self.wizard.importProgressBar.setMaximum(260) if last_chapter != chapter: if last_chapter != 0: self.session.commit() diff --git a/openlp/plugins/bibles/resources/biblegateway.csv b/openlp/plugins/bibles/resources/biblegateway.csv index deca46d7c..14f167897 100644 --- a/openlp/plugins/bibles/resources/biblegateway.csv +++ b/openlp/plugins/bibles/resources/biblegateway.csv @@ -48,12 +48,12 @@ Hungarian Károli,KAR Icelandic Bible,ICELAND La Nuova Diodati,LND La Parola è Vita,LM -Jacalteco, Oriental,JAC +Jacalteco - Oriental,JAC Kekchi,KEK Korean Bible,KOREAN Maori Bible,MAORI Macedonian New Testament,MNT -Mam, Central,MVC +Mam - Central,MVC Mam de Todos Santos Chuchumatán,MVJ Reimer 2001,REIMER Náhuatl de Guerrero,NGU @@ -62,7 +62,7 @@ Det Norsk Bibelselskap 1930,DNB1930 Levande Bibeln,LB O Livro,OL João Ferreira de Almeida Atualizada,AA -Quiché, Centro Occidental,QUT +Quiché - Centro Occidental,QUT Romanian,RMNN Romanian,TLCR Russian Synodal Version,RUSV @@ -77,4 +77,4 @@ Ukrainian Bible,UKR Uspanteco,USP 1934 Vietnamese Bible,VIET Chinese Union Version (Simplified),CUVS -Chinese Union Version (Traditional),CUV \ No newline at end of file +Chinese Union Version (Traditional),CUV diff --git a/openlp/plugins/bibles/resources/bibleserver.csv b/openlp/plugins/bibles/resources/bibleserver.csv index cc0a843ce..0f2baa0cc 100644 --- a/openlp/plugins/bibles/resources/bibleserver.csv +++ b/openlp/plugins/bibles/resources/bibleserver.csv @@ -1,5 +1,5 @@ عربي, ARA -Bible, překlad 21. století, B21 +Bible – překlad 21. století, B21 Bible du Semeur, BDS Българската Библия, BLG Český ekumenický překlad, CEP @@ -8,7 +8,7 @@ Hrvatski, CRO Version La Biblia al Dia, CST 中文和合本（简体）, CUVS Bibelen på hverdagsdansk, DK -Rev. Elberfelder, ELB +Revidierte Elberfelder, ELB Einheitsübersetzung, EU Gute Nachricht Bibel, GNB Hoffnung für alle, HFA @@ -20,7 +20,7 @@ King James Version, KJV Luther 1984, LUT Septuaginta, LXX Neue Genfer Übersetzung, NGÜ -New Int. Readers Version, NIRV +New International Readers Version, NIRV New International Version, NIV Neues Leben, NL En Levende Bok, NOR From a46ea7c4ebcc07ae093bc578bccf0320dfa294a7 Mon Sep 17 00:00:00 2001 From: M2j Date: Fri, 17 Dec 2010 14:21:55 +0100 Subject: [PATCH 13/27] localisation off seperators. --- openlp/plugins/bibles/lib/__init__.py | 92 ++++++++++--------- openlp/plugins/bibles/lib/http.py | 2 +- openlp/plugins/bibles/lib/mediaitem.py | 61 ++++++------ .../plugins/bibles/resources/bibleserver.csv | 4 +- 4 files changed, 82 insertions(+), 77 deletions(-) diff --git a/openlp/plugins/bibles/lib/__init__.py b/openlp/plugins/bibles/lib/__init__.py index 253c6cfbc..7a35508fc 100644 --- a/openlp/plugins/bibles/lib/__init__.py +++ b/openlp/plugins/bibles/lib/__init__.py @@ -32,24 +32,32 @@ import re log = logging.getLogger(__name__) -# English: -BIBLE_SEPARATORS = {u'sep_v': r'\s*:\s*', u'sep_r': r'\s*-\s*', u'sep_l': r','} -# German: -#BIBLE_SEPARATORS = {u'sep_v': r'\s*,\s*', u'sep_r': r'\s*-\s*', u'sep_l': r'\.'} +def get_reference_match(match_type): + local_separator = unicode(u':;;\s*[:vV]\s*;;-;;\s*-\s*;;,;;\s*,\s*;;end' + ).split(u';;') # English + # local_separator = unicode(u',;;\s*,\s*;;-;;\s*-\s*;;.;;\.;;[Ee]nde' + # ).split(u';;') # German + separators = { + u'sep_v_display': local_separator[0], u'sep_v': local_separator[1], + u'sep_r_display': local_separator[2], u'sep_r': local_separator[3], + u'sep_l_display': local_separator[4], u'sep_l': local_separator[5], + u'sep_e': local_separator[6]} -# RegEx for a verse span: (:)?(-(:)??)? -BIBLE_RANGE_REGEX = str(r'(?:(?P[0-9]+)%(sep_v)s)?' - r'(?P[0-9]+)(?P%(sep_r)s(?:(?:(?P[0-9]+)' - r'%(sep_v)s)?(?P[0-9]+))?)?' % BIBLE_SEPARATORS) - -BIBLE_RANGE = re.compile(r'^\s*' + BIBLE_RANGE_REGEX + r'\s*$', re.UNICODE) - -BIBLE_RANGE_SPLIT = re.compile(BIBLE_SEPARATORS[u'sep_l']) - -# RegEx for a reference ((,|(?=$)))+ -BIBLE_REFERENCE = re.compile(str(r'^\s*(?!\s)(?P[\d]*[^\d]+)(?(?:' + BIBLE_RANGE_REGEX + r'(?:%(sep_l)s|(?=\s*$)))+)\s*$') % - BIBLE_SEPARATORS, re.UNICODE) + # verse range match: (:)?(-(:)??)? + range_string = str(r'(?:(?P[0-9]+)%(sep_v)s)?(?P' + r'[0-9]+)(?P%(sep_r)s(?:(?:(?P[0-9]+)%(sep_v)s)?' + r'(?P[0-9]+)|%(sep_e)s)?)?' % separators) + if match_type == u'range': + return re.compile(r'^\s*' + range_string + r'\s*$', re.UNICODE) + elif match_type == u'range_separator': + return re.compile(separators[u'sep_l']) + elif match_type == u'full': + # full reference match: ((,|(?=$)))+ + return re.compile(str(r'^\s*(?!\s)(?P[\d]*[^\d]+)(?(?:' + range_string + r'(?:%(sep_l)s|(?=\s*$)))+)\s*$') + % separators, re.UNICODE) + else: + return separators[match_type] def parse_reference(reference): """ @@ -57,7 +65,6 @@ def parse_reference(reference): typed in string and converts it to a reference list, a list of references to be queried from the Bible database files. -##### This is a user manual like description, how the references are working. - Each reference starts with the book name. A chapter name is manditory. @@ -80,9 +87,8 @@ def parse_reference(reference): chapter 3 verse 1 - If there is a range separator without further verse declaration the last refered chapter is addressed until the end. -##### - The ``BIBLE_RANGE`` regular expression produces match groups for verse range + ``range_string`` is a regular expression which matches for verse range declarations: 1. ``(?:(?P[0-9]+)%(sep_v)s)?' @@ -90,28 +96,25 @@ def parse_reference(reference): a verse separator. 2. ``(?P[0-9]+)`` The verse reference ``from_verse`` is manditory - 3. ``(?P%(sep_r)s(?:`` ... ``)?)?`` + 3. ``(?P%(sep_r)s(?:`` ... ``|%(sep_e)s)?)?`` A ``range_to`` declaration is optional. It starts with a range seperator - and contains a optional chapter and verse declaration + and contains optional a chapter and verse declaration or a end + separator. 4. ``(?:(?P[0-9]+)%(sep_v)s)?`` The ``to_chapter`` reference with seperator is equivalent to group 1. - 5. ``(?P[0-9]+)?)?`` + 5. ``(?P[0-9]+)`` The ``to_verse`` reference is equivalent to group 2. - The ``BIBLE_REFERENCE`` regular expression produces matched groups for the - whole reference string: + The full reference is matched against get_reference_match(u'full'). This + regular expression looks like this: 1. ``^\s*(?!\s)(?P[\d]*[^\d]+)(?(?:`` + BIBLE_RANGE_REGEX + - ``(?:%(sep_l)s|(?=\s*$)))+)\s*$`` - The sechon group contains all ``ranges``. This can be multiple - declarations of a BIBLE_RANGE separated by a list separator. - - ``BIBLE_SEPARATORS`` is a dict which defines the separator formats. It might - be used to localize the bible references. + 2. ``(?P(?:`` + range_string + ``(?:%(sep_l)s|(?=\s*$)))+)\s*$`` + The second group contains all ``ranges``. This can be multiple + declarations of a range_string separated by a list separator. The reference list is a list of tuples, with each tuple structured like this:: @@ -125,20 +128,21 @@ def parse_reference(reference): """ log.debug('parse_reference("%s")', reference) - match = BIBLE_REFERENCE.match(reference) + match = get_reference_match(u'full').match(reference) if match: log.debug(u'Matched reference %s' % reference) book = match.group(u'book') - ranges = BIBLE_RANGE_SPLIT.split(match.group(u'ranges')) + ranges = match.group(u'ranges') + range_list = get_reference_match(u'range_separator').split(ranges) ref_list = [] chapter = 0 - for this_range in ranges: - range_match = BIBLE_RANGE.match(this_range) - from_chapter = range_match.group('from_chapter') - from_verse = range_match.group('from_verse') - has_range = range_match.group('range_to') - to_chapter = range_match.group('to_chapter') - to_verse = range_match.group('to_verse') + for this_range in range_list: + range_match = get_reference_match(u'range').match(this_range) + from_chapter = range_match.group(u'from_chapter') + from_verse = range_match.group(u'from_verse') + has_range = range_match.group(u'range_to') + to_chapter = range_match.group(u'to_chapter') + to_verse = range_match.group(u'to_verse') if from_chapter: from_chapter = int(from_chapter) if from_verse: @@ -147,7 +151,7 @@ def parse_reference(reference): to_chapter = int(to_chapter) if to_verse: to_verse = int(to_verse) - # Fill chapters with reasonable values. + # Fill chapter fields with reasonable values. if from_chapter: chapter = from_chapter elif chapter: @@ -173,10 +177,10 @@ def parse_reference(reference): to_verse = -1 if to_chapter > from_chapter: ref_list.append((book, from_chapter, from_verse, -1)) - for i in range(int(from_chapter) + 1, int(to_chapter) - 1): + for i in range(from_chapter + 1, to_chapter - 1): ref_list.append((book, i, 1, -1)) ref_list.append((book, to_chapter, 1, to_verse)) - elif to_verse >= from_verse: + elif to_verse >= from_verse or to_verse == -1: ref_list.append((book, from_chapter, from_verse, to_verse)) elif from_verse: ref_list.append((book, from_chapter, from_verse, from_verse)) diff --git a/openlp/plugins/bibles/lib/http.py b/openlp/plugins/bibles/lib/http.py index 8f36d33c5..4ed6e5394 100644 --- a/openlp/plugins/bibles/lib/http.py +++ b/openlp/plugins/bibles/lib/http.py @@ -273,7 +273,7 @@ class BSExtract(object): chapter_url = u'http://m.bibleserver.com/text/%s/%s%s000' % \ (version, bookindex, chapter_string) ''' - chapter_url = u'http://m.bibleserver.com/#/%s/%s%s' % \ + chapter_url = u'http://m.bibleserver.com/text/%s/%s%s' % \ (version, bookname, chapter) log.debug(u'URL: %s', chapter_url) diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index 84505c991..cced544b9 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -32,6 +32,7 @@ from PyQt4 import QtCore, QtGui from openlp.core.lib import MediaManagerItem, Receiver, BaseListWithDnD, \ ItemCapabilities, translate from openlp.plugins.bibles.forms import BibleImportForm +from openlp.plugins.bibles.lib import get_reference_match log = logging.getLogger(__name__) @@ -553,12 +554,15 @@ class BibleMediaItem(MediaManagerItem): bible = unicode(self.AdvancedVersionComboBox.currentText()) second_bible = unicode(self.AdvancedSecondBibleComboBox.currentText()) book = unicode(self.AdvancedBookComboBox.currentText()) - chapter_from = int(self.AdvancedFromChapter.currentText()) - chapter_to = int(self.AdvancedToChapter.currentText()) - verse_from = int(self.AdvancedFromVerse.currentText()) - verse_to = int(self.AdvancedToVerse.currentText()) - versetext = u'%s %s:%s-%s:%s' % (book, chapter_from, verse_from, - chapter_to, verse_to) + chapter_from = self.AdvancedFromChapter.currentText() + chapter_to = self.AdvancedToChapter.currentText() + verse_from = self.AdvancedFromVerse.currentText() + verse_to = self.AdvancedToVerse.currentText() + verse_separator = get_reference_match(u'sep_v_display') + range_separator = get_reference_match(u'sep_r_display') + verse_range = chapter_from + verse_separator + verse_from + \ + range_separator + chapter_to + verse_separator + verse_to + versetext = u'%s %s' % (book, verse_range) self.search_results = self.parent.manager.get_verses(bible, versetext) if second_bible: self.second_search_results = self.parent.manager.get_verses( @@ -709,7 +713,7 @@ class BibleMediaItem(MediaManagerItem): obj = reference[QtCore.QString(key)] if isinstance(obj, QtCore.QVariant): obj = obj.toPyObject() - return unicode(obj) + return unicode(obj).strip() def generateSlideData(self, service_item, item=None, xmlVersion=False): """ @@ -816,36 +820,31 @@ class BibleMediaItem(MediaManagerItem): ``old_item`` The last item of a range. """ + verse_separator = get_reference_match(u'sep_v_display') + range_separator = get_reference_match(u'sep_r_display') old_bitem = self.listView.item(old_item.row()) - old_chapter = int(self._decodeQtObject(old_bitem, 'chapter')) - old_verse = int(self._decodeQtObject(old_bitem, 'verse')) + old_chapter = self._decodeQtObject(old_bitem, 'chapter') + old_verse = self._decodeQtObject(old_bitem, 'verse') start_bitem = self.listView.item(start_item.row()) start_book = self._decodeQtObject(start_bitem, 'book') - start_chapter = int(self._decodeQtObject(start_bitem, 'chapter')) - start_verse = int(self._decodeQtObject(start_bitem, 'verse')) + start_chapter = self._decodeQtObject(start_bitem, 'chapter') + start_verse = self._decodeQtObject(start_bitem, 'verse') start_bible = self._decodeQtObject(start_bitem, 'bible') start_second_bible = self._decodeQtObject(start_bitem, 'second_bible') if start_second_bible: - if start_verse == old_verse and start_chapter == old_chapter: - title = u'%s %s:%s (%s, %s)' % (start_book, start_chapter, - start_verse, start_bible, start_second_bible) - elif start_chapter == old_chapter: - title = u'%s %s:%s-%s (%s, %s)' % (start_book, start_chapter, - start_verse, old_verse, start_bible, start_second_bible) - else: - title = u'%s %s:%s-%s:%s (%s, %s)' % (start_book, start_chapter, - start_verse, old_chapter, old_verse, start_bible, - start_second_bible) + bibles = u'%s, %s' % (start_bible, start_second_bible) else: - if start_verse == old_verse and start_chapter == old_chapter: - title = u'%s %s:%s (%s)' % (start_book, start_chapter, - start_verse, start_bible) - elif start_chapter == old_chapter: - title = u'%s %s:%s-%s (%s)' % (start_book, start_chapter, - start_verse, old_verse, start_bible) + bibles = start_bible + if start_chapter == old_chapter: + if start_verse == old_verse: + verse_range = start_chapter + verse_separator + start_verse else: - title = u'%s %s:%s-%s:%s (%s)' % (start_book, start_chapter, - start_verse, old_chapter, old_verse, start_bible) + verse_range = start_chapter + verse_separator + start_verse + \ + range_separator + old_verse + else: + verse_range = start_chapter + verse_separator + start_verse + \ + range_separator + old_chapter + verse_separator + old_verse + title = u'%s %s (%s)' % (start_book, verse_range, bibles) return title def checkTitle(self, item, old_item): @@ -907,9 +906,11 @@ class BibleMediaItem(MediaManagerItem): ``verse`` The verse number (int). """ + + verse_separator = get_reference_match(u'sep_v_display') if not self.parent.settings_tab.show_new_chapters or \ old_chapter != chapter: - verse_text = u'%s:%s' % (chapter, verse) + verse_text = unicode(chapter) + verse_separator + unicode(verse) else: verse_text = u'%s' % verse if self.parent.settings_tab.display_style == 1: diff --git a/openlp/plugins/bibles/resources/bibleserver.csv b/openlp/plugins/bibles/resources/bibleserver.csv index 0f2baa0cc..d73bf1678 100644 --- a/openlp/plugins/bibles/resources/bibleserver.csv +++ b/openlp/plugins/bibles/resources/bibleserver.csv @@ -23,7 +23,7 @@ Neue Genfer Übersetzung, NGÜ New International Readers Version, NIRV New International Version, NIV Neues Leben, NL -En Levende Bok, NOR +En Levende Bok (NOR), NOR Nádej pre kazdého, NPK Noua traducere în limba românã, NTR Nueva Versión Internacional, NVI @@ -33,7 +33,7 @@ O Livro, PRT Новый перевод на русский язык, RUS Slovo na cestu, SNC Schlachter 2000, SLT -En Levande Bok, SVL +En Levande Bok (SWE), SVL Today's New International Version, TNIV Türkçe, TR Vulgata, VUL From 3cdac511e2955b3d1ba79babed593a2f1cf99650 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Fri, 17 Dec 2010 14:30:48 +0100 Subject: [PATCH 14/27] fixed bug #690774 --- openlp/plugins/songs/lib/mediaitem.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py index 884cf4a8b..e42cb7fa3 100644 --- a/openlp/plugins/songs/lib/mediaitem.py +++ b/openlp/plugins/songs/lib/mediaitem.py @@ -429,20 +429,26 @@ class SongMediaItem(MediaManagerItem): if search_results: for song in search_results: same_authors = True - for author in song.authors: - if author.display_name not in author_list: - same_authors = False - # All Authors the same, so we can stop here and the song + # If the author counts are different, we do not have to do + # any further checking. This is also important when a song + # does not have any author (because we can not loop over an + # empty list). + if len(song.authors) == len(author_list): + for author in song.authors: + if author.display_name not in author_list: + same_authors = False + else: + same_authors = False + # All authors are the same, so we can stop here and the song # does not have to be saved. if same_authors: - editId = song.id add_song = False + editId = song.id break if add_song: - # Authors different if self.addSongFromService: editId = self.openLyrics.xml_to_song(item.xml_version) - # Update service with correct song id + # Update service with correct song id. if editId != 0: Receiver.send_message(u'service_item_update', u'%s:%s' %(editId, uuid)) From 9c5177b0f71b43372a6713c433d3674f568a57ed Mon Sep 17 00:00:00 2001 From: M2j Date: Fri, 17 Dec 2010 14:33:25 +0100 Subject: [PATCH 15/27] exception, if bibleserver.com response contains no verses --- openlp/plugins/bibles/lib/http.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/openlp/plugins/bibles/lib/http.py b/openlp/plugins/bibles/lib/http.py index 4ed6e5394..b1cc188b6 100644 --- a/openlp/plugins/bibles/lib/http.py +++ b/openlp/plugins/bibles/lib/http.py @@ -295,7 +295,13 @@ class BSExtract(object): if not soup: return None Receiver.send_message(u'openlp_process_events') - content = soup.find(u'div', u'content').find(u'div').findAll(u'div') + try: + content = soup.find(u'div', u'content').find(u'div').findAll(u'div') + except: + log.exception(u'No verses found.') + finally: + if not content: + return None verse_number = re.compile(r'v\d{5}(\d{3}) verse') verses = {} for verse in content: From 04d4d76dcd00b187a37b54b19a39bc46e4be4044 Mon Sep 17 00:00:00 2001 From: M2j Date: Fri, 17 Dec 2010 14:46:34 +0100 Subject: [PATCH 16/27] removed commented code in openlp.plugins.bibles.lib.http --- openlp/plugins/bibles/lib/http.py | 33 ------------------------------- 1 file changed, 33 deletions(-) diff --git a/openlp/plugins/bibles/lib/http.py b/openlp/plugins/bibles/lib/http.py index b1cc188b6..bd24b3f46 100644 --- a/openlp/plugins/bibles/lib/http.py +++ b/openlp/plugins/bibles/lib/http.py @@ -262,17 +262,6 @@ class BSExtract(object): Chapter number """ log.debug(u'get_bible_chapter %s,%s,%s', version, bookname, chapter) - ''' - bookindex = self._get_book_index(bookname) - if chapter < 10: - chapter_string = u'00' + unicode(chapter) - elif chapter < 100: - chapter_string = u'0' + unicode(chapter) - else: - chapter_string = unicode(chapter) - chapter_url = u'http://m.bibleserver.com/text/%s/%s%s000' % \ - (version, bookindex, chapter_string) - ''' chapter_url = u'http://m.bibleserver.com/text/%s/%s%s' % \ (version, bookname, chapter) @@ -309,28 +298,6 @@ class BSExtract(object): versenumber = int(verse_number.sub(r'\1', verse[u'class'])) verses[versenumber] = verse.contents[1].rstrip(u'\n') return SearchResults(bookname, chapter, verses) - ''' - def _get_book_index(self, bookname): - print bookname - bookmap = {u'Gen': u'01', u'Exod': u'02', u'Lev': u'03', - u'Num': u'04', u'Deut': u'05', u'Josh': u'06', u'Judg': u'07', - u'Ruth': u'08', u'1Sam': u'09', u'2Sam': u'10', u'1Kgs': u'11', - u'2Kgs': u'12', u'1Chr': u'13', u'2Chr': u'14', u'Ezra': u'15', - u'Neh': u'16', u'Esth': u'17', u'Job': u'18', u'Ps': u'19', - u'Prov': u'20', u'Eccl': u'21', u'Song': u'22', u'Isa': u'23', - u'Jer': u'24', u'Lam': u'25', u'Ezek': u'26', u'Dan': u'27', - u'Hos': u'28', u'Joel': u'29', u'Amos': u'30', u'Obad': u'31', - u'Jonah': u'32', u'Mic': u'33', u'Nah': u'34', u'Hab': u'35', - u'Zeph': u'36', u'Hag': u'37', u'Zech': u'38', u'Mal': u'39', - u'Matt': u'40', u'Mark': u'41', u'Luke': u'42', u'John': u'43', - u'Acts': u'44', u'Rom': u'45', u'1Cor': u'46', u'2Cor': u'47', - u'Gal': u'48', u'Eph': u'49', u'Phil': u'50', u'Col': u'51', - u'1Thess':u'52', u'2Thess':u'53', u'1Tim': u'54', u'2Tim': u'55', - u'Titus': u'56', u'Phlm': u'57', u'Heb': u'58', u'Jas': u'59', - u'1Pet': u'60', u'2Pet': u'61', u'1John': u'62', u'2John':u'63', - u'3John': u'64', u'Jude': u'65', u'Rev': u'66'} - return bookmap[bookname] - ''' class CWExtract(object): From fa79dd2cca89638a936459eac89a67600882f8c9 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Fri, 17 Dec 2010 15:28:19 +0100 Subject: [PATCH 17/27] keep copyright field empty if imported song does not have any copyright information --- openlp/core/lib/serviceitem.py | 1 + openlp/plugins/songs/lib/xml.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py index b9394030a..9b4a035a5 100644 --- a/openlp/core/lib/serviceitem.py +++ b/openlp/core/lib/serviceitem.py @@ -44,6 +44,7 @@ class ServiceItemType(object): Image = 2 Command = 3 + class ItemCapabilities(object): """ Provides an enumeration of a serviceitem's capabilities diff --git a/openlp/plugins/songs/lib/xml.py b/openlp/plugins/songs/lib/xml.py index d26919d79..9d98737dc 100644 --- a/openlp/plugins/songs/lib/xml.py +++ b/openlp/plugins/songs/lib/xml.py @@ -297,6 +297,8 @@ class OpenLyricsParser(object): song_xml = objectify.fromstring(xml) properties = song_xml.properties song.copyright = unicode(properties.copyright.text) + if song.copyright == u'None': + song.copyright = u'' song.verse_order = unicode(properties.verseOrder.text) if song.verse_order == u'None': song.verse_order = u'' @@ -357,7 +359,7 @@ class OpenLyricsParser(object): def _add_text_to_element(self, tag, parent, text=None, label=None): if label: - element = etree.Element(tag, name = unicode(label)) + element = etree.Element(tag, name=unicode(label)) else: element = etree.Element(tag) if text: From d1c79a595daac3eff4f4d63aa191841fa5a14acf Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Fri, 17 Dec 2010 19:15:31 +0000 Subject: [PATCH 18/27] Fix image edit bug --- openlp/core/ui/serviceitemeditform.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/openlp/core/ui/serviceitemeditform.py b/openlp/core/ui/serviceitemeditform.py index f385754f5..e57474315 100644 --- a/openlp/core/ui/serviceitemeditform.py +++ b/openlp/core/ui/serviceitemeditform.py @@ -64,8 +64,7 @@ class ServiceItemEditForm(QtGui.QDialog, Ui_ServiceItemEditDialog): self.item._raw_frames = [] if self.item.is_image(): for item in self.itemList: - self.item.add_from_image(item[u'path'], item[u'title'], - item[u'image']) + self.item.add_from_image(item[u'path'], item[u'title']) self.item.render() return self.item From c226979f2434c2b14e43021688dbde3fd7e4abe4 Mon Sep 17 00:00:00 2001 From: M2j Date: Fri, 17 Dec 2010 23:10:29 +0100 Subject: [PATCH 19/27] Format fixes, comment fixes and biblegateway.csv updated --- .../plugins/bibles/forms/bibleimportform.py | 19 +-- openlp/plugins/bibles/lib/__init__.py | 22 +-- openlp/plugins/bibles/lib/http.py | 8 +- openlp/plugins/bibles/lib/manager.py | 2 +- openlp/plugins/bibles/lib/mediaitem.py | 1 - .../plugins/bibles/resources/biblegateway.csv | 157 +++++++++--------- .../plugins/bibles/resources/bibleserver.csv | 4 +- .../bibles/resources/crosswalkbooks.csv | 2 +- 8 files changed, 105 insertions(+), 110 deletions(-) diff --git a/openlp/plugins/bibles/forms/bibleimportform.py b/openlp/plugins/bibles/forms/bibleimportform.py index 67c292c5c..a454404d9 100644 --- a/openlp/plugins/bibles/forms/bibleimportform.py +++ b/openlp/plugins/bibles/forms/bibleimportform.py @@ -339,31 +339,27 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard): """ Load the list of Crosswalk and BibleGateway bibles. """ - # Load and store Crosswalk Bibles. + # Load Crosswalk Bibles. filepath = AppLocation.get_directory(AppLocation.PluginsDir) filepath = os.path.join(filepath, u'bibles', u'resources') books_file = None try: self.web_bible_list[WebDownload.Crosswalk] = {} books_file = open( - os.path.join(filepath, u'crosswalkbooks.csv'), 'r') + os.path.join(filepath, u'crosswalkbooks.csv'), 'rb') dialect = csv.Sniffer().sniff(books_file.read(1024)) books_file.seek(0) books_reader = csv.reader(books_file, dialect) for line in books_reader: - ver = line[0] - name = line[1] - if not isinstance(ver, unicode): - ver = unicode(ver, u'utf8') - if not isinstance(name, unicode): - name = unicode(name, u'utf8') + ver = unicode(line[0], u'utf-8') + name = unicode(line[1], u'utf-8') self.web_bible_list[WebDownload.Crosswalk][ver] = name.strip() except IOError: log.exception(u'Crosswalk resources missing') finally: if books_file: books_file.close() - # Load and store BibleGateway Bibles. + # Load BibleGateway Bibles. books_file = None try: self.web_bible_list[WebDownload.BibleGateway] = {} @@ -385,8 +381,7 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard): finally: if books_file: books_file.close() - - # Load and store Bibleserver Bibles. + # Load and Bibleserver Bibles. filepath = AppLocation.get_directory(AppLocation.PluginsDir) filepath = os.path.join(filepath, u'bibles', u'resources') books_file = None @@ -402,7 +397,7 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard): name = unicode(line[1], u'utf-8') self.web_bible_list[WebDownload.Bibleserver][ver] = name.strip() except IOError, UnicodeError: - log.exception(u'Bibelserver resources could not be imported') + log.exception(u'Bibelserver resources missing') finally: if books_file: books_file.close() diff --git a/openlp/plugins/bibles/lib/__init__.py b/openlp/plugins/bibles/lib/__init__.py index 7a35508fc..6cb33bcce 100644 --- a/openlp/plugins/bibles/lib/__init__.py +++ b/openlp/plugins/bibles/lib/__init__.py @@ -46,18 +46,18 @@ def get_reference_match(match_type): # verse range match: (:)?(-(:)??)? range_string = str(r'(?:(?P[0-9]+)%(sep_v)s)?(?P' r'[0-9]+)(?P%(sep_r)s(?:(?:(?P[0-9]+)%(sep_v)s)?' - r'(?P[0-9]+)|%(sep_e)s)?)?' % separators) + r'(?P[0-9]+)|%(sep_e)s)?)?') % separators if match_type == u'range': return re.compile(r'^\s*' + range_string + r'\s*$', re.UNICODE) elif match_type == u'range_separator': return re.compile(separators[u'sep_l']) elif match_type == u'full': - # full reference match: ((,|(?=$)))+ - return re.compile(str(r'^\s*(?!\s)(?P[\d]*[^\d]+)(?((,|(?=$)))+ + return re.compile(str(r'^\s*(?!\s)(?P[\d]*[^\d]+)(?(?:' + range_string + r'(?:%(sep_l)s|(?=\s*$)))+)\s*$') % separators, re.UNICODE) else: - return separators[match_type] + return separators[match_type] def parse_reference(reference): """ @@ -69,9 +69,9 @@ def parse_reference(reference): - Each reference starts with the book name. A chapter name is manditory. ``John 3`` refers to Gospel of John chapter 3 - - A reference range can be given after a range seperator. + - A reference range can be given after a range separator. ``John 3-5`` refers to John chapters 3 to 5 - - Single verses can be addressed after a verse seperator + - Single verses can be addressed after a verse separator ``John 3:16`` refers to John chapter 3 verse 16 ``John 3:16-4:3`` refers to John chapter 3 verse 16 to chapter 4 verse 3 - After a verse reference all further single values are treat as verse in @@ -82,7 +82,7 @@ def parse_reference(reference): number of verse references. It is not possible to refer to verses in additional books. ``John 3:16,18`` refers to John chapter 3 verses 16 and 18 - ``John 3:16-18,20`` refers to John chapter 3 verses 16 to 18 to 20 + ``John 3:16-18,20`` refers to John chapter 3 verses 16 to 18 and 20 ``John 3:16-18,4:1`` refers to John chapter 3 verses 16 to 18 and chapter 3 verse 1 - If there is a range separator without further verse declaration the last @@ -97,11 +97,11 @@ def parse_reference(reference): 2. ``(?P[0-9]+)`` The verse reference ``from_verse`` is manditory 3. ``(?P%(sep_r)s(?:`` ... ``|%(sep_e)s)?)?`` - A ``range_to`` declaration is optional. It starts with a range seperator + A ``range_to`` declaration is optional. It starts with a range separator and contains optional a chapter and verse declaration or a end separator. 4. ``(?:(?P[0-9]+)%(sep_v)s)?`` - The ``to_chapter`` reference with seperator is equivalent to group 1. + The ``to_chapter`` reference with separator is equivalent to group 1. 5. ``(?P[0-9]+)`` The ``to_verse`` reference is equivalent to group 2. @@ -126,7 +126,6 @@ def parse_reference(reference): Returns None or a reference list. """ - log.debug('parse_reference("%s")', reference) match = get_reference_match(u'full').match(reference) if match: @@ -135,7 +134,7 @@ def parse_reference(reference): ranges = match.group(u'ranges') range_list = get_reference_match(u'range_separator').split(ranges) ref_list = [] - chapter = 0 + chapter = None for this_range in range_list: range_match = get_reference_match(u'range').match(this_range) from_chapter = range_match.group(u'from_chapter') @@ -169,6 +168,7 @@ def parse_reference(reference): to_chapter = chapter else: to_chapter = to_verse + to_verse = None # Append references to the list if has_range: if not from_verse: diff --git a/openlp/plugins/bibles/lib/http.py b/openlp/plugins/bibles/lib/http.py index bd24b3f46..218f7212e 100644 --- a/openlp/plugins/bibles/lib/http.py +++ b/openlp/plugins/bibles/lib/http.py @@ -250,13 +250,13 @@ class BSExtract(object): def get_bible_chapter(self, version, bookname, chapter): """ - Access and decode bibles via http://m.Bibleserver.com + Access and decode bibles via Bibleserver mobile website ``version`` The version of the bible like NIV for New International Version ``bookname`` - Text name of in english e.g. 'gen' for Genesis + Text name of bible book e.g. Genesis, 1. John, 1John or Offenbarung ``chapter`` Chapter number @@ -291,11 +291,11 @@ class BSExtract(object): finally: if not content: return None - verse_number = re.compile(r'v\d{5}(\d{3}) verse') + verse_number = re.compile(r'v(\d{2})(\d{3})(\d{3}) verse') verses = {} for verse in content: Receiver.send_message(u'openlp_process_events') - versenumber = int(verse_number.sub(r'\1', verse[u'class'])) + versenumber = int(verse_number.sub(r'\3', verse[u'class'])) verses[versenumber] = verse.contents[1].rstrip(u'\n') return SearchResults(bookname, chapter, verses) diff --git a/openlp/plugins/bibles/lib/manager.py b/openlp/plugins/bibles/lib/manager.py index 39d8b644c..93f301713 100644 --- a/openlp/plugins/bibles/lib/manager.py +++ b/openlp/plugins/bibles/lib/manager.py @@ -312,7 +312,7 @@ class BibleManager(object): 'Scripture Reference Error'), translate('BiblesPlugin.BibleManager', 'You did not enter a ' 'search keyword.\nYou can separate different keywords by a ' - 'space to search for all of your keywords and you can seperate ' + 'space to search for all of your keywords and you can separate ' 'them by a comma to search for one of them.')) return None diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index cced544b9..c206bd309 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -906,7 +906,6 @@ class BibleMediaItem(MediaManagerItem): ``verse`` The verse number (int). """ - verse_separator = get_reference_match(u'sep_v_display') if not self.parent.settings_tab.show_new_chapters or \ old_chapter != chapter: diff --git a/openlp/plugins/bibles/resources/biblegateway.csv b/openlp/plugins/bibles/resources/biblegateway.csv index 14f167897..ad8052704 100644 --- a/openlp/plugins/bibles/resources/biblegateway.csv +++ b/openlp/plugins/bibles/resources/biblegateway.csv @@ -1,80 +1,81 @@ +João Ferreira de Almeida Atualizada,AA +التفسير التطبيقى للكتاب المقدس,ALAB +Shqip,ALB +Amplified Bible,AMP Amuzgo de Guerrero,AMU -Arabic Life Application Bible,ALAB -Bulgarian Bible,BULG -1940 Bulgarian Bible,BG1940 -Chinanteco de Comaltepec,CCO -Cakchiquel Occidental,CKW -Haitian Creole Version,HCV -Slovo na cestu,SNC -Dette er Biblen pÃ¥ dansk,DN1933 -Hoffnung für Alle,HOF -Luther Bibel 1545,LUTH1545 -New International Version,NIV -New American Standard Bible,NASB -The Message,MSG -Amplified Bible,AMP -New Living Translation,NLT -King James Version,KJV -English Standard Version,ESV -Contemporary English Version,CEV -New King James Version,NKJV -New Century Version,NCV -21st Century King James Version,KJ21 -American Standard Version,ASV -Young's Literal Translation,YLT -Darby Translation,DARBY -Holman Christian Standard Bible,HCSB -New International Reader's Version,NIRV -Wycliffe New Testament,WYC -Worldwide English (New Testament),WE -New International Version - UK,NIVUK -Today's New International Version,TNIV +American Standard Version,ASV +La Bible du Semeur,BDS +Български 1940,BG1940 +Български,BULG +Chinanteco de Comaltepec,CCO +Contemporary English Version,CEV +Cakchiquel Occidental,CKW +Hrvatski,CRO +Castilian,CST +聖經和合本 (简体中文),CUVS +聖經和合本 (繁体中文),CUV +Darby Translation,DARBY +Dette er Biblen på dansk,DN1933 +Det Norsk Bibelselskap 1930,DNB1930 +English Standard Version,ESV +GOD’S WORD Translation,GW +Holman Christian Standard Bible,HCSB +Kreyòl ayisyen bib,HCV +Hiligaynon Bible,HLGN +Hoffnung für Alle,HOF +Het Boek,HTB +Icelandic Bible,ICELAND +Jacalteco – Oriental,JAC +Károlyi-biblia,KAR +Kekchi,KEK +21st Century King James Version,KJ21 +King James Version,KJV +La Biblia de las Américas,LBLA +Levande Bibeln,LB +La Parola è Vita,LM +La Nuova Diodati,LND +Louis Segond,LSG +Luther Bibel 1545,LUTH1545 +Māori Bible,MAORI +Македонски Новиот Завет,MNT +The Message,MSG +Mam de Comitancillo Central,MVC +Mam de Todos Santos Cuchumatán,MVJ +New American Standard Bible,NASB +New Century Version,NCV +Náhuatl de Guerrero,NGU +New International Reader's Version,NIRV +New International Version 1984,NIV1984 +New International Version 2010,NIV +New International Version - UK,NIVUK +New King James Version,NKJV +New Living Translation,NLT +Nádej pre kazdého,NPK +Nueva Versión Internacional,NVI +O Livro,OL +Quiché – Centro Occidental,QUT +Reimer 2001,REIMER +Română Cornilescu,RMNN +Новый перевод на русский язык,RUSV +Reina-Valera Antigua,RVA Reina-Valera 1960,RVR1960 -Nueva Versión Internacional,NVI -Reina-Valera 1995,RVR1995 -Castilian,CST -Reina-Valera Antigua,RVA -Biblia en Lenguaje Sencillo,BLS -La Biblia de las Américas,LBLA -Louis Segond,LSG -La Bible du Semeur,BDS -1881 Westcott-Hort New Testament,WHNU -1550 Stephanus New Testament,TR1550 -1894 Scrivener New Testament,TR1894 -The Westminster Leningrad Codex,WLC -Hiligaynon Bible,HLGN -Croatian Bible,CRO -Hungarian Károli,KAR -Icelandic Bible,ICELAND -La Nuova Diodati,LND -La Parola è Vita,LM -Jacalteco - Oriental,JAC -Kekchi,KEK -Korean Bible,KOREAN -Maori Bible,MAORI -Macedonian New Testament,MNT -Mam - Central,MVC -Mam de Todos Santos Chuchumatán,MVJ -Reimer 2001,REIMER -Náhuatl de Guerrero,NGU -Het Boek,HTB -Det Norsk Bibelselskap 1930,DNB1930 -Levande Bibeln,LB -O Livro,OL -João Ferreira de Almeida Atualizada,AA -Quiché - Centro Occidental,QUT -Romanian,RMNN -Romanian,TLCR -Russian Synodal Version,RUSV -Slovo Zhizny,SZ -Nádej pre kazdého,NPK -Albanian Bible,ALB -Levande Bibeln,SVL -Svenska 1917,SV1917 -Swahili New Testament,SNT -Ang Salita ng Diyos,SND -Ukrainian Bible,UKR -Uspanteco,USP -1934 Vietnamese Bible,VIET -Chinese Union Version (Simplified),CUVS -Chinese Union Version (Traditional),CUV +Reina-Valera 1995,RVR1995 +Slovo na cestu,SNC +Ang Salita ng Diyos,SND +Swahili New Testament,SNT +Svenska 1917,SV1917 +Levande Bibeln,SVL +Создать страницу,SZ +Traducción en lenguaje actual,TLA +New Romanian Translation,TLCR +Today’s New International Version 2005,TNIV +Textus Receptus Stephanus 1550,TR1550 +Textus Receptus Scrivener 1894,TR1894 +Українська Біблія. Переклад Івана Огієнка,UKR +Uspanteco,USP +Kinh Thánh tiếng Việt 1934,VIET +Worldwide English (New Testament),WE +Codex Vaticanus Westcott-Hort 1881,WHNU +Westminster Leningrad Codex,WLC +Wycliffe New Testament,WYC +Young's Literal Translation,YLT diff --git a/openlp/plugins/bibles/resources/bibleserver.csv b/openlp/plugins/bibles/resources/bibleserver.csv index d73bf1678..c0d109f97 100644 --- a/openlp/plugins/bibles/resources/bibleserver.csv +++ b/openlp/plugins/bibles/resources/bibleserver.csv @@ -27,7 +27,7 @@ En Levende Bok (NOR), NOR Nádej pre kazdého, NPK Noua traducere în limba românã, NTR Nueva Versión Internacional, NVI -Hebrew OT, OT +הברית הישנה, OT Słowo Życia, POL O Livro, PRT Новый перевод на русский язык, RUS @@ -36,4 +36,4 @@ Schlachter 2000, SLT En Levande Bok (SWE), SVL Today's New International Version, TNIV Türkçe, TR -Vulgata, VUL +Biblia Vulgata, VUL diff --git a/openlp/plugins/bibles/resources/crosswalkbooks.csv b/openlp/plugins/bibles/resources/crosswalkbooks.csv index 0b6de47de..7957bfdc8 100644 --- a/openlp/plugins/bibles/resources/crosswalkbooks.csv +++ b/openlp/plugins/bibles/resources/crosswalkbooks.csv @@ -24,4 +24,4 @@ New International Reader's Version,nrv The Darby Translation,dby The Webster Bible,wbt The Latin Vulgate,vul -Weymouth New Testament,wnt \ No newline at end of file +Weymouth New Testament,wnt From fc2569cf830b64262b32c167ea6be5b0df38c0c8 Mon Sep 17 00:00:00 2001 From: M2j Date: Sat, 18 Dec 2010 03:12:41 +0100 Subject: [PATCH 20/27] missed some fixes --- openlp/plugins/bibles/forms/bibleimportform.py | 2 +- openlp/plugins/bibles/lib/__init__.py | 6 +++--- openlp/plugins/bibles/lib/mediaitem.py | 7 ++++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/openlp/plugins/bibles/forms/bibleimportform.py b/openlp/plugins/bibles/forms/bibleimportform.py index a454404d9..53e659064 100644 --- a/openlp/plugins/bibles/forms/bibleimportform.py +++ b/openlp/plugins/bibles/forms/bibleimportform.py @@ -397,7 +397,7 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard): name = unicode(line[1], u'utf-8') self.web_bible_list[WebDownload.Bibleserver][ver] = name.strip() except IOError, UnicodeError: - log.exception(u'Bibelserver resources missing') + log.exception(u'Bibleserver resources missing') finally: if books_file: books_file.close() diff --git a/openlp/plugins/bibles/lib/__init__.py b/openlp/plugins/bibles/lib/__init__.py index 6cb33bcce..7975bfed7 100644 --- a/openlp/plugins/bibles/lib/__init__.py +++ b/openlp/plugins/bibles/lib/__init__.py @@ -43,7 +43,7 @@ def get_reference_match(match_type): u'sep_l_display': local_separator[4], u'sep_l': local_separator[5], u'sep_e': local_separator[6]} - # verse range match: (:)?(-(:)??)? + # verse range match: (:)?(-((:)?|end)?)? range_string = str(r'(?:(?P[0-9]+)%(sep_v)s)?(?P' r'[0-9]+)(?P%(sep_r)s(?:(?:(?P[0-9]+)%(sep_v)s)?' r'(?P[0-9]+)|%(sep_e)s)?)?') % separators @@ -54,8 +54,8 @@ def get_reference_match(match_type): elif match_type == u'full': # full reference match: ((,|(?=$)))+ return re.compile(str(r'^\s*(?!\s)(?P[\d]*[^\d]+)(?(?:' + range_string + r'(?:%(sep_l)s|(?=\s*$)))+)\s*$') - % separators, re.UNICODE) + r'(?P(?:' + range_string + r'(?:%(sep_l)s|(?=\s*$)))+)\s*$') + % separators, re.UNICODE) else: return separators[match_type] diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index c206bd309..8fafd0f97 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -743,7 +743,8 @@ class BibleMediaItem(MediaManagerItem): second_bible = self._decodeQtObject(bitem, 'second_bible') second_version = self._decodeQtObject(bitem, 'second_version') second_copyright = self._decodeQtObject(bitem, 'second_copyright') - second_permissions = self._decodeQtObject(bitem, 'second_permissions') + second_permissions = \ + self._decodeQtObject(bitem, 'second_permissions') second_text = self._decodeQtObject(bitem, 'second_text') verse_text = self.formatVerse(old_chapter, chapter, verse) footer = u'%s (%s %s %s)' % (book, version, copyright, permissions) @@ -754,8 +755,8 @@ class BibleMediaItem(MediaManagerItem): second_copyright, second_permissions) if footer not in raw_footer: raw_footer.append(footer) - bible_text = u'%s\u00a0%s\n\n%s\u00a0%s' % (verse_text, text, verse_text, - second_text) + bible_text = u'%s\u00a0%s\n\n%s\u00a0%s' % (verse_text, text, + verse_text, second_text) raw_slides.append(bible_text) bible_text = u'' # If we are 'Verse Per Slide' then create a new slide. From 02645f0457665692ab16ca578a2d71489f247546 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 18 Dec 2010 17:11:21 +0000 Subject: [PATCH 21/27] Songs must have an Author --- openlp/plugins/songs/forms/editsongform.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py index 58488a6e9..21958d403 100644 --- a/openlp/plugins/songs/forms/editsongform.py +++ b/openlp/plugins/songs/forms/editsongform.py @@ -547,14 +547,11 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): if self.AuthorsListView.count() == 0: self.SongTabWidget.setCurrentIndex(1) self.AuthorsListView.setFocus() - answer = QtGui.QMessageBox.warning(self, + QtGui.QMessageBox.critical(self, translate('SongsPlugin.EditSongForm', 'Warning'), translate('SongsPlugin.EditSongForm', - 'You have not added any authors for this song. Do you ' - 'want to add an author now?'), - QtGui.QMessageBox.Yes | QtGui.QMessageBox.No) - if answer == QtGui.QMessageBox.Yes: - return False + 'You need to have an author for this song.')) + return False if self.song.verse_order: order = [] order_names = self.song.verse_order.split() From 47ac10f413fbce5bb09833f23e23be9d81a3ec18 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 18 Dec 2010 17:28:50 +0000 Subject: [PATCH 22/27] Fix songs with no text being saved Fixes: https://launchpad.net/bugs/691952 --- openlp/plugins/songs/forms/editverseform.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/openlp/plugins/songs/forms/editverseform.py b/openlp/plugins/songs/forms/editverseform.py index d954bfb1f..e9f1359d2 100644 --- a/openlp/plugins/songs/forms/editverseform.py +++ b/openlp/plugins/songs/forms/editverseform.py @@ -29,7 +29,7 @@ import logging from PyQt4 import QtCore, QtGui -from openlp.plugins.songs.lib import VerseType +from openlp.plugins.songs.lib import VerseType, translate from editversedialog import Ui_EditVerseDialog @@ -130,7 +130,7 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog): self.verseNumberBox.setValue(verse_number) def setVerse(self, text, single=False, - tag=u'%s:1' % VerseType.to_string(VerseType.Verse)): + tag = u'%s:1' % VerseType.to_string(VerseType.Verse)): if single: verse_type, verse_number = tag.split(u':') verse_type_index = VerseType.from_string(verse_type) @@ -159,3 +159,12 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog): text = u'---[%s:1]---\n%s' % (VerseType.to_string(VerseType.Verse), text) return text + + def accept(self): + if len(unicode(self.getVerse()[0])) == 0: + QtGui.QMessageBox.critical(self, + translate('SongsPlugin.EditSongForm', 'Error'), + translate('SongsPlugin.EditSongForm', + 'You need to type some text in to the verse.')) + return False + QtGui.QDialog.accept(self) From b553b2ac89d2cc07c73b054f1fcd08b21c538be9 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 18 Dec 2010 19:24:44 +0000 Subject: [PATCH 23/27] Tighten up the validation --- openlp/plugins/songs/forms/editverseform.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/openlp/plugins/songs/forms/editverseform.py b/openlp/plugins/songs/forms/editverseform.py index e9f1359d2..dce8c91d7 100644 --- a/openlp/plugins/songs/forms/editverseform.py +++ b/openlp/plugins/songs/forms/editverseform.py @@ -131,6 +131,7 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog): def setVerse(self, text, single=False, tag = u'%s:1' % VerseType.to_string(VerseType.Verse)): + self.verseType = single if single: verse_type, verse_number = tag.split(u':') verse_type_index = VerseType.from_string(verse_type) @@ -161,7 +162,11 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog): return text def accept(self): - if len(unicode(self.getVerse()[0])) == 0: + if self.verseType: + value = unicode(self.getVerse()[0]) + else: + value = self.getVerse()[0].split(u'\n')[1] + if len(value) == 0: QtGui.QMessageBox.critical(self, translate('SongsPlugin.EditSongForm', 'Error'), translate('SongsPlugin.EditSongForm', From bef5479a6a9237ccf628e68e5f8a76ea35b68d8b Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 19 Dec 2010 08:22:48 +0000 Subject: [PATCH 24/27] Fix spacing --- openlp/plugins/songs/forms/editverseform.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/plugins/songs/forms/editverseform.py b/openlp/plugins/songs/forms/editverseform.py index dce8c91d7..5711abc6c 100644 --- a/openlp/plugins/songs/forms/editverseform.py +++ b/openlp/plugins/songs/forms/editverseform.py @@ -130,7 +130,7 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog): self.verseNumberBox.setValue(verse_number) def setVerse(self, text, single=False, - tag = u'%s:1' % VerseType.to_string(VerseType.Verse)): + tag=u'%s:1' % VerseType.to_string(VerseType.Verse)): self.verseType = single if single: verse_type, verse_number = tag.split(u':') From 12af5cada389f34fba0658b1de326d4d2fe7aaec Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Mon, 20 Dec 2010 14:15:03 +0000 Subject: [PATCH 25/27] Fix field name --- openlp/plugins/songs/forms/editverseform.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openlp/plugins/songs/forms/editverseform.py b/openlp/plugins/songs/forms/editverseform.py index 5711abc6c..8f5f04194 100644 --- a/openlp/plugins/songs/forms/editverseform.py +++ b/openlp/plugins/songs/forms/editverseform.py @@ -131,7 +131,7 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog): def setVerse(self, text, single=False, tag=u'%s:1' % VerseType.to_string(VerseType.Verse)): - self.verseType = single + self.hasSingleVerse = single if single: verse_type, verse_number = tag.split(u':') verse_type_index = VerseType.from_string(verse_type) @@ -162,7 +162,7 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog): return text def accept(self): - if self.verseType: + if self.hasSingleVerse: value = unicode(self.getVerse()[0]) else: value = self.getVerse()[0].split(u'\n')[1] From cb4fa5d03ab5c84d5234c3c19aedc91c6df2846c Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Mon, 20 Dec 2010 20:22:21 +0000 Subject: [PATCH 26/27] Fix Preview of Theme with Image bug Fix Protection of Single Character Theme titles Add Cursor update to Image import Fixes: https://launchpad.net/bugs/692684 --- openlp/core/lib/imagemanager.py | 10 ++++++++++ openlp/core/lib/rendermanager.py | 2 ++ openlp/core/ui/slidecontroller.py | 2 +- openlp/core/ui/themeform.py | 2 +- openlp/plugins/images/lib/mediaitem.py | 6 +++++- 5 files changed, 19 insertions(+), 3 deletions(-) diff --git a/openlp/core/lib/imagemanager.py b/openlp/core/lib/imagemanager.py index 307ee84df..14de141fc 100644 --- a/openlp/core/lib/imagemanager.py +++ b/openlp/core/lib/imagemanager.py @@ -113,6 +113,14 @@ class ImageManager(QtCore.QObject): time.sleep(0.1) return self._cache[name].image_bytes + def del_image(self, name): + """ + Delete the Image from the Cache + """ + log.debug(u'del_image %s' % name) + if name in self._cache: + del self._cache[name] + def add_image(self, name, path): """ Add image to cache if it is not already there @@ -125,6 +133,8 @@ class ImageManager(QtCore.QObject): image.image = resize_image(path, self.width, self.height) self._cache[name] = image + else: + log.debug(u'Image in cache %s:%s' % (name, path)) self._cache_dirty = True # only one thread please if not self._thread_running: diff --git a/openlp/core/lib/rendermanager.py b/openlp/core/lib/rendermanager.py index 81cde12a0..fc7ba38b8 100644 --- a/openlp/core/lib/rendermanager.py +++ b/openlp/core/lib/rendermanager.py @@ -213,6 +213,8 @@ class RenderManager(object): # make big page for theme edit dialog to get line count if self.force_page: verse = verse + verse + verse + else: + self.image_manager.del_image(self.theme_data.theme_name) footer = [] footer.append(u'Arky Arky (Unknown)' ) footer.append(u'Public Domain') diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 6c7fb8538..0f275a792 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -560,7 +560,7 @@ class SlideController(QtGui.QWidget): [serviceItem, self.isLive, blanked, slideno]) self.slideList = {} width = self.parent.ControlSplitter.sizes()[self.split] - # Set pointing cursor when we have somthing to point at + # Set pointing cursor when we have something to point at self.PreviewListWidget.setCursor(QtCore.Qt.PointingHandCursor) self.serviceItem = serviceItem self.PreviewListWidget.clear() diff --git a/openlp/core/ui/themeform.py b/openlp/core/ui/themeform.py index b091427bf..84c6f0aa3 100644 --- a/openlp/core/ui/themeform.py +++ b/openlp/core/ui/themeform.py @@ -444,7 +444,7 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard): def setPreviewTabValues(self): self.setField(u'name', QtCore.QVariant(self.theme.theme_name)) - if len(self.theme.theme_name) > 1: + if len(self.theme.theme_name) > 0: self.themeNameEdit.setEnabled(False) else: self.themeNameEdit.setEnabled(True) diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py index 4f1e9378e..0774787f5 100644 --- a/openlp/plugins/images/lib/mediaitem.py +++ b/openlp/plugins/images/lib/mediaitem.py @@ -31,7 +31,7 @@ from PyQt4 import QtCore, QtGui from openlp.core.lib import MediaManagerItem, BaseListWithDnD, build_icon, \ context_menu_action, ItemCapabilities, SettingsManager, translate, \ - check_item_selected + check_item_selected, Receiver from openlp.core.utils import AppLocation, get_images_filter log = logging.getLogger(__name__) @@ -139,6 +139,8 @@ class ImageMediaItem(MediaManagerItem): self.settingsSection, self.getFileList()) def loadList(self, list): + self.listView.setCursor(QtCore.Qt.BusyCursor) + Receiver.send_message(u'openlp_process_events') for file in list: filename = os.path.split(unicode(file))[1] thumb = os.path.join(self.servicePath, filename) @@ -153,6 +155,8 @@ class ImageMediaItem(MediaManagerItem): item_name.setIcon(icon) item_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(file)) self.listView.addItem(item_name) + self.listView.setCursor(QtCore.Qt.ArrowCursor) + Receiver.send_message(u'openlp_process_events') def generateSlideData(self, service_item, item=None, xmlVersion=False): items = self.listView.selectedIndexes() From 47ac045f1da61de4e5651328de89fcf64508e92c Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Tue, 21 Dec 2010 11:09:00 +0000 Subject: [PATCH 27/27] Fix config tag error --- openlp/core/ui/slidecontroller.py | 2 +- openlp/core/ui/themeform.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 0f275a792..4f75a3ce0 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -466,7 +466,7 @@ class SlideController(QtGui.QWidget): self.Toolbar.actions[u'Stop Loop'].setVisible(False) if item.is_text(): if QtCore.QSettings().value( - self.parent.songsSettingsSection + u'/show songbar', + self.parent.songsSettingsSection + u'/display songbar', QtCore.QVariant(True)).toBool() and len(self.slideList) > 0: self.Toolbar.makeWidgetsVisible([u'Song Menu']) if item.is_capable(ItemCapabilities.AllowsLoop) and \ diff --git a/openlp/core/ui/themeform.py b/openlp/core/ui/themeform.py index 84c6f0aa3..7ed58e943 100644 --- a/openlp/core/ui/themeform.py +++ b/openlp/core/ui/themeform.py @@ -289,6 +289,7 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard): """ Run the wizard. """ + log.debug(u'Editing theme %s' % self.theme.theme_name) self.updateThemeAllowed = False self.setDefaults() self.updateThemeAllowed = True