[Openlp-core] macOS Test Results: Passed
macOS tests passed! -- https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/369490 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] Linting: Passed
Linting passed! -- https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/369490 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] Linux Test Results: Passed
Linux tests passed! -- https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/369490 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~john+ubuntu-g/openlp/singingthefaith into lp:openlp
John Lines has proposed merging lp:~john+ubuntu-g/openlp/singingthefaith into
lp:openlp.
Commit message:
Initial merge of SingingTheFaithImport, including update to importer.py
Requested reviews:
Raoul Snyman (raoul-snyman)
For more details, see:
https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/369490
Singing The Faith is the new Authorized Hymn book for the Methodist Church of
Great Britain.
There is an electronic version of the Hymn book, for Windows only, which can
export Hymns as text files.
This import module smooths the process of converting these text files into
OpenLP. The input format is messy and not intended for automatic processing so
the importer uses a combination of heuristics and a hints file. This version
has not been tested on all the hymns in Singing The Faith, but deals with most
of the, more than 100, hymns it has been tested with.
Note that it includes a test module, which works for the single verse case.
Multiple verse songs import OK, but tests fail.
--
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/plugins/songs/lib/importer.py'
--- openlp/plugins/songs/lib/importer.py 2019-04-13 13:00:22 +
+++ openlp/plugins/songs/lib/importer.py 2019-06-30 19:19:46 +
@@ -42,6 +42,7 @@
from .importers.powersong import PowerSongImport
from .importers.presentationmanager import PresentationManagerImport
from .importers.propresenter import ProPresenterImport
+from .importers.singingthefaith import SingingTheFaithImport
from .importers.songbeamer import SongBeamerImport
from .importers.songpro import SongProImport
from .importers.songshowplus import SongShowPlusImport
@@ -173,16 +174,17 @@
PowerSong = 16
PresentationManager = 17
ProPresenter = 18
-SongBeamer = 19
-SongPro = 20
-SongShowPlus = 21
-SongsOfFellowship = 22
-SundayPlus = 23
-VideoPsalm = 24
-WordsOfWorship = 25
-WorshipAssistant = 26
-WorshipCenterPro = 27
-ZionWorx = 28
+SingingTheFaith = 19
+SongBeamer = 20
+SongPro = 21
+SongShowPlus = 22
+SongsOfFellowship = 23
+SundayPlus = 24
+VideoPsalm = 25
+WordsOfWorship = 26
+WorshipAssistant = 27
+WorshipCenterPro = 28
+ZionWorx = 29
# Set optional attribute defaults
__defaults__ = {
@@ -343,6 +345,15 @@
'filter': '{text} (*.pro4 *.pro5 *.pro6)'.format(text=translate('SongsPlugin.ImportWizardForm',
'ProPresenter Song Files'))
},
+SingingTheFaith: {
+'class': SingingTheFaithImport,
+'name': 'SingingTheFaith',
+'prefix': 'singingTheFaith',
+'filter': '%s (*.txt)' % translate('SongsPlugin.ImportWizardForm', 'Singing The Faith Exported Files'),
+'descriptionText': translate('SongsPlugin.ImportWizardForm',
+ 'First use Singing The Faith Electonic edition to export '
+ 'the song(s) in Text format.')
+},
SongBeamer: {
'class': SongBeamerImport,
'name': 'SongBeamer',
@@ -462,6 +473,7 @@
SongFormat.PowerSong,
SongFormat.PresentationManager,
SongFormat.ProPresenter,
+SongFormat.SingingTheFaith,
SongFormat.SongBeamer,
SongFormat.SongPro,
SongFormat.SongShowPlus,
=== added file 'openlp/plugins/songs/lib/importers/singingthefaith.py'
--- openlp/plugins/songs/lib/importers/singingthefaith.py 1970-01-01 00:00:00 +
+++ openlp/plugins/songs/lib/importers/singingthefaith.py 2019-06-30 19:19:46 +
@@ -0,0 +1,347 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###
+# OpenLP - Open Source Lyrics Projection #
+# --- #
+# Copyright (c) 2008-2019 OpenLP Developers #
+# --- #
+# This program is free software; you can redistribute it and/or modify it #
+# under the terms of the GNU General Public License as published by the Free #
+# Software Foundation; version 2 of the License. #
+# #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for#
+# more details. #
+# #
+#
[Openlp-core] [Merge] lp:~john+ubuntu-g/openlp/singingthefaith into lp:openlp
The proposal to merge lp:~john+ubuntu-g/openlp/singingthefaith into lp:openlp has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/369489 -- Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~john+ubuntu-g/openlp/singingthefaith into lp:openlp
Fix lint tests outside main importer code -- https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/369489 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] Linting: Failed
Linting failed, please see https://ci.openlp.io/job/MP-03-Linting/132/ for more details -- https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/369489 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] Linux Test Results: Passed
Linux tests passed! -- https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/369489 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~john+ubuntu-g/openlp/singingthefaith into lp:openlp
John Lines has proposed merging lp:~john+ubuntu-g/openlp/singingthefaith into
lp:openlp.
Commit message:
Initial merge of SingingTheFaithImport, including update to importer.py
Requested reviews:
Raoul Snyman (raoul-snyman)
For more details, see:
https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/369489
Singing The Faith is the new Authorized Hymn book for the Methodist Church of
Great Britain.
There is an electronic version of the Hymn book, for Windows only, which can
export Hymns as text files.
This import module smooths the process of converting these text files into
OpenLP. The input format is messy and not intended for automatic processing so
the importer uses a combination of heuristics and a hints file. This version
has not been tested on all the hymns in Singing The Faith, but deals with most
of the, more than 100, hymns it has been tested with.
Note that it includes a test module, which works for the single verse case.
Multiple verse songs import OK, but tests fail.
--
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/plugins/songs/lib/importer.py'
--- openlp/plugins/songs/lib/importer.py 2019-04-13 13:00:22 +
+++ openlp/plugins/songs/lib/importer.py 2019-06-30 18:28:14 +
@@ -42,6 +42,7 @@
from .importers.powersong import PowerSongImport
from .importers.presentationmanager import PresentationManagerImport
from .importers.propresenter import ProPresenterImport
+from .importers.singingthefaith import SingingTheFaithImport
from .importers.songbeamer import SongBeamerImport
from .importers.songpro import SongProImport
from .importers.songshowplus import SongShowPlusImport
@@ -173,16 +174,17 @@
PowerSong = 16
PresentationManager = 17
ProPresenter = 18
-SongBeamer = 19
-SongPro = 20
-SongShowPlus = 21
-SongsOfFellowship = 22
-SundayPlus = 23
-VideoPsalm = 24
-WordsOfWorship = 25
-WorshipAssistant = 26
-WorshipCenterPro = 27
-ZionWorx = 28
+SingingTheFaith = 19
+SongBeamer = 20
+SongPro = 21
+SongShowPlus = 22
+SongsOfFellowship = 23
+SundayPlus = 24
+VideoPsalm = 25
+WordsOfWorship = 26
+WorshipAssistant = 27
+WorshipCenterPro = 28
+ZionWorx = 29
# Set optional attribute defaults
__defaults__ = {
@@ -343,6 +345,15 @@
'filter': '{text} (*.pro4 *.pro5 *.pro6)'.format(text=translate('SongsPlugin.ImportWizardForm',
'ProPresenter Song Files'))
},
+ SingingTheFaith: {
+'class': SingingTheFaithImport,
+'name': 'SingingTheFaith',
+'prefix': 'singingTheFaith',
+'filter': '%s (*.txt)' % translate('SongsPlugin.ImportWizardForm', 'Singing The Faith Exported Files'),
+'descriptionText': translate('SongsPlugin.ImportWizardForm',
+ 'First use Singing The Faith Electonic edition to export '
+ 'the song(s) in Text format.')
+},
SongBeamer: {
'class': SongBeamerImport,
'name': 'SongBeamer',
@@ -462,6 +473,7 @@
SongFormat.PowerSong,
SongFormat.PresentationManager,
SongFormat.ProPresenter,
+SongFormat.SingingTheFaith,
SongFormat.SongBeamer,
SongFormat.SongPro,
SongFormat.SongShowPlus,
=== added file 'openlp/plugins/songs/lib/importers/singingthefaith.py'
--- openlp/plugins/songs/lib/importers/singingthefaith.py 1970-01-01 00:00:00 +
+++ openlp/plugins/songs/lib/importers/singingthefaith.py 2019-06-30 18:28:14 +
@@ -0,0 +1,347 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###
+# OpenLP - Open Source Lyrics Projection #
+# --- #
+# Copyright (c) 2008-2019 OpenLP Developers #
+# --- #
+# This program is free software; you can redistribute it and/or modify it #
+# under the terms of the GNU General Public License as published by the Free #
+# Software Foundation; version 2 of the License. #
+# #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for#
+# more details. #
+# #
+#
[Openlp-core] [Merge] lp:~john+ubuntu-g/openlp/singingthefaith into lp:openlp
The proposal to merge lp:~john+ubuntu-g/openlp/singingthefaith into lp:openlp has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/369398 -- Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~john+ubuntu-g/openlp/singingthefaith into lp:openlp
1. Thanks for the info on flake8 - is now flake8 clean - you are quite right - it is better for me to learn about the tools. 2. Think indentation is fixed - flake8 was handy as well 3. Email address now set in my bzr config 4. Can you have another look at the change now. -- https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/369398 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
